-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: "%(WXDIR)s\lib\%(WXDLL)s"; DestDir: "{app}\wxPython"; Components: core
-Source: "wxPython\wxc.pyd"; 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\utilsc.pyd"; DestDir: "{app}\wxPython"; Components: core
-Source: "wxPython\calendarc.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
-Source: "wxPython\xrcc.pyd"; DestDir: "{app}\wxPython"; Components: core
-
-Source: "wxPython\*.py"; DestDir: "{app}\wxPython"; Components: core
-Source: "wxPython\lib\*.py"; DestDir: "{app}\wxPython\lib"; Components: core
-Source: "wxPython\lib\editor\*.py"; DestDir: "{app}\wxPython\lib\editor"; Components: core
-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: "demo\*.py"; DestDir: "{app}\wxPython\demo"; Components: demo
-Source: "demo\*.xml"; DestDir: "{app}\wxPython\demo"; Components: demo
-Source: "demo\*.txt"; DestDir: "{app}\wxPython\demo"; Components: demo
-
-Source: "demo\bitmaps\*.gif"; DestDir: "{app}\wxPython\demo\bitmaps"; Components: demo
-Source: "demo\bitmaps\*.bmp"; DestDir: "{app}\wxPython\demo\bitmaps"; Components: demo
-Source: "demo\bitmaps\*.jpg"; DestDir: "{app}\wxPython\demo\bitmaps"; Components: demo
-Source: "demo\bitmaps\*.png"; DestDir: "{app}\wxPython\demo\bitmaps"; Components: demo
-Source: "demo\bitmaps\*.ico"; DestDir: "{app}\wxPython\demo\bitmaps"; Components: demo
-
-Source: "demo\data\*.htm"; DestDir: "{app}\wxPython\demo\data"; Components: demo
-Source: "demo\data\*.html"; DestDir: "{app}\wxPython\demo\data"; Components: demo
-Source: "demo\data\*.py"; DestDir: "{app}\wxPython\demo\data"; Components: demo
-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\*.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
-Source: "demo\data\*.xrc"; DestDir: "{app}\wxPython\demo\data"; Components: demo
-
-Source: "README.txt"; DestDir: "{app}\wxPython\docs"; Flags: isreadme; Components: core
-Source: "CHANGES.txt"; DestDir: "{app}\wxPython\docs"; Components: core
-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: "tools\*.py"; DestDir: "{app}\wxPython\tools"; Components: tools
-Source: "tools\XRCed\CHANGES"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools
-Source: "tools\XRCed\TODO"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools
-Source: "tools\XRCed\README"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools
-Source: "tools\XRCed\*.py"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools
-Source: "tools\XRCed\*.xrc"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools
-
-Source: "samples\doodle\*.py"; DestDir: "{app}\wxPython\samples\doodle"; Components: samples
-Source: "samples\doodle\*.txt"; DestDir: "{app}\wxPython\samples\doodle"; Components: samples
-Source: "samples\doodle\sample.ddl"; DestDir: "{app}\wxPython\samples\doodle"; Components: samples
-Source: "samples\doodle\superdoodle.iss"; DestDir: "{app}\wxPython\samples\doodle"; Components: samples
-
-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\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: "%(SYSDIR)s\MSVCRT.dll"; DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core
+Source: "%(SYSDIR)s\MSVCIRT.dll"; DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core
+Source: "%(SYSDIR)s\MSVCP60.dll"; DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core
+
+Source: "%(WXDIR)s\BIN\wx*%(WXDLLVER)s*.dll"; DestDir: "{app}\wx"; Components: core
+%(MSLU)s
+Source: "wx\_core.pyd"; DestDir: "{app}\wx"; Components: core
+Source: "wx\_gdi.pyd"; DestDir: "{app}\wx"; Components: core
+Source: "wx\_windows.pyd"; DestDir: "{app}\wx"; Components: core
+Source: "wx\_controls.pyd"; DestDir: "{app}\wx"; Components: core
+Source: "wx\_misc.pyd"; DestDir: "{app}\wx"; Components: core
+Source: "wx\_calendar.pyd"; DestDir: "{app}\wx"; Components: core
+Source: "wx\_grid.pyd"; DestDir: "{app}\wx"; Components: core
+Source: "wx\_html.pyd"; DestDir: "{app}\wx"; Components: core
+Source: "wx\_wizard.pyd"; DestDir: "{app}\wx"; Components: core
+Source: "wx\_gizmos.pyd"; DestDir: "{app}\wx"; Components: core
+Source: "wx\_glcanvas.pyd"; DestDir: "{app}\wx"; Components: core
+Source: "wx\_iewin.pyd"; DestDir: "{app}\wx"; Components: core
+Source: "wx\_ogl.pyd"; DestDir: "{app}\wx"; Components: core
+Source: "wx\_stc.pyd"; DestDir: "{app}\wx"; Components: core
+Source: "wx\_xrc.pyd"; DestDir: "{app}\wx"; Components: core
+
+
+Source: "wx\*.py"; DestDir: "{app}\wx"; Components: core
+Source: "wx\lib\*.py"; DestDir: "{app}\wx\lib"; Components: core
+Source: "wx\lib\*.wdr"; 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\editor\*.txt"; 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\py\*.txt"; DestDir: "{app}\wx\py"; Components: core
+Source: "wx\py\*.ico"; DestDir: "{app}\wx\py"; Components: core
+Source: "wx\py\*.png"; DestDir: "{app}\wx\py"; Components: core
+Source: "wx\py\tests\*.py"; DestDir: "{app}\wx\py\tests"; Components: core
+Source: "wx\py\wxd\*.py"; DestDir: "{app}\wx\py\wxd"; Components: core
+Source: "wx\tools\*.py"; DestDir: "{app}\wx\tools"; Components: core
+Source: "wx\tools\XRCed\*.txt"; DestDir: "{app}\wx\tools\XRCed"; Components: core
+Source: "wx\tools\XRCed\sawfishrc"; DestDir: "{app}\wx\tools\XRCed"; Components: core
+Source: "wx\tools\XRCed\*.py"; DestDir: "{app}\wx\tools\XRCed"; Components: core
+Source: "wx\tools\XRCed\*.xrc"; DestDir: "{app}\wx\tools\XRCed"; Components: core
+Source: "wx\tools\XRCed\*.ico"; DestDir: "{app}\wx\tools\XRCed"; Components: core
+Source: "wx\tools\XRCed\*.png"; DestDir: "{app}\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}\wx\tools\XRCed\src-images"; Components: core
+
+
+Source: "wxPython\*.py"; DestDir: "{app}\wxPython"; Components: core
+Source: "wxPython\lib\*.py"; DestDir: "{app}\wxPython\lib"; Components: core
+Source: "wxPython\lib\colourchooser\*.py"; DestDir: "{app}\wxPython\lib\colourchooser"; Components: core
+Source: "wxPython\lib\editor\*.py"; DestDir: "{app}\wxPython\lib\editor"; Components: core
+Source: "wxPython\lib\mixins\*.py"; DestDir: "{app}\wxPython\lib\mixins"; Components: core
+Source: "wxPython\tools\*.py"; DestDir: "{app}\wxPython\tools"; Components: core
+
+
+
+%(LOCALE)s
+
+
+Source: "demo\*.py"; DestDir: "{app}\wx\demo"; Components: demo
+Source: "demo\*.xml"; DestDir: "{app}\wx\demo"; Components: demo
+Source: "demo\*.txt"; DestDir: "{app}\wx\demo"; Components: demo
+Source: "demo\*.ico"; DestDir: "{app}\wx\demo"; Components: demo
+
+Source: "demo\bitmaps\*.bmp"; DestDir: "{app}\wx\demo\bitmaps"; Components: demo
+Source: "demo\bitmaps\*.gif"; DestDir: "{app}\wx\demo\bitmaps"; Components: demo
+Source: "demo\bitmaps\*.jpg"; DestDir: "{app}\wx\demo\bitmaps"; Components: demo
+Source: "demo\bitmaps\*.png"; DestDir: "{app}\wx\demo\bitmaps"; Components: demo
+Source: "demo\bitmaps\*.ico"; DestDir: "{app}\wx\demo\bitmaps"; Components: demo
+
+Source: "demo\bmp_source\*.gif"; DestDir: "{app}\wx\demo\bmp_source"; Components: demo
+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\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: "%(WXDIR)s\docs\htmlhelp\wx.chm"; DestDir: "{app}\wx\docs"; Components: docs
+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: "samples\doodle\*.py"; DestDir: "{app}\wx\samples\doodle"; Components: samples
+Source: "samples\doodle\*.txt"; 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\wx_examples\basic\*.py"; DestDir: "{app}\wx\samples\wx_examples\basic"; Components: samples
+Source: "samples\wx_examples\hello\*.py"; DestDir: "{app}\wx\samples\wx_examples\hello"; Components: samples
+Source: "samples\wx_examples\hello\*.jpg"; DestDir: "{app}\wx\samples\wx_examples\hello"; 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: 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"; Description: "Create batch files for tool scripts"; Flags: postinstall; Components: core