You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ma...@apache.org on 2014/07/08 17:44:44 UTC
git commit: CB-6899 Fixes exception while parsing master.cfg
Repository: cordova-medic
Updated Branches:
refs/heads/master 7febfbd25 -> 15fcefece
CB-6899 Fixes exception while parsing master.cfg
github: close #15
Project: http://git-wip-us.apache.org/repos/asf/cordova-medic/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-medic/commit/15fcefec
Tree: http://git-wip-us.apache.org/repos/asf/cordova-medic/tree/15fcefec
Diff: http://git-wip-us.apache.org/repos/asf/cordova-medic/diff/15fcefec
Branch: refs/heads/master
Commit: 15fcefece6e66664cc325c00def22d224a7e99ac
Parents: 7febfbd
Author: Vladimir Kotikov <v-...@microsoft.com>
Authored: Tue Jul 8 12:05:07 2014 +0400
Committer: Max Woghiren <ma...@gmail.com>
Committed: Tue Jul 8 11:43:47 2014 -0400
----------------------------------------------------------------------
master.cfg | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/15fcefec/master.cfg
----------------------------------------------------------------------
diff --git a/master.cfg b/master.cfg
index 80171cf..cbaac34 100644
--- a/master.cfg
+++ b/master.cfg
@@ -204,14 +204,11 @@ common_steps_mobilespec_1 = [
]
# The steps for any platform after platform add
-copy_www_cmd = ShellCommand(command=["node", "-e", "require('fs').symlinkSync('../cordova-mobile-spec/www','www','dir')"], workdir='build/mobilespec',haltOnFailure=True,description='Link www', descriptionDone='Link www'),
-if is_Windows :
- copy_www_cmd=ShellCommand(command=["cp","-r","../cordova-mobile-spec/www","www"],workdir='build/mobilespec',haltOnFailure=True,description ='Copy www',descriptionDone ='Copy www')
common_steps_mobilespec_2 = [
ShellCommand(command=["node", "../cordova-cli/bin/cordova","plugin","add","../cordova-mobile-spec/dependencies-plugin","--searchpath",".." ],workdir='build/mobilespec',haltOnFailure=True,description='Plugin add',descriptionDone='Plugin add'),
ShellCommand(command=["node", "../cordova-cli/bin/cordova", "plugin", "add", "../medic/cordova-plugin-medic"],workdir='build/mobilespec',haltOnFailure=True,description='Medic plugin add',descriptionDone='Medic plugin add'),
ShellCommand(command=["rm","-rf","mobilespec/www"],workdir='build',haltOnFailure=False,description='Remove www',descriptionDone='Remove www'),
- copy_www_cmd,
+ ShellCommand(command=["node", "-e", "require('fs').symlinkSync('../cordova-mobile-spec/www','www','dir')"], workdir='build/mobilespec',haltOnFailure=True,description='Link www', descriptionDone='Link www'),
ShellCommand(command=["node", "../cordova-cli/bin/cordova","prepare"],workdir='build/mobilespec',haltOnFailure=True,description='CLI Prepare',descriptionDone='CLI Prepare')
]
@@ -220,7 +217,7 @@ common_steps_mobilespec_2M = [
ShellCommand(command=["node", "../cordova-cli/bin/cordova","plugin","add","../cordova-mobile-spec/dependencies-plugin","--searchpath",".." ],workdir='build/mobilespec',haltOnFailure=True,description='Plugin add',descriptionDone='Plugin add'),
ShellCommand(command=["node", "../cordova-cli/bin/cordova", "plugin", "add", "../medic/cordova-plugin-medic"],workdir='build/mobilespec',haltOnFailure=True,description='Medic plugin add',descriptionDone='Medic plugin add'),
ShellCommand(command=["rm","-rf","mobilespec/www"],workdir='build',haltOnFailure=False,description='Remove www',descriptionDone='Remove www'),
- copy_www_cmd,
+ ShellCommand(command=["node", "-e", "require('fs').symlinkSync('../cordova-mobile-spec/www','www','dir')"], workdir='build/mobilespec',haltOnFailure=True,description='Link www', descriptionDone='Link www'),
ShellCommand(command=["cp","mobilespec/www/config.xml","mobilespec/config.xml"],workdir='build',haltOnFailure=False,description='Copy config',descriptionDone='Copy config'),
ShellCommand(command=["node", "../cordova-cli/bin/cordova","prepare"],workdir='build/mobilespec',haltOnFailure=True,description='CLI Prepare',descriptionDone='CLI Prepare')
]