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

add js win32 test

This commit is contained in:
andyque 2015-05-25 15:08:31 +08:00
parent dae2ca14d3
commit a6a5318e13
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,14 +37,15 @@ 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 = ""
if(node_name == 'android') or (node_name == 'android_bak'): if(node_name == 'android') or (node_name == 'android_bak'):
# patch_cpp_empty_test()
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"
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'):
@ -58,6 +59,8 @@ 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)

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

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