[Python-checkins] CVS: distutils/distutils/command build.py,1.25,1.26

Greg Ward python-dev@python.org
Fri, 15 Sep 2000 18:54:49 -0700


Update of /cvsroot/python/distutils/distutils/command
In directory slayer.i.sourceforge.net:/tmp/cvs-serv4733

Modified Files:
	build.py 
Log Message:
Include the Python version in the platform-specific build directories:
with the recent change in 'get_platform()', we now have directory names
like "build/lib-1.5-linux-i586".  Idea and original patch by 
Rene Liebscher.

Index: build.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/command/build.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** build.py	2000/06/24 01:23:37	1.25
--- build.py	2000/09/16 01:54:46	1.26
***************
*** 68,71 ****
--- 68,73 ----
          self.plat = get_platform ()
  
+         plat_specifier = sys.version[0:3] + '-' + self.plat
+ 
          # 'build_purelib' and 'build_platlib' just default to 'lib' and
          # 'lib.<plat>' under the base build directory.  We only use one of
***************
*** 75,79 ****
          if self.build_platlib is None:
              self.build_platlib = os.path.join (self.build_base,
!                                                'lib.' + self.plat)
  
          # 'build_lib' is the actual directory that we will use for this
--- 77,81 ----
          if self.build_platlib is None:
              self.build_platlib = os.path.join (self.build_base,
!                                                'lib-' + plat_specifier)
  
          # 'build_lib' is the actual directory that we will use for this
***************
*** 90,94 ****
          if self.build_temp is None:
              self.build_temp = os.path.join (self.build_base,
!                                             'temp.' + self.plat)
          if self.build_scripts is None:
              self.build_scripts = os.path.join (self.build_base, 'scripts')
--- 92,96 ----
          if self.build_temp is None:
              self.build_temp = os.path.join (self.build_base,
!                                             'temp-' + plat_specifier)
          if self.build_scripts is None:
              self.build_scripts = os.path.join (self.build_base, 'scripts')