working around upstream updates

mozilla · Sep 14, 2011 · fea8beb · fea8beb
2 parents 363fc2a + 4e6c980
commit fea8beb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 24 deletions.
diff --git a/impl/appifier/resources/application.ini.template b/impl/appifier/resources/application.ini.template
@@ -7,8 +7,8 @@ Copyright=
 ID=${developer_email}
 
 [Gecko]
-MinVersion=2.0
-MaxVersion=2.0
+MinVersion=6.0.2
+MaxVersion=6.0.2
 
 [XRE]
 EnableExtensionManager=true
diff --git a/impl/mozfetcher/_config.py b/impl/mozfetcher/_config.py
@@ -1,43 +1,35 @@
 software = {
     "Linux_64bit": {
-       "url": "http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/2.0/runtimes/xulrunner-2.0.en-US.linux-x86_64.tar.bz2",
-       "md5": "cb0dc6ff5304b325098fc8910057884f",
+       "url": "http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/6.0.2/runtimes/xulrunner-6.0.2.en-US.linux-x86_64.tar.bz2",
+       "md5": "a1e98013cbb4d9685461465e09b3c7c7",
        "bin": {
            "path": "xulrunner/xulrunner",
-           "sig": "d103f16afe6a6125bb28987a9e391fee"
+           "sig": "e473d9a27a10b9bf1ffb1bd8a3e6d668"
        }
     },
     # for both 32 and 64 bit darwin we'll use 32 bit binaries
-    "Darwin_64bit": {
-        "url": "http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/2.0/sdk/xulrunner-2.0.en-US.mac-x86_64.sdk.tar.bz2",
-        "md5": "ac2ddb114107680fe75ee712cddf1ab4",
+    ( "Darwin_64bit", "Darwin_32bit" ): {
+        "url": "http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/6.0.2/sdk/xulrunner-6.0.2.en-US.mac-i386.sdk.tar.bz2",
+        "md5": "a645c56fb9f3dacc8e7f96166bfb288d",
         "bin": {
             "path": "xulrunner-sdk/bin/xulrunner-bin",
-            "sig": "33da759e7dee9fbec7865eb55cfddda0"
-        }
-    },
-    "Darwin_32bit": {
-        "url": "http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/2.0/sdk/xulrunner-2.0.en-US.mac-i386.sdk.tar.bz2",
-        "md5": "cf56e216a05feed16cb290110fd89802",
-        "bin": {
-            "path": "xulrunner-sdk/bin/xulrunner-bin",
-            "sig": "ec043427ca789950bf388db3cf88c7cf"
+            "sig": "fa285003839fd8e128b9a2171ca89757"
         }
     },
     ( "Windows_32bit", "Windows_64bit" ): {
-        "url": "http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/2.0/runtimes/xulrunner-2.0.en-US.win32.zip",
-        "md5": "38e5c5ad08927278ed6c333aef836882",
+        "url": "http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/6.0.2/runtimes/xulrunner-6.0.2.en-US.win32.zip",
+        "md5": "173502a8f48d8eb74baa9c7326d91733",
         "bin": {
             "path": "xulrunner/xulrunner.exe",
-            "sig": "0910106650f397e67aa52f4c4d924f8e"
+            "sig": "0f7b375432357138ff6a1127d54a8403"
         }
     },
     "Linux_32bit": {
-        "url": "http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/2.0/runtimes/xulrunner-2.0.en-US.linux-i686.tar.bz2",
-        "md5": "5acef7cc816691f5c8726731ee0d8bdf",
+        "url": "http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/6.0.2/runtimes/xulrunner-6.0.2.en-US.linux-i686.tar.bz2",
+        "md5": "b348164d69ab9d1b226e98a4893029f2",
         "bin": {
             "path": "xulrunner/xulrunner",
-            "sig": "d103f16afe6a6125bb28987a9e391fee"
+            "sig": "e473d9a27a10b9bf1ffb1bd8a3e6d668"
         }
     }
 }

diff --git a/modules/lib/app-paths.js b/modules/lib/app-paths.js
@@ -60,7 +60,7 @@ exports.profileDir = dirsvc.get("ProfD", Ci.nsIFile).path;
  * This path should be expected to be read-only.
  * @type string
  */
-exports.browserCodeDir = path.join(dirsvc.get("resource:app", Ci.nsIFile).path, "browser_code");
+exports.browserCodeDir = path.join(dirsvc.get("DefRt", Ci.nsIFile).parent.path, "browser_code");
 
 /**
  * @property startMenuDir