X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/54f07ec450b42553cd80d00eec72df6ed5a4d4e7..9fd4be5571cbbbeaa6c4f7dabcc2ba69fe1e3471:/wxPython/distrib/make_installer.py diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py index a5f3358202..c29f15829f 100644 --- a/wxPython/distrib/make_installer.py +++ b/wxPython/distrib/make_installer.py @@ -1,3 +1,16 @@ +# -*- coding: iso-8859-1 -*- +#---------------------------------------------------------------------- +# Name: make_installer.py +# Purpose: A script to create the wxPython windows installer +# +# Author: Robin Dunn +# +# Created: 30-April-2001 +# RCS-ID: $Id$ +# Copyright: (c) 2003 by Total Control Software +# Licence: wxWindows license +#---------------------------------------------------------------------- + """ This script will generate a setup script for InnoSetup and then run it to make the installer executable. If all goes right the proper versions @@ -7,7 +20,9 @@ will be created. """ -import sys, os, string +# TODO: Remove the registry entry upon uninstall. + +import sys, os, time KEEP_TEMPS = 0 ISCC = r"%s\InnoSetup2Ex\ISCC.exe %s" @@ -21,23 +36,21 @@ ISS_Template = r''' AppName = wxPython AppVerName = wxPython %(VERSION)s for Python %(PYTHONVER)s OutputBaseFilename = wxPythonWIN32-%(VERSION)s-%(PYVER)s -AppCopyright = Copyright © 2002 Total Control Software +AppCopyright = Copyright © 2003 Total Control Software DefaultDirName = {code:GetInstallDir|c:\DoNotInstallHere} DefaultGroupName = wxPython %(SHORTVER)s for Python %(PYTHONVER)s AlwaysCreateUninstallIcon = yes - -;; SourceDir = . -;; OutputDir is relative to SourceDir +AdminPrivilegesRequired = no OutputDir = dist WizardStyle = modern UninstallStyle = modern DisableStartupPrompt = true -CompressLevel = 9 +Compression = bzip DirExistsWarning = no DisableReadyMemo = true DisableReadyPage = true ;;DisableDirPage = true -DisableProgramGroupPage = true +DisableProgramGroupPage = no DisableAppendDir = true UsePreviousAppDir = no UsePreviousGroup = no @@ -47,6 +60,8 @@ AppPublisherURL = http://wxPython.org/ LicenseFile = licence\licence.txt CodeFile = %(IFSFILE)s +;;WizardDebug = yes + ;;------------------------------------------------------------ ;;[Dirs] @@ -59,23 +74,26 @@ Name: core; Description: "wxPython modules and library"; Types: full compact Name: docs; Description: "Documentation"; Types: full Name: demo; Description: "Demo application"; Types: full Name: samples; Description: "Sample applications"; Types: full -Name: tools; Description: "Tools"; Types: full ;;------------------------------------------------------------ [Files] -Source: "%(SYSDIR)s\MSVCRT.dll"; DestDir: "{sys}"; CopyMode: alwaysskipifsameorolder; Flags: sharedfile uninsneveruninstall restartreplace; Components: core -Source: "%(SYSDIR)s\MSVCIRT.dll"; DestDir: "{sys}"; CopyMode: alwaysskipifsameorolder; Flags: sharedfile uninsneveruninstall restartreplace; Components: core +Source: "%(SYSDIR)s\MSVCRT.dll"; DestDir: "{sys}"; CopyMode: alwaysskipifsameorolder; Flags: sharedfile uninsneveruninstall restartreplace; Check: IsSysInstall; Components: core +Source: "%(SYSDIR)s\MSVCIRT.dll"; DestDir: "{sys}"; CopyMode: alwaysskipifsameorolder; Flags: sharedfile uninsneveruninstall restartreplace; Check: IsSysInstall; Components: core +Source: "%(SYSDIR)s\MSVCP60.dll"; DestDir: "{sys}"; CopyMode: alwaysskipifsameorolder; Flags: sharedfile uninsneveruninstall restartreplace; Check: IsSysInstall; Components: core +Source: "%(SYSDIR)s\MSVCRT.dll"; DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Check: IsNotSysInstall; Components: core +Source: "%(SYSDIR)s\MSVCIRT.dll"; DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Check: IsNotSysInstall; Components: core +Source: "%(SYSDIR)s\MSVCP60.dll"; DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Check: IsNotSysInstall; Components: core Source: "%(WXDIR)s\lib\%(WXDLL)s"; DestDir: "{app}\wxPython"; Components: core %(MSLU)s Source: "wxPython\wxc.pyd"; DestDir: "{app}\wxPython"; Components: core -Source: "wxPython\wxc.pyd.manifest"; DestDir: "{app}\wxPython"; Components: core Source: "wxPython\gridc.pyd"; DestDir: "{app}\wxPython"; Components: core Source: "wxPython\helpc.pyd"; DestDir: "{app}\wxPython"; Components: core Source: "wxPython\htmlc.pyd"; DestDir: "{app}\wxPython"; Components: core Source: "wxPython\calendarc.pyd"; DestDir: "{app}\wxPython"; Components: core +Source: "wxPython\wizardc.pyd"; DestDir: "{app}\wxPython"; Components: core Source: "wxPython\glcanvasc.pyd"; DestDir: "{app}\wxPython"; Components: core Source: "wxPython\oglc.pyd"; DestDir: "{app}\wxPython"; Components: core Source: "wxPython\stc_c.pyd"; DestDir: "{app}\wxPython"; Components: core @@ -91,8 +109,26 @@ Source: "wxPython\lib\editor\*.py"; DestDir: "{app}\wxPython\lib\editor" Source: "wxPython\lib\editor\*.txt"; DestDir: "{app}\wxPython\lib\editor"; Components: core Source: "wxPython\lib\mixins\*.py"; DestDir: "{app}\wxPython\lib\mixins"; Components: core Source: "wxPython\lib\PyCrust\*.py"; DestDir: "{app}\wxPython\lib\PyCrust"; Components: core -Source: "wxPython\lib\PyCrust\*.txt"; DestDir: "{app}\wxPython\lib\PyCrust"; Components: core -Source: "wxPython\lib\PyCrust\*.ico"; DestDir: "{app}\wxPython\lib\PyCrust"; Components: core +Source: "wxPython\lib\colourchooser\*.py"; DestDir: "{app}\wxPython\lib\colourchooser"; Components: core +Source: "wxPython\lib\colourchooser\*.py"; DestDir: "{app}\wxPython\lib\colourchooser"; Components: core +Source: "wxPython\py\*.py"; DestDir: "{app}\wxPython\py"; Components: core +Source: "wxPython\py\*.txt"; DestDir: "{app}\wxPython\py"; Components: core +Source: "wxPython\py\*.ico"; DestDir: "{app}\wxPython\py"; Components: core +Source: "wxPython\py\*.png"; DestDir: "{app}\wxPython\py"; Components: core +Source: "wxPython\py\tests\*.py"; DestDir: "{app}\wxPython\py\tests"; Components: core +Source: "wxPython\py\wxd\*.py"; DestDir: "{app}\wxPython\py\wxd"; Components: core + +Source: "wx\*.py"; DestDir: "{app}\wx"; Components: core +Source: "wx\lib\*.py"; DestDir: "{app}\wx\lib"; Components: core +Source: "wx\lib\colourchooser\*.py"; DestDir: "{app}\wx\lib\colourchooser"; Components: core +Source: "wx\lib\editor\*.py"; DestDir: "{app}\wx\lib\editor"; Components: core +Source: "wx\lib\mixins\*.py"; DestDir: "{app}\wx\lib\mixins"; Components: core +Source: "wx\py\*.py"; DestDir: "{app}\wx\py"; Components: core +Source: "wx\tools\*.py"; DestDir: "{app}\wx\tools"; Components: core +Source: "wx\tools\XRCed\*.py"; DestDir: "{app}\wx\tools\XRCed"; Components: core + + +%(LOCALE)s Source: "demo\*.py"; DestDir: "{app}\wxPython\demo"; Components: demo Source: "demo\*.xml"; DestDir: "{app}\wxPython\demo"; Components: demo @@ -118,7 +154,7 @@ Source: "demo\data\*.py"; DestDir: "{app}\wxPython\demo\data"; Source: "demo\data\*.png"; DestDir: "{app}\wxPython\demo\data"; Components: demo Source: "demo\data\*.bmp"; DestDir: "{app}\wxPython\demo\data"; Components: demo Source: "demo\data\*.i"; DestDir: "{app}\wxPython\demo\data"; Components: demo -;;Source: "demo\data\*.h"; DestDir: "{app}\wxPython\demo\data"; Components: demo +Source: "demo\data\*.dat"; DestDir: "{app}\wxPython\demo\data"; Components: demo Source: "demo\data\*.txt"; DestDir: "{app}\wxPython\demo\data"; Components: demo Source: "demo\data\*.wav"; DestDir: "{app}\wxPython\demo\data"; Components: demo Source: "demo\data\*.wdr"; DestDir: "{app}\wxPython\demo\data"; Components: demo @@ -135,24 +171,34 @@ Source: "CHANGES.txt"; DestDir: "{app}\wxPython\docs"; Comp Source: "licence\*.txt"; DestDir: "{app}\wxPython\docs\licence"; Components: core Source: "%(WXDIR)s\docs\htmlhelp\wx.chm"; DestDir: "{app}\wxPython\docs"; Components: docs Source: "%(WXDIR)s\docs\htmlhelp\ogl.chm"; DestDir: "{app}\wxPython\docs"; Components: docs - -Source: "wxPython\tools\*.py"; DestDir: "{app}\wxPython\tools"; Components: tools -Source: "wxPython\tools\XRCed\CHANGES"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools -Source: "wxPython\tools\XRCed\TODO"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools -Source: "wxPython\tools\XRCed\README"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools -Source: "wxPython\tools\XRCed\*.py"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools -Source: "wxPython\tools\XRCed\*.xrc"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools -Source: "wxPython\tools\XRCed\*.ico"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools -Source: "wxPython\tools\XRCed\*.sh"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools - -Source: "scripts\*.bat"; DestDir: "{code:GetPythonDir}\Scripts"; Components: tools -Source: "scripts\*.py"; DestDir: "{code:GetPythonDir}\Scripts"; Components: tools -Source: "scripts\img2png"; DestDir: "{code:GetPythonDir}\Scripts"; Components: tools -Source: "scripts\img2py"; DestDir: "{code:GetPythonDir}\Scripts"; Components: tools -Source: "scripts\img2xpm"; DestDir: "{code:GetPythonDir}\Scripts"; Components: tools -Source: "scripts\xrced"; DestDir: "{code:GetPythonDir}\Scripts"; Components: tools -Source: "scripts\pyshell"; DestDir: "{code:GetPythonDir}\Scripts"; Components: tools -Source: "scripts\pycrust"; DestDir: "{code:GetPythonDir}\Scripts"; Components: tools +Source: "docs\*.txt"; DestDir: "{app}\wxPython\docs"; Components: docs +Source: "docs\*.css"; DestDir: "{app}\wxPython\docs"; Components: docs +Source: "docs\*.html"; DestDir: "{app}\wxPython\docs"; Components: docs +Source: "docs\*.conf"; DestDir: "{app}\wxPython\docs"; Components: docs +Source: "docs\screenshots\*.png"; DestDir: "{app}\wxPython\docs\screenshots"; Components: docs + +Source: "wxPython\tools\*.py"; DestDir: "{app}\wxPython\tools"; Components: core +Source: "wxPython\tools\XRCed\*.txt"; DestDir: "{app}\wxPython\tools\XRCed"; Components: core +Source: "wxPython\tools\XRCed\sawfishrc"; DestDir: "{app}\wxPython\tools\XRCed"; Components: core +Source: "wxPython\tools\XRCed\*.py"; DestDir: "{app}\wxPython\tools\XRCed"; Components: core +Source: "wxPython\tools\XRCed\*.xrc"; DestDir: "{app}\wxPython\tools\XRCed"; Components: core +Source: "wxPython\tools\XRCed\*.ico"; DestDir: "{app}\wxPython\tools\XRCed"; Components: core +Source: "wxPython\tools\XRCed\*.png"; DestDir: "{app}\wxPython\tools\XRCed"; Components: core +Source: "wxPython\tools\XRCed\*.sh"; DestDir: "{app}\wxPython\tools\XRCed"; Components: core +Source: "wxPython\tools\XRCed\src-images\*.png"; DestDir: "{app}\wxPython\tools\XRCed\src-images"; Components: core + +Source: "scripts\*.bat"; DestDir: "{code:GetPythonDir}\Scripts"; Components: core +Source: "scripts\*.py"; DestDir: "{code:GetPythonDir}\Scripts"; Components: core +Source: "scripts\helpviewer"; DestDir: "{code:GetPythonDir}\Scripts"; Components: core +Source: "scripts\img2png"; DestDir: "{code:GetPythonDir}\Scripts"; Components: core +Source: "scripts\img2py"; DestDir: "{code:GetPythonDir}\Scripts"; Components: core +Source: "scripts\img2xpm"; DestDir: "{code:GetPythonDir}\Scripts"; Components: core +Source: "scripts\pyalacarte"; DestDir: "{code:GetPythonDir}\Scripts"; Components: core +Source: "scripts\pyalamode"; DestDir: "{code:GetPythonDir}\Scripts"; Components: core +Source: "scripts\pyshell"; DestDir: "{code:GetPythonDir}\Scripts"; Components: core +Source: "scripts\pycrust"; DestDir: "{code:GetPythonDir}\Scripts"; Components: core +Source: "scripts\pywrap"; DestDir: "{code:GetPythonDir}\Scripts"; Components: core +Source: "scripts\xrced"; DestDir: "{code:GetPythonDir}\Scripts"; Components: core Source: "samples\doodle\*.py"; DestDir: "{app}\wxPython\samples\doodle"; Components: samples Source: "samples\doodle\*.txt"; DestDir: "{app}\wxPython\samples\doodle"; Components: samples @@ -162,21 +208,17 @@ Source: "samples\doodle\superdoodle.iss"; DestDir: "{app}\wxPython\samples\doo Source: "samples\wxProject\*.txt"; DestDir: "{app}\wxPython\samples\wxProject"; Components: samples Source: "samples\wxProject\*.py"; DestDir: "{app}\wxPython\samples\wxProject"; Components: samples -Source: "samples\stxview\*.py"; DestDir: "{app}\wxPython\samples\stxview"; Components: samples -Source: "samples\stxview\*.stx"; DestDir: "{app}\wxPython\samples\stxview"; Components: samples -Source: "samples\stxview\*.txt"; DestDir: "{app}\wxPython\samples\stxview"; Components: samples -Source: "samples\stxview\StructuredText\*.py"; DestDir: "{app}\wxPython\samples\stxview\StructuredText"; Components: samples -Source: "samples\stxview\StructuredText\*.txt"; DestDir: "{app}\wxPython\samples\stxview\StructuredText"; Components: samples - -Source: "samples\StyleEditor\*.txt"; DestDir: "{app}\wxPython\samples\StyleEditor"; Components: samples -Source: "samples\StyleEditor\*.py"; DestDir: "{app}\wxPython\samples\StyleEditor"; Components: samples -Source: "samples\StyleEditor\*.cfg"; DestDir: "{app}\wxPython\samples\StyleEditor"; Components: samples +Source: "samples\StyleEditor\*.txt"; DestDir: "{app}\wxPython\samples\StyleEditor"; Components: samples +Source: "samples\StyleEditor\*.py"; DestDir: "{app}\wxPython\samples\StyleEditor"; Components: samples +Source: "samples\StyleEditor\*.cfg"; DestDir: "{app}\wxPython\samples\StyleEditor"; Components: samples Source: "samples\pySketch\*.py"; DestDir: "{app}\wxPython\samples\pySketch"; Components: samples Source: "samples\pySketch\images\*.bmp"; DestDir: "{app}\wxPython\samples\pySketch\images"; Components: samples Source: "samples\frogedit\*.py"; DestDir: "{app}\wxPython\samples\frogedit"; Components: samples +Source: "samples\hangman\*.py"; DestDir: "{app}\wxPython\samples\hangman"; Components: samples + Source: "samples\embedded\*.py"; DestDir: "{app}\wxPython\samples\embedded"; Components: samples Source: "samples\embedded\*.cpp"; DestDir: "{app}\wxPython\samples\embedded"; Components: samples Source: "samples\embedded\*.txt"; DestDir: "{app}\wxPython\samples\embedded"; Components: samples @@ -185,26 +227,40 @@ Source: "samples\embedded\*.unx"; DestDir: "{app}\wxPython\samples\embe Source: "samples\embedded\*.ico"; DestDir: "{app}\wxPython\samples\embedded"; Components: samples Source: "samples\embedded\*.xpm"; DestDir: "{app}\wxPython\samples\embedded"; Components: samples +Source: "samples\wx_examples\basic\*.py"; DestDir: "{app}\wxPython\samples\wx_examples\basic"; Components: samples +Source: "samples\wx_examples\hello\*.py"; DestDir: "{app}\wxPython\samples\wx_examples\hello"; Components: samples +Source: "samples\wx_examples\hello\*.jpg"; DestDir: "{app}\wxPython\samples\wx_examples\hello"; Components: samples + +Source: "src\winxp.manifest"; DestDir: "{code:GetPythonDir}"; DestName: "python.exe.manifest"; Components: core +Source: "src\winxp.manifest"; DestDir: "{code:GetPythonDir}"; DestName: "pythonw.exe.manifest"; Components: core + + ;;------------------------------------------------------------ [Run] +;; Compile the .py files +Filename: "{code:GetPythonDir}\python.exe"; Parameters: "{code:GetPythonDir}\Lib\compileall.py {app}\wxPython {app}\wx"; Description: "Compile Python .py files to .pyc"; Flags: postinstall; Components: core + ;; Recreate the tool scripts to use the paths on the users machine -Filename: "{code:GetPythonDir}\python.exe"; Parameters: "CreateBatchFiles.py"; WorkingDir: "{code:GetPythonDir}\Scripts"; Components: tools +Filename: "{code:GetPythonDir}\python.exe"; Parameters: "CreateBatchFiles.py"; WorkingDir: "{code:GetPythonDir}\Scripts"; Description: "Create batch files for tool scripts"; Flags: postinstall; Components: core ;;------------------------------------------------------------ [Icons] -Name: "{group}\Run the DEMO"; Filename: "{code:GetPythonDir}\pythonw.exe"; WorkingDir: "{app}\wxPython\demo"; Parameters: "demo.py"; IconFilename: "{app}\wxPython\demo\wxpdemo.ico"; Components: core -Name: "{group}\PyCrust"; Filename: "{code:GetPythonDir}\pythonw.exe"; WorkingDir: "c:\"; Parameters: "{code:GetPythonDir}\Scripts\pycrust"; IconFilename: "{app}\wxPython\lib\PyCrust\PyCrust.ico"; Components: core -Name: "{group}\PyShell"; Filename: "{code:GetPythonDir}\pythonw.exe"; WorkingDir: "c:\"; Parameters: "{code:GetPythonDir}\Scripts\pyshell"; IconFilename: "{app}\wxPython\lib\PyCrust\PyCrust.ico"; Components: core +Name: "{group}\Run the wxPython DEMO"; Filename: "{code:GetPythonDir}\pythonw.exe"; WorkingDir: "{app}\wxPython\demo"; Parameters: "demo.py"; IconFilename: "{app}\wxPython\demo\wxpdemo.ico"; Components: core +Name: "{group}\PyCrust"; Filename: "{code:GetPythonDir}\pythonw.exe"; WorkingDir: "c:\"; Parameters: "{code:GetPythonDir}\Scripts\pycrust"; IconFilename: "{app}\wxPython\py\PyCrust.ico"; Components: core +Name: "{group}\PyShell"; Filename: "{code:GetPythonDir}\pythonw.exe"; WorkingDir: "c:\"; Parameters: "{code:GetPythonDir}\Scripts\pyshell"; IconFilename: "{app}\wxPython\py\PyCrust.ico"; Components: core +Name: "{group}\PyAlaMode"; Filename: "{code:GetPythonDir}\pythonw.exe"; WorkingDir: "c:\"; Parameters: "{code:GetPythonDir}\Scripts\pyalamode"; IconFilename: "{app}\wxPython\py\PyCrust.ico"; Components: core +Name: "{group}\PyAlaCarte"; Filename: "{code:GetPythonDir}\pythonw.exe"; WorkingDir: "c:\"; Parameters: "{code:GetPythonDir}\Scripts\pyalacarte"; IconFilename: "{app}\wxPython\py\PyCrust.ico"; Components: core Name: "{group}\wxWindows Reference"; Filename: "{app}\wxPython\docs\wx.chm"; Components: docs Name: "{group}\wxOGL Reference"; Filename: "{app}\wxPython\docs\ogl.chm"; Components: docs Name: "{group}\licence.txt"; Filename: "{app}\wxPython\docs\licence\licence.txt"; Components: core Name: "{group}\README.txt"; Filename: "{app}\wxPython\docs\README.txt"; Components: core Name: "{group}\CHANGES.txt"; Filename: "{app}\wxPython\docs\CHANGES.txt"; Components: core Name: "{group}\Sample Apps"; Filename: "{app}\wxPython\samples"; Components: samples -Name: "{group}\Resource Editor"; Filename: "{code:GetPythonDir}\pythonw.exe"; WorkingDir: "c:\"; Parameters: "{code:GetPythonDir}\Scripts\xrced"; IconFilename: "{app}\wxPython\Tools\XRCed\xrced.ico"; Components: tools +Name: "{group}\Resource Editor"; Filename: "{code:GetPythonDir}\pythonw.exe"; WorkingDir: "c:\"; Parameters: "{code:GetPythonDir}\Scripts\xrced"; IconFilename: "{app}\wxPython\Tools\XRCed\xrced.ico"; Components: core +Name: "{group}\wxPython Docs"; Filename: "{app}\wxPython\docs\wxPythonDocs.html"; Components: docs ;;------------------------------------------------------------ @@ -221,6 +277,14 @@ Type: files; Name: "{app}\wxPython\lib\mixins\*.pyc"; Type: files; Name: "{app}\wxPython\lib\mixins\*.pyo"; Type: files; Name: "{app}\wxPython\lib\PyCrust\*.pyc"; Type: files; Name: "{app}\wxPython\lib\PyCrust\*.pyo"; +Type: files; Name: "{app}\wxPython\lib\colourchooser\*.pyc"; +Type: files; Name: "{app}\wxPython\lib\colourchooser\*.pyo"; +Type: files; Name: "{app}\wxPython\py\*.pyc"; +Type: files; Name: "{app}\wxPython\py\*.pyo"; +Type: files; Name: "{app}\wxPython\py\tests\*.pyc"; +Type: files; Name: "{app}\wxPython\py\tests\*.pyo"; +Type: files; Name: "{app}\wxPython\py\wxd\*.pyc"; +Type: files; Name: "{app}\wxPython\py\wxd\*.pyo"; Type: files; Name: "{app}\wxPython\tools\*.pyc"; Type: files; Name: "{app}\wxPython\tools\*.pyo"; Type: files; Name: "{app}\wxPython\tools\XRCed\*.pyc"; @@ -238,12 +302,42 @@ Type: files; Name: "{app}\wxPython\samples\wxProject\*.pyc"; Type: files; Name: "{app}\wxPython\samples\wxProject\*.pyo"; Type: files; Name: "{app}\wxPython\samples\StyleEditor\*.pyc"; Type: files; Name: "{app}\wxPython\samples\StyleEditor\*.pyo"; -Type: files; Name: "{app}\wxPython\samples\stxview\*.pyc"; -Type: files; Name: "{app}\wxPython\samples\stxview\*.pyo"; -Type: files; Name: "{app}\wxPython\samples\stxview\StructuredText\*.pyc"; -Type: files; Name: "{app}\wxPython\samples\stxview\StructuredText\*.pyo"; Type: files; Name: "{app}\wxPython\samples\frogedit\*.pyc"; Type: files; Name: "{app}\wxPython\samples\frogedit\*.pyo"; +Type: files; Name: "{app}\wxPython\samples\hangman\*.pyc"; +Type: files; Name: "{app}\wxPython\samples\hangman\*.pyo"; +Type: files; Name: "{app}\wxPython\samples\hangman\*.txt"; +Type: files; Name: "{app}\wxPython\samples\wx_examples\basic\*.pyc"; +Type: files; Name: "{app}\wxPython\samples\wx_examples\basic\*.pyo"; +Type: files; Name: "{app}\wxPython\samples\wx_examples\hello\*.pyc"; +Type: files; Name: "{app}\wxPython\samples\wx_examples\hello\*.pyo"; +Type: files; Name: "{app}\wxPython\demo\data\*.pyc"; +Type: files; Name: "{app}\wxPython\demo\data\*.pyo"; +Type: files; Name: "{app}\wxPython\demo\dllwidget\*.pyc"; +Type: files; Name: "{app}\wxPython\demo\dllwidget\*.pyo"; +Type: files; Name: "{app}\wxPython\samples\embedded\*.pyc"; +Type: files; Name: "{app}\wxPython\samples\embedded\*.pyo"; +Type: files; Name: "{app}\wxPython\samples\pySketch\*.pyc"; +Type: files; Name: "{app}\wxPython\samples\pySketch\*.pyo"; +Type: files; Name: "{app}\wx\*.pyc"; +Type: files; Name: "{app}\wx\*.pyo"; +Type: files; Name: "{app}\wx\lib\*.pyc"; +Type: files; Name: "{app}\wx\lib\*.pyo"; +Type: files; Name: "{app}\wx\lib\colourchooser\*.pyc"; +Type: files; Name: "{app}\wx\lib\colourchooser\*.pyo"; +Type: files; Name: "{app}\wx\lib\editor\*.pyc"; +Type: files; Name: "{app}\wx\lib\editor\*.pyo"; +Type: files; Name: "{app}\wx\lib\mixins\*.pyc"; +Type: files; Name: "{app}\wx\lib\mixins\*.pyo"; +Type: files; Name: "{app}\wx\py\*.pyc"; +Type: files; Name: "{app}\wx\py\*.pyo"; +Type: files; Name: "{app}\wx\tools\*.pyc"; +Type: files; Name: "{app}\wx\tools\*.pyo"; +Type: files; Name: "{app}\wx\tools\XRCed\*.pyc"; +Type: files; Name: "{app}\wx\tools\XRCed\*.pyo"; + + + ''' @@ -254,11 +348,17 @@ Type: files; Name: "{app}\wxPython\samples\frogedit\*.pyo"; IFS_Template = r""" program Setup; var - PythonDir : String; + PythonDir : String; InstallDir : String; + sysInstall : Boolean; + function InitializeSetup(): Boolean; begin + + (* -------------------------------------------------------------- *) + (* Figure out what to use as a default installation dir *) + if not RegQueryStringValue(HKEY_LOCAL_MACHINE, 'Software\Python\PythonCore\%(PYTHONVER)s\InstallPath', '', PythonDir) then begin @@ -267,33 +367,103 @@ begin 'Software\Python\PythonCore\%(PYTHONVER)s\InstallPath', '', PythonDir) then begin - MsgBox('No installation of Python %(PYTHONVER)s found in registry.\nBe sure to enter a pathname that places wxPython\non the PYTHONPATH', + MsgBox('No installation of Python %(PYTHONVER)s found in registry.' + #13 + + 'Be sure to enter a pathname that places wxPython on the PYTHONPATH', mbConfirmation, MB_OK); PythonDir := 'C:\Put a directory on PYTHONPATH here\'; end; end; InstallDir := PythonDir; %(IF22)s + + + (* -------------------------------------------------------------- *) + (* And now where to put the system DLLs *) + + sysInstall := False; + + (* Check if Python has a regkey in HKLM, if so it installed the DLLs in the SYSTEM dir *) + if RegValueExists(HKEY_LOCAL_MACHINE, + 'Software\Python\PythonCore\%(PYTHONVER)s\InstallPath', '') then begin + sysInstall := True; + end; + + (* If so, ensure that the user can write to HKLM *) + if sysInstall and not RegWriteStringValue(HKEY_LOCAL_MACHINE, + 'Software\Python\PythonCore\%(PYTHONVER)s\Modules\wxPython', + '', '%(VERSION)s') then begin + (* if not then revert to installing to the Python dir *) + sysInstall := False; + (* and put the regkey in HKCU *) + RegWriteStringValue(HKEY_CURRENT_USER, + 'Software\Python\PythonCore\%(PYTHONVER)s\Modules\wxPython', + '', '%(VERSION)s'); + end; + Result := true; end; +function IsSysInstall(): Boolean; +begin + Result := sysInstall; +end; +function IsNotSysInstall(): Boolean; +begin + Result := not sysInstall; +end; + + + +function GetDLLDir(Default: String): String; +begin + if sysInstall then begin + Result := Default; + end else begin + Result := PythonDir; + end; +end; + + function GetPythonDir(Default: String): String; begin Result := PythonDir; end; + function GetInstallDir(Default: String): String; begin Result := InstallDir; end; + + +function NextButtonClick(CurPage: Integer): Boolean; +var + FileName: string; + ResultCode: Integer; +begin + Result := True; + if CurPage <> wpSelectDir then Exit; + FileName := WizardDirValue() + '\wxPython\unins000.exe'; + if FileExists(FileName) then begin + ResultCode := MsgBox('A prior wxPython installation was found in this directory. It' + #13 + + 'is recommended that it be uninstalled first.' + #13#13 + + 'Should I do it?', + mbConfirmation, MB_YESNO); + if ResultCode = IDYES then begin + InstExec(FileName, '/SILENT', WizardDirValue()+'\wxPython', True, False, SW_SHOWNORMAL, ResultCode); + + end; + end; +end; + + begin end. """ - #---------------------------------------------------------------------- def find_DLLs(): @@ -305,7 +475,7 @@ def find_DLLs(): proc.close() for line in lines: if line[:6] == " wx": - WXDLL = string.strip(line) + WXDLL = line.strip() if line[:10] == " python": PYTHONVER = line[10] + '.' + line[11] @@ -314,6 +484,31 @@ def find_DLLs(): return WXDLL, PYTHONVER +#---------------------------------------------------------------------- + +locale_template = 'Source: "%s"; DestDir: "{app}\%s"; Components: core' + +def build_locale_string(): + stringlst = [] + + def walk_helper(lst, dirname, files): + for f in files: + filename = os.path.join(dirname, f) + if not os.path.isdir(filename): + lst.append( locale_template % (filename, dirname) ) + + os.path.walk('wxPython\\locale', walk_helper, stringlst) + return '\n'.join(stringlst) + +def get_system_dir(): + for p in [r"C:\WINNT\SYSTEM32", + r"C:\WINDOWS\SYSTEM32", + ]: + if os.path.exists(p): + return p + raise IOError, "System dir not found" + + #---------------------------------------------------------------------- def main(): @@ -321,7 +516,7 @@ def main(): verglob = {} execfile("wxPython/__version__.py", verglob) - VERSION = verglob["ver"] + VERSION = verglob["wxVERSION_STRING"] SHORTVER = VERSION[:3] WXDLL, PYTHONVER = find_DLLs() @@ -329,17 +524,20 @@ def main(): PYVER = "Py" + PYTHONVER[0] + PYTHONVER[2] WXDIR = os.environ["WXWIN"] WXPYDIR = os.path.join(WXDIR, "wxPython") - SYSDIR = r"C:\WINNT\SYSTEM32" + SYSDIR = get_system_dir() ISSFILE = "__wxPython.iss" IFSFILE = "__wxPython.ifs" + LOCALE = build_locale_string() if PYTHONVER >= "2.2": IF22 = r"InstallDir := InstallDir + '\Lib\site-packages';" else: IF22 = "" - if string.find(WXDLL, "h") != -1: - PYVER = PYVER + "-hybrid" + # Starting with 2.3.3 the hybrid build is the release build too, so + # no need to label it that way. + ##if WXDLL.find("h") != -1: + ## PYVER = PYVER + "-hybrid" MSLU='' if len(sys.argv) > 1 and sys.argv[1] == "UNICODE=1": @@ -356,6 +554,7 @@ def main(): os.system(ISCC % (os.environ['TOOLS'], ISSFILE)) if not KEEP_TEMPS: + time.sleep(1) os.remove(ISSFILE) os.remove(IFSFILE)