generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Repo normalization problems fixed.

Browse Source
This commit is contained in:
Alexander Smorkalov 2012-10-24 12:46:36 +04:00
parent 4f0f6686d1
commit 680fba7e0d
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
android/service/all.py
View File

@ -8,7 +8,7 @@ LOCAL_LOG_PATH = os.path.join(os.getcwd(), "logs")
if (__name__ == "__main__"): if (__name__ == "__main__"):
if (not os.path.exists(LOCAL_LOG_PATH)): if (not os.path.exists(LOCAL_LOG_PATH)):
os.makedirs(LOCAL_LOG_PATH) os.makedirs(LOCAL_LOG_PATH)
print("Building native part of OpenCV Manager...") print("Building native part of OpenCV Manager...")
HomeDir = os.getcwd() HomeDir = os.getcwd()
@ -19,25 +19,25 @@ if (__name__ == "__main__"):
#print(BuildCommand) #print(BuildCommand)
res = os.system(BuildCommand) res = os.system(BuildCommand)
if (0 == res): if (0 == res):
print("Build\t[OK]") print("Build\t[OK]")
else: else:
print("Build\t[FAILED]") print("Build\t[FAILED]")
sys.exit(-1) sys.exit(-1)
os.chdir(HomeDir) os.chdir(HomeDir)
ConfFile = open("device.conf", "rt") ConfFile = open("device.conf", "rt")
for s in ConfFile.readlines(): for s in ConfFile.readlines():
keys = s.split(";") keys = s.split(";")
if (len(keys) < 2): if (len(keys) < 2):
print("Error: invalid config line: \"%s\"" % s) print("Error: invalid config line: \"%s\"" % s)
continue continue
Arch = keys[0] Arch = keys[0]
Name = keys[1] Name = keys[1]
print("testing \"%s\" arch" % Arch) print("testing \"%s\" arch" % Arch)
print("Pushing to device \"%s\"" % Name) print("Pushing to device \"%s\"" % Name)
PushCommand = "%s \"%s\" \"%s\" 2>&1" % (os.path.join(HomeDir, "push_native.py"), Arch, Name) PushCommand = "%s \"%s\" \"%s\" 2>&1" % (os.path.join(HomeDir, "push_native.py"), Arch, Name)
os.system(PushCommand) os.system(PushCommand)
print("Testing on device \"%s\"" % Name) print("Testing on device \"%s\"" % Name)
TestCommand = "%s \"%s\" \"%s\" 2>&1" % (os.path.join(HomeDir, "test_native.py"), Arch, Name) TestCommand = "%s \"%s\" \"%s\" 2>&1" % (os.path.join(HomeDir, "test_native.py"), Arch, Name)
os.system(TestCommand) os.system(TestCommand)

4
android/service/push_native.py
View File

@ -10,8 +10,8 @@ DEVICE_ARCH = "armeabi"
if (__name__ == "__main__"): if (__name__ == "__main__"):
if (len(sys.argv) >= 3): if (len(sys.argv) >= 3):
DEVICE_ARCH = sys.argv[1] DEVICE_ARCH = sys.argv[1]
DEVICE_NAME = sys.argv[2] DEVICE_NAME = sys.argv[2]
if (DEVICE_NAME != ""): if (DEVICE_NAME != ""):
DEVICE_STR = "-s \"" + DEVICE_NAME + "\"" DEVICE_STR = "-s \"" + DEVICE_NAME + "\""

6
android/service/test_native.py
View File

@ -18,14 +18,14 @@ def RunTestApp(AppName):
if (__name__ == "__main__"): if (__name__ == "__main__"):
if (3 == len(sys.argv)): if (3 == len(sys.argv)):
DEVICE_ARCH = sys.argv[1] DEVICE_ARCH = sys.argv[1]
DEVICE_NAME = sys.argv[2] DEVICE_NAME = sys.argv[2]
if (DEVICE_NAME != ""): if (DEVICE_NAME != ""):
DEVICE_STR = "-s \"" + DEVICE_NAME + "\"" DEVICE_STR = "-s \"" + DEVICE_NAME + "\""
if (not os.path.exists(LOCAL_LOG_PATH)): if (not os.path.exists(LOCAL_LOG_PATH)):
os.makedirs(LOCAL_LOG_PATH) os.makedirs(LOCAL_LOG_PATH)
print("Waiting for device \"%s\" with arch \"%s\" ..." % (DEVICE_NAME, DEVICE_ARCH)) print("Waiting for device \"%s\" with arch \"%s\" ..." % (DEVICE_NAME, DEVICE_ARCH))
os.system("adb %s wait-for-device" % DEVICE_STR) os.system("adb %s wait-for-device" % DEVICE_STR)