Transfert the distutil.ext from the org.asm project

distutils.ext/obidistutils/command/build.py

@@ -10,33 +10,29 @@ from obidistutils.serenity.checksystem import is_mac_system
 
 class build(ori_build):
     
-    def has_ctools(self):
-        return self.distribution.has_ctools()
-
-    def has_files(self):
-        return self.distribution.has_files()
-
-    def has_executables(self):
-        return self.distribution.has_executables()
-    
     def has_ext_modules(self):
         return self.distribution.has_ext_modules()
     
-    def has_littlebigman(self):
-        return True
-    
     def has_pidname(self):
         return is_mac_system()
 
     def has_doc(self):
         return True
     
+    def has_littlebigman(self):
+        return True
     
-    sub_commands = [('littlebigman', has_littlebigman),
-                    ('pidname',has_pidname),
-                    ('build_ctools', has_ctools),
-                    ('build_files', has_files),
-                    ('build_cexe', has_executables)] \
-                   + ori_build.sub_commands + \
-                   [('build_sphinx',has_doc)]
-    
+    try:
+        from obidistutils.command.build_sphinx import build_sphinx  # @UnusedImport
+
+        sub_commands = [("littlebigman",has_littlebigman),
+                         ('pidname',has_pidname)
+                       ] \
+                       + ori_build.sub_commands + \
+                       [('build_sphinx',has_doc)]
+    except ImportError:
+        sub_commands = [("littlebigman",has_littlebigman),
+                         ('pidname',has_pidname)
+                       ] \
+                       + ori_build.sub_commands
+        

distutils.ext/obidistutils/command/build_cexe.py

@@ -4,10 +4,11 @@ Created on 20 oct. 2012
 @author: coissac
 '''
 
-from obidistutils.command.build_ctools import build_ctools
+from .build_ctools import build_ctools
+from .build_exe import build_exe
 from distutils.errors import DistutilsSetupError
 from distutils import log
-
+import os
 
 class build_cexe(build_ctools):
 
@@ -38,7 +39,9 @@ class build_cexe(build_ctools):
         self.set_undefined_options('build_files',
                                    ('files',  'built_files'))
                    
-        self.executables = self.distribution.executables
+        self.executables   = self.distribution.executables
+#         self.build_cexe = os.path.join(os.path.dirname(self.build_cexe),'cbinaries') 
+#         self.mkpath(self.build_cexe)
 
         if self.executables:
             self.check_executable_list(self.executables)
@@ -70,4 +73,13 @@ class build_cexe(build_ctools):
                 log.info("%s ok",message)
 
         return sources
-    
+ 
+    def run(self):
+
+        for cmd_name in self.get_sub_commands():
+            self.run_command(cmd_name)
+
+        build_exe.run(self)
+        
+
+   

distutils.ext/obidistutils/command/build_ctools.py

@@ -5,7 +5,8 @@ Created on 20 oct. 2012
 '''
 
 
-from obidistutils.command.build_exe import build_exe
+from .build_exe import build_exe
+from distutils import log
 
 class build_ctools(build_exe):
     description = "build C/C++ executable not distributed with Python extensions"
@@ -37,19 +38,26 @@ class build_ctools(build_exe):
         self.executables = self.distribution.ctools
         self.check_executable_list(self.executables)
         
+
         if self.littlebigman =='-DLITTLE_END':
             if self.define is None:
                 self.define=[('LITTLE_END',None)]
             else:
                 self.define.append('LITTLE_END',None)
+                
+        log.info('Look for CPU architecture... %s',self.define)
 
         self.ctools = set()
 
     def run(self):
+
+        for cmd_name in self.get_sub_commands():
+            self.run_command(cmd_name)
+
         
         build_exe.run(self)
+        
         for e,p in self.executables:                                  # @UnusedVariable
             self.ctools.add(e)
             
 
-

distutils.ext/obidistutils/command/build_exe.py

@@ -208,3 +208,4 @@ class build_exe(Command):
                                             output_dir=self.build_cexe,
                                             debug=self.debug)
 
+        

distutils.ext/obidistutils/command/build_ext.py

@@ -8,12 +8,16 @@ from distutils import log
 import os
 
 from Cython.Distutils import build_ext  as ori_build_ext  # @UnresolvedImport
-    
+
+from Cython.Compiler import Options as cython_options  # @UnresolvedImport
+
 from distutils.errors import DistutilsSetupError
 
 class build_ext(ori_build_ext):
+
+    
     def modifyDocScripts(self):
-        build_dir_file=open("doc/build_dir.txt","w")
+        build_dir_file=open("doc/sphinx/build_dir.txt","w")
         print(self.build_lib,file=build_dir_file)
         build_dir_file.close()
         
@@ -84,9 +88,25 @@ class build_ext(ori_build_ext):
         
     def run(self):
         self.modifyDocScripts()
+
+        for cmd_name in self.get_sub_commands():
+            self.run_command(cmd_name)
+
+        cython_options.annotate = True
         ori_build_ext.run(self)  # @UndefinedVariable
         
 
+    def has_files(self):
+        return self.distribution.has_files()
+
+    def has_executables(self):
+        return self.distribution.has_executables()
+    
+    sub_commands = [('build_files',has_files),
+                    ('build_cexe', has_executables)
+                    ] + \
+                   ori_build_ext.sub_commands
+
         
 
 

distutils.ext/obidistutils/command/build_files.py

@@ -28,6 +28,10 @@ class build_files(Command):
         self.files = {}
         
     def run(self):
+
+        for cmd_name in self.get_sub_commands():
+            self.run_command(cmd_name)
+
         
         for dest,prog,command in self.distribution.files:
             destfile = os.path.join(self.build_temp,dest)
@@ -48,6 +52,12 @@ class build_files(Command):
             
             log.info("Done.\n")
             
+    def has_ctools(self):
+        return self.distribution.has_ctools()
+
+
+    sub_commands = [('build_ctools', has_ctools)] + \
+                   Command.sub_commands
             
             
         

distutils.ext/obidistutils/command/build_scripts.py

@@ -6,14 +6,14 @@ Created on 20 oct. 2012
 
 import os.path
 
-from distutils.command.build_scripts import build_scripts as ori_build_scripts,\
-    first_line_re
+from distutils.command.build_scripts import build_scripts as ori_build_scripts
 from distutils.util import convert_path
 from distutils import log, sysconfig
 from distutils.dep_util import newer
 from stat import ST_MODE
+import re
 
-
+first_line_re = re.compile('^#!.*python[0-9.]*([ \t].*)?$')
 
 class build_scripts(ori_build_scripts):
             

distutils.ext/obidistutils/command/build_sphinx.py

@@ -4,23 +4,24 @@ Created on 10 mars 2015
 @author: coissac
 '''
 
-from sphinx.setup_command import BuildDoc as ori_build_sphinx  # @UnresolvedImport
+try:
+    from sphinx.setup_command import BuildDoc as ori_build_sphinx  # @UnresolvedImport
+        
+    class build_sphinx(ori_build_sphinx):
+        '''Build Sphinx documentation in html, epub and man formats 
+        '''
     
-class build_sphinx(ori_build_sphinx):
-    '''
-    Build Sphinx documentation in html, epub and man formats 
-    '''
-
-    description = __doc__
-
-    def run(self):
-        self.builder='html'
-        self.finalize_options()
-        ori_build_sphinx.run(self)
-        self.builder='epub'
-        self.finalize_options()
-        ori_build_sphinx.run(self)
-        self.builder='man'
-        self.finalize_options()
-        ori_build_sphinx.run(self)
-    
+        description = __doc__
+    
+        def run(self):
+            self.builder='html'
+            self.finalize_options()
+            ori_build_sphinx.run(self)
+            self.builder='epub'
+            self.finalize_options()
+            ori_build_sphinx.run(self)
+            self.builder='man'
+            self.finalize_options()
+            ori_build_sphinx.run(self)
+except ImportError:
+    pass  

distutils.ext/obidistutils/command/install.py

@@ -4,11 +4,16 @@ Created on 6 oct. 2014
 @author: coissac
 '''
 
+# try:
+#     from setuptools.command.install import install as install_ori
+# except ImportError:
+#     from distutils.command.install import install as install_ori
+
 from distutils.command.install import install as install_ori
 
 class install(install_ori):
     
     def __init__(self,dist):
         install_ori.__init__(self, dist)
-        self.sub_commands.insert(0, ('build',lambda self: True))
+#        self.sub_commands.insert(0, ('build',lambda self: True))
         self.sub_commands.append(('install_sphinx',lambda self: self.distribution.serenity))

distutils.ext/obidistutils/command/install_scripts.py

@@ -3,6 +3,12 @@ Created on 20 oct. 2012
 
 @author: coissac
 '''
+
+# try:
+#     from setuptools.command.install_scripts import install_scripts as ori_install_scripts
+# except ImportError:
+#     from distutils.command.install_scripts import install_scripts as ori_install_scripts
+
 from distutils.command.install_scripts import install_scripts as ori_install_scripts
 
 import os.path
@@ -18,12 +24,10 @@ class install_scripts(ori_install_scripts):
     def install_public_link(self):
         self.mkpath(self.public_dir)
         for file in self.get_outputs():
-            if self.dry_run:
-                log.info("changing mode of %s", file)
-            else:
-                log.info("exporting file %s -> %s", file,os.path.join(self.public_dir,
-                                        os.path.split(file)[1]
-                                        ))
+            log.info("exporting file %s -> %s", file,os.path.join(self.public_dir,
+                                    os.path.split(file)[1]
+                                    ))
+            if not self.dry_run:
                 dest = os.path.join(self.public_dir,
                                     os.path.split(file)[1]
                                    )

distutils.ext/obidistutils/command/install_sphinx.py

@@ -43,4 +43,19 @@ class install_sphinx(Command):
                 self.copy_file(os.path.join(epub), 
                                os.path.join(self.install_doc,os.path.split(epub)[1]))
             
+    def get_outputs(self):
+        directory=os.path.join(self.install_doc,'html')
+        files = [os.path.join(self.install_doc,'html', f) 
+                 for dp, dn, filenames in os.walk(directory) for f in filenames]  # @UnusedVariable
+        
+        directory=os.path.join(self.build_dir,'man')
+        files.append(os.path.join(self.install_doc,'man','man1', f) 
+                 for dp, dn, filenames in os.walk(directory) for f in filenames)  # @UnusedVariable
+
+        directory=os.path.join(self.build_dir,'epub')
+        files.append(os.path.join(self.install_doc, f) 
+                 for dp, dn, filenames in os.walk(directory)  # @UnusedVariable
+                 for f in glob.glob(os.path.join(dp, '*.epub')) )
+        
+        return files
         

distutils.ext/obidistutils/command/littlebigman.py

@@ -49,7 +49,7 @@ class littlebigman(build_exe):
                              shell=True, 
                              stdout=subprocess.PIPE)
         little = p.communicate()[0]
-        return little
+        return little.decode('latin1')
 
     def run(self):
         build_exe.run(self)

distutils.ext/obidistutils/command/pidname.py

@@ -41,6 +41,10 @@ class pidname(build_exe):
         else:
             self.executables = []
 
+#         self.build_cexe = os.path.join(os.path.dirname(self.build_cexe),'cbinaries') 
+#         self.mkpath(self.build_cexe)
+
+
 
     def run(self):
         if is_mac_system():