atria-tools/lutin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] add standard command run

Browse Source
This commit is contained in:
Edouard DUPIN 2013-07-11 13:53:19 +02:00
parent 0954b467de
commit 4c584a694e
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lutinTargetAndroid.py
View File

@ -4,19 +4,9 @@ import lutinDebug as debug
import lutinTarget import lutinTarget
import lutinTools import lutinTools
import lutinHost import lutinHost
import lutinMultiprocess
import os import os
def RunCommand(cmdLine):
debug.debug(cmdLine)
ret = os.system(cmdLine)
# TODO : Use "subprocess" instead ==> permit to pipline the renderings ...
if ret != 0:
if ret == 2:
debug.error("can not execute cmdLine ... [keyboard interrrupt]")
else:
debug.error("can not execute cmdLine ... ret : " + str(ret))
class Target(lutinTarget.Target): class Target(lutinTarget.Target):
def __init__(self, typeCompilator, debugMode, generatePackage): def __init__(self, typeCompilator, debugMode, generatePackage):
@ -184,7 +174,7 @@ class Target(lutinTarget.Target):
+ "-I " + self.folder_sdk + "/platforms/android-" + str(self.boardId) + "/android.jar "\ + "-I " + self.folder_sdk + "/platforms/android-" + str(self.boardId) + "/android.jar "\
+ "-S " + self.GetStagingFolder(pkgName) + "/res/ " \ + "-S " + self.GetStagingFolder(pkgName) + "/res/ " \
+ "-J " + self.GetStagingFolder(pkgName) + "/src " + "-J " + self.GetStagingFolder(pkgName) + "/src "
RunCommand(cmdLine) lutinMultiprocess.RunCommand(cmdLine)
#aapt package -f -M ${manifest.file} -F ${packaged.resource.file} -I ${path.to.android-jar.library} #aapt package -f -M ${manifest.file} -F ${packaged.resource.file} -I ${path.to.android-jar.library}
# -S ${android-resource-directory} [-m -J ${folder.to.output.the.R.java}] # -S ${android-resource-directory} [-m -J ${folder.to.output.the.R.java}]
@ -203,14 +193,14 @@ class Target(lutinTarget.Target):
+ self.folder_ewol + "/sources/android/src/org/ewol/EwolSurfaceViewGL.java " \ + self.folder_ewol + "/sources/android/src/org/ewol/EwolSurfaceViewGL.java " \
+ self.folder_ewol + "/sources/android/src/org/ewol/EwolActivity.java " \ + self.folder_ewol + "/sources/android/src/org/ewol/EwolActivity.java " \
+ self.GetStagingFolder(pkgName) + "/src/R.java " + self.GetStagingFolder(pkgName) + "/src/R.java "
RunCommand(cmdLine) lutinMultiprocess.RunCommand(cmdLine)
debug.printElement("pkg", ".dex", "<==", "*.class") debug.printElement("pkg", ".dex", "<==", "*.class")
cmdLine = self.folder_sdk + "/platform-tools/dx " \ cmdLine = self.folder_sdk + "/platform-tools/dx " \
+ "--dex --no-strict " \ + "--dex --no-strict " \
+ "--output=" + self.GetStagingFolder(pkgName) + "/build/" + pkgName + ".dex " \ + "--output=" + self.GetStagingFolder(pkgName) + "/build/" + pkgName + ".dex " \
+ self.GetStagingFolder(pkgName) + "/build/classes/ " + self.GetStagingFolder(pkgName) + "/build/classes/ "
RunCommand(cmdLine) lutinMultiprocess.RunCommand(cmdLine)
debug.printElement("pkg", ".apk", "<==", ".dex, assets, .so, res") debug.printElement("pkg", ".apk", "<==", ".dex, assets, .so, res")
cmdLine = self.folder_sdk + "/tools/apkbuilder " \ cmdLine = self.folder_sdk + "/tools/apkbuilder " \
@ -219,7 +209,7 @@ class Target(lutinTarget.Target):
+ "-z " + self.GetStagingFolder(pkgName) + "/resources.res " \ + "-z " + self.GetStagingFolder(pkgName) + "/resources.res " \
+ "-f " + self.GetStagingFolder(pkgName) + "/build/" + pkgName + ".dex " \ + "-f " + self.GetStagingFolder(pkgName) + "/build/" + pkgName + ".dex " \
+ "-rf " + self.GetStagingFolder(pkgName) + "/data " + "-rf " + self.GetStagingFolder(pkgName) + "/data "
RunCommand(cmdLine) lutinMultiprocess.RunCommand(cmdLine)
# doc : # doc :
# http://developer.android.com/tools/publishing/app-signing.html # http://developer.android.com/tools/publishing/app-signing.html
@ -239,7 +229,7 @@ class Target(lutinTarget.Target):
+ self.GetStagingFolder(pkgName) + "/build/" + pkgName + "-unalligned.apk " \ + self.GetStagingFolder(pkgName) + "/build/" + pkgName + "-unalligned.apk " \
+ " alias__AndroidDebugKey " \ + " alias__AndroidDebugKey " \
+ " < tmpPass.boo" + " < tmpPass.boo"
RunCommand(cmdLine) lutinMultiprocess.RunCommand(cmdLine)
print("") print("")
else: else:
# keytool is situated in $(JAVA_HOME)/bin ... # keytool is situated in $(JAVA_HOME)/bin ...
@ -289,7 +279,7 @@ class Target(lutinTarget.Target):
cmdLine = self.folder_sdk + "/tools/zipalign 4 " \ cmdLine = self.folder_sdk + "/tools/zipalign 4 " \
+ self.GetStagingFolder(pkgName) + "/build/" + pkgName + "-unalligned.apk " \ + self.GetStagingFolder(pkgName) + "/build/" + pkgName + "-unalligned.apk " \
+ self.GetStagingFolder(pkgName) + "/" + pkgName + ".apk " + self.GetStagingFolder(pkgName) + "/" + pkgName + ".apk "
RunCommand(cmdLine) lutinMultiprocess.RunCommand(cmdLine)
# copy file in the final stage : # copy file in the final stage :
lutinTools.CopyFile(self.GetStagingFolder(pkgName) + "/" + pkgName + ".apk", lutinTools.CopyFile(self.GetStagingFolder(pkgName) + "/" + pkgName + ".apk",
@ -302,20 +292,20 @@ class Target(lutinTarget.Target):
debug.debug("------------------------------------------------------------------------") debug.debug("------------------------------------------------------------------------")
cmdLine = self.folder_sdk + "/platform-tools/adb install -r " \ cmdLine = self.folder_sdk + "/platform-tools/adb install -r " \
+ self.GetStagingFolder(pkgName) + "/" + pkgName + ".apk " + self.GetStagingFolder(pkgName) + "/" + pkgName + ".apk "
RunCommand(cmdLine) lutinMultiprocess.RunCommand(cmdLine)
def UnInstallPackage(self, pkgName): def UnInstallPackage(self, pkgName):
debug.debug("------------------------------------------------------------------------") debug.debug("------------------------------------------------------------------------")
debug.info("Un-Install package '" + pkgName + "'") debug.info("Un-Install package '" + pkgName + "'")
debug.debug("------------------------------------------------------------------------") debug.debug("------------------------------------------------------------------------")
cmdLine = self.folder_sdk + "/platform-tools/adb uninstall " + pkgName cmdLine = self.folder_sdk + "/platform-tools/adb uninstall " + pkgName
RunCommand(cmdLine) RlutinMultiprocess.unCommand(cmdLine)
def Log(self, pkgName): def Log(self, pkgName):
debug.debug("------------------------------------------------------------------------") debug.debug("------------------------------------------------------------------------")
debug.info("logcat of android board") debug.info("logcat of android board")
debug.debug("------------------------------------------------------------------------") debug.debug("------------------------------------------------------------------------")
cmdLine = self.folder_sdk + "/platform-tools/adb shell logcat " cmdLine = self.folder_sdk + "/platform-tools/adb shell logcat "
RunCommand(cmdLine) lutinMultiprocess.RunCommand(cmdLine)