cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From drk...@apache.org
Subject git commit: Handle config.xmlk move, add Chrome tests
Date Thu, 13 Feb 2014 14:58:10 GMT
Updated Branches:
  refs/heads/master 37e05c651 -> 303c1bb4a


Handle config.xmlk move, add Chrome tests


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

Branch: refs/heads/master
Commit: 303c1bb4ac47301477dd42e90831c4b02fce5b1f
Parents: 37e05c6
Author: David Kemp <drkemp@chromium.org>
Authored: Thu Feb 13 09:57:16 2014 -0500
Committer: David Kemp <drkemp@chromium.org>
Committed: Thu Feb 13 09:57:16 2014 -0500

----------------------------------------------------------------------
 master.cfg | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
 repos.json | 31 +++++++++++++++++++++++++++++--
 2 files changed, 78 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/303c1bb4/master.cfg
----------------------------------------------------------------------
diff --git a/master.cfg b/master.cfg
index 728bee8..d85b2bc 100644
--- a/master.cfg
+++ b/master.cfg
@@ -37,6 +37,7 @@ platform_list=json_config['app']['platforms']
 branch_release =str(json_config['app']['release'])
 
 build_android=('android' in platform_list)
+build_chrome=('chrome' in platform_list)
 build_ios=('ios' in platform_list)
 build_wp8=('wp8' in platform_list)
 build_windows8=('windows8' in platform_list)
@@ -164,6 +165,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
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=["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,6 +195,7 @@ common_steps_1 = [
 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=["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')
@@ -210,6 +213,16 @@ common_steps_mobilespec_2 = [
     ShellCommand(command=["node", "../cordova-cli/bin/cordova","prepare"],workdir='build/mobilespec',haltOnFailure=True,description='CLI
Prepare',descriptionDone='CLI Prepare')
 ]
 
+# added to handle the moved config.xml (up one directory)
+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=["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')
+]
+
 # The steps to build just the js
 common_steps_js = [
     ShellCommand(command=["npm","install"], workdir='build/cordova-js',description='Install
Grunt',descriptionDone='Install Grunt'),
@@ -259,7 +272,7 @@ if(build_ios) :
     factory_IOS_master.addStep(ShellCommand(command=["node","medic/writejson.js","--branch=master"],workdir='build',haltOnFailure=True,
description='Write json',descriptionDone='Write json'))
     factory_IOS_master.addStep(ShellCommand(command=["../cordova-cli/bin/cordova","platform","add","ios"],workdir='build/mobilespec',haltOnFailure=True,
description='Platform Add',descriptionDone='Platform Add'))
     factory_IOS_master.addSteps(common_steps_js)
-    factory_IOS_master.addSteps(common_steps_mobilespec_2)
+    factory_IOS_master.addSteps(common_steps_mobilespec_2M)
     factory_IOS_master.addStep(ShellCommand(command=["cp","-f","cordova-js/pkg/cordova.ios.js","mobilespec/platforms/ios/www/cordova.js"],workdir='build',haltOnFailure=True,description='Copy
JS',descriptionDone='Copy JS'))
     factory_IOS_master.addStep(ShellCommand(command=["node", "medic/build_ios.js"], workdir='build',
timeout=600,description='Deploy IOS',descriptionDone='Deploy IOS',name='Deploy IOS'))
     c['builders'].append(BuilderConfig(name="IOS_Master",slavenames=["ios-slave"],factory=factory_IOS_master))
@@ -276,7 +289,7 @@ if(build_android) :
     factory_Android_master.addStep(ShellCommand(command=["node","medic/writejson.js","--branch=master"],workdir='build',haltOnFailure=True,
description='Write json',descriptionDone='Write json'))
     factory_Android_master.addStep(ShellCommand(command=["../cordova-cli/bin/cordova","platform","add","android"],workdir='build/mobilespec',haltOnFailure=True,
description='Platform Add',descriptionDone='Platform Add'))
     factory_Android_master.addSteps(common_steps_js)
-    factory_Android_master.addSteps(common_steps_mobilespec_2)
+    factory_Android_master.addSteps(common_steps_mobilespec_2M)
     factory_Android_master.addStep(ShellCommand(command=["cp","-f","cordova-js/pkg/cordova.android.js","mobilespec/platforms/android/assets/www/cordova.js"],workdir='build',haltOnFailure=True,description='Copy
JS',descriptionDone='Copy JS'))
     factory_Android_master.addStep(ShellCommand(command=["node", "medic/build_android.js"],
workdir='build', timeout=600,description='Deploy Android',descriptionDone='Deploy Android',name='Deploy
Android'))
     c['builders'].append(BuilderConfig(name="Android_Master",slavenames=["android-slave"],factory=factory_Android_master))
@@ -331,6 +344,40 @@ if not is_Windows :
     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()
+    factory_chrome_desktop.addStep(ShellCommand(command=["rm","-rf","medic"],workdir='build',haltOnFailure=False,description='Medic
Clean',descriptionDone='Medic Clean'))
+    factory_chrome_desktop.addStep(ShellCommand(command=[shellCmd,shellRunParam,"git clone
-b " + branches['TESTMASTER'] + " " + repos['TESTMASTER']+" medic"],workdir='build',haltOnFailure=True,
description='Get Medic', descriptionDone='Get Medic'))
+    # --production switch is used to speed up installation + fruitstrap dev dependency is
not supported on Windows
+    factory_chrome_desktop.addStep(ShellCommand(command=["npm","install","--production"],
workdir='build/medic',haltOnFailure=True,description='Install Medic',descriptionDone='Install
Medic'))
+    factory_chrome_desktop.addStep(ShellCommand(command=["rm","-rf","chrome-cordova"],workdir='build',haltOnFailure=True,
description='Clean Chromespec',descriptionDone='Clean Chromespec'))
+    factory_chrome_desktop.addStep(ShellCommand(command=["git","clone",repos['CHROME-CORDOVA']],workdir='build',haltOnFailure=True,
description='Fetch Chromespec',descriptionDone='Fetch Chromespec'))
+    factory_chrome_desktop.addStep(ShellCommand(command=["npm","install"],workdir='build/medic/runner',haltOnFailure=True,
description='Install Runner',descriptionDone='Install Runner'))
+    factory_chrome_desktop.addStep(ShellCommand(command=["node","medic/runner/testrunner.js","--cmd=medic/runner/runchrome.sh","--path=chrome-cordova/chrome-apps-api-tests","--args=chrome-cordova/chrome-apps-api-tests"],workdir='build',haltOnFailure=True,
description='Run Chrome',descriptionDone='Run Chrome'))
+    c['builders'].append(BuilderConfig(name="ZChrome_Desktop",slavenames=["common-slave"],
factory=factory_chrome_desktop))
+
+    factory_chrome_mobile = BuildFactory()
+    factory_chrome_mobile.addStep(ShellCommand(command=["rm","-rf","medic"],workdir='build',haltOnFailure=False,description='Medic
Clean',descriptionDone='Medic Clean'))
+    factory_chrome_mobile.addStep(ShellCommand(command=[shellCmd,shellRunParam,"git clone
-b " + branches['TESTMASTER'] + " " + repos['TESTMASTER']+" medic"],workdir='build',haltOnFailure=True,
description='Get Medic', descriptionDone='Get Medic'))
+    # --production switch is used to speed up installation + fruitstrap dev dependency is
not supported on Windows
+    factory_chrome_mobile.addStep(ShellCommand(command=["npm","install","--production"],
workdir='build/medic',haltOnFailure=True,description='Install Medic',descriptionDone='Install
Medic'))
+    factory_chrome_mobile.addStep(ShellCommand(command=["rm","-rf","chrome-apps-api-tests"],workdir='build',haltOnFailure=True,
description='Clean Chromespec',descriptionDone='Clean Chromespec'))
+    factory_chrome_mobile.addStep(ShellCommand(command=["git","clone",repos['CHROMESPEC']],workdir='build',haltOnFailure=True,
description='Fetch Chromespec',descriptionDone='Fetch Chromespec'))
+    factory_chrome_mobile.addStep(ShellCommand(command=["npm","install"],workdir='build/medic/runner',haltOnFailure=True,
description='Install Runner',descriptionDone='Install Runner'))
+
+    factory_chrome_mobile.addStep(ShellCommand(command=["rm","-rf","mobile-chrome-apps"],workdir='build',haltOnFailure=True,
description='Clean cca',descriptionDone='Clean cca'))
+    factory_chrome_mobile.addStep(ShellCommand(command=["git","clone","--recurse-submodules",repos['CCA']],workdir='build',haltOnFailure=True,
description='Fetch cca',descriptionDone='Fetch cca'))
+    factory_chrome_mobile.addStep(ShellCommand(command=["rm","-rf","chrome-cordova"],workdir='build/mobile-chrome-apps',haltOnFailure=True,
description='Clean chrome-cordova',descriptionDone='Clean chrome-cordova'))
+    factory_chrome_mobile.addStep(ShellCommand(command=["git","clone",repos['CHROME-CORDOVA']],workdir='build/mobile-chrome-apps',haltOnFailure=True,
description='Update chrome-cordova',descriptionDone='Update chrome-cordova'))
+    factory_chrome_mobile.addStep(ShellCommand(command=["npm","install"],workdir='build/mobile-chrome-apps',haltOnFailure=True,
description='Install cca',descriptionDone='Install cca'))
+    factory_chrome_mobile.addStep(ShellCommand(command=["rm","-rf","ccatest"],workdir='build',haltOnFailure=True,
description='Clean ccatest',descriptionDone='Clean ccatest'))
+    factory_chrome_mobile.addStep(ShellCommand(command=["mobile-chrome-apps/src/cca.js","init"],workdir='build',haltOnFailure=True,
description='cca init',descriptionDone='cca init'))
+    factory_chrome_mobile.addStep(ShellCommand(command=["mobile-chrome-apps/src/cca.js","create","ccatest","--copy-from","mobile-chrome-apps/chrome-cordova/chrome-apps-api-tests"],workdir='build',haltOnFailure=True,
description='cca create',descriptionDone='cca create'))
+
+    factory_chrome_mobile.addStep(ShellCommand(command=["node","../medic/runner/testrunner.js","--ip=192.168.1.122","--port=6800","--cmd=../medic/runner/runcca.sh","--path=www","--args=android"],workdir='build/ccatest',timeout=300,haltOnFailure=True,
description='Run Mobile',descriptionDone='Run Mobile'))
+    c['builders'].append(BuilderConfig(name="ZChrome_Mobile",slavenames=["android-slave"],
factory=factory_chrome_mobile))
+
+
 
 ####### STATUS TARGETS
 

http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/303c1bb4/repos.json
----------------------------------------------------------------------
diff --git a/repos.json b/repos.json
index 54c016f..aba61bb 100644
--- a/repos.json
+++ b/repos.json
@@ -99,11 +99,38 @@
     "branch" : "master",
     "builder": "Tools_Plugman",
     "platform": "ios"
+  },
+  {
+    "title" : "ChromeSpec on Chrome",
+    "categories" : ["CHROMESPEC"],
+    "branch" : "master",
+    "builder": "ZChrome_Desktop",
+    "platform": "chrome"
+  },
+  {
+    "title" : "ChromeSpec on Android",
+    "categories" : ["CHROMESPEC"],
+    "branch" : "master",
+    "builder": "ZChrome_Mobile",
+    "platform": "chrome"
   }
-
 ],
 "repos" : [
 {
+    "title" : "CCA",
+    "repo" : "https://github.com/MobileChromeApps/mobile-chrome-apps.git",
+    "category" : "CHROMESPEC",
+    "release" : "master",
+    "current" : "master"
+},
+{
+    "title" : "CHROME-CORDOVA",
+    "repo" : "https://github.com/MobileChromeApps/chrome-cordova.git",
+    "category" : "CHROMESPEC",
+    "release" : "master",
+    "current" : "master"
+},
+{
     "title" : "TESTMASTER",
     "repo" : "https://git-wip-us.apache.org/repos/asf/cordova-medic.git",
     "category" : "TESTMASTER",
@@ -276,4 +303,4 @@
     "current" :"dev"
 }
 ]
-}
\ No newline at end of file
+}


Mime
View raw message