Changeset 41fc24f for python/lib

Timestamp:

Aug 29, 2016, 11:21:41 PM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

3f961c4

Parents:

67f0092

Message:

python/lib/gen_external.py: clean-up

File:

• python/lib/gen_external.py (modified) (4 diffs)

python/lib/gen_external.py

@@ -120 +120 @@
     return cpp_output, cpp_objects
 
-def generate_external(header=header, output_path=output_path, usedouble=False, overwrite=True):
-    if not os.path.isdir(output_path): os.mkdir(output_path)
-    elif not overwrite: return glob.glob(os.path.join(output_path, '*.c'))
-    sources_list = []
-    cpp_output, cpp_objects = get_cpp_objects(header)
+
+def analyze_cpp_output(cpp_objects, cpp_output):
     lib = {}
 
@@ -154 +151 @@
                     #print "no idea what to do about", fn
                     lib[shortname]['other'].append(fn)
-
-    """
+    return lib
+
+def print_cpp_output_results(lib, cpp_output):
     for fn in cpp_output:
         found = 0
@@ -163 +161 @@
                     found = 1
         if found == 0:
-            print "missing", fn
+            print ("missing", fn)
 
     for o in lib:
@@ -172 +170 @@
                 print ( "{:15s} {:10s} {:s}".format(o, family, lib[o][family][0] ) )
             else:
-                print ( "{:15s} {:10s} {:d}".format(o, family, len(lib[o][family]) ) )
-    """
-
+                print ( "{:15s} {:10s} {:s}".format(o, family, lib[o][family] ) )
+
+
+def generate_external(header=header, output_path=output_path, usedouble=False, overwrite=True):
+    if not os.path.isdir(output_path): os.mkdir(output_path)
+    elif not overwrite: return glob.glob(os.path.join(output_path, '*.c'))
+
+    cpp_output, cpp_objects = get_cpp_objects(header)
+
+    lib = analyze_cpp_output(cpp_objects, cpp_output)
+    # print_cpp_output_results(lib, cpp_output)
+
+    sources_list = []
     try:
         from .gen_code import MappedObject