diff --git a/android/service/all.py b/android/service/all.py index b552b38823..0993b89acf 100755 --- a/android/service/all.py +++ b/android/service/all.py @@ -8,7 +8,7 @@ LOCAL_LOG_PATH = os.path.join(os.getcwd(), "logs") if (__name__ == "__main__"): 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...") HomeDir = os.getcwd() @@ -19,25 +19,25 @@ if (__name__ == "__main__"): #print(BuildCommand) res = os.system(BuildCommand) if (0 == res): - print("Build\t[OK]") + print("Build\t[OK]") else: - print("Build\t[FAILED]") + print("Build\t[FAILED]") sys.exit(-1) os.chdir(HomeDir) ConfFile = open("device.conf", "rt") for s in ConfFile.readlines(): - keys = s.split(";") - if (len(keys) < 2): - print("Error: invalid config line: \"%s\"" % s) - continue - Arch = keys[0] - Name = keys[1] - print("testing \"%s\" arch" % Arch) - print("Pushing to device \"%s\"" % Name) - PushCommand = "%s \"%s\" \"%s\" 2>&1" % (os.path.join(HomeDir, "push_native.py"), Arch, Name) - os.system(PushCommand) - print("Testing on device \"%s\"" % Name) - TestCommand = "%s \"%s\" \"%s\" 2>&1" % (os.path.join(HomeDir, "test_native.py"), Arch, Name) - os.system(TestCommand) \ No newline at end of file + keys = s.split(";") + if (len(keys) < 2): + print("Error: invalid config line: \"%s\"" % s) + continue + Arch = keys[0] + Name = keys[1] + print("testing \"%s\" arch" % Arch) + print("Pushing to device \"%s\"" % Name) + PushCommand = "%s \"%s\" \"%s\" 2>&1" % (os.path.join(HomeDir, "push_native.py"), Arch, Name) + os.system(PushCommand) + print("Testing on device \"%s\"" % Name) + TestCommand = "%s \"%s\" \"%s\" 2>&1" % (os.path.join(HomeDir, "test_native.py"), Arch, Name) + os.system(TestCommand) \ No newline at end of file diff --git a/android/service/push_native.py b/android/service/push_native.py index f637bd681c..408fefc285 100755 --- a/android/service/push_native.py +++ b/android/service/push_native.py @@ -10,8 +10,8 @@ DEVICE_ARCH = "armeabi" if (__name__ == "__main__"): if (len(sys.argv) >= 3): - DEVICE_ARCH = sys.argv[1] - DEVICE_NAME = sys.argv[2] + DEVICE_ARCH = sys.argv[1] + DEVICE_NAME = sys.argv[2] if (DEVICE_NAME != ""): DEVICE_STR = "-s \"" + DEVICE_NAME + "\"" diff --git a/android/service/test_native.py b/android/service/test_native.py index a62d2071a1..9a39032b18 100755 --- a/android/service/test_native.py +++ b/android/service/test_native.py @@ -18,14 +18,14 @@ def RunTestApp(AppName): if (__name__ == "__main__"): if (3 == len(sys.argv)): - DEVICE_ARCH = sys.argv[1] - DEVICE_NAME = sys.argv[2] + DEVICE_ARCH = sys.argv[1] + DEVICE_NAME = sys.argv[2] if (DEVICE_NAME != ""): DEVICE_STR = "-s \"" + DEVICE_NAME + "\"" 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)) os.system("adb %s wait-for-device" % DEVICE_STR)