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

Merge pull request #1158 from John-cdy/gles20 

issue #1404:Modify directory structure
This commit is contained in:
minggo 2012-08-05 23:24:10 -07:00
parent c799bd3c15 37d84ba6bb
commit 1b01659221
16 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/JenkinsScript/androidtest-debug3.sh → tools/JenkinsScript/Mac/android/androidtest-debug3.sh
View File

@ -53,13 +53,13 @@ antcompile()
#record the relevant catalog #record the relevant catalog
compileresult=0 compileresult=0
CUR=$(pwd) CUR=$(pwd)
cd ../.. cd ../../../..
ROOT=$(pwd) ROOT=$(pwd)
#copy configuration files to target. #copy configuration files to target.
cp $CUR/ant.properties $ROOT/samples/TestCpp/proj.android cp $ROOT/tools/JenkinsScript/ant.properties $ROOT/samples/TestCpp/proj.android
cp $CUR/build.xml $ROOT/samples/TestCpp/proj.android cp $ROOT/tools/JenkinsScript/build.xml $ROOT/samples/TestCpp/proj.android
cp $CUR/rootconfig-Mac.sh $ROOT/samples/TestCpp/proj.android cp $$ROOT/tools/JenkinsScript/Mac/rootconfig-Mac.sh $ROOT/samples/TestCpp/proj.android
cd samples/TestCpp/proj.android cd samples/TestCpp/proj.android
sh rootconfig-Mac.sh TestCpp sh rootconfig-Mac.sh TestCpp
sh build_native.sh sh build_native.sh
@ -70,9 +70,9 @@ android update project -p proj.android
cd proj.android cd proj.android
antcompile antcompile
cp $CUR/ant.properties $ROOT/samples/HelloCpp/proj.android cp $ROOT/tools/JenkinsScript/ant.properties $ROOT/samples/HelloCpp/proj.android
cp $CUR/build.xml $ROOT/samples/HelloCpp/proj.android cp $ROOT/tools/JenkinsScript/build.xml $ROOT/samples/HelloCpp/proj.android
cp $CUR/rootconfig-Mac.sh $ROOT/samples/HelloCpp/proj.android cp $$ROOT/tools/JenkinsScript/Mac/rootconfig-Mac.sh $ROOT/samples/HelloCpp/proj.android
cd ../../HelloCpp/proj.android cd ../../HelloCpp/proj.android
sh rootconfig-Mac.sh HelloCpp sh rootconfig-Mac.sh HelloCpp
sh build_native.sh sh build_native.sh
@ -81,9 +81,9 @@ android update project -p proj.android
cd proj.android cd proj.android
antcompile antcompile
cp $CUR/ant.properties $ROOT/samples/HelloLua/proj.android cp $ROOT/tools/JenkinsScript/ant.properties $ROOT/samples/HelloLua/proj.android
cp $CUR/build.xml $ROOT/samples/HelloLua/proj.android cp $ROOT/tools/JenkinsScript/build.xml $ROOT/samples/HelloLua/proj.android
cp $CUR/rootconfig-Mac.sh $ROOT/samples/HelloLua/proj.android cp $$ROOT/tools/JenkinsScript/Mac/rootconfig-Mac.sh $ROOT/samples/HelloLua/proj.android
cd ../../HelloLua/proj.android cd ../../HelloLua/proj.android
sh rootconfig-Mac.sh HelloLua sh rootconfig-Mac.sh HelloLua
sh build_native.sh sh build_native.sh

20
tools/JenkinsScript/androidtest-debug4.sh → tools/JenkinsScript/Mac/android/androidtest-debug4.sh
View File

@ -29,13 +29,13 @@ antcompile()
#record the relevant catalog #record the relevant catalog
compileresult=0 compileresult=0
CUR=$(pwd) CUR=$(pwd)
cd ../.. cd ../../../..
ROOT=$(pwd) ROOT=$(pwd)
#copy configuration files to target. #copy configuration files to target.
cp $CUR/ant.properties $ROOT/samples/TestCpp/proj.android cp $ROOT/tools/JenkinsScript/ant.properties $ROOT/samples/TestCpp/proj.android
cp $CUR/build.xml $ROOT/samples/TestCpp/proj.android cp $ROOT/tools/JenkinsScript/build.xml $ROOT/samples/TestCpp/proj.android
cp $CUR/rootconfig-Mac.sh $ROOT/samples/TestCpp/proj.android cp $$ROOT/tools/JenkinsScript/Mac/rootconfig-Mac.sh $ROOT/samples/TestCpp/proj.android
cd samples/TestCpp/proj.android cd samples/TestCpp/proj.android
sh rootconfig-Mac.sh TestCpp sh rootconfig-Mac.sh TestCpp
sh build_native.sh sh build_native.sh
@ -46,9 +46,9 @@ android update project -p proj.android
cd proj.android cd proj.android
antcompile antcompile
cp $CUR/ant.properties $ROOT/samples/HelloCpp/proj.android cp $ROOT/tools/JenkinsScript/ant.properties $ROOT/samples/HelloCpp/proj.android
cp $CUR/build.xml $ROOT/samples/HelloCpp/proj.android cp $ROOT/tools/JenkinsScript/build.xml $ROOT/samples/HelloCpp/proj.android
cp $CUR/rootconfig-Mac.sh $ROOT/samples/HelloCpp/proj.android cp $$ROOT/tools/JenkinsScript/Mac/rootconfig-Mac.sh $ROOT/samples/HelloCpp/proj.android
cd ../../HelloCpp/proj.android cd ../../HelloCpp/proj.android
sh rootconfig-Mac.sh HelloCpp sh rootconfig-Mac.sh HelloCpp
sh build_native.sh sh build_native.sh
@ -57,9 +57,9 @@ android update project -p proj.android
cd proj.android cd proj.android
antcompile antcompile
cp $CUR/ant.properties $ROOT/samples/HelloLua/proj.android cp $ROOT/tools/JenkinsScript/ant.properties $ROOT/samples/HelloLua/proj.android
cp $CUR/build.xml $ROOT/samples/HelloLua/proj.android cp $ROOT/tools/JenkinsScript/build.xml $ROOT/samples/HelloLua/proj.android
cp $CUR/rootconfig-Mac.sh $ROOT/samples/HelloLua/proj.android cp $$ROOT/tools/JenkinsScript/Mac/rootconfig-Mac.sh $ROOT/samples/HelloLua/proj.android
cd ../../HelloLua/proj.android cd ../../HelloLua/proj.android
sh rootconfig-Mac.sh HelloLua sh rootconfig-Mac.sh HelloLua
sh build_native.sh sh build_native.sh

22
tools/JenkinsScript/androidtest-release3.sh → tools/JenkinsScript/Mac/android/androidtest-release3.sh
View File

@ -53,17 +53,17 @@ antcompile()
#record the relevant catalog #record the relevant catalog
compileresult=0 compileresult=0
CUR=$(pwd) CUR=$(pwd)
cd ../.. cd ../../../..
ROOT=$(pwd) ROOT=$(pwd)
#copy configuration files to target. #copy configuration files to target.
sed -i '' '14d' $CUR/ant.properties sed -i '' '14d' $CUR/ant.properties
gsed -i "14 i\\key.store=$ANDROID_HOME/debug.keystore" $CUR/ant.properties gsed -i "14 i\\key.store=$ANDROID_HOME/debug.keystore" $CUR/ant.properties
cp $CUR/debug.keystore $ANDROID_HOME cp $CUR/../debug.keystore $ANDROID_HOME
cp $CUR/ant.properties $ROOT/samples/TestCpp/proj.android cp $ROOT/tools/JenkinsScript/ant.properties $ROOT/samples/TestCpp/proj.android
cp $CUR/build.xml $ROOT/samples/TestCpp/proj.android cp $ROOT/tools/JenkinsScript/build.xml $ROOT/samples/TestCpp/proj.android
cp $CUR/rootconfig-Mac.sh $ROOT/samples/TestCpp/proj.android cp $ROOT/tools/JenkinsScript/Mac/rootconfig-Mac.sh $ROOT/samples/TestCpp/proj.android
cd samples/TestCpp/proj.android cd samples/TestCpp/proj.android
sh rootconfig-Mac.sh TestCpp sh rootconfig-Mac.sh TestCpp
sh build_native.sh sh build_native.sh
@ -74,9 +74,9 @@ android update project -p proj.android
cd proj.android cd proj.android
antcompile antcompile
cp $CUR/ant.properties $ROOT/samples/HelloCpp/proj.android cp $ROOT/tools/JenkinsScript/ant.properties $ROOT/samples/HelloCpp/proj.android
cp $CUR/build.xml $ROOT/samples/HelloCpp/proj.android cp $ROOT/tools/JenkinsScript/build.xml $ROOT/samples/HelloCpp/proj.android
cp $CUR/rootconfig-Mac.sh $ROOT/samples/HelloCpp/proj.android cp $ROOT/tools/JenkinsScript/Mac/rootconfig-Mac.sh $ROOT/samples/HelloCpp/proj.android
cd ../../HelloCpp/proj.android cd ../../HelloCpp/proj.android
sh rootconfig-Mac.sh HelloCpp sh rootconfig-Mac.sh HelloCpp
sh build_native.sh sh build_native.sh
@ -85,9 +85,9 @@ android update project -p proj.android
cd proj.android cd proj.android
antcompile antcompile
cp $CUR/ant.properties $ROOT/samples/HelloLua/proj.android cp $ROOT/tools/JenkinsScript/ant.properties $ROOT/samples/HelloLua/proj.android
cp $CUR/build.xml $ROOT/samples/HelloLua/proj.android cp $ROOT/tools/JenkinsScript/build.xml $ROOT/samples/HelloLua/proj.android
cp $CUR/rootconfig-Mac.sh $ROOT/samples/HelloLua/proj.android cp $ROOT/tools/JenkinsScript/Mac/rootconfig-Mac.sh $ROOT/samples/HelloLua/proj.android
cd ../../HelloLua/proj.android cd ../../HelloLua/proj.android
sh rootconfig-Mac.sh HelloLua sh rootconfig-Mac.sh HelloLua
sh build_native.sh sh build_native.sh

22
tools/JenkinsScript/androidtest-release4.sh → tools/JenkinsScript/Mac/android/androidtest-release4.sh
View File

@ -29,17 +29,17 @@ antcompile()
#record the relevant catalog #record the relevant catalog
compileresult=0 compileresult=0
CUR=$(pwd) CUR=$(pwd)
cd ../.. cd ../../../..
ROOT=$(pwd) ROOT=$(pwd)
#copy configuration files to target. #copy configuration files to target.
sed -i '' '14d' $CUR/ant.properties sed -i '' '14d' $CUR/ant.properties
gsed -i "14 i\\key.store=$ANDROID_HOME/debug.keystore" $CUR/ant.properties gsed -i "14 i\\key.store=$ANDROID_HOME/debug.keystore" $CUR/ant.properties
cp $CUR/debug.keystore $ANDROID_HOME cp $CUR/../debug.keystore $ANDROID_HOME
cp $CUR/ant.properties $ROOT/samples/TestCpp/proj.android cp $ROOT/tools/JenkinsScript/ant.properties $ROOT/samples/TestCpp/proj.android
cp $CUR/build.xml $ROOT/samples/TestCpp/proj.android cp $ROOT/tools/JenkinsScript/build.xml $ROOT/samples/TestCpp/proj.android
cp $CUR/rootconfig-Mac.sh $ROOT/samples/TestCpp/proj.android cp $ROOT/tools/JenkinsScript/Mac/rootconfig-Mac.sh $ROOT/samples/TestCpp/proj.android
cd samples/TestCpp/proj.android cd samples/TestCpp/proj.android
sh rootconfig-Mac.sh TestCpp sh rootconfig-Mac.sh TestCpp
sh build_native.sh sh build_native.sh
@ -50,9 +50,9 @@ android update project -p proj.android
cd proj.android cd proj.android
antcompile antcompile
cp $CUR/ant.properties $ROOT/samples/HelloCpp/proj.android cp $ROOT/tools/JenkinsScript/ant.properties $ROOT/samples/HelloCpp/proj.android
cp $CUR/build.xml $ROOT/samples/HelloCpp/proj.android cp $ROOT/tools/JenkinsScript/build.xml $ROOT/samples/HelloCpp/proj.android
cp $CUR/rootconfig-Mac.sh $ROOT/samples/HelloCpp/proj.android cp $ROOT/tools/JenkinsScript/Mac/rootconfig-Mac.sh $ROOT/samples/HelloCpp/proj.android
cd ../../HelloCpp/proj.android cd ../../HelloCpp/proj.android
sh rootconfig-Mac.sh HelloCpp sh rootconfig-Mac.sh HelloCpp
sh build_native.sh sh build_native.sh
@ -61,9 +61,9 @@ android update project -p proj.android
cd proj.android cd proj.android
antcompile antcompile
cp $CUR/ant.properties $ROOT/samples/HelloLua/proj.android cp $ROOT/tools/JenkinsScript/ant.properties $ROOT/samples/HelloLua/proj.android
cp $CUR/build.xml $ROOT/samples/HelloLua/proj.android cp $ROOT/tools/JenkinsScript/build.xml $ROOT/samples/HelloLua/proj.android
cp $CUR/rootconfig-Mac.sh $ROOT/samples/HelloLua/proj.android cp $ROOT/tools/JenkinsScript/Mac/rootconfig-Mac.sh $ROOT/samples/HelloLua/proj.android
cd ../../HelloLua/proj.android cd ../../HelloLua/proj.android
sh rootconfig-Mac.sh HelloLua sh rootconfig-Mac.sh HelloLua
sh build_native.sh sh build_native.sh

0
tools/JenkinsScript/debug.keystore → tools/JenkinsScript/Mac/debug.keystore
View File

0
tools/JenkinsScript/iostest-debug.sh → tools/JenkinsScript/Mac/ios/iostest-debug.sh
View File

0
tools/JenkinsScript/iostest-release.sh → tools/JenkinsScript/Mac/ios/iostest-release.sh
View File

0
tools/JenkinsScript/mactest-debug.sh → tools/JenkinsScript/Mac/mac/mactest-debug.sh
View File

0
tools/JenkinsScript/mactest-release.sh → tools/JenkinsScript/Mac/mac/mactest-release.sh
View File

2
tools/JenkinsScript/rootconfig-Mac.sh → tools/JenkinsScript/Mac/rootconfig-Mac.sh
View File

@ -13,7 +13,7 @@ cd ../../..
#echo $_COCOS2DX_ROOT #echo $_COCOS2DX_ROOT
#Modify the configuration files #Modify the configuration files
sed -i '' '3,4d' $CUR/build_native.sh #sed -i '' '3,4d' $CUR/build_native.sh
sed -i '' '13d' $CUR/project.properties sed -i '' '13d' $CUR/project.properties
#gsed -i "3 i\\$_NDK_ROOT" $CUR/build_native.sh #gsed -i "3 i\\$_NDK_ROOT" $CUR/build_native.sh
#gsed -i "4 i\\$_COCOS2DX_ROOT" $CUR/build_native.sh #gsed -i "4 i\\$_COCOS2DX_ROOT" $CUR/build_native.sh

4
tools/JenkinsScript/androidtest-debug3.bat → tools/JenkinsScript/Windows/android/androidtest-debug3.bat
View File

@ -11,13 +11,13 @@ if not exist "%ANDROID_NDK%" echo Couldn't find Cygwin at "%ANDROID_NDK%" and yo
if not exist "%JAVA_HOME%" echo Couldn't find Cygwin at "%JAVA_HOME%" and you should set like this "C:\Program Files\Java\jdk1.7.0_05"& pause & exit 5 if not exist "%JAVA_HOME%" echo Couldn't find Cygwin at "%JAVA_HOME%" and you should set like this "C:\Program Files\Java\jdk1.7.0_05"& pause & exit 5
set _PROJECTNAME=TestCpp set _PROJECTNAME=TestCpp
cd ..\.. cd ..\..\..\..
:project :project
::Copy build Configuration files to target directory ::Copy build Configuration files to target directory
copy %cd%\tools\JenkinsScript\ant.properties %cd%\samples\%_PROJECTNAME%\proj.android 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\build.xml %cd%\samples\%_PROJECTNAME%\proj.android
copy %cd%\tools\JenkinsScript\rootconfig.sh %cd%\samples\%_PROJECTNAME%\proj.android copy %cd%\tools\JenkinsScript\Windows\android\rootconfig.sh %cd%\samples\%_PROJECTNAME%\proj.android
::Modify the configuration files ::Modify the configuration files
cd samples\%_PROJECTNAME%\proj.android cd samples\%_PROJECTNAME%\proj.android

10
tools/JenkinsScript/androidtest-debug4.bat → tools/JenkinsScript/Windows/android/androidtest-debug4.bat
View File

@ -11,13 +11,13 @@ if not exist "%ANDROID_NDK%" echo Couldn't find Cygwin at "%ANDROID_NDK%" and yo
if not exist "%JAVA_HOME%" echo Couldn't find Cygwin at "%JAVA_HOME%" and you should set like this "C:\Program Files\Java\jdk1.7.0_05"& pause & exit 5 if not exist "%JAVA_HOME%" echo Couldn't find Cygwin at "%JAVA_HOME%" and you should set like this "C:\Program Files\Java\jdk1.7.0_05"& pause & exit 5
set _PROJECTNAME=TestCpp set _PROJECTNAME=TestCpp
cd ..\.. cd ..\..\..\..
:project :project
::Copy build Configuration files to target directory ::Copy build Configuration files to target directory
copy %cd%\tools\JenkinsScript\ant.properties %cd%\samples\%_PROJECTNAME%\proj.android 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\build.xml %cd%\samples\%_PROJECTNAME%\proj.android
copy %cd%\tools\JenkinsScript\rootconfig.sh %cd%\samples\%_PROJECTNAME%\proj.android copy %cd%\tools\JenkinsScript\Windows\android\rootconfig.sh %cd%\samples\%_PROJECTNAME%\proj.android
::Modify the configuration files ::Modify the configuration files
cd samples\%_PROJECTNAME%\proj.android cd samples\%_PROJECTNAME%\proj.android
@ -73,9 +73,9 @@ move anttmp.properties ant.properties
::Calculate the errorlevel and change build target. ::Calculate the errorlevel and change build target.
cd ../../.. cd ../../..
IF "%_PROJECTNAME%"=="TestCpp" set /a testresult1=(result8+result10+result11+result12+result13) && set _PROJECTNAME=HelloCpp&& goto project IF "%_PROJECTNAME%"=="TestCpp" set /a testresult1=(result14+result15) && set _PROJECTNAME=HelloCpp&& goto project
IF "%_PROJECTNAME%"=="HelloCpp" set /a testresult2=(result8+result10+result11+result12+result13) && set _PROJECTNAME=HelloLua&& goto project IF "%_PROJECTNAME%"=="HelloCpp" set /a testresult2=(result14+result15) && set _PROJECTNAME=HelloLua&& goto project
IF "%_PROJECTNAME%"=="HelloLua" set /a testresult3=(result8+result10+result11+result12+result13) IF "%_PROJECTNAME%"=="HelloLua" set /a testresult3=(result14+result15)
set /a testresult=(testresult1+testresult2+testresult3) set /a testresult=(testresult1+testresult2+testresult3)
IF %testresult% NEQ 0 goto error IF %testresult% NEQ 0 goto error

4
tools/JenkinsScript/androidtest-release3.bat → tools/JenkinsScript/Windows/android/androidtest-release3.bat
View File

@ -11,13 +11,13 @@ if not exist "%ANDROID_NDK%" echo Couldn't find Cygwin at "%ANDROID_NDK%" and yo
if not exist "%JAVA_HOME%" echo Couldn't find Cygwin at "%JAVA_HOME%" and you should set like this "C:\Program Files\Java\jdk1.7.0_05"& pause & exit 5 if not exist "%JAVA_HOME%" echo Couldn't find Cygwin at "%JAVA_HOME%" and you should set like this "C:\Program Files\Java\jdk1.7.0_05"& pause & exit 5
set _PROJECTNAME=TestCpp set _PROJECTNAME=TestCpp
cd ..\.. cd ..\..\..\..
:project :project
::Copy build Configuration files to target directory ::Copy build Configuration files to target directory
copy %cd%\tools\JenkinsScript\ant.properties %cd%\samples\%_PROJECTNAME%\proj.android 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\build.xml %cd%\samples\%_PROJECTNAME%\proj.android
copy %cd%\tools\JenkinsScript\rootconfig.sh %cd%\samples\%_PROJECTNAME%\proj.android copy %cd%\tools\JenkinsScript\Windows\android\rootconfig.sh %cd%\samples\%_PROJECTNAME%\proj.android
::Modify the configuration files ::Modify the configuration files
cd samples\%_PROJECTNAME%\proj.android cd samples\%_PROJECTNAME%\proj.android

4
tools/JenkinsScript/androidtest-release4.bat → tools/JenkinsScript/Windows/android/androidtest-release4.bat
View File

@ -11,13 +11,13 @@ if not exist "%ANDROID_NDK%" echo Couldn't find Cygwin at "%ANDROID_NDK%" and yo
if not exist "%JAVA_HOME%" echo Couldn't find Cygwin at "%JAVA_HOME%" and you should set like this "C:\Program Files\Java\jdk1.7.0_05"& pause & exit 5 if not exist "%JAVA_HOME%" echo Couldn't find Cygwin at "%JAVA_HOME%" and you should set like this "C:\Program Files\Java\jdk1.7.0_05"& pause & exit 5
set _PROJECTNAME=TestCpp set _PROJECTNAME=TestCpp
cd ..\.. cd ..\..\..\..
:project :project
::Copy build Configuration files to target directory ::Copy build Configuration files to target directory
copy %cd%\tools\JenkinsScript\ant.properties %cd%\samples\%_PROJECTNAME%\proj.android 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\build.xml %cd%\samples\%_PROJECTNAME%\proj.android
copy %cd%\tools\JenkinsScript\rootconfig.sh %cd%\samples\%_PROJECTNAME%\proj.android copy %cd%\tools\JenkinsScript\Windows\android\rootconfig.sh %cd%\samples\%_PROJECTNAME%\proj.android
::Modify the configuration files ::Modify the configuration files
cd samples\%_PROJECTNAME%\proj.android cd samples\%_PROJECTNAME%\proj.android

0
tools/JenkinsScript/androidtestcommon.bat → tools/JenkinsScript/Windows/android/androidtestcommon.bat
View File

2
tools/JenkinsScript/rootconfig.sh → tools/JenkinsScript/Windows/android/rootconfig.sh
View File

@ -17,7 +17,7 @@ cd ../../..
#echo $_COCOS2DX_ROOT #echo $_COCOS2DX_ROOT
#Modify the configuration files #Modify the configuration files
sed -i '3,4d' $CUR/build_native.sh #sed -i '3,4d' $CUR/build_native.sh
sed -i '13d' $CUR/project.properties sed -i '13d' $CUR/project.properties
#sed -i "3 i\\$_NDK_ROOT" $CUR/build_native.sh #sed -i "3 i\\$_NDK_ROOT" $CUR/build_native.sh
#sed -i "4 i\\$_COCOS2DX_ROOT" $CUR/build_native.sh #sed -i "4 i\\$_COCOS2DX_ROOT" $CUR/build_native.sh