[Python-checkins] CVS: python/dist/src/PCbuild python.iss,1.1.2.1,1.1.2.2 python20.wse,1.40.2.4,1.40.2.5

Tim Peters tim_one@users.sourceforge.net
Fri, 27 Jul 2001 22:03:02 -0700 

Update of /cvsroot/python/python/dist/src/PCbuild
In directory usw-pr-cvs1:/tmp/cvs-serv14630/descr/dist/src/PCbuild

Modified Files:
      Tag: descr-branch
	python.iss python20.wse 
Log Message:
Merge of trunk tags date2001-07-21 to date2001-07-28.


Index: python.iss
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/python.iss,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** python.iss	2001/07/21 06:07:13	1.1.2.1
--- python.iss	2001/07/28 05:03:00	1.1.2.2
***************
*** 9,13 ****
  ; the installer into PCBuild/Python-2.2a1.exe.  Size and speed of the
  ; installer are competitive with the Wise installer; Inno uninstall
! ; seems much quicker than Wise.
  ;
  ; What's Done
--- 9,14 ----
  ; the installer into PCBuild/Python-2.2a1.exe.  Size and speed of the
  ; installer are competitive with the Wise installer; Inno uninstall
! ; seems much quicker than Wise (but also feebler, and the uninstall
! ; log is in some un(human)readable binary format).
  ;
  ; What's Done
***************
*** 16,25 ****
  ; All the usual Windows Python Start menu entries are created and
  ; work fine.
! ; The Python install is fully functional for "typical" uses (e.g.,
! ; nothing I ever do with Python requires more than this).
  ;
  ; What's Not Done
  ; ---------------
! ; No registry entries are written.
  ; No installation of files is done into the system dir:
  ;     The MS DLLs aren't handled at all by this yet.
--- 17,29 ----
  ; All the usual Windows Python Start menu entries are created and
  ; work fine.
! ; .py, .pyw, .pyc and .pyo extensions are registered.
! ;     PROBLEM:  Inno uninstall does not restore their previous registry
! ;               associations (if any).  Wise did.  This will make life
! ;               difficult for alpha (etc) testers.
! ; The Python install is fully functional for "typical" uses.
  ;
  ; What's Not Done
  ; ---------------
! ; None of "Mark Hammond's" registry entries are written.
  ; No installation of files is done into the system dir:
  ;     The MS DLLs aren't handled at all by this yet.
***************
*** 39,45 ****
--- 43,51 ----
  
  [Setup]
+ ; Note:  we *want* the version number to show up everywhere.
  ; Which of these controls App Path???
  AppName=Python 2.2 alpha 1
  AppVerName=Python 2.2 alpha 1
+ AppId=Python 2.2
  AppVersion=2.2a1
  AppCopyright=Copyright © 2001 Python Software Foundation
***************
*** 49,57 ****
  DefaultDirName={sd}\Python22
  
! ; Start menu folder name.
  DefaultGroupName=Python 2.2
  
- AppId=Python 2.2
- 
  ; Point SourceDir to one above PCBuild = src.
  ; YAY!  That actually worked:  means this script can run unchanged from anyone's
--- 55,61 ----
  DefaultDirName={sd}\Python22
  
! ; Start menu folder name; value of {group} later (unless user overrides).
  DefaultGroupName=Python 2.2
  
  ; Point SourceDir to one above PCBuild = src.
  ; YAY!  That actually worked:  means this script can run unchanged from anyone's
***************
*** 62,66 ****
  OutputBaseFilename=Python-2.2a1
  
! AppPublisher=PythonLabs at Digicool
  AppPublisherURL=http://www.python.org
  AppSupportURL=http://www.python.org
--- 66,70 ----
  OutputBaseFilename=Python-2.2a1
  
! AppPublisher=PythonLabs at Digital Creations
  AppPublisherURL=http://www.python.org
  AppSupportURL=http://www.python.org
***************
*** 70,75 ****
--- 74,82 ----
  ChangesAssociations=yes
  UninstallLogMode=new
+ 
+ ; The fewer screens the better; leave these commented.
  ;LicenseFile=LICENSE
  ;InfoBeforeFile=Misc\NEWS
+ 
  ; uncomment the following line if you want your installation to run on NT 3.51 too.
  ; MinVersion=4,3.51
***************
*** 79,86 ****
  
  [Components]
! Name: main;  Description: "Python interpreter and library"; Types: normal
! Name: docs;  Description: "Python documentation (HTML)";    Types: normal
! Name: tools; Description: "Python utility scripts";         Types: normal
! Name: test;  Description: "Python test suite (Lib\test\)";  Types: normal
  
  [Files]
--- 86,97 ----
  
  [Components]
! Name: main;  Description: "Python interpreter, library and Tk"; Types: normal
! Name: docs;  Description: "Python documentation (HTML)";        Types: normal
! Name: tools; Description: "Python utility scripts (Tools\)";    Types: normal
! Name: test;  Description: "Python test suite (Lib\test\)";      Types: normal
! 
! [Tasks]
! Name: startmenu; Description: "Create Start menu shortcuts"; Components: main docs tools
! Name: extensions; Description: "Register file extensions (.py, .pyw, .pyc, .pyo)"; Components: main
  
  [Files]
***************
*** 162,166 ****
  Source: Lib\site-packages\README; DestDir: "{app}\Lib\site-packages"; DestName: README.txt; CopyMode: alwaysoverwrite; Components: main
  Source: Include\*.h; DestDir: "{app}\include"; CopyMode: alwaysoverwrite; Components: main
! Source: PC\config.h; DestDir: "{app}\include"; CopyMode: alwaysoverwrite; Components: main
  
  Source: Tools\scripts\*.py;  DestDir: "{app}\Tools\Scripts";  CopyMode: alwaysoverwrite; Components: tools
--- 173,177 ----
  Source: Lib\site-packages\README; DestDir: "{app}\Lib\site-packages"; DestName: README.txt; CopyMode: alwaysoverwrite; Components: main
  Source: Include\*.h; DestDir: "{app}\include"; CopyMode: alwaysoverwrite; Components: main
! Source: PC\pyconfig.h; DestDir: "{app}\include"; CopyMode: alwaysoverwrite; Components: main
  
  Source: Tools\scripts\*.py;  DestDir: "{app}\Tools\Scripts";  CopyMode: alwaysoverwrite; Components: tools
***************
*** 200,206 ****
  
  [Icons]
! Name: "{group}\IDLE (Python GUI)"; Filename: "{app}\pythonw.exe"; WorkingDir: "{app}"; Parameters: "{app}\Tools\idle\idle.pyw"
! Name: "{group}\Module Docs"; Filename: "{app}\pythonw.exe"; WorkingDir: "{app}"; Parameters: "{app}\Tools\Scripts\pydoc.pyw"
! Name: "{group}\Python (command line)"; Filename: "{app}\python.exe"; WorkingDir: "{app}"
! Name: "{group}\Python Manuals"; Filename: "{app}\Doc\index.html"; WorkingDir: "{app}"
  
--- 211,241 ----
  
  [Icons]
! Tasks: startmenu; Name: "{group}\IDLE (Python GUI)"; Filename: "{app}\pythonw.exe"; WorkingDir: "{app}"; Parameters: """{app}\Tools\idle\idle.pyw"""; Components: tools
! Tasks: startmenu; Name: "{group}\Module Docs"; Filename: "{app}\pythonw.exe"; WorkingDir: "{app}"; Parameters: """{app}\Tools\Scripts\pydoc.pyw"""; Components: tools
! Tasks: startmenu; Name: "{group}\Python (command line)"; Filename: "{app}\python.exe"; WorkingDir: "{app}"; Components: main
! Tasks: startmenu; Name: "{group}\Python Manuals"; Filename: "{app}\Doc\index.html"; WorkingDir: "{app}"; Components: docs
! 
! [Registry]
! ; Register .py
! Tasks: extensions; Root: HKCR; Subkey: ".py"; ValueType: string; ValueName: ""; ValueData: "Python File"; Flags: uninsdeletevalue
! Tasks: extensions; Root: HKCR; Subkey: ".py"; ValueType: string; ValueName: "Content Type"; ValueData: "text/plain"; Flags: uninsdeletevalue
! Tasks: extensions; Root: HKCR; Subkey: "Python File"; ValueType: string; ValueName: ""; ValueData: "Python File"; Flags: uninsdeletekey
! Tasks: extensions; Root: HKCR; Subkey: "Python File\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\Py.ico"
! Tasks: extensions; Root: HKCR; Subkey: "Python File\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\python.exe"" ""%1"" %*"
! 
! ; Register .pyc
! Tasks: extensions; Root: HKCR; Subkey: ".pyc"; ValueType: string; ValueName: ""; ValueData: "Python CompiledFile"; Flags: uninsdeletevalue
! Tasks: extensions; Root: HKCR; Subkey: "Python CompiledFile"; ValueType: string; ValueName: ""; ValueData: "Compiled Python File"; Flags: uninsdeletekey
! Tasks: extensions; Root: HKCR; Subkey: "Python CompiledFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\pyc.ico"
! Tasks: extensions; Root: HKCR; Subkey: "Python CompiledFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\python.exe"" ""%1"" %*"
! 
! ; Register .pyo
! Tasks: extensions; Root: HKCR; Subkey: ".pyo"; ValueType: string; ValueName: ""; ValueData: "Python CompiledFile"; Flags: uninsdeletevalue
! 
! ; Register .pyw
! Tasks: extensions; Root: HKCR; Subkey: ".pyw"; ValueType: string; ValueName: ""; ValueData: "Python NoConFile"; Flags: uninsdeletevalue
! Tasks: extensions; Root: HKCR; Subkey: ".pyw"; ValueType: string; ValueName: "Content Type"; ValueData: "text/plain"; Flags: uninsdeletevalue
! Tasks: extensions; Root: HKCR; Subkey: "Python NoConFile"; ValueType: string; ValueName: ""; ValueData: "Python File (no console)"; Flags: uninsdeletekey
! Tasks: extensions; Root: HKCR; Subkey: "Python NoConFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\Py.ico"
! Tasks: extensions; Root: HKCR; Subkey: "Python NoConFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\pythonw.exe"" ""%1"" %*"
  

Index: python20.wse
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/python20.wse,v
retrieving revision 1.40.2.4
retrieving revision 1.40.2.5
diff -C2 -d -r1.40.2.4 -r1.40.2.5
*** python20.wse	2001/07/18 08:40:45	1.40.2.4
--- python20.wse	2001/07/28 05:03:00	1.40.2.5
***************
*** 927,933 ****
  end
  item: Install File
!   Source=%_SRC_%\PC\config.h
!   Destination=%MAINDIR%\include\config.h
!   Description=Header files (config.h)
    Flags=0000000000000010
  end
--- 927,933 ----
  end
  item: Install File
!   Source=%_SRC_%\PC\pyconfig.h
!   Destination=%MAINDIR%\include\pyconfig.h
!   Description=Header files (pyconfig.h)
    Flags=0000000000000010
  end