Bug 520801 - Remove sub directory from taskbar module path. Addresses installer build issues which prevented jsm installation. r=dao.
authorJim Mathies <jmathies@mozilla.com>
Wed, 07 Oct 2009 20:06:30 -0500
changeset 33642 eec6a2c6a390cc4dc3d525ffdef9bdefc6f77206
parent 33641 eef814b58a9c6251e82e26b61085118423657364
child 33643 63c6082e6230064ddc3b89227d3227da81fd25ca
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao
bugs520801
milestone1.9.3a1pre
Bug 520801 - Remove sub directory from taskbar module path. Addresses installer build issues which prevented jsm installation. r=dao.
browser/base/content/browser.js
browser/components/nsBrowserGlue.js
browser/components/wintaskbar/Makefile.in
browser/components/wintaskbar/WindowsJumpLists.jsm
browser/components/wintaskbar/WindowsPreviewPerTab.jsm
browser/components/wintaskbar/jumpLists.jsm
browser/components/wintaskbar/preview-per-tab.jsm
browser/makefiles.sh
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -131,17 +131,17 @@ let gInitialPages = [
 
 #ifdef XP_WIN
 #ifndef WINCE
 #define WIN7_FEATURES
 XPCOMUtils.defineLazyGetter(this, "Win7Features", function () {
   const WINTASKBAR_CONTRACTID = "@mozilla.org/windows-taskbar;1";
   let taskbar = Cc[WINTASKBAR_CONTRACTID].getService(Ci.nsIWinTaskbar);
   if (taskbar.available) {
-    Cu.import("resource://gre/modules/wintaskbar/preview-per-tab.jsm");
+    Cu.import("resource://gre/modules/WindowsPreviewPerTab.jsm");
     return {
       onOpenWindow: function () {
         AeroPeek.onOpenWindow(window);
       },
       onCloseWindow: function () {
         AeroPeek.onCloseWindow(window);
       }
     };
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -354,17 +354,17 @@ BrowserGlue.prototype = {
     // been warned about them yet, open the plugins update page.
     if (this._prefs.getBoolPref(PREF_PLUGINS_NOTIFYUSER))
       this._showPluginUpdatePage();
 
 #ifdef XP_WIN
 #ifndef WINCE
     // For windows seven, initialize the jump list module.
     let temp = {};
-    Cu.import("resource://gre/modules/wintaskbar/jumpLists.jsm", temp);
+    Cu.import("resource://gre/modules/WindowsJumpLists.jsm", temp);
     temp.WinTaskbarJumpList.startup();
 #endif
 #endif
   },
 
   _onQuitRequest: function(aCancelQuit, aQuitType)
   {
     // If user has already dismissed quit request, then do nothing
--- a/browser/components/wintaskbar/Makefile.in
+++ b/browser/components/wintaskbar/Makefile.in
@@ -43,19 +43,14 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 ifdef ENABLE_TESTS
 DIRS += test
 endif
 
 MODULE = wintaskbar
 
-_WINTASKBAR_FILES = \
-	preview-per-tab.jsm \
-	jumpLists.jsm \
+EXTRA_JS_MODULES = \
+	WindowsPreviewPerTab.jsm \
+	WindowsJumpLists.jsm \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
-
-libs:: $(_WINTASKBAR_FILES)
-	$(NSINSTALL) -D $(DIST)/bin/modules/wintaskbar;
-	$(INSTALL) $(foreach f,$^,"$f") $(DIST)/bin/modules/wintaskbar
-
rename from browser/components/wintaskbar/jumpLists.jsm
rename to browser/components/wintaskbar/WindowsJumpLists.jsm
rename from browser/components/wintaskbar/preview-per-tab.jsm
rename to browser/components/wintaskbar/WindowsPreviewPerTab.jsm
--- a/browser/makefiles.sh
+++ b/browser/makefiles.sh
@@ -64,16 +64,17 @@ browser/components/safebrowsing/src/Make
 browser/components/search/Makefile
 browser/components/sessionstore/Makefile
 browser/components/sessionstore/src/Makefile
 browser/components/sidebar/Makefile
 browser/components/sidebar/src/Makefile
 browser/components/shell/Makefile
 browser/components/shell/public/Makefile
 browser/components/shell/src/Makefile
+browser/components/wintaskbar/Makefile
 browser/fuel/Makefile
 browser/fuel/public/Makefile
 browser/fuel/src/Makefile
 browser/installer/Makefile
 browser/installer/windows/Makefile
 browser/locales/Makefile
 browser/themes/Makefile
 browser/themes/pinstripe/browser/Makefile
@@ -100,11 +101,12 @@ if [ "$ENABLE_TESTS" ]; then
     browser/components/feeds/test/chrome/Makefile
     browser/components/places/tests/Makefile
     browser/components/places/tests/chrome/Makefile
     browser/components/places/tests/browser/Makefile
     browser/components/places/tests/perf/Makefile
     browser/components/privatebrowsing/test/Makefile
     browser/components/privatebrowsing/test/browser/Makefile
     browser/components/safebrowsing/content/test/Makefile
+    browser/components/wintaskbar/test/Makefile
     browser/fuel/test/Makefile
   "
 fi