Build cpp_utils with setuptools

andrewleech · andrewleech · commit 3972f7cc307e · 2016-10-26T22:26:35.000+11:00
diff --git a/src/linux/compile.py b/src/linux/compile.py
@@ -131,18 +131,27 @@
 # fails and then run the compile.py script again and this time
 # make should succeed.
 
+def run_setuptools_build():
+    ret = subprocess.call("{python} setup.py build_ext --inplace {fast}"
+                          .format(python=sys.executable,
+                                  fast=('--fast' if FAST_FLAG else '')), shell=True)
+
+
+    if ret != 0:
+        what = input("%s build failed, press 'y' to continue, 'n' to stop: " % os.path.basename('.'))
+        if what != "y":
+            sys.exit(1)
+
+    return ret
+
 # -------- CPP_UTILS_DIR
 
 os.chdir(CPP_UTILS_DIR)
 if not FAST_FLAG:
     subprocess.call("rm -f *.o *.a", shell=True)
 
-ret = subprocess.call("make -f Makefile", shell=True)
-if ret != 0:
-    # noinspection PyUnboundLocalVariable
-    what = input("make failed, press 'y' to continue, 'n' to stop: ")
-    if what != "y":
-        sys.exit(1)
+run_setuptools_build()
+
 
 # -------- CLIENT_HANDLER_DIR
 
@@ -163,13 +172,7 @@
     subprocess.call("rm -f *.o *.a", shell=True)
     subprocess.call("rm -f subprocess", shell=True)
 
-ret = subprocess.call("{python} setup.py build_ext --inplace {fast}"
-                      .format(python=sys.executable,
-                              fast=('--fast' if FAST_FLAG else '')), shell=True)
-if ret != 0:
-    what = input("subprocess build failed, press 'y' to continue, 'n' to stop: ")
-    if what != "y":
-        sys.exit(1)
+run_setuptools_build()
 
 subprocess_exe = os.path.join(CEFPYTHON_BINARY, "subprocess")
 if os.path.exists("./subprocess"):
@@ -214,15 +217,7 @@
 with open("__version__.pyx", "w") as fo:
     fo.write('__version__ = "{}"\n'.format(VERSION))
 
-# if DEBUG_FLAG:
-#     ret = subprocess.call("python-dbg setup.py build_ext --inplace"
-#                           " --cython-gdb", shell=True)
-if FAST_FLAG:
-    ret = subprocess.call("{python} setup.py build_ext --inplace --fast"
-                          .format(python=sys.executable), shell=True)
-else:
-    ret = subprocess.call("{python} setup.py build_ext --inplace"
-                          .format(python=sys.executable), shell=True)
+ret = run_setuptools_build()
 
 # if DEBUG_FLAG:
 #     shutil.rmtree("./../binaries_%s/cython_debug/" % BITS,
