You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by dr...@apache.org on 2014/05/06 21:56:43 UTC
git commit: Changes required for cordova-lib
Repository: cordova-medic
Updated Branches:
refs/heads/master c9c17e53e -> 936d0f61a
Changes required for cordova-lib
Project: http://git-wip-us.apache.org/repos/asf/cordova-medic/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-medic/commit/936d0f61
Tree: http://git-wip-us.apache.org/repos/asf/cordova-medic/tree/936d0f61
Diff: http://git-wip-us.apache.org/repos/asf/cordova-medic/diff/936d0f61
Branch: refs/heads/master
Commit: 936d0f61ab9dc4ae78316588e5278729b6604e9d
Parents: c9c17e5
Author: David Kemp <dr...@chromium.org>
Authored: Tue May 6 19:55:40 2014 +0000
Committer: David Kemp <dr...@chromium.org>
Committed: Tue May 6 19:55:40 2014 +0000
----------------------------------------------------------------------
master.cfg | 27 ++++++++++++++-------------
repos.json | 15 +++++++--------
2 files changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/936d0f61/master.cfg
----------------------------------------------------------------------
diff --git a/master.cfg b/master.cfg
index 2bfc3b3..ef4aa20 100644
--- a/master.cfg
+++ b/master.cfg
@@ -163,10 +163,11 @@ if is_Windows :
cli_steps = [
ShellCommand(command=[shellCmd,shellRunParam,"rm -rf cordova-*"],workdir='build',haltOnFailure=False,description='Cordova Clean', descriptionDone='Cordova Clean'),
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 Plugman',descriptionDone='Prepare Plugman'),
- ShellCommand(command=["git","clone",repos['PLUGMAN'],"plugman"],workdir='build/cordova-cli/node_modules',haltOnFailure=True,description='Update Plugman',descriptionDone='Update Plugman'),
- ShellCommand(command=[shellCmd,shellRunParam,"rm -rf .git"],workdir='build/cordova-cli/node_modules/plugman',haltOnFailure=False,description='Plugman Clean', descriptionDone='Plugman Clean'),
- ShellCommand(command=["npm","install"], workdir='build/cordova-cli/node_modules/plugman',haltOnFailure=True,description='Install Plugman',descriptionDone='Install Plugman'),
+ ShellCommand(command=["mkdir","node_modules"],workdir='build/cordova-cli',haltOnFailure=True,description='prepare cordova-lib',descriptionDone='Prepare cordova-lib'),
+ ShellCommand(command=[shellCmd,shellRunParam, "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=[shellCmd,shellRunParam,"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=["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'),
ShellCommand(command=["npm","test"], workdir='build/cordova-cli',haltOnFailure=True,description='Test CLI',descriptionDone='Test CLI'),
]
@@ -193,12 +194,12 @@ common_steps_1 = [
# The steps for any platform before platform add
common_steps_mobilespec_1 = [
- ShellCommand(command=["mkdir","node_modules"],workdir='build/cordova-cli',haltOnFailure=True,description='prepare Plugman',descriptionDone='Prepare Plugman'),
- ShellCommand(command=[shellCmd,shellRunParam, "git clone -b " + branches['PLUGMAN'] + ' ' + repos['PLUGMAN'] + " plugman"],workdir='build/cordova-cli/node_modules',haltOnFailure=True,description='Update Plugman',descriptionDone='Update Plugman'),
- ShellCommand(command=[shellCmd,shellRunParam,"rm -rf .git"],workdir='build/cordova-cli/node_modules/plugman',haltOnFailure=False,description='Plugman Clean', descriptionDone='Plugman Clean'),
- ShellCommand(command=["npm","install","--production"], workdir='build/cordova-cli/node_modules/plugman',haltOnFailure=True,description='Install Plugman',descriptionDone='Install Plugman'),
- ShellCommand(command=["rm","npm-shrinkwrap.json"],workdir='build/cordova-cli',haltOnFailure=False,description='Remove CLI SW',descriptionDone='Remove CLI SW'),
- ShellCommand(command=["sed","-e","s/plugman\": \"0./plugman\": \">=0./","-i","bak","package.json"],workdir='build/cordova-cli',haltOnFailure=True,description='Edit Plugman pkg',descriptioDone='Edit Plugman pkg'),
+ ShellCommand(command=["mkdir","node_modules"],workdir='build/cordova-cli',haltOnFailure=True,description='prepare cordova-lib',descriptionDone='Prepare cordova-lib'),
+ ShellCommand(command=[shellCmd,shellRunParam, "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=[shellCmd,shellRunParam,"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=["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./","-i","bak","package.json"],workdir='build/cordova-cli',haltOnFailure=True,description='Edit json',descriptionDone='Edit json'),
ShellCommand(command=["npm","install","--production"],workdir='build/cordova-cli',haltOnFailure=True,description='Install CLI',descriptionDone='Install CLI'),
ShellCommand(command=["node", "cordova-cli/bin/cordova","create","mobilespec","org.apache.mobilespec","mobilespec"],workdir='build',haltOnFailure=True, description='CLI Create', descriptionDone='CLI Create')
]
@@ -312,9 +313,9 @@ if not is_Windows :
factory_cli.addSteps(cli_steps)
c['builders'].append(BuilderConfig(name="Tools_CLI",slavenames=["common-slave"],factory=factory_cli))
- factory_plugman = BuildFactory()
- factory_plugman.addSteps(plugman_steps)
- c['builders'].append(BuilderConfig(name="Tools_Plugman",slavenames=["common-slave"],factory=factory_plugman))
+# factory_plugman = BuildFactory()
+# factory_plugman.addSteps(plugman_steps)
+# c['builders'].append(BuilderConfig(name="Tools_Plugman",slavenames=["common-slave"],factory=factory_plugman))
if build_chrome :
factory_chrome_desktop = BuildFactory()
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/936d0f61/repos.json
----------------------------------------------------------------------
diff --git a/repos.json b/repos.json
index 8e208cd..b4948da 100644
--- a/repos.json
+++ b/repos.json
@@ -46,19 +46,12 @@
,
{
"title" : "CLI tooling tests",
- "categories" : ["CLI","PLUGMAN"],
+ "categories" : ["CLI","CORDOVA-LIB"],
"branch" : "master",
"builder": "Tools_CLI",
"platform": "ios"
},
{
- "title" : "Plugman tests",
- "categories" : ["PLUGMAN"],
- "branch" : "master",
- "builder": "Tools_Plugman",
- "platform": "ios"
- },
- {
"title" : "ChromeSpec on Chrome",
"categories" : ["CHROMESPEC"],
"branch" : "master",
@@ -105,6 +98,12 @@
"category" : "PLUGMAN",
"release" : "master",
"current" :"master"
+},{
+ "title" : "CORDOVA-LIB",
+ "repo" : "https://git-wip-us.apache.org/repos/asf/cordova-lib.git",
+ "category" : "CLI",
+ "release" : "master",
+ "current" :"master"
}
,
{