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

Merge pull request #12851 from zilongshanren/v3 

[ci skip]fix win32&win8.1 template compile
This commit is contained in:
子龙山人 2015-07-15 10:04:03 +08:00
parent 49b47f576d 15b0fea530
commit 49b39bb9c5
17 changed files with 39 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,8 +73,14 @@ def do_build_slaves():
if(node_name == 'android') or (node_name == 'android_bak'):
slave_build_scripts = jenkins_script_path + "android-build.sh "
elif(node_name == 'win32' or node_name == 'win32_win7' or node_name == 'win32_bak'):
if daily_build_type == "runtime" or daily_build_type == "templates":
slave_build_scripts = jenkins_script_path + "win32-" + language + ".bat "
else:
slave_build_scripts = jenkins_script_path + "win32-build.bat "
elif(node_name == 'windows-universal' or node_name == 'windows-universal_bak'):
if daily_build_type == "runtime" or daily_build_type == "templates":
slave_build_scripts = jenkins_script_path + "windows-universal-" + language + ".bat "
else:
slave_build_scripts = jenkins_script_path + "windows-universal.bat "
elif(node_name == 'ios_mac' or node_name == 'ios' or node_name == 'ios_bak'):
slave_build_scripts = jenkins_script_path + "ios-build.sh "
@ -86,8 +92,14 @@ def do_build_slaves():
if(branch != 'v4'):
slave_build_scripts = jenkins_script_path + "wp8-v3.bat "
if daily_build_type == 'templates':
ret = os.system("python tools/cocos2d-console/bin/cocos.py new -l " + language)
elif daily_build_type == 'runtime':
ret = os.system("python tools/cocos2d-console/bin/cocos.py new -l " + language + " -t runtime")
else:
ret = 0
slave_build_scripts += language
ret = os.system(slave_build_scripts)
ret = ret + os.system(slave_build_scripts)
#get build result
print "build finished and return " + str(ret)

15
tools/jenkins-scripts/slave-scripts/runtime/win32-build.bat
View File

@ -1,15 +0,0 @@
@echo on
set mycocos=tools/cocos2d-console/bin/cocos.bat
set language=%1
rmdir /s /q .git
call %mycocos% new -l %language% -t runtime
set projectname=
if "%language%"=="cpp" set projectname=MyCppGame/proj.win32/MyCppGame.sln
if "%language%"=="lua" set projectname=MyLuaGame/frameworks/runtime-src/proj.win32/MyLuaGame.sln
if "%language%"=="js" set projectname=MyJSGame/frameworks/runtime-src/proj.win32/MyJSGame.sln
echo %projectname%
call "%VS120COMNTOOLS%vsvars32.bat"
msbuild %projectname% /t:Build /p:VisualStudioVersion=12.0 /p:Platform="Win32" /p:Configuration="Release" /m

2
tools/jenkins-scripts/slave-scripts/runtime/win32-cpp.bat Normal file
View File

@ -0,0 +1,2 @@
call "%VS120COMNTOOLS%vsvars32.bat"
msbuild MyCppGame/proj.win32/MyCppGame.sln /t:Build /p:VisualStudioVersion=12.0 /p:Platform="Win32" /p:Configuration="Release" /m

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

@ -0,0 +1,2 @@
call "%VS120COMNTOOLS%vsvars32.bat"
msbuild MyJSGame/frameworks/runtime-src/proj.win32/MyJSGame.sln /t:Build /p:VisualStudioVersion=12.0 /p:Platform="Win32" /p:Configuration="Release" /m

2
tools/jenkins-scripts/slave-scripts/runtime/win32-lua.bat Normal file
View File

@ -0,0 +1,2 @@
call "%VS120COMNTOOLS%vsvars32.bat"
msbuild MyLuaGame/frameworks/runtime-src/proj.win32/MyLuaGame.sln /t:Build /p:VisualStudioVersion=12.0 /p:Platform="Win32" /p:Configuration="Release" /m

2
tools/jenkins-scripts/slave-scripts/runtime/windows-universal-cpp.bat Executable file
View File

@ -0,0 +1,2 @@
call "%VS120COMNTOOLS%vsvars32.bat"
msbuild MyCppGame/proj.win8.1-universal/MyCppGame.sln /t:Build /p:VisualStudioVersion=12.0 /p:Platform="Win32" /p:Configuration="Release" /m

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

@ -0,0 +1,2 @@
call "%VS120COMNTOOLS%vsvars32.bat"
msbuild MyJSGame/frameworks/runtime-src/proj.win8.1-universal/MyJSGame.sln /t:Build /p:VisualStudioVersion=12.0 /p:Platform="Win32" /p:Configuration="Release" /m

2
tools/jenkins-scripts/slave-scripts/runtime/windows-universal-lua.bat Executable file
View File

@ -0,0 +1,2 @@
call "%VS120COMNTOOLS%vsvars32.bat"
msbuild MyLuaGame/frameworks/runtime-src/proj.win8.1-universal/MyLuaGame.sln /t:Build /p:VisualStudioVersion=12.0 /p:Platform="Win32" /p:Configuration="Release" /m

15
tools/jenkins-scripts/slave-scripts/runtime/windows-universal.bat
View File

@ -1,15 +0,0 @@
@echo on
set mycocos=tools/cocos2d-console/bin/cocos.bat
set language=%1
rmdir /s /q .git
call %mycocos% new -l %language%
set projectname=
if "%language%"=="cpp" set projectname=MyCppGame/proj.win8.1-universal/MyCppGame.sln
if "%language%"=="lua" set projectname=MyLuaGame/frameworks/runtime-src/proj.win8.1-universal/MyLuaGame.sln
if "%language%"=="js" set projectname=MyJSGame/frameworks/runtime-src/proj.win8.1-universal/MyJSGame.sln
echo %projectname%
call "%VS120COMNTOOLS%vsvars32.bat"
msbuild %projectname% /t:Build /p:VisualStudioVersion=12.0 /p:Platform="Win32" /p:Configuration="Release" /m

15
tools/jenkins-scripts/slave-scripts/templates/win32-build.bat
View File

@ -1,15 +0,0 @@
@echo on
set mycocos=tools/cocos2d-console/bin/cocos.bat
set language=%1
rmdir /s /q .git
call %mycocos% new -l %language%
set projectname=
if "%language%"=="cpp" set projectname=MyCppGame/proj.win32/MyCppGame.sln
if "%language%"=="lua" set projectname=MyLuaGame/frameworks/runtime-src/proj.win32/MyLuaGame.sln
if "%language%"=="js" set projectname=MyJSGame/frameworks/runtime-src/proj.win32/MyJSGame.sln
echo %projectname%
call "%VS120COMNTOOLS%vsvars32.bat"
msbuild %projectname% /t:Build /p:VisualStudioVersion=12.0 /p:Platform="Win32" /p:Configuration="Release" /m

2
tools/jenkins-scripts/slave-scripts/templates/win32-cpp.bat Normal file
View File

@ -0,0 +1,2 @@
call "%VS120COMNTOOLS%vsvars32.bat"
msbuild MyCppGame/proj.win32/MyCppGame.sln /t:Build /p:VisualStudioVersion=12.0 /p:Platform="Win32" /p:Configuration="Release" /m

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

@ -0,0 +1,2 @@
call "%VS120COMNTOOLS%vsvars32.bat"
msbuild MyJSGame/frameworks/runtime-src/proj.win32/MyJSGame.sln /t:Build /p:VisualStudioVersion=12.0 /p:Platform="Win32" /p:Configuration="Release" /m

2
tools/jenkins-scripts/slave-scripts/templates/win32-lua.bat Normal file
View File

@ -0,0 +1,2 @@
call "%VS120COMNTOOLS%vsvars32.bat"
msbuild MyLuaGame/frameworks/runtime-src/proj.win32/MyLuaGame.sln /t:Build /p:VisualStudioVersion=12.0 /p:Platform="Win32" /p:Configuration="Release" /m

2
tools/jenkins-scripts/slave-scripts/templates/windows-universal-cpp.bat Executable file
View File

@ -0,0 +1,2 @@
call "%VS120COMNTOOLS%vsvars32.bat"
msbuild MyCppGame/proj.win8.1-universal/MyCppGame.sln /t:Build /p:VisualStudioVersion=12.0 /p:Platform="Win32" /p:Configuration="Release" /m

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

@ -0,0 +1,2 @@
call "%VS120COMNTOOLS%vsvars32.bat"
msbuild MyJSGame/frameworks/runtime-src/proj.win8.1-universal/MyJSGame.sln /t:Build /p:VisualStudioVersion=12.0 /p:Platform="Win32" /p:Configuration="Release" /m

2
tools/jenkins-scripts/slave-scripts/templates/windows-universal-lua.bat Executable file
View File

@ -0,0 +1,2 @@
call "%VS120COMNTOOLS%vsvars32.bat"
msbuild MyLuaGame/frameworks/runtime-src/proj.win8.1-universal/MyLuaGame.sln /t:Build /p:VisualStudioVersion=12.0 /p:Platform="Win32" /p:Configuration="Release" /m

16
tools/jenkins-scripts/slave-scripts/templates/windows-universal.bat
View File

@ -1,16 +0,0 @@
@echo on
set mycocos=tools/cocos2d-console/bin/cocos.bat
set language=%1
rmdir /s /q .git
call %mycocos% new -l %language%
set projectname=
if "%language%"=="cpp" set projectname=MyCppGame/proj.win8.1-universal/MyCppGame.sln
if "%language%"=="lua" set projectname=MyLuaGame/frameworks/runtime-src/proj.win8.1-universal/MyLuaGame.sln
if "%language%"=="js" set projectname=MyJSGame/frameworks/runtime-src/proj.win8.1-universal/MyJSGame.sln
echo %projectname%
call "%VS120COMNTOOLS%vsvars32.bat"
msbuild %projectname% /t:Build /p:VisualStudioVersion=12.0 /p:Platform="Win32" /p:Configuration="Release" /m