commit ef16bde1c5ee26da7eafa2a3ba66c6fab853760e
author braas <braas@steckelfisch.nl> Wed Mar 19 16:52:32 2014 +0100
committer braas <braas@steckelfisch.nl> Wed Mar 19 16:52:32 2014 +0100
tree 27d0d71a659522374d8546475fd6ba81a449e59d
parent 8a5108006a71e43c90566e5f282a58e11163c344

CB-5816 manifest.webapp should be package.manifest

bin/templates/project/cordova/lib/build.js

diff --git a/bin/templates/project/cordova/lib/build.js b/bin/templates/project/cordova/lib/build.js
index 3a18f75..2df4ba6 100644
--- a/bin/templates/project/cordova/lib/build.js
+++ b/bin/templates/project/cordova/lib/build.js
@@ -43,14 +43,14 @@
  */
 function hasAllMergesRequiredCustomReleaseArtifacts() {
     if(!fs.existsSync('merges/firefoxos/'+buildDirInMerge+'/manifest.webapp')) { 
-        console.error('\nPlease provide <project>/merges/firefoxos/'+buildDirInMerge+'/manifest.webapp');
+        console.error('\nPlease provide <project>/merges/firefoxos/'+buildDirInMerge+'/package.manifest');
     }
 
     if(!fs.existsSync('merges/firefoxos/'+buildDirInMerge+'/index.html')) {
         console.error('\nPlease provide <project>/merges/firefoxos/'+buildDirInMerge+'/index.html');
     }
 
-    return (   fs.existsSync('merges/firefoxos/'+buildDirInMerge+'/manifest.webapp')
+    return (   fs.existsSync('merges/firefoxos/'+buildDirInMerge+'/package.manifest')
             && fs.existsSync('merges/firefoxos/'+buildDirInMerge+'/index.html') );
 }
 
@@ -61,14 +61,14 @@
  */
 function hasAllRequiredCustomReleaseArtifacts() {
     if(!fs.existsSync('platforms/firefoxos/www/'+buildDirInMerge+'/manifest.webapp')) { 
-        console.error('\nPlease provide <project>/merges/firefoxos/'+buildDirInMerge+'/manifest.webapp');
+        console.error('\nPlease provide <project>/merges/firefoxos/'+buildDirInMerge+'/package.manifest');
     }
 
     if(!fs.existsSync('platforms/firefoxos/www/'+buildDirInMerge+'/index.html')) {
         console.error('\nPlease provide <project>/merges/firefoxos/'+buildDirInMerge+'/index.html');
     }
 
-    return (   fs.existsSync('platforms/firefoxos/www/'+buildDirInMerge+'/manifest.webapp')
+    return (   fs.existsSync('platforms/firefoxos/www/'+buildDirInMerge+'/package.manifest')
             && fs.existsSync('platforms/firefoxos/www/'+buildDirInMerge+'/index.html') );
 }
 
@@ -77,7 +77,7 @@
     hasAllRequiredCustomReleaseArtifacts();
     console.log('Move index.html and manifest.webapp provided at \'merges/firefoxos/'+buildDirInMerge+'/\' to platforms/firefoxos/build');
     shjs.mv('-f', 'platforms/firefoxos/www/'+buildDirInMerge+'/index.html', 'platforms/firefoxos/build/index.html');
-    shjs.mv('-f' ,'platforms/firefoxos/www/'+buildDirInMerge+'/manifest.webapp', 'platforms/firefoxos/build/manifest.webapp');
+    shjs.mv('-f' ,'platforms/firefoxos/www/'+buildDirInMerge+'/package.manifest', 'platforms/firefoxos/build/package.manifest');
 }