[Idle-dev] CVS: idle setup.py,1.12,1.13

[Kurt B. Kaiser]

Update of /cvsroot/idlefork/idle
In directory sc8-pr-cvs1:/tmp/cvs-serv19297

Modified Files:
	setup.py 
Log Message:
1. Restore the rest of Python IDLE setup.py Rev 1.4 (Python SF 634078)
   (Loewis) which uses 'SRCDIR' (if available) in package dir path.
2. Merge Python IDLE setup.py Rev 1.5 (Loewis) to allow installation 
   from the build directory. IDLEfork SF Patch 668998 (Loewis) 


Index: setup.py
===================================================================
RCS file: /cvsroot/idlefork/idle/setup.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** setup.py	2 Jan 2003 20:33:26 -0000	1.12
--- setup.py	21 Jan 2003 04:42:50 -0000	1.13
***************
*** 10,15 ****
  pkgname = idle_name + "lib"
  
- pkg_dir = "."
- 
  try:
      pos = sys.argv.index("--check-tkinter")
--- 10,13 ----
***************
*** 24,27 ****
--- 22,30 ----
          raise SystemExit
  
+ try:
+     pkg_dir = os.path.join(os.environ['SRCDIR'], 'Tools', idle_name)
+ except KeyError:
+     pkg_dir = "."
+ 
  # the normal build_py would not incorporate anything but .py files
  txt_files = ['extend.txt', 'help.txt', 'CREDITS.txt', 'HISTORY.txt',
***************
*** 31,35 ****
  txt_files += [idle_name + '.bat', idle_name + '.pyw']
  
! Icons = glob.glob1("Icons","*.gif")
  
  class IDLE_Builder(build_py):
--- 34,38 ----
  txt_files += [idle_name + '.bat', idle_name + '.pyw']
  
! Icons = glob.glob1(os.path.join(pkg_dir, "Icons"), "*.gif")
  
  class IDLE_Builder(build_py):
***************
*** 53,57 ****
              dir = os.path.dirname(outfile)
              self.mkpath(dir)
!             self.copy_file(os.path.join("Icons", name),
                             outfile, preserve_mode = 0)
  
--- 56,60 ----
              dir = os.path.dirname(outfile)
              self.mkpath(dir)
!             self.copy_file(os.path.join(pkg_dir, "Icons", name),
                             outfile, preserve_mode = 0)