Bug 746771 - Mac installer needs to use updated webapp.json structure with registryDir instead of app.profile [r=myk, a=desktop-only]
authorFelipe Gomes <felipc@gmail.com>
Fri, 20 Apr 2012 15:56:02 -0700
changeset 92065 ffb9beb36e5a8761a600f1b4244d6ae1e071c979
parent 92064 ba03257fab287cc2b87e70a9221b004d31b28c3d
child 92066 c141dcc8c829c74c751dd7cce2e12cf5030da68e
push id22504
push userphilringnalda@gmail.com
push dateSun, 22 Apr 2012 06:24:14 +0000
treeherdermozilla-central@990f6542747b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmyk, desktop-only
bugs746771
milestone14.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 746771 - Mac installer needs to use updated webapp.json structure with registryDir instead of app.profile [r=myk, a=desktop-only] Rename app.profile to registryDir for the updated webapp.json structure.
browser/modules/WebappsInstaller.jsm
--- a/browser/modules/WebappsInstaller.jsm
+++ b/browser/modules/WebappsInstaller.jsm
@@ -531,20 +531,20 @@ MacNativeApp.prototype = {
 
   _copyPrebuiltFiles: function() {
     let webapprt = this.processFolder.clone();
     webapprt.append("webapprt-stub");
     webapprt.copyTo(this.macOSDir, "webapprt");
   },
 
   _createConfigFiles: function() {
-    // ${ProfileDir}/config.json
+    // ${ProfileDir}/webapp.json
     let json = {
+      "registryDir": this.profileFolder.path,
       "app": {
-        "profile": this.profileFolder.path,
         "origin": this.launchURI.prePath,
         "installOrigin": "apps.mozillalabs.com",
         "manifest": this.manifest
        }
     };
 
     let configJson = this.appProfileDir.clone();
     configJson.append("webapp.json");