From 79530616ea1b9b9387623e88ca3b2a521f9e2267 Mon Sep 17 00:00:00 2001 From: minggo Date: Tue, 25 Dec 2012 12:57:24 +0800 Subject: [PATCH] issue #1603:modify windows auto-build script --- .../windows/android/build-android-2.2-3.2-release.bat | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 c5e360c5ad..4eda8d2bd0 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 @@ -17,7 +17,7 @@ cd %_ROOT_% :project ::Copy build Configuration files to target directory -copy %_ROOT_%\tools\jenkins_scripts\ant.properties %_ROOT_%\samples\%_LANGUANE_%\%_PROJECTNAME%\proj.android +copy %_ROOT_%\tools\jenkins_scripts\ant.properties %_ROOT_%\samples\%_LANGUAGE_%\%_PROJECTNAME%\proj.android copy %_ROOT_%\tools\jenkins_scripts\build.xml %_ROOT_%\samples\%_LANGUAGE_%\%_PROJECTNAME%\proj.android copy %_ROOT_%\tools\jenkins_scripts\windows\android\rootconfig.sh %_ROOT_%\samples\%_LANGUAGE_%\%_PROJECTNAME%\proj.android @@ -148,11 +148,11 @@ 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%"=="HelloLua" set /a testresult3=(result8+result10+result11+result12+result13) +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%"=="HelloLua" set /a testresult3=(result8+result10+result11+result12+result13) set /a testresult=(testresult1+testresult2+testresult3) -IF %testresult% NEQ 0 goto error +if %testresult% NEQ 0 goto error goto success