Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update daily build and pr build

This commit is contained in:
andyque 2015-06-30 16:24:03 +08:00
parent 329aab4a7a
commit a6451c6c5e
6 changed files with 0 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/jenkins-scripts/daily-build.py
View File

@ -57,7 +57,6 @@ def gen_scripting_bindings():
def do_build_slaves(): def do_build_slaves():
jenkins_script_path = "tools" + os.sep + "jenkins-scripts" + os.sep + "slave-scripts" + os.sep jenkins_script_path = "tools" + os.sep + "jenkins-scripts" + os.sep + "slave-scripts" + os.sep
js_tests_build_scripts = ""
if(branch == 'v3' or branch == 'v4-develop'): if(branch == 'v3' or branch == 'v4-develop'):
slave_build_scripts = "" slave_build_scripts = ""
@ -65,16 +64,12 @@ def do_build_slaves():
slave_build_scripts = jenkins_script_path + "android-build.sh" slave_build_scripts = jenkins_script_path + "android-build.sh"
elif(node_name == 'win32' or node_name == 'win32_win7' or node_name == 'win32_bak'): elif(node_name == 'win32' or node_name == 'win32_win7' or node_name == 'win32_bak'):
slave_build_scripts = jenkins_script_path + "win32-build.bat" slave_build_scripts = jenkins_script_path + "win32-build.bat"
js_tests_build_scripts = jenkins_script_path + "win32-js-build.bat"
elif(node_name == 'windows-universal' or node_name == 'windows-universal_bak'): elif(node_name == 'windows-universal' or node_name == 'windows-universal_bak'):
slave_build_scripts = jenkins_script_path + "windows-universal.bat" slave_build_scripts = jenkins_script_path + "windows-universal.bat"
js_tests_build_scripts = jenkins_script_path + "windows-js-universal.bat"
elif(node_name == 'ios_mac' or node_name == 'ios' or node_name == 'ios_bak'): elif(node_name == 'ios_mac' or node_name == 'ios' or node_name == 'ios_bak'):
slave_build_scripts = jenkins_script_path + "ios-build.sh" slave_build_scripts = jenkins_script_path + "ios-build.sh"
js_tests_build_scripts = jenkins_script_path + "ios-js-build.sh"
elif(node_name == 'mac' or node_name == 'mac_bak'): elif(node_name == 'mac' or node_name == 'mac_bak'):
slave_build_scripts = jenkins_script_path + "mac-build.sh" slave_build_scripts = jenkins_script_path + "mac-build.sh"
js_tests_build_scripts = jenkins_script_path + "mac-js-build.sh"
elif(node_name == 'linux_centos' or node_name == 'linux' or node_name == 'linux_bak'): elif(node_name == 'linux_centos' or node_name == 'linux' or node_name == 'linux_bak'):
slave_build_scripts = jenkins_script_path + "linux-build.sh" slave_build_scripts = jenkins_script_path + "linux-build.sh"
elif(node_name == 'wp8'): elif(node_name == 'wp8'):
@ -82,8 +77,6 @@ def do_build_slaves():
slave_build_scripts = jenkins_script_path + "wp8-v3.bat" slave_build_scripts = jenkins_script_path + "wp8-v3.bat"
ret = os.system(slave_build_scripts) ret = os.system(slave_build_scripts)
js_test_ret = os.system(js_tests_build_scripts)
ret = ret + js_test_ret
#get build result #get build result
print "build finished and return " + str(ret) print "build finished and return " + str(ret)

7
tools/jenkins-scripts/do-pull-request-builder.py
View File

@ -37,7 +37,6 @@ def do_build_slaves():
global node_name global node_name
jenkins_script_path = "tools" + os.sep + "jenkins-scripts" + os.sep + "slave-scripts" + os.sep jenkins_script_path = "tools" + os.sep + "jenkins-scripts" + os.sep + "slave-scripts" + os.sep
js_tests_build_scripts = ""
if(branch != 'v1' and branch != 'v2'): if(branch != 'v1' and branch != 'v2'):
slave_build_scripts = "" slave_build_scripts = ""
@ -45,16 +44,12 @@ def do_build_slaves():
slave_build_scripts = jenkins_script_path + "android-build.sh" slave_build_scripts = jenkins_script_path + "android-build.sh"
elif(node_name == 'win32' or node_name == 'win32_win7' or node_name == 'win32_bak'): elif(node_name == 'win32' or node_name == 'win32_win7' or node_name == 'win32_bak'):
slave_build_scripts = jenkins_script_path + "win32-build.bat" slave_build_scripts = jenkins_script_path + "win32-build.bat"
js_tests_build_scripts = jenkins_script_path + "win32-js-build.bat"
elif(node_name == 'windows-universal' or node_name == 'windows-universal_bak'): elif(node_name == 'windows-universal' or node_name == 'windows-universal_bak'):
slave_build_scripts = jenkins_script_path + "windows-universal.bat" slave_build_scripts = jenkins_script_path + "windows-universal.bat"
js_tests_build_scripts = jenkins_script_path + "windows-js-universal.bat"
elif(node_name == 'ios_mac' or node_name == 'ios' or node_name == 'ios_bak'): elif(node_name == 'ios_mac' or node_name == 'ios' or node_name == 'ios_bak'):
slave_build_scripts = jenkins_script_path + "ios-build.sh" slave_build_scripts = jenkins_script_path + "ios-build.sh"
js_tests_build_scripts = jenkins_script_path + "ios-js-build.sh"
elif(node_name == 'mac' or node_name == 'mac_bak'): elif(node_name == 'mac' or node_name == 'mac_bak'):
slave_build_scripts = jenkins_script_path + "mac-build.sh" slave_build_scripts = jenkins_script_path + "mac-build.sh"
js_tests_build_scripts = jenkins_script_path + "mac-js-build.sh"
elif(node_name == 'linux_centos' or node_name == 'linux' or node_name == 'linux_bak'): elif(node_name == 'linux_centos' or node_name == 'linux' or node_name == 'linux_bak'):
slave_build_scripts = jenkins_script_path + "linux-build.sh" slave_build_scripts = jenkins_script_path + "linux-build.sh"
elif(node_name == 'wp8'): elif(node_name == 'wp8'):
@ -62,8 +57,6 @@ def do_build_slaves():
slave_build_scripts = jenkins_script_path + "wp8-v3.bat" slave_build_scripts = jenkins_script_path + "wp8-v3.bat"
ret = os.system(slave_build_scripts) ret = os.system(slave_build_scripts)
js_test_ret = os.system(js_tests_build_scripts)
ret = ret + js_test_ret
#get build result #get build result
print "build finished and return " + str(ret) print "build finished and return " + str(ret)

7
tools/jenkins-scripts/slave-scripts/ios-js-build.sh
View File

@ -1,7 +0,0 @@
#put xctool.sh into your PATH
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
COCOS2DX_ROOT="$DIR"/../../..
xcodebuild -project "$COCOS2DX_ROOT"/build/cocos2d_js_tests.xcodeproj -scheme "js-tests iOS" -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" clean | xcpretty
xcodebuild -project "$COCOS2DX_ROOT"/build/cocos2d_js_tests.xcodeproj -scheme "js-tests iOS" -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build | xcpretty
#the following commands must not be removed
xcodebuild -project "$COCOS2DX_ROOT"/build/cocos2d_js_tests.xcodeproj -scheme "js-tests iOS" -destination "platform=iOS Simulator,name=iPhone Retina (4-inch)" build

22
tools/jenkins-scripts/slave-scripts/mac-js-build.sh
View File

@ -1,22 +0,0 @@
#put xctool.sh into your PATH
#######
# Cmake build
#######
# DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# COCOS2DX_ROOT="$DIR"/../../..
# cd ${COCOS2DX_ROOT}
# mkdir mac-build
# cd mac-build
# cmake ..
# make -j4
#######
# xcode build
#######
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
COCOS2DX_ROOT="$DIR"/../../..
xcodebuild -project "$COCOS2DX_ROOT"/build/cocos2d_js_tests.xcodeproj -scheme "js-tests Mac" clean | xcpretty
xcodebuild -project "$COCOS2DX_ROOT"/build/cocos2d_js_tests.xcodeproj -scheme "js-tests Mac" build | xcpretty
#xcpretty has a bug, some xcodebuid fails return value would be treated as 0.
xcodebuild -project "$COCOS2DX_ROOT"/build/cocos2d_js_tests.xcodeproj -scheme "js-tests Mac" build

2
tools/jenkins-scripts/slave-scripts/win32-js-build.bat
View File

@ -1,2 +0,0 @@
call "%VS120COMNTOOLS%vsvars32.bat"
msbuild build\cocos2d-js-win32.sln /t:Build /p:Platform="Win32" /p:Configuration="Release" /m

2
tools/jenkins-scripts/slave-scripts/windows-js-universal.bat
View File

@ -1,2 +0,0 @@
call "%VS120COMNTOOLS%vsvars32.bat"
msbuild build\cocos2d-js-win8.1-universal.sln /t:Build /p:Platform="Win32" /p:Configuration="Release" /m