[Python-checkins] r42345 - sandbox/trunk/setuptools/setuptools/command/bdist_egg.py sandbox/trunk/setuptools/setuptools/command/install_scripts.py

[phillip.eby]

Author: phillip.eby
Date: Mon Feb 13 18:32:42 2006
New Revision: 42345

Modified:
   sandbox/trunk/setuptools/setuptools/command/bdist_egg.py
   sandbox/trunk/setuptools/setuptools/command/install_scripts.py
Log:
Fixed duplication of scripts inside .egg files


Modified: sandbox/trunk/setuptools/setuptools/command/bdist_egg.py
==============================================================================
--- sandbox/trunk/setuptools/setuptools/command/bdist_egg.py	(original)
+++ sandbox/trunk/setuptools/setuptools/command/bdist_egg.py	Mon Feb 13 18:32:42 2006
@@ -201,7 +201,7 @@
         if self.distribution.scripts:
             script_dir = os.path.join(egg_info, 'scripts')
             log.info("installing scripts to %s" % script_dir)
-            self.call_command('install_scripts', install_dir=script_dir)
+            self.call_command('install_scripts',install_dir=script_dir,no_ep=1)
 
         native_libs = os.path.join(self.egg_info,"native_libs.txt")
         if all_outputs:

Modified: sandbox/trunk/setuptools/setuptools/command/install_scripts.py
==============================================================================
--- sandbox/trunk/setuptools/setuptools/command/install_scripts.py	(original)
+++ sandbox/trunk/setuptools/setuptools/command/install_scripts.py	Mon Feb 13 18:32:42 2006
@@ -8,12 +8,20 @@
 class install_scripts(_install_scripts):
     """Do normal script install, plus any egg_info wrapper scripts"""
 
+    def initialize_options(self):
+        _install_scripts.initialize_options(self)
+        self.no_ep = False
+   
     def run(self):
         self.run_command("egg_info")
         if self.distribution.scripts:
             _install_scripts.run(self)  # run first to set up self.outfiles
         else:
             self.outfiles = []
+        if self.no_ep:
+            # don't install entry point scripts into .egg file!
+            return  
+
         ei_cmd = self.get_finalized_command("egg_info")       
         dist = Distribution(
             ei_cmd.egg_base, PathMetadata(ei_cmd.egg_base, ei_cmd.egg_info),
@@ -21,7 +29,15 @@
         )
         bs_cmd = self.get_finalized_command('build_scripts')
         executable = getattr(bs_cmd,'executable',sys_executable)
-        for args in get_script_args(dist, executable): self.write_script(*args)
+
+        for args in get_script_args(dist, executable):
+            self.write_script(*args)
+
+
+
+
+
+
 
     def write_script(self, script_name, contents, mode="t", *ignored):
         """Write an executable file to the scripts directory"""
@@ -39,3 +55,28 @@
             except (AttributeError, os.error):
                 pass
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+