Merge pull request #15980 from timdream/build-l10n-copy-bulid-stage

Bug 968187 - Localize manifests copied from build_stage, r=yuren
mozilla-b2g · Feb 5, 2014 · f217571 · f217571
2 parents 95cea77 + 0512175
commit f217571
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/build/copy-build-stage-manifest.js b/build/copy-build-stage-manifest.js
@@ -14,11 +14,20 @@ function execute(options) {
     var manifest = app.buildDirectoryFile.clone();
     manifest.append(WEBAPP_FILENAME);
     if (manifest.exists()) {
-      var webappTargetDir = webappsBaseDir.clone();
-      webappTargetDir.append(app.domain);
-      manifest.copyTo(webappTargetDir, WEBAPP_FILENAME);
+      if (gaia.l10nManager) {
+        var manifestContent = gaia.l10nManager.localizeManifest(app);
+        var targetManifest = webappsBaseDir.clone();
+        targetManifest.append(app.domain);
+        targetManifest.append(WEBAPP_FILENAME)
+
+        utils.writeContent(targetManifest, JSON.stringify(manifestContent));
+      } else {
+        var webappTargetDir = webappsBaseDir.clone();
+        webappTargetDir.append(app.domain);
+        manifest.copyTo(webappTargetDir, WEBAPP_FILENAME);
+      }
     }
   })
 }
 
-exports.execute = execute;
+exports.execute = execute;
diff --git a/build/multilocale.js b/build/multilocale.js
@@ -278,8 +278,11 @@ function L10nManager(gaiaDir, sharedDir, localesFilePath, localeBasedir) {
       return true;
     });
 
+    var manifestFile = webapp.buildManifestFile.exists() ?
+      webapp.buildManifestFile : webapp.manifestFile;
+
     var manifest = addLocaleManifest(localesForManifest, localesProps,
-      utils.getJSON(webapp.manifestFile));
+      utils.getJSON(manifestFile));
     return manifest;
   }
 

diff --git a/build/utils-xpc.js b/build/utils-xpc.js
@@ -203,6 +203,7 @@ function makeWebappsObject(appdirs, domain, scheme, port) {
         let webapp = {
           manifest: getJSON(manifest),
           manifestFile: manifest,
+          buildManifestFile: manifest,
           url: scheme + appDomain + (port ? port : ''),
           domain: appDomain,
           sourceDirectoryFile: manifestFile.parent,
@@ -235,6 +236,11 @@ function makeWebappsObject(appdirs, domain, scheme, port) {
             });
 
             webapp.buildDirectoryFile = buildDirectoryFile;
+
+            let buildManifestFile = buildDirectoryFile.clone();
+            buildManifestFile.append('manifest.webapp');
+
+            webapp.buildManifestFile = buildManifestFile;
           }
         }