diff options
Diffstat (limited to 'Tools/wx/packaging')
| -rw-r--r-- | Tools/wx/packaging/build-mac-installer.py | 7 | ||||
| -rw-r--r-- | Tools/wx/packaging/build-win-installer.py | 8 | ||||
| -rw-r--r-- | Tools/wx/packaging/wxWebKitInstaller.iss.in | 4 |
3 files changed, 13 insertions, 6 deletions
diff --git a/Tools/wx/packaging/build-mac-installer.py b/Tools/wx/packaging/build-mac-installer.py index d0ef945..8231049 100644 --- a/Tools/wx/packaging/build-mac-installer.py +++ b/Tools/wx/packaging/build-mac-installer.py @@ -70,7 +70,7 @@ if sys.platform.startswith("darwin"): wx_root = "/usr/local/lib/wxPython-unicode-%s" % wx.__version__ sp_root = "%s/lib/python%s/site-packages" % (wx_root, py_version) sitepackages = "%s/wx-%s-mac-unicode/wx" % (sp_root, wx_version[:3]) -prefix = wxroot + "/lib" +prefix = wx_root + "/lib" def mac_update_dependencies(dylib, prefix): """ @@ -131,7 +131,7 @@ try: shutil.copy(afile, wxroot) if sys.platform.startswith("darwin"): - dylib_path = os.path.join(wxpythonroot, "libwxwebkit.dylib") + dylib_path = os.path.join(wxroot, "libwxwebkit.dylib") os.system("install_name_tool -id %s %s" % (os.path.join(prefix, "libwxwebkit.dylib"), dylib_path)) mac_update_dependencies(dylib_path, prefix) mac_update_dependencies(os.path.join(wxpythonroot, "_webview.so"), prefix) @@ -140,7 +140,7 @@ try: if not os.path.exists(demodir): os.makedirs(demodir) - shutil.copy(os.path.join(wxwk_root, "WebKit", "wx", "bindings", "python", "samples", "simple.py"), demodir) + shutil.copy(os.path.join(wxwk_root, "Source", "WebKit", "wx", "bindings", "python", "samples", "simple.py"), demodir) if os.path.exists(pkgname + ".pkg"): shutil.rmtree(pkgname + ".pkg") @@ -152,7 +152,6 @@ try: '--domain system', '--root-volume-only', '--root ' + installroot, - '--resources %s/mac/resources' % script_dir, '--verbose' ] diff --git a/Tools/wx/packaging/build-win-installer.py b/Tools/wx/packaging/build-win-installer.py index ffbdd19..553d1b3 100644 --- a/Tools/wx/packaging/build-win-installer.py +++ b/Tools/wx/packaging/build-win-installer.py @@ -31,6 +31,8 @@ import datetime import glob from subprocess import * +import wx + script_dir = os.path.abspath(os.path.dirname(__file__)) sys.path.append(os.path.abspath(os.path.join(script_dir, "..", "build"))) @@ -85,7 +87,13 @@ CopyMode: alwaysoverwrite; Source: *.py; DestDir: "{app}" installerTemplate = open("wxWebKitInstaller.iss.in", "r").read() + wx_version = '%d.%d' % (wx.MAJOR_VERSION, wx.MINOR_VERSION) + if wx.MINOR_VERSION % 2 == 1: + wx_version += ".%d" % wx.RELEASE_VERSION + installerTemplate = installerTemplate.replace("msw-unicode", "msw") + installerTemplate = installerTemplate.replace("<<VERSION>>", date) + installerTemplate = installerTemplate.replace("<<WXVERSION>>", wx_version) installerTemplate = installerTemplate.replace("<<ROOTDIR>>", wxwebkit_dir ) installerTemplate = installerTemplate.replace("<<PYTHONVER>>", sys.version[0:3] ) installerTemplate = installerTemplate.replace("<<FILES>>", fileList ) diff --git a/Tools/wx/packaging/wxWebKitInstaller.iss.in b/Tools/wx/packaging/wxWebKitInstaller.iss.in index ebc89d4..2312474 100644 --- a/Tools/wx/packaging/wxWebKitInstaller.iss.in +++ b/Tools/wx/packaging/wxWebKitInstaller.iss.in @@ -17,7 +17,7 @@ UninstallFilesDir={app}\Uninstall Compression=bzip/9 SourceDir=<<ROOTDIR>> OutputDir=win-installer -OutputBaseFilename=wxWebKit-wx2.8-Py<<PYTHONVER>>-<<VERSION>> +OutputBaseFilename=wxWebKit-wx<<WXVERSION>>-Py<<PYTHONVER>>-<<VERSION>> DisableStartupPrompt=yes AllowNoIcons=yes DisableProgramGroupPage=yes @@ -57,7 +57,7 @@ begin PythonDir := 'C:\Put a directory on PYTHONPATH here\'; end; end; - InstallDir := PythonDir + '\Lib\site-packages\wx-2.8-msw-unicode\wx\'; + InstallDir := PythonDir + '\Lib\site-packages\wx-<<WXVERSION>>-msw-unicode\wx\'; Result := True; end; |