cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From an-s...@apache.org
Subject [2/3] cordova-medic git commit: Fixed merge issue
Date Fri, 06 Feb 2015 08:37:16 GMT
Fixed merge issue


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

Branch: refs/heads/master
Commit: d59eafd4dd4928158f035f7a98df985ee14b774a
Parents: f041a8b 4c475e5
Author: Nikhil Khandelwal <nikhilkh@microsoft.com>
Authored: Thu Feb 5 10:54:02 2015 -0800
Committer: Nikhil Khandelwal <nikhilkh@microsoft.com>
Committed: Thu Feb 5 10:54:02 2015 -0800

----------------------------------------------------------------------
 cordova.conf | 49 +++++++++++++++++++++++++++----------------------
 master.cfg   |  4 ++--
 2 files changed, 29 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/d59eafd4/cordova.conf
----------------------------------------------------------------------
diff --cc cordova.conf
index c15f098,e00f855..64fda24
--- a/cordova.conf
+++ b/cordova.conf
@@@ -110,10 -112,13 +112,13 @@@ from buildbot.steps.transfer import Fil
  
  def RMCommand(path, **kwargs):
      js_script = "var s = require('shelljs'); console.log('removing {path}'); s.rm('-rf',
'{path}');".format(path=path)
 -    return ShellCommand(command=['node -e "'+ js_script + '"> rm.txt 2>&1'], logfiles
= {"log": "rm.txt"}, **kwargs)
 +    return ShellCommand(command='node -e "'+ js_script + '"> ../rm.txt 2>&1',
logfiles = {"log": "../rm.txt"}, **kwargs)
  
+ def NPMInstall(command=list(), **kwargs):
+     return ShellCommand(command=["npm", "install"] + command + ["--cache=./npm_cache"],
**kwargs)
+ 
  def InstallShellJS():
-     return ShellCommand(command=["npm", "install", "shelljs"], workdir='build', haltOnFailure=True,
description='Install shelljs')
+     return NPMInstall(["shelljs"], workdir='build', haltOnFailure=True, description='Install
shelljs')
  
  class PlatformTestBase(object):
      """Base class with common build steps for all platforms"""


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message