port OSX to xulrunner 6.0.2. only change required was the way we popu…

…late browserCodePath in app-paths.js, suspected due to different evaluation order under xulrunner 6
mozilla · Sep 12, 2011 · 707a16a · 707a16a
1 parent cabc4cb
commit 707a16a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 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
+MinVersion=6.0.2
-MaxVersion=2.0
+MaxVersion=6.0.2
 
 [XRE]
 EnableExtensionManager=true
diff --git a/impl/mozfetcher/_config.py b/impl/mozfetcher/_config.py
@@ -9,11 +9,11 @@
     },
     # for both 32 and 64 bit darwin we'll use 32 bit binaries
     ( "Darwin_64bit", "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",
+        "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": "cf56e216a05feed16cb290110fd89802",
+        "md5": "a645c56fb9f3dacc8e7f96166bfb288d",
         "bin": {
             "path": "xulrunner-sdk/bin/xulrunner-bin",
-            "sig": "ec043427ca789950bf388db3cf88c7cf"
+            "sig": "fa285003839fd8e128b9a2171ca89757"
         }
     },
     ( "Windows_32bit", "Windows_64bit" ): {

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