From 4f833a1216fa95c3e79ec3adbd9259ae0b860fa5 Mon Sep 17 00:00:00 2001 From: "kevino@webkit.org" Date: Tue, 28 Sep 2010 16:17:17 +0000 Subject: [PATCH] [wx] Build fixes for recent changes. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@68524 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- ChangeLog | 6 ++++++ WebKitTools/ChangeLog | 8 ++++++++ WebKitTools/wx/packaging/build-mac-installer.py | 7 ++++--- WebKitTools/wx/packaging/build-win-installer.py | 4 ++-- wscript | 14 +++++++++++++- 5 files changed, 33 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3178f18..99438d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-09-28 Kevin Ollivier + + [wx] Build fix, ignore Qt-specific (for now?) source in platform/graphics. + + * wscript: + 2010-09-28 Andras Becsi Reviewed by Csaba Osztrogonác. diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog index ee1bda25a..cbf979e 100644 --- a/WebKitTools/ChangeLog +++ b/WebKitTools/ChangeLog @@ -1,3 +1,11 @@ +2010-09-28 Kevin Ollivier + + [wx] Build fix, don't try to get the svn revision from the git repo when packaging, + it causes the process to hang on the gitorious repo. + + * wx/packaging/build-mac-installer.py: + * wx/packaging/build-win-installer.py: + 2010-09-28 Adam Roben Test that a plugin's HWND is sized/positioned before NPP_SetWindow is diff --git a/WebKitTools/wx/packaging/build-mac-installer.py b/WebKitTools/wx/packaging/build-mac-installer.py index a0c1b22..5b76b0b 100644 --- a/WebKitTools/wx/packaging/build-mac-installer.py +++ b/WebKitTools/wx/packaging/build-mac-installer.py @@ -26,6 +26,7 @@ # Script for building Mac .pkg installer import commands +import datetime import distutils.sysconfig import glob import optparse @@ -48,11 +49,11 @@ wxwebkit_dir = os.path.abspath(os.path.join(wxwk_root, "WebKitBuild", get_config wx_version = wx.__version__[:5] py_version = sys.version[:3] -wxwk_version = svn_revision() +date = str(datetime.date.today()) platform = "osx" -pkgname = "wxWebKit-%s-wx%s-py%s" % (platform, wx_version[:3], py_version) +pkgname = "wxWebKit-%s-wx%s-py%s-%s" % (platform, wx_version[:3], py_version, date) tempdir = "/tmp/%s" % (pkgname) @@ -141,7 +142,7 @@ try: pkg_args = ['--title ' + pkgname, '--out %s.pkg' % pkgname, - '--version ' + wxwk_version.strip(), + '--version ' + date.strip(), '--id org.wxwebkit.wxwebkit', '--domain system', '--root-volume-only', diff --git a/WebKitTools/wx/packaging/build-win-installer.py b/WebKitTools/wx/packaging/build-win-installer.py index 2bb8034..628882a 100644 --- a/WebKitTools/wx/packaging/build-win-installer.py +++ b/WebKitTools/wx/packaging/build-win-installer.py @@ -62,7 +62,7 @@ if __name__ == "__main__": innoSetup = getInnoSetupPath() os.chdir(sys.path[0]) - svnrevision = svn_revision() + date = str(datetime.date.today()) if not os.path.exists(innoSetup): print "ERROR: Cannot find InnoSetup." @@ -84,7 +84,7 @@ CopyMode: alwaysoverwrite; Source: *.py; DestDir: "{app}" installerTemplate = open("wxWebKitInstaller.iss.in", "r").read() - installerTemplate = installerTemplate.replace("<>", svnrevision) + installerTemplate = installerTemplate.replace("<>", date) installerTemplate = installerTemplate.replace("<>", wxwebkit_dir ) installerTemplate = installerTemplate.replace("<>", sys.version[0:3] ) installerTemplate = installerTemplate.replace("<>", fileList ) diff --git a/wscript b/wscript index 0cb8850..8942d13 100644 --- a/wscript +++ b/wscript @@ -259,6 +259,9 @@ def build(bld): excludes.append('HTMLEntityNames.cpp') excludes.append('tokenizer.cpp') + # Qt specific file in common sources + excludes.append('ContextShadow.cpp') + # FIXME: these three require headers that I can't seem to find in trunk. # Investigate how to resolve these issues. excludes.append('JSAbstractView.cpp') @@ -310,9 +313,18 @@ def build(bld): webcore.includes += ' WebKit/mac/WebCoreSupport WebCore/platform/mac' webcore.source += " WebKit/mac/WebCoreSupport/WebSystemInterface.mm" + if building_on_win32: + for wxlib in bld.env['LIB_WX']: + wxlibname = os.path.join(bld.env['LIBPATH_WX'][0], wxlib + '_vc.dll') + if os.path.exists(wxlibname): + bld.install_files(obj.install_path, [wxlibname]) + + for dep in windows_deps: + bld.install_files(obj.install_path, [os.path.join(msvclibs_dir, dep)]) + webcore.find_sources_in_dirs(full_dirs, excludes = excludes, exts=['.c', '.cpp']) bld.add_group() - if build_port == "wx": + if build_port == "wx": bld.add_subdirs(['WebKitTools/DumpRenderTree', 'WebKitTools/wx/browser', 'WebKit/wx/bindings/python']) -- 1.8.3.1