Changeset 775 for python

Timestamp:

Jun 6, 2016, 4:48:20 PM (9 years ago)

Author:

Yuri Dario

Message:

python: generate both 8.3 and long names for pyd dynamic libraries. fixes ticket#185.

Location:

python/trunk/Lib/distutils

Files:

• command/build_ext.py (modified) (1 diff)
• command/install_lib.py (modified) (1 diff)
• emxccompiler.py (modified) (4 diffs)

python/trunk/Lib/distutils/command/build_ext.py

@@ -669 +669 @@
         ext_path = string.split(ext_name, '.')
         # OS/2 has an 8 character module (extension) limit :-(
-        if os.name == "os2":
-            ext_path[len(ext_path) - 1] = ext_path[len(ext_path) - 1][:8]
+        # YD build 8.3 moved to emxcompiler.py
+        #if os.name == "os2":
+        #    ext_path[len(ext_path) - 1] = ext_path[len(ext_path) - 1][:8]
         # extensions in debug_mode are named 'module_d.pyd' under windows
         so_ext = get_config_var('SO')

python/trunk/Lib/distutils/command/install_lib.py

@@ -113 +113 @@
     def install(self):
         if os.path.isdir(self.build_dir):
-            outfiles = self.copy_tree(self.build_dir, self.install_dir)
+            outfiles = self.copy_tree(self.build_dir, self.install_dir, preserve_symlinks=1)
         else:
             self.warn("'%s' does not exist -- no Python modules to install" %

python/trunk/Lib/distutils/emxccompiler.py

@@ -107 +107 @@
         libraries.extend(self.dll_libraries)
 
+        # get pyd name and extension
+        pyd_name8, pyd_ext = os.path.splitext( os.path.basename(output_filename))
+        # if name is longer than 8.3, generate a hashed 8.3 name
+        if len(os.path.basename(output_filename)) > 8+1+3:
+            pyd_name8 = os.path.basename(output_filename)[:3] + str(reduce(lambda x,y:x+y, map(ord, output_filename)) % 65536)
+
+        # full relative path of pyd
+        pyd_name = os.path.join(os.path.dirname(output_filename),
+            pyd_name8 + ".pyd")
+
         # handle export symbols by creating a def-file
         # with executables this only works with gcc/ld as linker
@@ -130 +140 @@
             contents = [
                 "LIBRARY %s INITINSTANCE TERMINSTANCE" % \
-                os.path.splitext(os.path.basename(output_filename))[0],
+                pyd_name8,
                 "DATA MULTIPLE NONSHARED",
                 "EXPORTS"]
@@ -157 +167 @@
                            target_desc,
                            objects,
-                           output_filename,
+                           pyd_name,
                            output_dir,
                            libraries,
@@ -168 +178 @@
                            build_temp,
                            target_lang)
+        # if filename exceed 8.3, create a symlink to 8.3 pyd
+        if len(os.path.basename(output_filename)) > 8+1+3:
+            os.remove( output_filename)
+            os.symlink( pyd_name8 + ".pyd", output_filename)
 
     # link ()