summaryrefslogtreecommitdiffstats
path: root/Tools/wx
diff options
context:
space:
mode:
Diffstat (limited to 'Tools/wx')
-rw-r--r--Tools/wx/build/settings.py1
-rw-r--r--Tools/wx/build/wxpresets.py10
-rwxr-xr-xTools/wx/install-unix-extras63
-rw-r--r--Tools/wx/packaging/build-mac-installer.py7
-rw-r--r--Tools/wx/packaging/build-win-installer.py8
-rw-r--r--Tools/wx/packaging/wxWebKitInstaller.iss.in4
6 files changed, 74 insertions, 19 deletions
diff --git a/Tools/wx/build/settings.py b/Tools/wx/build/settings.py
index 6d7a7a5..8186d16 100644
--- a/Tools/wx/build/settings.py
+++ b/Tools/wx/build/settings.py
@@ -83,6 +83,7 @@ jscore_dirs = [
'bytecompiler',
'debugger',
'DerivedSources',
+ 'heap',
'interpreter',
'jit',
'parser',
diff --git a/Tools/wx/build/wxpresets.py b/Tools/wx/build/wxpresets.py
index 3d6b693..f5181b1 100644
--- a/Tools/wx/build/wxpresets.py
+++ b/Tools/wx/build/wxpresets.py
@@ -53,8 +53,12 @@ def get_wx_version(wx_root):
majorVersion = re.search("#define\swxMAJOR_VERSION\s+(\d+)", versionText).group(1)
minorVersion = re.search("#define\swxMINOR_VERSION\s+(\d+)", versionText).group(1)
+ releaseVersion = re.search("#define\swxRELEASE_NUMBER\s+(\d+)", versionText).group(1)
- return (majorVersion, minorVersion)
+ release = [majorVersion, minorVersion]
+ if int(minorVersion) % 2 == 1:
+ release.append(releaseVersion)
+ return release
def get_wxmsw_settings(wx_root, shared = False, unicode = False, debug = False, wxPython=False):
if not os.path.exists(wx_root):
@@ -71,7 +75,7 @@ def get_wxmsw_settings(wx_root, shared = False, unicode = False, debug = False,
ext = ''
postfix = 'vc'
- version_str_nodot = ''.join(get_wx_version(wx_root))
+ version_str_nodot = ''.join(get_wx_version(wx_root)[0:2])
if shared:
defines.append('WXUSINGDLL')
@@ -84,7 +88,7 @@ def get_wxmsw_settings(wx_root, shared = False, unicode = False, debug = False,
ext += 'u'
depext = ''
- if wxPython:
+ if wxPython and not version_str_nodot.startswith('29'):
ext += 'h'
depext += 'h'
elif debug:
diff --git a/Tools/wx/install-unix-extras b/Tools/wx/install-unix-extras
index 00c936c..1f14294 100755
--- a/Tools/wx/install-unix-extras
+++ b/Tools/wx/install-unix-extras
@@ -80,6 +80,18 @@ LIBCURL_URL="http://curl.haxx.se/download/$LIBCURL_TARBALL"
export MAC_OS_X_DEPLOYMENT_TARGET=10.4
+ARCH_FLAGS="-arch i386 -arch ppc -arch x86_64"
+SDK="/Developer/SDKs/MacOSX10.4u.sdk"
+
+if [ ! -d $SDK ]; then
+ SDK="/Developer/SDKs/MacOSX10.5.sdk"
+fi
+
+if [ "${OSTYPE:0:6}" == "darwin" ]; then
+ export CC="gcc-4.0"
+ export CXX="g++-4.0"
+fi
+
cd $DL_DIR
# build ICU
if [ `which icu-config >/dev/null 2>&1` ]; then
@@ -92,8 +104,8 @@ if [ `which icu-config >/dev/null 2>&1` ]; then
if [ "${OSTYPE:0:6}" == "darwin" ]; then
./configure --prefix=$DEPS_PREFIX --disable-dependency-tracking
- make CFLAGS="-O -g -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" \
- LDFLAGS="-arch i386 -arch ppc"
+ make CFLAGS="-O -g -isysroot $SDK $ARCH_FLAGS" \
+ LDFLAGS=$ARCH_FLAGS
make install
else
./configure --prefix=$DEPS_PREFIX
@@ -115,8 +127,8 @@ if [ ! -f $DEPS_PREFIX/lib/libiconv.$DLLEXT ]; then
if [ "${OSTYPE:0:6}" == "darwin" ]; then
./configure --prefix=$DEPS_PREFIX --disable-dependency-tracking
- make CFLAGS="-O -g -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" \
- LDFLAGS="-arch i386 -arch ppc"
+ make CFLAGS="-O -g -isysroot $SDK $ARCH_FLAGS" \
+ LDFLAGS="$ARCH_FLAGS"
make install
else
./configure --prefix=$DEPS_PREFIX
@@ -139,8 +151,8 @@ if [ ! -f $DEPS_PREFIX/lib/libjpeg.a ]; then
if [ "${OSTYPE:0:6}" == "darwin" ]; then
./configure --prefix=$DEPS_PREFIX --disable-dependency-tracking
- make CFLAGS="-O -g -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" \
- LDFLAGS="-arch i386 -arch ppc"
+ make CFLAGS="-O -g -isysroot $SDK $ARCH_FLAGS" \
+ LDFLAGS="$ARCH_FLAGS"
make install
else
./configure --prefix=$DEPS_PREFIX
@@ -163,8 +175,8 @@ if [ ! -f $DEPS_PREFIX/lib/libpng.a ]; then
if [ "${OSTYPE:0:6}" == "darwin" ]; then
./configure --prefix=$DEPS_PREFIX --disable-dependency-tracking
- make CFLAGS="-O -g -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" \
- LDFLAGS="-arch i386 -arch ppc"
+ make CFLAGS="-O -g -isysroot $SDK $ARCH_FLAGS" \
+ LDFLAGS="$ARCH_FLAGS"
make install
else
./configure --prefix=$DEPS_PREFIX
@@ -184,9 +196,40 @@ if [ ! -f $DEPS_PREFIX/lib/libcurl.$DLLEXT ]; then
cd $DL_DIR/curl-$LIBCURL_VERSION
if [ "${OSTYPE:0:6}" == "darwin" ]; then
+ # CURL creates different build headers for 32 and 64 bit, so to get a universal build,
+ # we must first create a 32 bit version of the header, then a 64 bit version, and
+ # have the original header simply decide which to use.
+ export CFLAGS="-O -g -isysroot $SDK -mmacosx-version-min=10.4 -arch i386 -arch ppc"
+ ./configure --prefix=$DEPS_PREFIX --disable-dependency-tracking
+
+ mkdir -p $DEPS_PREFIX/include/curl
+
+ cp include/curl/curlbuild.h include/curl/curlbuild32.h
+ cp include/curl/curlbuild.h $DEPS_PREFIX/include/curl/curlbuild32.h
+
+ make distclean
+
+ export CFLAGS="-O -g -isysroot $SDK -mmacosx-version-min=10.4 -arch x86_64 -arch ppc64"
+ ./configure --prefix=$DEPS_PREFIX --disable-dependency-tracking
+
+ cp include/curl/curlbuild.h include/curl/curlbuild64.h
+ cp include/curl/curlbuild.h $DEPS_PREFIX/include/curl/curlbuild64.h
+
+ make distclean
+
+ export CFLAGS="-O -g -isysroot $SDK -mmacosx-version-min=10.4 $ARCH_FLAGS"
./configure --prefix=$DEPS_PREFIX --disable-dependency-tracking
- make CFLAGS="-O -g -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" \
- LDFLAGS="-arch i386 -arch ppc"
+
+ cat > include/curl/curlbuild.h <<EOF
+#ifdef __LP64__
+#include "curlbuild64.h"
+#else
+#include "curlbuild32.h"
+#endif
+EOF
+
+ make CFLAGS="-O -g -isysroot $SDK $ARCH_FLAGS" \
+ LDFLAGS="$ARCH_FLAGS"
make install
else
./configure --prefix=$DEPS_PREFIX
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;
generated by cgit v1.1 at 2025-08-22 03:33:34 +0000