You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2014/05/14 02:09:48 UTC
[19/27] git commit: CB-5816 manifest.webapp should be package.manifest
CB-5816 manifest.webapp should be package.manifest
Project: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/commit/ef16bde1
Tree: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/tree/ef16bde1
Diff: http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/diff/ef16bde1
Branch: refs/heads/3.5.x
Commit: ef16bde1c5ee26da7eafa2a3ba66c6fab853760e
Parents: 8a51080
Author: braas <br...@steckelfisch.nl>
Authored: Wed Mar 19 16:52:32 2014 +0100
Committer: braas <br...@steckelfisch.nl>
Committed: Wed Mar 19 16:52:32 2014 +0100
----------------------------------------------------------------------
bin/templates/project/cordova/lib/build.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-firefoxos/blob/ef16bde1/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 hasCustomReleaseArtifactsDir() {
*/
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 hasAllMergesRequiredCustomReleaseArtifacts() {
*/
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 @@ function moveWwwBuildReleaseToBuild() {
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');
}