Merge pull request #1311 from walzer/gles20

update jenkins_scripts for build android-ant on windows cygwin
This commit is contained in:
Walzer 2012-09-12 20:29:12 -07:00
commit 4fd8650b06
6 changed files with 24 additions and 14 deletions

View File

@ -9,7 +9,7 @@ set AndroidHome=D:\Windows7\android-sdk-windows
rem android version path
set AndroidVersion=\platforms\android-8
rem android project path
set AndroidProject=D:\cocos2d-x\tests\proj.android
set AndroidProject=D:\cocos2d-x\samples\TestCpp\proj.android
rem unsigned apk name
set unsign_apk=Tests.apk
rem signed apk name

View File

@ -4,6 +4,7 @@
::Here are the environment variables you should set.
::%ANT_HOME% %ANDROID_HOME% %JAVA_HOME% %CYGWIN% %ANDROID_NDK%
echo off
if not exist "%CYGWIN%" echo Couldn't find Cygwin at "%CYGWIN%" and you should set it like this "C:\cygwin"& pause & exit 1
if not exist "%ANDROID_HOME%" echo Couldn't find ANDROID_HOME at "%ANDROID_HOME%" and you should set it like this "D:\xx\android-sdk-windows"& pause & exit 2
if not exist "%ANDROID_NDK%" echo Couldn't find Cygwin at "%ANDROID_NDK%" and you should set it like this "D:\xx\android-ndk-r8"& pause & exit 3
@ -15,9 +16,9 @@ cd ..\..\..\..
:project
::Copy build Configuration files to target directory
copy %cd%\tools\JenkinsScript\ant.properties %cd%\samples\%_PROJECTNAME%\proj.android
copy %cd%\tools\JenkinsScript\build.xml %cd%\samples\%_PROJECTNAME%\proj.android
copy %cd%\tools\JenkinsScript\Windows\android\rootconfig.sh %cd%\samples\%_PROJECTNAME%\proj.android
copy %cd%\tools\jenkins_scripts\ant.properties %cd%\samples\%_PROJECTNAME%\proj.android /Y
copy %cd%\tools\jenkins_scripts\build.xml %cd%\samples\%_PROJECTNAME%\proj.android /Y
copy %cd%\tools\jenkins_scripts\windows\android\rootconfig.sh %cd%\samples\%_PROJECTNAME%\proj.android /Y
::Modify the configuration files
cd samples\%_PROJECTNAME%\proj.android

View File

@ -15,9 +15,9 @@ cd ..\..\..\..
:project
::Copy build Configuration files to target directory
copy %cd%\tools\JenkinsScript\ant.properties %cd%\samples\%_PROJECTNAME%\proj.android
copy %cd%\tools\JenkinsScript\build.xml %cd%\samples\%_PROJECTNAME%\proj.android
copy %cd%\tools\JenkinsScript\Windows\android\rootconfig.sh %cd%\samples\%_PROJECTNAME%\proj.android
copy %cd%\tools\jenkins_scripts\ant.properties %cd%\samples\%_PROJECTNAME%\proj.android
copy %cd%\tools\jenkins_scripts\build.xml %cd%\samples\%_PROJECTNAME%\proj.android
copy %cd%\tools\jenkins_scripts\windows\android\rootconfig.sh %cd%\samples\%_PROJECTNAME%\proj.android
::Modify the configuration files
cd samples\%_PROJECTNAME%\proj.android

View File

@ -15,9 +15,9 @@ cd ..\..\..\..
:project
::Copy build Configuration files to target directory
copy %cd%\tools\JenkinsScript\ant.properties %cd%\samples\%_PROJECTNAME%\proj.android
copy %cd%\tools\JenkinsScript\build.xml %cd%\samples\%_PROJECTNAME%\proj.android
copy %cd%\tools\JenkinsScript\Windows\android\rootconfig.sh %cd%\samples\%_PROJECTNAME%\proj.android
copy %cd%\tools\jenkins_scripts\ant.properties %cd%\samples\%_PROJECTNAME%\proj.android
copy %cd%\tools\jenkins_scripts\build.xml %cd%\samples\%_PROJECTNAME%\proj.android
copy %cd%\tools\jenkins_scripts\windows\android\rootconfig.sh %cd%\samples\%_PROJECTNAME%\proj.android
::Modify the configuration files
cd samples\%_PROJECTNAME%\proj.android

View File

@ -15,9 +15,9 @@ cd ..\..\..\..
:project
::Copy build Configuration files to target directory
copy %cd%\tools\JenkinsScript\ant.properties %cd%\samples\%_PROJECTNAME%\proj.android
copy %cd%\tools\JenkinsScript\build.xml %cd%\samples\%_PROJECTNAME%\proj.android
copy %cd%\tools\JenkinsScript\Windows\android\rootconfig.sh %cd%\samples\%_PROJECTNAME%\proj.android
copy %cd%\tools\jenkins_scripts\ant.properties %cd%\samples\%_PROJECTNAME%\proj.android
copy %cd%\tools\jenkins_scripts\build.xml %cd%\samples\%_PROJECTNAME%\proj.android
copy %cd%\tools\jenkins_scripts\windows\android\rootconfig.sh %cd%\samples\%_PROJECTNAME%\proj.android
::Modify the configuration files
cd samples\%_PROJECTNAME%\proj.android

11
tools/jenkins_scripts/windows/android/rootconfig.sh Normal file → Executable file
View File

@ -31,7 +31,16 @@ if [ $1 = TestCpp ]; then
elif [ $1 = HelloCpp ]; then
sed -i '2d' $CUR/build.xml
sed -i '2 i\<project name="HelloCpp" default="help">' $CUR/build.xml
else
else [ $1 = HelloLua ]; then
sed -i '2d' $CUR/build.xml
sed -i '2 i\<project name="HelloLua" default="help">' $CUR/build.xml
else [ $1 = TestLua ]; then
sed -i '2d' $CUR/build.xml
sed -i '2 i\<project name="TestLua" default="help">' $CUR/build.xml
else [ $1 = TestJavascript ]; then
sed -i '2d' $CUR/build.xml
sed -i '2 i\<project name="TestJavascript" default="help">' $CUR/build.xml
else [ $1 = SimpleGame ]; then
sed -i '2d' $CUR/build.xml
sed -i '2 i\<project name="SimpleGame" default="help">' $CUR/build.xml
fi