From d94e4c30b848cf9bd9d999d3941581427a2c6b2b Mon Sep 17 00:00:00 2001 From: minggo Date: Wed, 26 Dec 2012 10:42:35 +0800 Subject: [PATCH] issue #1603:delete space when setting language --- .../windows/android/build-android-2.2-3.2-debug.bat | 2 +- .../windows/android/build-android-2.2-3.2-release.bat | 2 +- .../jenkins_scripts/windows/android/build-android-4.x-debug.bat | 2 +- .../windows/android/build-android-4.x-release.bat | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/jenkins_scripts/windows/android/build-android-2.2-3.2-debug.bat b/tools/jenkins_scripts/windows/android/build-android-2.2-3.2-debug.bat index 034cf4308e..f95720db38 100755 --- a/tools/jenkins_scripts/windows/android/build-android-2.2-3.2-debug.bat +++ b/tools/jenkins_scripts/windows/android/build-android-2.2-3.2-debug.bat @@ -132,7 +132,7 @@ move anttmp.properties ant.properties ::Calculate the errorlevel and change build target. cd %_ROOT_% if "%_PROJECTNAME%"=="TestCpp" set /a TestCpp_Result=(result8+result10+result11+result12+result13) && set _PROJECTNAME=HelloCpp&& goto project -if "%_PROJECTNAME%"=="HelloCpp" set /a HelloCpp_Result=(result8+result10+result11+result12+result13) && set _LANGUAGE_=Lua && set _PROJECTNAME=HelloLua&& goto project +if "%_PROJECTNAME%"=="HelloCpp" set /a HelloCpp_Result=(result8+result10+result11+result12+result13) && set _LANGUAGE_=Lua&& set _PROJECTNAME=HelloLua&& goto project if "%_PROJECTNAME%"=="HelloLua" set /a HelloLua_Result=(result8+result10+result11+result12+result13) set /a Compile_Result=(TestCpp_Result+HelloCpp_Result+HelloLua_Result) if %Compile_Result% NEQ 0 goto error diff --git a/tools/jenkins_scripts/windows/android/build-android-2.2-3.2-release.bat b/tools/jenkins_scripts/windows/android/build-android-2.2-3.2-release.bat index 4eda8d2bd0..99b7702446 100755 --- a/tools/jenkins_scripts/windows/android/build-android-2.2-3.2-release.bat +++ b/tools/jenkins_scripts/windows/android/build-android-2.2-3.2-release.bat @@ -149,7 +149,7 @@ move ant1.properties ant.properties ::Calculate the errorlevel and change build target. cd %_ROOT_% if "%_PROJECTNAME%"=="TestCpp" set /a testresult1=(result8+result10+result11+result12+result13) && set _PROJECTNAME=HelloCpp&& goto project -if "%_PROJECTNAME%"=="HelloCpp" set /a testresult2=(result8+result10+result11+result12+result13) && set _LANGUAGE_=Lua && set _PROJECTNAME=HelloLua&& goto project +if "%_PROJECTNAME%"=="HelloCpp" set /a testresult2=(result8+result10+result11+result12+result13) && set _LANGUAGE_=Lua&& set _PROJECTNAME=HelloLua&& goto project if "%_PROJECTNAME%"=="HelloLua" set /a testresult3=(result8+result10+result11+result12+result13) set /a testresult=(testresult1+testresult2+testresult3) if %testresult% NEQ 0 goto error diff --git a/tools/jenkins_scripts/windows/android/build-android-4.x-debug.bat b/tools/jenkins_scripts/windows/android/build-android-4.x-debug.bat index 77e4fc9b5b..167bddbf3f 100755 --- a/tools/jenkins_scripts/windows/android/build-android-4.x-debug.bat +++ b/tools/jenkins_scripts/windows/android/build-android-4.x-debug.bat @@ -88,7 +88,7 @@ move anttmp.properties ant.properties ::Calculate the errorlevel and change build target. cd %_ROOT_% IF "%_PROJECTNAME%"=="TestCpp" set /a testresult1=(result14+result15) && set _PROJECTNAME=HelloCpp&& goto project -IF "%_PROJECTNAME%"=="HelloCpp" set /a testresult2=(result14+result15) && set _LANGUAGE_=Lua && set _PROJECTNAME=HelloLua&& goto project +IF "%_PROJECTNAME%"=="HelloCpp" set /a testresult2=(result14+result15) && set _LANGUAGE_=Lua&& set _PROJECTNAME=HelloLua&& goto project IF "%_PROJECTNAME%"=="HelloLua" set /a testresult3=(result14+result15) set /a testresult=(testresult1+testresult2+testresult3) IF %testresult% NEQ 0 goto error diff --git a/tools/jenkins_scripts/windows/android/build-android-4.x-release.bat b/tools/jenkins_scripts/windows/android/build-android-4.x-release.bat index 8164a5ae6a..6ff32fee48 100755 --- a/tools/jenkins_scripts/windows/android/build-android-4.x-release.bat +++ b/tools/jenkins_scripts/windows/android/build-android-4.x-release.bat @@ -97,7 +97,7 @@ move ant1.properties ant.properties ::Calculate the errorlevel and change build target. cd %_ROOT_% IF "%_PROJECTNAME%"=="TestCpp" set /a testresult1=(result14+result15) && set _PROJECTNAME=HelloCpp&& goto project -IF "%_PROJECTNAME%"=="HelloCpp" set /a testresult2=(result14+result15) && set _LANGUAGE_=Lua && set _PROJECTNAME=HelloLua&& goto project +IF "%_PROJECTNAME%"=="HelloCpp" set /a testresult2=(result14+result15) && set _LANGUAGE_=Lua&& set _PROJECTNAME=HelloLua&& goto project IF "%_PROJECTNAME%"=="HelloLua" set /a testresult3=(result14+result15) set /a testresult=(testresult1+testresult2+testresult3) IF %testresult% NEQ 0 goto error