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

Merge pull request #6834 from lmskater/fix-android-path 

[Jenkins][ci skip] Fix the path of android public project
This commit is contained in:
minggo 2014-05-20 14:54:41 +08:00
parent 8409b99abd 70d1daf8f4
commit 875f7bc49f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/jenkins-scripts/autotest.py
View File

@ -118,7 +118,7 @@ def ANDROID_BUILD():
print 'clean **CLEAN FAILED**'
time.sleep(sleep_time)
def updateProperty():
infoUpdate = os.system('android update project -p ./cocos/2d/platform/android/java/ -t 12')
infoUpdate = os.system('android update project -p ./cocos/platform/android/java/ -t 12')
print 'cocos update:', infoUpdate
infoUpdate = os.system('android update project -p '+PATH_ANDROID_SRC+' -t 12')
print 'test update:', infoUpdate

2
tools/jenkins-scripts/ci-release-test.py
View File

@ -149,7 +149,7 @@ def main():
ret = os.system("python build/android-build.py -b " + mode + " -n -j10 all")
# create and save apk
if(ret == 0):
os.system('android update project -p cocos/2d/platform/android/java/ -t android-13')
os.system('android update project -p cocos/platform/android/java/ -t android-13')
for i, test in enumerate(tests_dirs):
os.system('android update project -p ' + test + ' -t android-13')
local_apk = test + '/' + tests_names[i] + '.apk'

2
tools/jenkins-scripts/pull-request-builder.py
View File

@ -194,7 +194,7 @@ def main():
# create and save apk
if(ret == 0):
sample_dir = 'tests/cpp-empty-test/proj.android/'
os.system('android update project -p cocos/2d/platform/android/java/ -t android-13')
os.system('android update project -p cocos/platform/android/java/ -t android-13')
os.system('android update project -p ' + sample_dir + ' -t android-13')
os.system('ant debug -f ' + sample_dir + 'build.xml')
local_apk = sample_dir + 'bin/CppEmptyTest-debug.apk'