Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* build and distrib tweaks.

Browse Source 
* restructuring of installer packages
* MSW build can use either MONOLITHIC or multi-lib wx build


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-10-10 00:48:34 +00:00
parent f07962f933
commit cb56afc421
9 changed files with 403 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wxPython/b.win32
View File

@@ -91,7 +91,7 @@ elif [ "$1" = "b" ]; then
$0 $VER $@ $0 $VER $@
$0 $VER h $@ $0 $VER h $@
# (no command arg) --> normal build for development # (no command arg) --> normal debug build for development
else else
CMD="$SETUP $FLAGS HYBRID=0 build_ext --inplace --debug $@" CMD="$SETUP $FLAGS HYBRID=0 build_ext --inplace --debug $@"
fi fi

60
wxPython/config.py
View File

@@ -162,16 +162,22 @@ CONTRIBS_INC = "" # A dir to add as an -I flag when compiling the contribs
# Some MSW build settings # Some MSW build settings
FINAL = 0 # Mirrors use of same flag in wx makefiles, MONOLITHIC = 1 # The core wxWidgets lib can be built as either a
# (0 or 1 only) should probably find a way to # single monolithic DLL or as a collection of DLLs.
# autodetect this... # This flag controls which set of libs will be used
# on Windows. (For other platforms it is automatic
# via using wx-config.)
FINAL = 0 # Will use the release version of the wxWidgets libs on MSW.
HYBRID = 1 # Will use the "hybrid" version of the wxWidgets
# libs on MSW. A "hybrid" build is one that is
# basically a release build, but that also defines
# __WXDEBUG__ to activate the runtime checks and
# assertions in the library. When any of these is
# triggered it is turned into a Python exception so
# this is a very useful feature to have turned on.
HYBRID = 1 # If set and not debug or FINAL, then build a
# hybrid extension that can be used by the
# non-debug version of python, but contains
# debugging symbols for wxWidgets and wxPython.
# wxWidgets must have been built with /MD, not /MDd
# (using FINAL=hybrid will do it.)
# Version part of wxWidgets LIB/DLL names # Version part of wxWidgets LIB/DLL names
WXDLLVER = '%d%d' % (VER_MAJOR, VER_MINOR) WXDLLVER = '%d%d' % (VER_MAJOR, VER_MINOR)
@@ -237,7 +243,7 @@ for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC',
'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'UNICODE', 'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'UNICODE',
'UNDEF_NDEBUG', 'NO_SCRIPTS', 'NO_HEADERS', 'BUILD_RENAMERS', 'UNDEF_NDEBUG', 'NO_SCRIPTS', 'NO_HEADERS', 'BUILD_RENAMERS',
'FULL_DOCS', 'INSTALL_MULTIVERSION', 'EP_ADD_OPTS', 'FULL_DOCS', 'INSTALL_MULTIVERSION', 'EP_ADD_OPTS',
'FINAL', 'HYBRID', ]: 'MONOLITHIC', 'FINAL', 'HYBRID', ]:
for x in range(len(sys.argv)): for x in range(len(sys.argv)):
if sys.argv[x].find(flag) == 0: if sys.argv[x].find(flag) == 0:
pos = sys.argv[x].find('=') + 1 pos = sys.argv[x].find('=') + 1
@@ -509,9 +515,10 @@ def find_data_files(srcdir, *wildcards):
def makeLibName(name): def makeLibName(name):
if os.name == 'posix': if os.name == 'posix':
libname = '%s_%s-%s' % (WXBASENAME, name, WXRELEASE) libname = '%s_%s-%s' % (WXBASENAME, name, WXRELEASE)
else: elif name:
libname = 'wxmsw%s%s_%s' % (WXDLLVER, libFlag(), name) libname = 'wxmsw%s%s_%s' % (WXDLLVER, libFlag(), name)
else:
libname = 'wxmsw%s%s' % (WXDLLVER, libFlag())
return [libname] return [libname]
@@ -558,14 +565,18 @@ def getExtraPath(shortVer=True, addOpts=False):
if shortVer: if shortVer:
# short version, just Major.Minor # short version, just Major.Minor
ep = "wx-%d.%d" % (VER_MAJOR, VER_MINOR) ep = "wx-%d.%d" % (VER_MAJOR, VER_MINOR)
# plus release if minor is odd # plus release if minor is odd
if VER_MINOR % 2 == 1: #if VER_MINOR % 2 == 1:
ep += ".%d" % VER_RELEASE # ep += ".%d" % VER_RELEASE
else: else:
# long version, full version # long version, full version
ep = "wx-%d.%d.%d.%d" % (VER_MAJOR, VER_MINOR, VER_RELEASE, VER_SUBREL) ep = "wx-%d.%d.%d.%d" % (VER_MAJOR, VER_MINOR, VER_RELEASE, VER_SUBREL)
if addOpts: if addOpts:
port = WXPORT
if port == "msw": port = "win32"
ep += "-%s-%s" % (WXPORT, (UNICODE and 'unicode' or 'ansi')) ep += "-%s-%s" % (WXPORT, (UNICODE and 'unicode' or 'ansi'))
if FLAVOUR: if FLAVOUR:
@@ -646,14 +657,17 @@ if os.name == 'nt':
defines.append( ('__WXDEBUG__', None) ) defines.append( ('__WXDEBUG__', None) )
libdirs = [ opj(WXDIR, 'lib', 'vc_dll') ] libdirs = [ opj(WXDIR, 'lib', 'vc_dll') ]
libs = [ 'wxbase' + WXDLLVER + libFlag(), # TODO: trim this down to what is really needed for the core if MONOLITHIC:
'wxbase' + WXDLLVER + libFlag() + '_net', libs = makeLibName('')
'wxbase' + WXDLLVER + libFlag() + '_xml', else:
makeLibName('core')[0], libs = [ 'wxbase' + WXDLLVER + libFlag(),
makeLibName('adv')[0], 'wxbase' + WXDLLVER + libFlag() + '_net',
makeLibName('html')[0], 'wxbase' + WXDLLVER + libFlag() + '_xml',
makeLibName('xrc')[0], makeLibName('core')[0],
] makeLibName('adv')[0],
makeLibName('html')[0],
makeLibName('xrc')[0],
]
libs = libs + ['kernel32', 'user32', 'gdi32', 'comdlg32', libs = libs + ['kernel32', 'user32', 'gdi32', 'comdlg32',
'winspool', 'winmm', 'shell32', 'oldnames', 'comctl32', 'winspool', 'winmm', 'shell32', 'oldnames', 'comctl32',
@@ -771,7 +785,7 @@ else:
if UNICODE: if UNICODE:
BUILD_BASE = BUILD_BASE + '.unicode' BUILD_BASE = BUILD_BASE + '.unicode'
VER_FLAGS += 'u' ##VER_FLAGS += 'u'
if os.path.exists('DAILY_BUILD'): if os.path.exists('DAILY_BUILD'):

607
wxPython/distrib/make_installer.py
View File

@@ -15,13 +15,11 @@
This script will generate a setup script for InnoSetup and then run it 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 to make the installer executable. If all goes right the proper versions
of Python and wxWindows (including hybrid/final settings) will all be of Python and wxWindows (including hybrid/final settings) will all be
calculated based on what wxc.pyd imports and an appropriate installer calculated based on what _core_.pyd imports and an appropriate installer
will be created. will be created.
""" """
# TODO: Remove the registry entry upon uninstall.
import sys, os, time import sys, os, time
KEEP_TEMPS = 0 KEEP_TEMPS = 0
@@ -30,16 +28,15 @@ ISCC = r"%s\InnoSetup2Ex\ISCC.exe %s"
#---------------------------------------------------------------------- #----------------------------------------------------------------------
ISS_Template = r''' ISS_Template = r'''
;;------------------------------------------------------------
[Setup] [Setup]
AppName = wxPython AppName = wxPython%(SHORTVER)s-%(CHARTYPE)s-%(PYVER)s
AppVerName = wxPython %(VERSION)s for Python %(PYTHONVER)s AppVerName = wxPython %(VERSION)s (%(CHARTYPE)s) for Python %(PYTHONVER)s
OutputBaseFilename = wxPythonWIN32-%(VERSION)s-%(PYVER)s OutputBaseFilename = wxPython%(SHORTVER)s-win32-%(CHARTYPE)s-%(VERSION)s-%(PYVER)s
AppCopyright = Copyright <20> 2004 Total Control Software AppCopyright = Copyright <20> 2004 Total Control Software
DefaultDirName = {code:GetInstallDir|c:\DoNotInstallHere} DefaultDirName = {code:GetInstallDir|c:\DoNotInstallHere}
DefaultGroupName = wxPython %(SHORTVER)s for Python %(PYTHONVER)s DefaultGroupName = wxPython %(VERSION)s (%(CHARTYPE)s) for Python %(PYTHONVER)s
AlwaysCreateUninstallIcon = yes AlwaysCreateUninstallIcon = no
AdminPrivilegesRequired = no AdminPrivilegesRequired = no
OutputDir = dist OutputDir = dist
WizardStyle = modern WizardStyle = modern
@@ -50,13 +47,18 @@ DirExistsWarning = no
DisableReadyMemo = true DisableReadyMemo = true
DisableReadyPage = true DisableReadyPage = true
;;DisableDirPage = true ;;DisableDirPage = true
DisableProgramGroupPage = no DisableProgramGroupPage = true
DisableAppendDir = true DisableAppendDir = true
UsePreviousAppDir = no UsePreviousAppDir = no
UsePreviousGroup = no UsePreviousGroup = no
UninstallFilesDir = {app}\wx AppPublisher = Total Control Software
AppPublisherURL = http://wxPython.org/ AppPublisherURL = http://wxPython.org/
AppSupportURL = http://wxPython.org/maillist.php
AppUpdatesURL = http://wxPython.org/download.php
AppVersion = %(VERSION)s-%(CHARTYPE)s
UninstallFilesDir = {app}\%(PKGDIR)s
LicenseFile = licence\licence.txt LicenseFile = licence\licence.txt
CodeFile = %(IFSFILE)s CodeFile = %(IFSFILE)s
@@ -65,11 +67,9 @@ CodeFile = %(IFSFILE)s
;;------------------------------------------------------------ ;;------------------------------------------------------------
[Components] [Components]
Name: core; Description: "wxPython modules and library"; Types: full compact custom; Flags: fixed Name: core; Description: "wxPython modules and library"; Types: full custom; Flags: fixed
Name: docs; Description: "Documentation"; Types: full Name: manifest; Description: "Manifest files for XP Themed LnF"; Types: full
Name: demo; Description: "Demo application"; Types: full Name: pthfile; Description: "Make this install be the default wxPython"; Types: full
Name: samples; Description: "Sample applications"; Types: full
Name: manifest; Description: "Manifest files for XP LnF"; Types: full
;;------------------------------------------------------------ ;;------------------------------------------------------------
@@ -78,266 +78,147 @@ Source: "distrib\msw\MSVCRT.dll"; DestDir: "{code:GetPythonDir}"; CopyMod
Source: "distrib\msw\MSVCIRT.dll"; DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core Source: "distrib\msw\MSVCIRT.dll"; DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core
Source: "distrib\msw\MSVCP60.dll"; DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core Source: "distrib\msw\MSVCP60.dll"; DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core
Source: "%(WXDIR)s\lib\vc_dll\wx*%(WXDLLVER)s_*.dll"; DestDir: "{app}\wx"; Components: core Source: "%(WXDIR)s\lib\vc_dll\wx*%(WXDLLVER)s_*.dll"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
%(MSLU)s %(MSLU)s
Source: "wx\_core_.pyd"; DestDir: "{app}\wx"; Components: core
Source: "wx\_gdi_.pyd"; DestDir: "{app}\wx"; Components: core Source: "wx\_core_.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
Source: "wx\_windows_.pyd"; DestDir: "{app}\wx"; Components: core Source: "wx\_gdi_.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
Source: "wx\_controls_.pyd"; DestDir: "{app}\wx"; Components: core Source: "wx\_windows_.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
Source: "wx\_misc_.pyd"; DestDir: "{app}\wx"; Components: core Source: "wx\_controls_.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
Source: "wx\_calendar.pyd"; DestDir: "{app}\wx"; Components: core Source: "wx\_misc_.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
Source: "wx\_grid.pyd"; DestDir: "{app}\wx"; Components: core Source: "wx\_calendar.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
Source: "wx\_html.pyd"; DestDir: "{app}\wx"; Components: core Source: "wx\_grid.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
Source: "wx\_wizard.pyd"; DestDir: "{app}\wx"; Components: core Source: "wx\_html.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
Source: "wx\_gizmos.pyd"; DestDir: "{app}\wx"; Components: core Source: "wx\_wizard.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
Source: "wx\_glcanvas.pyd"; DestDir: "{app}\wx"; Components: core Source: "wx\_gizmos.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
Source: "wx\_iewin.pyd"; DestDir: "{app}\wx"; Components: core Source: "wx\_glcanvas.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
Source: "wx\_activex.pyd"; DestDir: "{app}\wx"; Components: core Source: "wx\_iewin.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
Source: "wx\_ogl.pyd"; DestDir: "{app}\wx"; Components: core Source: "wx\_activex.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
Source: "wx\_stc.pyd"; DestDir: "{app}\wx"; Components: core Source: "wx\_ogl.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
Source: "wx\_xrc.pyd"; DestDir: "{app}\wx"; Components: core Source: "wx\_stc.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
Source: "wx\_xrc.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
Source: "wx\*.py"; DestDir: "{app}\wx"; Components: core Source: "wx\*.py"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
Source: "wx\build\*.py"; DestDir: "{app}\wx\build"; Components: core Source: "wx\build\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\build"; Components: core
Source: "wx\lib\*.py"; DestDir: "{app}\wx\lib"; Components: core Source: "wx\lib\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib"; Components: core
;;Source: "wx\lib\*.wdr"; DestDir: "{app}\wx\lib"; Components: core Source: "wx\lib\colourchooser\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib\colourchooser"; Components: core
Source: "wx\lib\colourchooser\*.py"; DestDir: "{app}\wx\lib\colourchooser"; Components: core Source: "wx\lib\editor\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib\editor"; Components: core
Source: "wx\lib\editor\*.py"; DestDir: "{app}\wx\lib\editor"; Components: core Source: "wx\lib\editor\*.txt"; DestDir: "{app}\%(PKGDIR)s\wx\lib\editor"; Components: core
Source: "wx\lib\editor\*.txt"; DestDir: "{app}\wx\lib\editor"; Components: core Source: "wx\lib\mixins\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib\mixins"; Components: core
Source: "wx\lib\mixins\*.py"; DestDir: "{app}\wx\lib\mixins"; Components: core Source: "wx\lib\masked\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib\masked"; Components: core
Source: "wx\lib\masked\*.py"; DestDir: "{app}\wx\lib\masked"; Components: core Source: "wx\lib\ogl\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib\ogl"; Components: core
Source: "wx\lib\ogl\*.py"; DestDir: "{app}\wx\lib\ogl"; Components: core Source: "wx\lib\floatcanvas\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib\floatcanvas"; Components: core
Source: "wx\lib\floatcanvas\*.py"; DestDir: "{app}\wx\lib\floatcanvas"; Components: core Source: "wx\py\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\py"; Components: core
Source: "wx\py\*.py"; DestDir: "{app}\wx\py"; Components: core Source: "wx\py\*.txt"; DestDir: "{app}\%(PKGDIR)s\wx\py"; Components: core
Source: "wx\py\*.txt"; DestDir: "{app}\wx\py"; Components: core Source: "wx\py\*.ico"; DestDir: "{app}\%(PKGDIR)s\wx\py"; Components: core
Source: "wx\py\*.ico"; DestDir: "{app}\wx\py"; Components: core Source: "wx\py\*.png"; DestDir: "{app}\%(PKGDIR)s\wx\py"; Components: core
Source: "wx\py\*.png"; DestDir: "{app}\wx\py"; Components: core Source: "wx\py\tests\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\py\tests"; Components: core
Source: "wx\py\tests\*.py"; DestDir: "{app}\wx\py\tests"; Components: core Source: "wx\tools\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\tools"; Components: core
Source: "wx\tools\*.py"; DestDir: "{app}\wx\tools"; Components: core Source: "wx\tools\XRCed\*.txt"; DestDir: "{app}\%(PKGDIR)s\wx\tools\XRCed"; Components: core
Source: "wx\tools\XRCed\*.txt"; DestDir: "{app}\wx\tools\XRCed"; Components: core Source: "wx\tools\XRCed\sawfishrc"; DestDir: "{app}\%(PKGDIR)s\wx\tools\XRCed"; Components: core
Source: "wx\tools\XRCed\sawfishrc"; DestDir: "{app}\wx\tools\XRCed"; Components: core Source: "wx\tools\XRCed\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\tools\XRCed"; Components: core
Source: "wx\tools\XRCed\*.py"; DestDir: "{app}\wx\tools\XRCed"; Components: core Source: "wx\tools\XRCed\*.xrc"; DestDir: "{app}\%(PKGDIR)s\wx\tools\XRCed"; Components: core
Source: "wx\tools\XRCed\*.xrc"; DestDir: "{app}\wx\tools\XRCed"; Components: core Source: "wx\tools\XRCed\*.ico"; DestDir: "{app}\%(PKGDIR)s\wx\tools\XRCed"; Components: core
Source: "wx\tools\XRCed\*.ico"; DestDir: "{app}\wx\tools\XRCed"; Components: core Source: "wx\tools\XRCed\*.png"; DestDir: "{app}\%(PKGDIR)s\wx\tools\XRCed"; Components: core
Source: "wx\tools\XRCed\*.png"; DestDir: "{app}\wx\tools\XRCed"; Components: core Source: "wx\tools\XRCed\*.sh"; DestDir: "{app}\%(PKGDIR)s\wx\tools\XRCed"; Components: core
Source: "wx\tools\XRCed\*.sh"; DestDir: "{app}\wx\tools\XRCed"; Components: core Source: "wx\tools\XRCed\src-images\*.png"; DestDir: "{app}\%(PKGDIR)s\wx\tools\XRCed\src-images"; Components: core
Source: "wx\tools\XRCed\src-images\*.png"; DestDir: "{app}\wx\tools\XRCed\src-images"; Components: core
Source: "wxPython\*.py"; DestDir: "{app}\wxPython"; Components: core Source: "wxPython\*.py"; DestDir: "{app}\%(PKGDIR)s\wxPython"; Components: core
Source: "wxPython\lib\*.py"; DestDir: "{app}\wxPython\lib"; Components: core Source: "wxPython\lib\*.py"; DestDir: "{app}\%(PKGDIR)s\wxPython\lib"; Components: core
Source: "wxPython\lib\colourchooser\*.py"; DestDir: "{app}\wxPython\lib\colourchooser"; Components: core Source: "wxPython\lib\colourchooser\*.py"; DestDir: "{app}\%(PKGDIR)s\wxPython\lib\colourchooser"; Components: core
Source: "wxPython\lib\editor\*.py"; DestDir: "{app}\wxPython\lib\editor"; Components: core Source: "wxPython\lib\editor\*.py"; DestDir: "{app}\%(PKGDIR)s\wxPython\lib\editor"; Components: core
Source: "wxPython\lib\mixins\*.py"; DestDir: "{app}\wxPython\lib\mixins"; Components: core Source: "wxPython\lib\mixins\*.py"; DestDir: "{app}\%(PKGDIR)s\wxPython\lib\mixins"; Components: core
Source: "wxPython\tools\*.py"; DestDir: "{app}\wxPython\tools"; Components: core Source: "wxPython\tools\*.py"; DestDir: "{app}\%(PKGDIR)s\wxPython\tools"; Components: core
Source: "src\winxp.manifest"; DestDir: "{code:GetPythonDir}"; DestName: "python.exe.manifest"; Flags: sharedfile; Components: manifest
Source: "src\winxp.manifest"; DestDir: "{code:GetPythonDir}"; DestName: "pythonw.exe.manifest"; Flags: sharedfile; Components: manifest
Source: "wxversion\wxversion.py"; DestDir: "{app}"; Flags: sharedfile; Components: core
Source: "src\wx.pth"; DestDir: "{app}"; Flags: sharedfile; Components: pthfile
%(LOCALE)s %(LOCALE)s
Source: "demo\*.py"; DestDir: "{app}\wx\demo"; Components: demo Source: "scripts\*.py"; DestDir: "{code:GetPythonDir}\Scripts"; Flags: sharedfile; Components: core
Source: "demo\*.xml"; DestDir: "{app}\wx\demo"; Components: demo Source: "scripts\helpviewer"; DestDir: "{code:GetPythonDir}\Scripts"; Flags: sharedfile; Components: core
Source: "demo\*.txt"; DestDir: "{app}\wx\demo"; Components: demo Source: "scripts\img2png"; DestDir: "{code:GetPythonDir}\Scripts"; Flags: sharedfile; Components: core
Source: "demo\*.ico"; DestDir: "{app}\wx\demo"; Components: demo Source: "scripts\img2py"; DestDir: "{code:GetPythonDir}\Scripts"; Flags: sharedfile; Components: core
Source: "scripts\img2xpm"; DestDir: "{code:GetPythonDir}\Scripts"; Flags: sharedfile; Components: core
Source: "demo\bitmaps\*.bmp"; DestDir: "{app}\wx\demo\bitmaps"; Components: demo Source: "scripts\pyalacarte"; DestDir: "{code:GetPythonDir}\Scripts"; Flags: sharedfile; Components: core
Source: "demo\bitmaps\*.gif"; DestDir: "{app}\wx\demo\bitmaps"; Components: demo Source: "scripts\pyalamode"; DestDir: "{code:GetPythonDir}\Scripts"; Flags: sharedfile; Components: core
Source: "demo\bitmaps\*.jpg"; DestDir: "{app}\wx\demo\bitmaps"; Components: demo Source: "scripts\pyshell"; DestDir: "{code:GetPythonDir}\Scripts"; Flags: sharedfile; Components: core
Source: "demo\bitmaps\*.png"; DestDir: "{app}\wx\demo\bitmaps"; Components: demo Source: "scripts\pycrust"; DestDir: "{code:GetPythonDir}\Scripts"; Flags: sharedfile; Components: core
Source: "demo\bitmaps\*.ico"; DestDir: "{app}\wx\demo\bitmaps"; Components: demo Source: "scripts\pywrap"; DestDir: "{code:GetPythonDir}\Scripts"; Flags: sharedfile; Components: core
Source: "scripts\pywxrc"; DestDir: "{code:GetPythonDir}\Scripts"; Flags: sharedfile; Components: core
Source: "demo\bmp_source\*.gif"; DestDir: "{app}\wx\demo\bmp_source"; Components: demo Source: "scripts\xrced"; DestDir: "{code:GetPythonDir}\Scripts"; Flags: sharedfile; Components: core
Source: "demo\bmp_source\*.bmp"; DestDir: "{app}\wx\demo\bmp_source"; Components: demo
Source: "demo\bmp_source\*.jpg"; DestDir: "{app}\wx\demo\bmp_source"; Components: demo
Source: "demo\bmp_source\*.png"; DestDir: "{app}\wx\demo\bmp_source"; Components: demo
Source: "demo\bmp_source\*.ico"; DestDir: "{app}\wx\demo\bmp_source"; Components: demo
Source: "demo\data\*.htm"; DestDir: "{app}\wx\demo\data"; Components: demo
Source: "demo\data\*.html"; DestDir: "{app}\wx\demo\data"; Components: demo
Source: "demo\data\*.py"; DestDir: "{app}\wx\demo\data"; Components: demo
Source: "demo\data\*.png"; DestDir: "{app}\wx\demo\data"; Components: demo
Source: "demo\data\*.bmp"; DestDir: "{app}\wx\demo\data"; Components: demo
Source: "demo\data\*.dat"; DestDir: "{app}\wx\demo\data"; Components: demo
Source: "demo\data\*.txt"; DestDir: "{app}\wx\demo\data"; Components: demo
Source: "demo\data\*.wav"; DestDir: "{app}\wx\demo\data"; Components: demo
Source: "demo\data\*.wdr"; DestDir: "{app}\wx\demo\data"; Components: demo
Source: "demo\data\*.xrc"; DestDir: "{app}\wx\demo\data"; Components: demo
Source: "demo\data\*.gif"; DestDir: "{app}\wx\demo\data"; Components: demo
Source: "demo\data\*.swf"; DestDir: "{app}\wx\demo\data"; Components: demo
;;Source: "demo\dllwidget\*.cpp"; DestDir: "{app}\wx\demo\dllwidget"; Components: demo
;;Source: "demo\dllwidget\*.py"; DestDir: "{app}\wx\demo\dllwidget"; Components: demo
;;Source: "demo\dllwidget\Makefile"; DestDir: "{app}\wx\demo\dllwidget"; Components: demo
;;Source: "demo\dllwidget\makefile.*"; DestDir: "{app}\wx\demo\dllwidget"; Components: demo
Source: "licence\*.txt"; DestDir: "{app}\wx\docs\licence"; Components: core Source: "docs\README.txt"; DestDir: "{app}\%(PKGDIR)s\docs"; Flags: isreadme; Components: core
Source: "%(WXDIR)s\docs\htmlhelp\wx.chm"; DestDir: "{app}\wx\docs"; Components: docs Source: "licence\*.txt"; DestDir: "{app}\%(PKGDIR)s\docs\licence"; Components: core
Source: "%(WXDIR)s\docs\htmlhelp\ogl.chm"; DestDir: "{app}\wx\docs"; Components: docs
Source: "docs\README.txt"; DestDir: "{app}\wx\docs"; Flags: isreadme; Components: core
Source: "docs\*.txt"; DestDir: "{app}\wx\docs"; Components: docs
Source: "docs\*.css"; DestDir: "{app}\wx\docs"; Components: docs
Source: "docs\*.html"; DestDir: "{app}\wx\docs"; Components: docs
Source: "docs\*.conf"; DestDir: "{app}\wx\docs"; Components: docs
Source: "docs\screenshots\*.png"; DestDir: "{app}\wx\docs\screenshots"; Components: docs
Source: "docs\xml\*.xml"; DestDir: "{app}\wx\docs\xml"; Components: docs
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: "%(WXDIR)s\lib\vc_dll\wxrc.exe"; DestDir: "{code:GetPythonDir}\Scripts"; Components: core
Source: "samples\doodle\*.py"; DestDir: "{app}\wx\samples\doodle"; Components: samples
Source: "samples\doodle\*.txt"; DestDir: "{app}\wx\samples\doodle"; Components: samples
Source: "samples\doodle\*.bat"; DestDir: "{app}\wx\samples\doodle"; Components: samples
Source: "samples\doodle\sample.ddl"; DestDir: "{app}\wx\samples\doodle"; Components: samples
Source: "samples\doodle\superdoodle.iss"; DestDir: "{app}\wx\samples\doodle"; Components: samples
Source: "samples\embedded\*.py"; DestDir: "{app}\wx\samples\embedded"; Components: samples
Source: "samples\embedded\*.cpp"; DestDir: "{app}\wx\samples\embedded"; Components: samples
Source: "samples\embedded\*.txt"; DestDir: "{app}\wx\samples\embedded"; Components: samples
Source: "samples\embedded\*.vc"; DestDir: "{app}\wx\samples\embedded"; Components: samples
Source: "samples\embedded\*.unx"; DestDir: "{app}\wx\samples\embedded"; Components: samples
Source: "samples\embedded\*.ico"; DestDir: "{app}\wx\samples\embedded"; Components: samples
Source: "samples\embedded\*.xpm"; DestDir: "{app}\wx\samples\embedded"; Components: samples
Source: "samples\embedded\*.rc"; DestDir: "{app}\wx\samples\embedded"; Components: samples
Source: "samples\frogedit\*.py"; DestDir: "{app}\wx\samples\frogedit"; Components: samples
Source: "samples\hangman\*.py"; DestDir: "{app}\wx\samples\hangman"; Components: samples
Source: "samples\pySketch\*.py"; DestDir: "{app}\wx\samples\pySketch"; Components: samples
Source: "samples\pySketch\images\*.bmp"; DestDir: "{app}\wx\samples\pySketch\images"; Components: samples
Source: "samples\simple\*.py"; DestDir: "{app}\wx\samples\simple"; Components: samples
Source: "samples\StyleEditor\*.txt"; DestDir: "{app}\wx\samples\StyleEditor"; Components: samples
Source: "samples\StyleEditor\*.py"; DestDir: "{app}\wx\samples\StyleEditor"; Components: samples
Source: "samples\StyleEditor\*.cfg"; DestDir: "{app}\wx\samples\StyleEditor"; Components: samples
Source: "samples\wxProject\*.txt"; DestDir: "{app}\wx\samples\wxProject"; Components: samples
Source: "samples\wxProject\*.py"; DestDir: "{app}\wx\samples\wxProject"; Components: samples
Source: "src\winxp.manifest"; DestDir: "{code:GetPythonDir}"; DestName: "python.exe.manifest"; Components: manifest
Source: "src\winxp.manifest"; DestDir: "{code:GetPythonDir}"; DestName: "pythonw.exe.manifest"; Components: manifest
;;------------------------------------------------------------ ;;------------------------------------------------------------
[Run] [Run]
;; Compile the .py files ;; 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 Filename: "{code:GetPythonDir}\python.exe"; Parameters: "{code:GetPythonDir}\Lib\compileall.py {app}\%(PKGDIR)s"; Description: "Compile Python .py files to .pyc"; Flags: postinstall; Components: core
;; Recreate the tool scripts to use the paths on the users machine ;; Recreate the tool scripts to use the paths on the users machine
Filename: "{code:GetPythonDir}\python.exe"; Parameters: "CreateBatchFiles.py"; WorkingDir: "{code:GetPythonDir}\Scripts"; Description: "Create batch files for tool scripts"; Flags: postinstall; Components: core 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 wxPython DEMO"; Filename: "{code:GetPythonDir}\pythonw.exe"; WorkingDir: "{app}\wx\demo"; Parameters: "demo.py"; IconFilename: "{app}\wx\demo\wxpdemo.ico"; Components: core
Name: "{group}\PyCrust"; Filename: "{code:GetPythonDir}\pythonw.exe"; WorkingDir: "c:\"; Parameters: "{code:GetPythonDir}\Scripts\pycrust"; IconFilename: "{app}\wx\py\PyCrust.ico"; Components: core
Name: "{group}\PyShell"; Filename: "{code:GetPythonDir}\pythonw.exe"; WorkingDir: "c:\"; Parameters: "{code:GetPythonDir}\Scripts\pyshell"; IconFilename: "{app}\wx\py\PyCrust.ico"; Components: core
Name: "{group}\PyAlaMode"; Filename: "{code:GetPythonDir}\pythonw.exe"; WorkingDir: "c:\"; Parameters: "{code:GetPythonDir}\Scripts\pyalamode"; IconFilename: "{app}\wx\py\PyCrust.ico"; Components: core
Name: "{group}\PyAlaCarte"; Filename: "{code:GetPythonDir}\pythonw.exe"; WorkingDir: "c:\"; Parameters: "{code:GetPythonDir}\Scripts\pyalacarte"; IconFilename: "{app}\wx\py\PyCrust.ico"; Components: core
Name: "{group}\Resource Editor"; Filename: "{code:GetPythonDir}\pythonw.exe"; WorkingDir: "c:\"; Parameters: "{code:GetPythonDir}\Scripts\xrced"; IconFilename: "{app}\wx\tools\XRCed\xrced.ico"; Components: core
Name: "{group}\Sample Apps"; Filename: "{app}\wx\samples"; Components: samples
Name: "{group}\wxWidgets Reference"; Filename: "{app}\wx\docs\wx.chm"; Components: docs
Name: "{group}\Migration Guide"; Filename: "{app}\wx\docs\MigrationGuide.html"; Components: docs
Name: "{group}\Recent Changes"; Filename: "{app}\wx\docs\CHANGES.html"; Components: docs
Name: "{group}\Other Docs"; Filename: "{app}\wx\docs"; Components: docs
;;------------------------------------------------------------ ;;------------------------------------------------------------
[UninstallDelete] [UninstallDelete]
Type: files; Name: "{app}\wx\*.pyc"; Type: files; Name: "{app}\%(PKGDIR)s\wx\*.pyc";
Type: files; Name: "{app}\wx\*.pyo"; Type: files; Name: "{app}\%(PKGDIR)s\wx\*.pyo";
Type: files; Name: "{app}\wx\*.pyd"; Type: files; Name: "{app}\%(PKGDIR)s\wx\*.pyd";
Type: files; Name: "{app}\wx\build\*.pyc"; Type: files; Name: "{app}\%(PKGDIR)s\wx\build\*.pyc";
Type: files; Name: "{app}\wx\build\*.pyo"; Type: files; Name: "{app}\%(PKGDIR)s\wx\build\*.pyo";
Type: files; Name: "{app}\wx\lib\*.pyc"; Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\*.pyc";
Type: files; Name: "{app}\wx\lib\*.pyo"; Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\*.pyo";
Type: files; Name: "{app}\wx\lib\colourchooser\*.pyc"; Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\colourchooser\*.pyc";
Type: files; Name: "{app}\wx\lib\colourchooser\*.pyo"; Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\colourchooser\*.pyo";
Type: files; Name: "{app}\wx\lib\editor\*.pyc"; Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\editor\*.pyc";
Type: files; Name: "{app}\wx\lib\editor\*.pyo"; Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\editor\*.pyo";
Type: files; Name: "{app}\wx\lib\mixins\*.pyc"; Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\mixins\*.pyc";
Type: files; Name: "{app}\wx\lib\mixins\*.pyo"; Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\mixins\*.pyo";
Type: files; Name: "{app}\wx\lib\masked\*.pyc"; Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\masked\*.pyc";
Type: files; Name: "{app}\wx\lib\masked\*.pyo"; Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\masked\*.pyo";
Type: files; Name: "{app}\wx\lib\ogl\*.pyc"; Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\ogl\*.pyc";
Type: files; Name: "{app}\wx\lib\ogl\*.pyo"; Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\ogl\*.pyo";
Type: files; Name: "{app}\wx\lib\floatcanvas\*.pyc"; Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\floatcanvas\*.pyc";
Type: files; Name: "{app}\wx\lib\floatcanvas\*.pyo"; Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\floatcanvas\*.pyo";
Type: files; Name: "{app}\wx\py\*.pyc"; Type: files; Name: "{app}\%(PKGDIR)s\wx\py\*.pyc";
Type: files; Name: "{app}\wx\py\*.pyo"; Type: files; Name: "{app}\%(PKGDIR)s\wx\py\*.pyo";
Type: files; Name: "{app}\wx\py\tests\*.pyc"; Type: files; Name: "{app}\%(PKGDIR)s\wx\py\tests\*.pyc";
Type: files; Name: "{app}\wx\py\tests\*.pyo"; Type: files; Name: "{app}\%(PKGDIR)s\wx\py\tests\*.pyo";
Type: files; Name: "{app}\wx\tools\*.pyc"; Type: files; Name: "{app}\%(PKGDIR)s\wx\tools\*.pyc";
Type: files; Name: "{app}\wx\tools\*.pyo"; Type: files; Name: "{app}\%(PKGDIR)s\wx\tools\*.pyo";
Type: files; Name: "{app}\wx\tools\XRCed\*.pyc"; Type: files; Name: "{app}\%(PKGDIR)s\wx\tools\XRCed\*.pyc";
Type: files; Name: "{app}\wx\tools\XRCed\*.pyo"; Type: files; Name: "{app}\%(PKGDIR)s\wx\tools\XRCed\*.pyo";
Type: files; Name: "{app}\wx\demo\*.pyc";
Type: files; Name: "{app}\wx\demo\*.pyo";
Type: files; Name: "{app}\wx\demo\data\showTips";
Type: files; Name: "{app}\wx\demo\data\*.pyc";
Type: files; Name: "{app}\wx\demo\data\*.pyo";
Type: files; Name: "{app}\wx\demo\dllwidget\*.pyc";
Type: files; Name: "{app}\wx\demo\dllwidget\*.pyo";
Type: files; Name: "{app}\wx\samples\doodle\*.pyc"; Type: files; Name: "{app}\%(PKGDIR)s\wxPython\*.pyc";
Type: files; Name: "{app}\wx\samples\doodle\*.pyo"; Type: files; Name: "{app}\%(PKGDIR)s\wxPython\*.pyo";
Type: files; Name: "{app}\wx\samples\embedded\*.pyc"; Type: files; Name: "{app}\%(PKGDIR)s\wxPython\lib\*.pyc";
Type: files; Name: "{app}\wx\samples\embedded\*.pyo"; Type: files; Name: "{app}\%(PKGDIR)s\wxPython\lib\*.pyo";
Type: files; Name: "{app}\wx\samples\frogedit\*.pyc"; Type: files; Name: "{app}\%(PKGDIR)s\wxPython\lib\colourchooser\*.pyc";
Type: files; Name: "{app}\wx\samples\frogedit\*.pyo"; Type: files; Name: "{app}\%(PKGDIR)s\wxPython\lib\colourchooser\*.pyo";
Type: files; Name: "{app}\wx\samples\hangman\*.pyc"; Type: files; Name: "{app}\%(PKGDIR)s\wxPython\lib\editor\*.pyc";
Type: files; Name: "{app}\wx\samples\hangman\*.pyo"; Type: files; Name: "{app}\%(PKGDIR)s\wxPython\lib\editor\*.pyo";
Type: files; Name: "{app}\wx\samples\hangman\*.txt"; Type: files; Name: "{app}\%(PKGDIR)s\wxPython\lib\mixins\*.pyc";
Type: files; Name: "{app}\wx\samples\pySketch\*.pyc"; Type: files; Name: "{app}\%(PKGDIR)s\wxPython\lib\mixins\*.pyo";
Type: files; Name: "{app}\wx\samples\pySketch\*.pyo"; Type: files; Name: "{app}\%(PKGDIR)s\wxPython\tools\*.pyc";
Type: files; Name: "{app}\wx\samples\simple\*.pyc"; Type: files; Name: "{app}\%(PKGDIR)s\wxPython\tools\*.pyo";
Type: files; Name: "{app}\wx\samples\simple\*.pyo";
Type: files; Name: "{app}\wx\samples\StyleEditor\*.pyc";
Type: files; Name: "{app}\wx\samples\StyleEditor\*.pyo";
Type: files; Name: "{app}\wx\samples\wx_examples\basic\*.pyc";
Type: files; Name: "{app}\wx\samples\wx_examples\basic\*.pyo";
Type: files; Name: "{app}\wx\samples\wx_examples\hello\*.pyc";
Type: files; Name: "{app}\wx\samples\wx_examples\hello\*.pyo";
Type: files; Name: "{app}\wx\samples\wxProject\*.pyc";
Type: files; Name: "{app}\wx\samples\wxProject\*.pyo";
Type: files; Name: "{app}\wxPython\*.pyc";
Type: files; Name: "{app}\wxPython\*.pyo";
Type: files; Name: "{app}\wxPython\lib\*.pyc";
Type: files; Name: "{app}\wxPython\lib\*.pyo";
Type: files; Name: "{app}\wxPython\lib\colourchooser\*.pyc";
Type: files; Name: "{app}\wxPython\lib\colourchooser\*.pyo";
Type: files; Name: "{app}\wxPython\lib\editor\*.pyc";
Type: files; Name: "{app}\wxPython\lib\editor\*.pyo";
Type: files; Name: "{app}\wxPython\lib\mixins\*.pyc";
Type: files; Name: "{app}\wxPython\lib\mixins\*.pyo";
Type: files; Name: "{app}\wxPython\tools\*.pyc";
Type: files; Name: "{app}\wxPython\tools\*.pyo";
%(UNINSTALL_BATCH)s
''' '''
@@ -419,7 +300,8 @@ begin
Result := True; Result := True;
if CurPage <> wpSelectDir then Exit; if CurPage <> wpSelectDir then Exit;
if not UninstallOld(WizardDirValue() + '\wxPython\unins000.exe') then if not UninstallOld(WizardDirValue() + '\wxPython\unins000.exe') then
UninstallOld(WizardDirValue() + '\wx\unins000.exe'); if not UninstallOld(WizardDirValue() + '\wx\unins000.exe') then
UninstallOld(WizardDirValue() + '\%(PKGDIR)s\unins000.exe')
end; end;
@@ -430,6 +312,201 @@ end.
#---------------------------------------------------------------------- #----------------------------------------------------------------------
ISS_DocDemo_Template = r'''
[Setup]
AppName = wxPython%(SHORTVER)s-DocsDemo
AppVerName = wxPython Docs and Demos %(VERSION)s
OutputBaseFilename = wxPython%(SHORTVER)s-DocsDemo-%(VERSION)s
AppCopyright = Copyright <20> 2004 Total Control Software
DefaultDirName = {pf}\wxPython%(SHORTVER)s Docs Demos and Tools
DefaultGroupName = wxPython%(SHORTVER)s Docs Demos and Tools
AlwaysCreateUninstallIcon = yes
AdminPrivilegesRequired = no
OutputDir = dist
WizardStyle = modern
UninstallStyle = modern
DisableStartupPrompt = true
Compression = bzip
DirExistsWarning = no
DisableReadyMemo = true
DisableReadyPage = true
;;DisableDirPage = true
DisableProgramGroupPage = no
DisableAppendDir = no
UsePreviousAppDir = no
UsePreviousGroup = no
AppPublisher = Total Control Software
AppPublisherURL = http://wxPython.org/
AppSupportURL = http://wxPython.org/maillist.php
AppUpdatesURL = http://wxPython.org/download.php
AppVersion = %(VERSION)s
UninstallDisplayIcon = {app}\demo\wxpdemo.ico
UninstallFilesDir = {app}
UninstallIconName = Uninstall
LicenseFile = licence\licence.txt
;; WizardDebug = yes
;;------------------------------------------------------------
[Files]
Source: "demo\demo.py"; DestDir: "{app}\demo"; DestName: "demo.pyw";
Source: "demo\*.py"; DestDir: "{app}\demo";
Source: "demo\*.xml"; DestDir: "{app}\demo";
Source: "demo\*.txt"; DestDir: "{app}\demo";
Source: "demo\*.ico"; DestDir: "{app}\demo";
Source: "demo\bitmaps\*.bmp"; DestDir: "{app}\demo\bitmaps";
Source: "demo\bitmaps\*.gif"; DestDir: "{app}\demo\bitmaps";
Source: "demo\bitmaps\*.jpg"; DestDir: "{app}\demo\bitmaps";
Source: "demo\bitmaps\*.png"; DestDir: "{app}\demo\bitmaps";
Source: "demo\bitmaps\*.ico"; DestDir: "{app}\demo\bitmaps";
Source: "demo\bmp_source\*.gif"; DestDir: "{app}\demo\bmp_source";
Source: "demo\bmp_source\*.bmp"; DestDir: "{app}\demo\bmp_source";
Source: "demo\bmp_source\*.jpg"; DestDir: "{app}\demo\bmp_source";
Source: "demo\bmp_source\*.png"; DestDir: "{app}\demo\bmp_source";
Source: "demo\bmp_source\*.ico"; DestDir: "{app}\demo\bmp_source";
Source: "demo\data\*.htm"; DestDir: "{app}\demo\data";
Source: "demo\data\*.html"; DestDir: "{app}\demo\data";
Source: "demo\data\*.py"; DestDir: "{app}\demo\data";
Source: "demo\data\*.png"; DestDir: "{app}\demo\data";
Source: "demo\data\*.bmp"; DestDir: "{app}\demo\data";
Source: "demo\data\*.dat"; DestDir: "{app}\demo\data";
Source: "demo\data\*.txt"; DestDir: "{app}\demo\data";
Source: "demo\data\*.wav"; DestDir: "{app}\demo\data";
Source: "demo\data\*.wdr"; DestDir: "{app}\demo\data";
Source: "demo\data\*.xrc"; DestDir: "{app}\demo\data";
Source: "demo\data\*.gif"; DestDir: "{app}\demo\data";
Source: "demo\data\*.swf"; DestDir: "{app}\demo\data";
;;Source: "demo\dllwidget\*.cpp"; DestDir: "{app}\demo\dllwidget";
;;Source: "demo\dllwidget\*.py"; DestDir: "{app}\demo\dllwidget";
;;Source: "demo\dllwidget\Makefile"; DestDir: "{app}\demo\dllwidget";
;;Source: "demo\dllwidget\makefile.*"; DestDir: "{app}\demo\dllwidget";
Source: "licence\*.txt"; DestDir: "{app}\docs\licence";
Source: "%(WXDIR)s\docs\htmlhelp\wx.chm"; DestDir: "{app}\docs";
Source: "%(WXDIR)s\docs\htmlhelp\ogl.chm"; DestDir: "{app}\docs";
Source: "docs\README.txt"; DestDir: "{app}\docs"; Flags: isreadme;
Source: "docs\*.txt"; DestDir: "{app}\docs";
Source: "docs\*.css"; DestDir: "{app}\docs";
Source: "docs\*.html"; DestDir: "{app}\docs";
Source: "docs\*.conf"; DestDir: "{app}\docs";
Source: "docs\screenshots\*.png"; DestDir: "{app}\docs\screenshots";
Source: "samples\doodle\*.py"; DestDir: "{app}\samples\doodle";
Source: "samples\doodle\*.txt"; DestDir: "{app}\samples\doodle";
Source: "samples\doodle\*.bat"; DestDir: "{app}\samples\doodle";
Source: "samples\doodle\sample.ddl"; DestDir: "{app}\samples\doodle";
Source: "samples\doodle\superdoodle.iss"; DestDir: "{app}\samples\doodle";
Source: "samples\embedded\*.py"; DestDir: "{app}\samples\embedded";
Source: "samples\embedded\*.cpp"; DestDir: "{app}\samples\embedded";
Source: "samples\embedded\*.txt"; DestDir: "{app}\samples\embedded";
Source: "samples\embedded\*.vc"; DestDir: "{app}\samples\embedded";
Source: "samples\embedded\*.unx"; DestDir: "{app}\samples\embedded";
Source: "samples\embedded\*.ico"; DestDir: "{app}\samples\embedded";
Source: "samples\embedded\*.xpm"; DestDir: "{app}\samples\embedded";
Source: "samples\embedded\*.rc"; DestDir: "{app}\samples\embedded";
Source: "samples\frogedit\*.py"; DestDir: "{app}\samples\frogedit";
Source: "samples\hangman\*.py"; DestDir: "{app}\samples\hangman";
Source: "samples\mainloop\*.py"; DestDir: "{app}\samples\mainloop";
Source: "samples\pySketch\*.py"; DestDir: "{app}\samples\pySketch";
Source: "samples\pySketch\images\*.bmp"; DestDir: "{app}\samples\pySketch\images";
Source: "samples\simple\*.py"; DestDir: "{app}\samples\simple";
Source: "samples\StyleEditor\*.txt"; DestDir: "{app}\samples\StyleEditor";
Source: "samples\StyleEditor\*.py"; DestDir: "{app}\samples\StyleEditor";
Source: "samples\StyleEditor\*.cfg"; DestDir: "{app}\samples\StyleEditor";
Source: "samples\wxProject\*.txt"; DestDir: "{app}\samples\wxProject";
Source: "samples\wxProject\*.py"; DestDir: "{app}\samples\wxProject";
Source: "scripts\pyshell"; DestDir: "{app}\scripts"; DestName: "pyshell.pyw";
Source: "scripts\pycrust"; DestDir: "{app}\scripts"; DestName: "pycrust.pyw";
Source: "scripts\pyalamode"; DestDir: "{app}\scripts"; DestName: "pyalamode.pyw";
Source: "scripts\pyalacarte"; DestDir: "{app}\scripts"; DestName: "pyalacarte.pyw";
Source: "scripts\xrced"; DestDir: "{app}\scripts"; DestName: "xrced.pyw";
Source: "wx\py\PyCrust.ico"; DestDir: "{app}\scripts";
Source: "wx\tools\XRCed\xrced.ico"; DestDir: "{app}\scripts";
;;------------------------------------------------------------
[Icons]
Name: "{group}\Run the wxPython DEMO"; Filename: "{app}\demo\demo.pyw"; WorkingDir: "{app}\demo"; IconFilename: "{app}\demo\wxpdemo.ico";
Name: "{group}\PyCrust"; Filename: "{app}\scripts\pycrust.pyw"; WorkingDir: "c:\"; IconFilename: "{app}\scripts\PyCrust.ico";
Name: "{group}\PyShell"; Filename: "{app}\scripts\pyshell.pyw"; WorkingDir: "c:\"; IconFilename: "{app}\scripts\PyCrust.ico";
Name: "{group}\PyAlaMode"; Filename: "{app}\scripts\pyalamode.pyw"; WorkingDir: "c:\"; IconFilename: "{app}\scripts\PyCrust.ico";
Name: "{group}\PyAlaCarte"; Filename: "{app}\scripts\pyalacarte.pyw"; WorkingDir: "c:\"; IconFilename: "{app}\scripts\PyCrust.ico";
Name: "{group}\Resource Editor"; Filename: "{app}\scripts\xrced.pyw"; WorkingDir: "c:\"; IconFilename: "{app}\scripts\xrced.ico";
Name: "{group}\Sample Apps"; Filename: "{app}\samples";
Name: "{group}\wxWidgets Reference"; Filename: "{app}\docs\wx.chm";
Name: "{group}\Migration Guide"; Filename: "{app}\docs\MigrationGuide.html";
Name: "{group}\Recent Changes"; Filename: "{app}\docs\CHANGES.html";
Name: "{group}\Other Docs"; Filename: "{app}\docs";
;;------------------------------------------------------------
[UninstallDelete]
Type: files; Name: "{app}\demo\*.pyc";
Type: files; Name: "{app}\demo\*.pyo";
Type: files; Name: "{app}\demo\data\showTips";
Type: files; Name: "{app}\demo\data\*.pyc";
Type: files; Name: "{app}\demo\data\*.pyo";
Type: files; Name: "{app}\demo\dllwidget\*.pyc";
Type: files; Name: "{app}\demo\dllwidget\*.pyo";
Type: files; Name: "{app}\samples\doodle\*.pyc";
Type: files; Name: "{app}\samples\doodle\*.pyo";
Type: files; Name: "{app}\samples\embedded\*.pyc";
Type: files; Name: "{app}\samples\embedded\*.pyo";
Type: files; Name: "{app}\samples\frogedit\*.pyc";
Type: files; Name: "{app}\samples\frogedit\*.pyo";
Type: files; Name: "{app}\samples\hangman\*.pyc";
Type: files; Name: "{app}\samples\hangman\*.pyo";
Type: files; Name: "{app}\samples\hangman\*.txt";
Type: files; Name: "{app}\samples\mainloop\*.pyc";
Type: files; Name: "{app}\samples\mainloop\*.pyo";
Type: files; Name: "{app}\samples\pySketch\*.pyc";
Type: files; Name: "{app}\samples\pySketch\*.pyo";
Type: files; Name: "{app}\samples\simple\*.pyc";
Type: files; Name: "{app}\samples\simple\*.pyo";
Type: files; Name: "{app}\samples\StyleEditor\*.pyc";
Type: files; Name: "{app}\samples\StyleEditor\*.pyo";
Type: files; Name: "{app}\samples\wx_examples\basic\*.pyc";
Type: files; Name: "{app}\samples\wx_examples\basic\*.pyo";
Type: files; Name: "{app}\samples\wx_examples\hello\*.pyc";
Type: files; Name: "{app}\samples\wx_examples\hello\*.pyo";
Type: files; Name: "{app}\samples\wxProject\*.pyc";
Type: files; Name: "{app}\samples\wxProject\*.pyo";
'''
#----------------------------------------------------------------------
def find_DLLs(): def find_DLLs():
WXDLLVER = PYTHONVER = None WXDLLVER = PYTHONVER = None
@@ -438,8 +515,8 @@ def find_DLLs():
lines = proc.readlines() lines = proc.readlines()
proc.close() proc.close()
for line in lines: for line in lines:
if line.startswith(" wxbase"): if line.startswith(" wxmsw"):
WXDLLVER = line[10:15] WXDLLVER = line[9:14]
if WXDLLVER.endswith('_'): if WXDLLVER.endswith('_'):
WXDLLVER = WXDLLVER[:-1] WXDLLVER = WXDLLVER[:-1]
@@ -454,16 +531,16 @@ def find_DLLs():
#---------------------------------------------------------------------- #----------------------------------------------------------------------
locale_template = 'Source: "%s"; DestDir: "{app}\%s"; Components: core' locale_template = 'Source: "%s"; DestDir: "{app}\%s\%s"; Components: core'
def build_locale_string(): def build_locale_string(pkgdir):
stringlst = [] stringlst = []
def walk_helper(lst, dirname, files): def walk_helper(lst, dirname, files):
for f in files: for f in files:
filename = os.path.join(dirname, f) filename = os.path.join(dirname, f)
if not os.path.isdir(filename): if not os.path.isdir(filename):
lst.append( locale_template % (filename, dirname) ) lst.append( locale_template % (filename, pkgdir, dirname) )
os.path.walk('wx\\locale', walk_helper, stringlst) os.path.walk('wx\\locale', walk_helper, stringlst)
return '\n'.join(stringlst) return '\n'.join(stringlst)
@@ -476,6 +553,12 @@ def get_system_dir():
return p return p
raise IOError, "System dir not found" raise IOError, "System dir not found"
def get_batch_files():
globs = {}
execfile("scripts/CreateBatchFiles.py", globs)
scripts = globs["scripts"]
scripts = ['Type: files; Name: "{code:GetPythonDir}\Scripts\%s.bat";' % i[0] for i in scripts]
return '\n'.join(scripts)
#---------------------------------------------------------------------- #----------------------------------------------------------------------
@@ -489,13 +572,16 @@ def main():
WXDLLVER, PYTHONVER = find_DLLs() WXDLLVER, PYTHONVER = find_DLLs()
PYVER = "Py" + PYTHONVER[0] + PYTHONVER[2] PYVER = "py" + PYTHONVER[0] + PYTHONVER[2]
WXDIR = os.environ["WXWIN"] WXDIR = os.environ["WXWIN"]
WXPYDIR = os.path.join(WXDIR, "wxPython") WXPYDIR = os.path.join(WXDIR, "wxPython")
SYSDIR = get_system_dir() SYSDIR = get_system_dir()
ISSFILE = "__wxPython.iss" ISSFILE = "__wxPython.iss"
IFSFILE = "__wxPython.ifs" ISSDEMOFILE = "__wxPythonDemo.iss"
LOCALE = build_locale_string() IFSFILE = "__wxPython.ifs"
UNINSTALL_BATCH = get_batch_files()
PKGDIR = open('src/wx.pth').read()
LOCALE = build_locale_string(PKGDIR)
print """Building Win32 installer for wxPython: print """Building Win32 installer for wxPython:
VERSION = %(VERSION)s VERSION = %(VERSION)s
@@ -503,6 +589,7 @@ def main():
WXDLLVER = %(WXDLLVER)s WXDLLVER = %(WXDLLVER)s
PYTHONVER = %(PYTHONVER)s PYTHONVER = %(PYTHONVER)s
PYVER = %(PYVER)s PYVER = %(PYVER)s
PKGDIR = %(PKGDIR)s
WXDIR = %(WXDIR)s WXDIR = %(WXDIR)s
WXPYDIR = %(WXPYDIR)s WXPYDIR = %(WXPYDIR)s
SYSDIR = %(SYSDIR)s SYSDIR = %(SYSDIR)s
@@ -519,8 +606,10 @@ def main():
## PYVER = PYVER + "-hybrid" ## PYVER = PYVER + "-hybrid"
MSLU='' MSLU=''
if len(sys.argv) > 1 and sys.argv[1] == "UNICODE=1": CHARTYPE='ansi'
if "UNICODE=1" in sys.argv:
MSLU=r'Source: "distrib\msw\unicows.dll"; DestDir: "{code:GetPythonDir}"; Components: core' % vars() MSLU=r'Source: "distrib\msw\unicows.dll"; DestDir: "{code:GetPythonDir}"; Components: core' % vars()
CHARTYPE='unicode'
f = open(ISSFILE, "w") f = open(ISSFILE, "w")
f.write(ISS_Template % vars()) f.write(ISS_Template % vars())
@@ -530,14 +619,20 @@ def main():
f.write(IFS_Template % vars()) f.write(IFS_Template % vars())
f.close() f.close()
f = open(ISSDEMOFILE, "w")
f.write(ISS_DocDemo_Template % vars())
f.close()
TOOLS = os.environ['TOOLS'] TOOLS = os.environ['TOOLS']
if TOOLS.startswith('/cygdrive'): if TOOLS.startswith('/cygdrive'):
TOOLS = r"c:\TOOLS" # temporary hack until I convert everything over to bash TOOLS = r"c:\TOOLS" # temporary hack until I convert everything over to bash
os.system(ISCC % (TOOLS, ISSFILE)) os.system(ISCC % (TOOLS, ISSFILE))
os.system(ISCC % (TOOLS, ISSDEMOFILE))
if not KEEP_TEMPS: if not KEEP_TEMPS:
time.sleep(1) time.sleep(1)
os.remove(ISSFILE) os.remove(ISSFILE)
os.remove(ISSDEMOFILE)
os.remove(IFSFILE) os.remove(IFSFILE)

4
wxPython/distrib/makedemo
View File

@@ -28,8 +28,8 @@ rm -f `find _distrib_tgz/wxPython-$VERSION -name ".#*"`
cd _distrib_tgz cd _distrib_tgz
tar cvf ../dist/wxPythonDemo-$VERSION.tar wxPython-$VERSION tar cvf ../dist/wxPython-demo-$VERSION.tar wxPython-$VERSION
gzip -9 ../dist/wxPythonDemo-$VERSION.tar gzip -9 ../dist/wxPython-demo-$VERSION.tar
cd .. cd ..
rm -r _distrib_tgz rm -r _distrib_tgz

5
wxPython/distrib/makedev.bat
View File

@@ -22,7 +22,6 @@ copy /s %WXWIN%\include\wx\* %BASE%\include\wx
copy /s %WXWIN%\contrib\include\wx\gizmos %BASE%\include\wx\gizmos copy /s %WXWIN%\contrib\include\wx\gizmos %BASE%\include\wx\gizmos
copy /s %WXWIN%\contrib\include\wx\ogl %BASE%\include\wx\ogl copy /s %WXWIN%\contrib\include\wx\ogl %BASE%\include\wx\ogl
copy /s %WXWIN%\contrib\include\wx\stc %BASE%\include\wx\stc copy /s %WXWIN%\contrib\include\wx\stc %BASE%\include\wx\stc
copy /s %WXWIN%\contrib\include\wx\xrc %BASE%\include\wx\xrc
copy /s %WXWIN%\wxPython\include\wx\* %BASE%\include\wx copy /s %WXWIN%\wxPython\include\wx\* %BASE%\include\wx
mkdir %BASE%\include\wx\wxPython\i_files mkdir %BASE%\include\wx\wxPython\i_files
@@ -68,8 +67,8 @@ rm del-files
rm del-dirs rm del-dirs
rem *** bundle it all up rem *** bundle it all up
tar cvf ../dist/wxPythonWIN32-devel-%1.tar wxPython-%1 tar cvf ../dist/wxPython-win32-devel-%1.tar wxPython-%1
gzip -9 ../dist/wxPythonWIN32-devel-%1.tar gzip -9 ../dist/wxPython-win32-devel-%1.tar
rem *** cleanup rem *** cleanup
cd .. cd ..

6
wxPython/distrib/makedocs
View File

@@ -59,9 +59,9 @@ cp ../distrib/viewdocs.py $DEST
cp ../distrib/README.viewdocs.txt $DEST/README.txt cp ../distrib/README.viewdocs.txt $DEST/README.txt
cp ../docs/xml/wxPython-metadata.xml $DEST cp ../docs/xml/wxPython-metadata.xml $DEST
rm -f ../dist/wxPythonDocs-$VERSION.tar.gz rm -f ../dist/wxPython-docs-$VERSION.tar.gz
tar cvf ../dist/wxPythonDocs-$VERSION.tar $DEST tar cvf ../dist/wxPython-docs-$VERSION.tar $DEST
gzip -9 ../dist/wxPythonDocs-$VERSION.tar gzip -9 ../dist/wxPython-docs-$VERSION.tar
# **** Cleanup # **** Cleanup

2
wxPython/distrib/msw/.mymake
View File

@@ -1,6 +1,6 @@
#! /bin/bash #! /bin/bash
COMMON_FLAGS="OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1" COMMON_FLAGS="OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=1 USE_OPENGL=1"
HYBRID_FLAGS="DEBUG_FLAG=1 CXXFLAGS=/D__NO_VC_CRTDBG__ WXDEBUGFLAG=h" HYBRID_FLAGS="DEBUG_FLAG=1 CXXFLAGS=/D__NO_VC_CRTDBG__ WXDEBUGFLAG=h"
MAKE_FLAGS=$COMMON_FLAGS MAKE_FLAGS=$COMMON_FLAGS

2
wxPython/distrib/msw/.mymake.btm
View File

@@ -1,7 +1,7 @@
@echo off @echo off
setlocal setlocal
set COMMON_FLAGS=OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 set COMMON_FLAGS=OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=1 USE_OPENGL=1
set HYBRID_FLAGS=DEBUG_FLAG=1 CXXFLAGS=/D__NO_VC_CRTDBG__ WXDEBUGFLAG=h set HYBRID_FLAGS=DEBUG_FLAG=1 CXXFLAGS=/D__NO_VC_CRTDBG__ WXDEBUGFLAG=h
set MAKE_FLAGS=%COMMON_FLAGS% set MAKE_FLAGS=%COMMON_FLAGS%

6
wxPython/docs/bin/makeapidocs
View File

@@ -51,9 +51,9 @@ DEST=wxPython-$VERSION/docs
mkdir -p _build_docs/$DEST mkdir -p _build_docs/$DEST
cp -R --link docs/api _build_docs/$DEST cp -R --link docs/api _build_docs/$DEST
cd _build_docs cd _build_docs
rm -f ../dist/wxPythonNewDocs-$VERSION.tar.gz rm -f ../dist/wxPython-newdocs-$VERSION.tar.gz
tar cf ../dist/wxPythonNewDocs-$VERSION.tar $DEST tar cf ../dist/wxPython-newdocs-$VERSION.tar $DEST
gzip -9 ../dist/wxPythonNewDocs-$VERSION.tar gzip -9 ../dist/wxPython-newdocs-$VERSION.tar
# Cleanup # Cleanup
cd .. cd ..