Merge pull request #15026 from yurenju/fix-gaia-build

Bug 956637 - gaia-build extension doesn't work after bug 922463 landed r=@timdream
mozilla-b2g · Jan 6, 2014 · 4c4a555 · 4c4a555
2 parents 7a68bc9 + 44c60da
commit 4c4a555
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/build/variant.js b/build/variant.js
@@ -237,6 +237,10 @@ function fetchApps(data, profilePath, distributionPath, done) {
     });
   }
 
+  if (Object.keys(apps).length === 0) {
+    done();
+  }
+
 }
 
 // read the app postion customization part in variant.json and write the result

diff --git a/tools/extensions/gaia-build@gaiamobile.org/content/aboutGaia.js b/tools/extensions/gaia-build@gaiamobile.org/content/aboutGaia.js
@@ -699,7 +699,7 @@ var Homescreen = {
       ['apps/homescreen/collections', 'social'],
       ['apps/homescreen/collections', 'games'],
       ['apps/homescreen/collections', 'music'],
-      ['apps/homescreen/collections', 'entertainment']
+      ['apps/homescreen/collections', 'showbiz']
     ];
     grid.homescreens.push(collections);
 

diff --git a/tools/extensions/gaia-build@gaiamobile.org/content/gaia.js b/tools/extensions/gaia-build@gaiamobile.org/content/gaia.js
@@ -31,6 +31,7 @@ var Gaia = {
     config.GAIA_PORT = ':8080';
     config.GAIA_LOCALES_PATH = 'locales';
     config.LOCALES_FILE = 'shared/resources/languages.json';
+    config.LOCALE_BASEDIR = '';
     config.BUILD_APP_NAME = '*';
     config.PRODUCTION = '0';
     config.GAIA_OPTIMIZE = '0';