cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject [3/3] git commit: CB-6899 Replaces "ln -s" command
Date Wed, 02 Jul 2014 15:55:49 GMT
CB-6899 Replaces "ln -s" command

It's not working on windows slaves, so it's replaced with inline node script.

github: close #12


Project: http://git-wip-us.apache.org/repos/asf/cordova-medic/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-medic/commit/1719d7ed
Tree: http://git-wip-us.apache.org/repos/asf/cordova-medic/tree/1719d7ed
Diff: http://git-wip-us.apache.org/repos/asf/cordova-medic/diff/1719d7ed

Branch: refs/heads/master
Commit: 1719d7ed90011746ef0ac74edd0e4aa66d7e14b6
Parents: 3a3d42d
Author: Vladimir Kotikov <v-vlkoti@microsoft.com>
Authored: Mon Jun 9 12:57:42 2014 +0400
Committer: Max Woghiren <max.woghiren@gmail.com>
Committed: Wed Jul 2 11:53:42 2014 -0400

----------------------------------------------------------------------
 master.cfg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/1719d7ed/master.cfg
----------------------------------------------------------------------
diff --git a/master.cfg b/master.cfg
index 30e34bf..192ee78 100644
--- a/master.cfg
+++ b/master.cfg
@@ -164,7 +164,7 @@ cli_steps = [
     ShellCommand(command=["git","clone",repos['CLI'],"cordova-cli"],workdir='build',haltOnFailure=True,description='Get
CLI',descriptionDone='Get CLI'),
     ShellCommand(command=["mkdir","node_modules"],workdir='build/cordova-cli',haltOnFailure=True,description='prepare
cordova-lib',descriptionDone='Prepare cordova-lib'),
     ShellCommand(command=["git","clone -b",branches['CORDOVA-LIB'],repos['CORDOVA-LIB'],"cordova-lib"],workdir='build',haltOnFailure=True,description='Update
Cordova-lib',descriptionDone='Update Cordova-lib'),
-    ShellCommand(command=["ln","-s","../../cordova-lib/cordova-lib","cordova-lib"], workdir='build/cordova-cli/node_modules',haltOnFailure=False,description='Cordova-lib
link', descriptionDone='Cordova-lib link'),
+    ShellCommand(command=["node", "-e", "require('fs').symlinkSync('../../cordova-lib/cordova-lib',
'cordova-lib', 'dir')"], workdir='build/cordova-cli/node_modules',haltOnFailure=False,description='Cordova-lib
link', descriptionDone='Cordova-lib link'),
     ShellCommand(command=["npm","install","--production"], workdir='build/cordova-cli/node_modules/cordova-lib',haltOnFailure=True,description='Install
Cordova-lib',descriptionDone='Install Cordova-lib'),
     ShellCommand(command=["rm","-f", "npm-shrinkwrap.json"],workdir='build/cordova-cli',haltOnFailure=False,description='Remove
CLI SW',descriptionDone='Remove CLI SW'),
     ShellCommand(command=["npm","install"],workdir='build/cordova-cli',haltOnFailure=True,description='Install
CLI',descriptionDone='Install CLI'),
@@ -195,7 +195,7 @@ common_steps_1 = [
 common_steps_mobilespec_1 = [
     ShellCommand(command=["mkdir","node_modules"],workdir='build/cordova-cli',haltOnFailure=True,description='prepare
cordova-lib',descriptionDone='Prepare cordova-lib'),
     ShellCommand(command=["git","clone","-b",branches['CORDOVA-LIB'],repos['CORDOVA-LIB'],"cordova-lib"],workdir='build',haltOnFailure=True,description='Update
Cordova-lib',descriptionDone='Update Cordova-lib'),
-    ShellCommand(command=["ln","-s","../../cordova-lib/cordova-lib","cordova-lib"],workdir='build/cordova-cli/node_modules',haltOnFailure=False,description='Cordova-lib
link', descriptionDone='Cordova-lib link'),
+    ShellCommand(command=["node", "-e", "require('fs').symlinkSync('../../cordova-lib/cordova-lib',
'cordova-lib', 'dir')"], workdir='build/cordova-cli/node_modules',haltOnFailure=False,description='Cordova-lib
link', descriptionDone='Cordova-lib link'),
     ShellCommand(command=["npm","install","--production"], workdir='build/cordova-cli/node_modules/cordova-lib',haltOnFailure=True,description='Install
Cordova-lib',descriptionDone='Install Cordova-lib'),
     ShellCommand(command=["rm","-f", "npm-shrinkwrap.json"],workdir='build/cordova-cli',haltOnFailure=False,description='Remove
CLI SW',descriptionDone='Remove CLI SW'),
     ShellCommand(command=["sed","-e","s/cordova-lib\": \"0./cordova-lib\": \">=0./","-ibak","package.json"],workdir='build/cordova-cli',haltOnFailure=True,description='Edit
json',descriptionDone='Edit json'),
@@ -204,7 +204,7 @@ common_steps_mobilespec_1 = [
 ]
 
 # The steps for any platform after platform add
-copy_www_cmd = ShellCommand(command=["ln","-s","../cordova-mobile-spec","www"],workdir='build/mobilespec',haltOnFailure=True,description
='Link www',descriptionDone ='Link www')
+copy_www_cmd = ShellCommand(command=["node", "-e", "require('fs').symlinkSync('../cordova-mobile-spec','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"],workdir='build/mobilespec',haltOnFailure=True,description
='Copy www',descriptionDone ='Copy www')
 common_steps_mobilespec_2 = [


Mime
View raw message