[Pkg-mozext-commits] [adblock-plus] 241/464: Moved modules to the lib/ directory

[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 02b2a547b5aab59e984b32740af8d874d57c2efa
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Thu Jun 14 16:24:39 2012 +0200

    Moved modules to the lib/ directory
    
    --HG--
    rename : keySelector.js => lib/keySelector.js
    rename : prefs.js => lib/prefs.js
    rename : windowObserver.js => lib/windowObserver.js
---
 bootstrap.js.tmpl                          | 2 +-
 keySelector.js => lib/keySelector.js       | 0
 prefs.js => lib/prefs.js                   | 0
 windowObserver.js => lib/windowObserver.js | 0
 packager.py                                | 6 +++---
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bootstrap.js.tmpl b/bootstrap.js.tmpl
index 360a9e7..b9a32e2 100644
--- a/bootstrap.js.tmpl
+++ b/bootstrap.js.tmpl
@@ -138,7 +138,7 @@ function require(module)
         onShutdown: onShutdown,
         {% endif %}
         exports: {}};
-      Services.scriptloader.loadSubScript(addonData.resourceURI.spec + module + ".js", scopes[module]);
+      Services.scriptloader.loadSubScript(addonData.resourceURI.spec + "lib/" + module + ".js", scopes[module]);
     {%- if 'info' in requires %}
     }
     {%- endif %}
diff --git a/keySelector.js b/lib/keySelector.js
similarity index 100%
rename from keySelector.js
rename to lib/keySelector.js
diff --git a/prefs.js b/lib/prefs.js
similarity index 100%
rename from prefs.js
rename to lib/prefs.js
diff --git a/windowObserver.js b/lib/windowObserver.js
similarity index 100%
rename from windowObserver.js
rename to lib/windowObserver.js
diff --git a/packager.py b/packager.py
index afc744c..c62de61 100644
--- a/packager.py
+++ b/packager.py
@@ -51,7 +51,7 @@ def getXPIFiles(baseDir):
   for file in ('components', 'modules', 'lib', 'resources', 'defaults', 'chrome.manifest', 'icon.png', 'icon64.png'):
     yield os.path.join(baseDir, file)
   for file in os.listdir(baseDir):
-    if file.endswith('.js') or file.endswith('.jsm') or file.endswith('.xml'):
+    if file.endswith('.xml'):
       yield os.path.join(baseDir, file)
 
 def getIgnoredFiles(params):
@@ -241,7 +241,7 @@ def addMissingFiles(baseDir, params, files):
     if name == 'defaults/preferences/prefs.js':
       if re.search(r'\.currentVersion"', content):
         templateData['hasVersionPref'] = True
-    if not '/' in name:
+    if not '/' in name or name.startswith('lib/'):
       if re.search(r'(?:^|\s)onShutdown\.', content):
         templateData['hasShutdownHandlers'] = True
 
@@ -258,7 +258,7 @@ def addMissingFiles(baseDir, params, files):
   while True:
     missing = []
     for module in templateData['requires']:
-      moduleFile = module + '.js'
+      moduleFile = 'lib/' + module + '.js'
       if not moduleFile in files:
         path = os.path.join(buildtools.__path__[0], moduleFile)
         if os.path.exists(path):

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