[Pkg-mozext-commits] [adblock-plus] 195/464: Topic 9240 - Fix packaging of locales for builds without inner JAR file

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit 1ff3f6230d2f1e642ce5bf0f6d432431df6685b7
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Fri Jan 6 15:17:51 2012 +0100

    Topic 9240 - Fix packaging of locales for builds without inner JAR file
---
 packager.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/packager.py b/packager.py
index 6de4c9d..0bce8a3 100644
--- a/packager.py
+++ b/packager.py
@@ -182,7 +182,10 @@ def fixupLocales(baseDir, files, params):
 
   for locale in params['locales']:
     for file in reference.iterkeys():
-      path = 'locale/%s/%s' % (locale, file)
+      if params['noJar']:
+        path = 'chrome/locale/%s/%s' % (locale, file)
+      else:
+        path = 'locale/%s/%s' % (locale, file)
       if path in files:
         data = localeTools.parseString(files[path].decode('utf-8'), path)
         for key, value in reference[file].iteritems():
@@ -297,11 +300,16 @@ def createBuild(baseDir, outFile=None, locales=None, buildNum=None, releaseBuild
     'version': version.encode('utf-8'),
     'metadata': metadata,
     'limitMetadata': limitMetadata,
+    'noJar': metadata.has_option('general', 'nojar'),
   }
   files = {}
   files['install.rdf'] = createManifest(baseDir, params)
-  if metadata.has_option('general', 'nojar'):
-    readFile(files, params, os.path.join(baseDir, 'chrome'), 'chrome')
+  if params['noJar']:
+    for name, path in getChromeSubdirs(baseDir, params['locales']).iteritems():
+      if os.path.isdir(path):
+        readFile(files, params, path, 'chrome/%s' % name)
+    if not params['limitMetadata']:
+      fixupLocales(baseDir, files, params)
   else:
     files['chrome/%s.jar' % metadata.get('general', 'baseName')] = createChromeJar(baseDir, params)
   readXPIFiles(baseDir, params, files)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git