Diff
Modified: trunk/Tools/ChangeLog (148979 => 148980)
--- trunk/Tools/ChangeLog 2013-04-23 19:15:35 UTC (rev 148979)
+++ trunk/Tools/ChangeLog 2013-04-23 19:21:25 UTC (rev 148980)
@@ -1,3 +1,56 @@
+2013-04-23 Benjamin Poulain <[email protected]>
+
+ Remove wxWebKit support from the Tools
+ https://bugs.webkit.org/show_bug.cgi?id=115005
+
+ Reviewed by Andreas Kling.
+
+ The wxWebKit port is no longer actively maintained by Kevin
+ on webkit.org. Remove the code until new maintainers resume the work.
+
+ * DumpRenderTree/DumpRenderTree.h:
+ * DumpRenderTree/config.h:
+ * DumpRenderTree/wscript: Removed.
+ * DumpRenderTree/wx/DumpRenderTreeWx.cpp: Removed.
+ * DumpRenderTree/wx/DumpRenderTreeWx.h: Removed.
+ * DumpRenderTree/wx/GCControllerWx.cpp: Removed.
+ * DumpRenderTree/wx/TestRunnerWx.cpp: Removed.
+ * DumpRenderTree/wx/WorkQueueItemWx.cpp: Removed.
+ * Scripts/build-dumprendertree:
+ * Scripts/build-jsc:
+ (buildMyProject):
+ * Scripts/build-webkit:
+ * Scripts/old-run-webkit-tests:
+ * Scripts/run-launcher:
+ * Scripts/webkitdirs.pm:
+ (argumentsForConfiguration):
+ (determineConfigurationProductDir):
+ (determinePassedArchitecture):
+ (builtDylibPathForName):
+ (determineIsQt):
+ (isAppleWebKit):
+ (launcherPath):
+ (launcherName):
+ (checkRequiredSystemConfig):
+ * Scripts/webkitpy/common/config/contributionareas.py:
+ * waf/build/build_utils.py: Removed.
+ * waf/build/settings.py: Removed.
+ * waf/build/waf_extensions.py: Removed.
+ * waf/build/wxpresets.py: Removed.
+ * wx/browser/browser.cpp: Removed.
+ * wx/browser/wscript: Removed.
+ * wx/install-unix-extras: Removed.
+ * wx/packaging/build-debian-installer.py: Removed.
+ * wx/packaging/build-mac-installer.py: Removed.
+ * wx/packaging/build-win-installer.py: Removed.
+ * wx/packaging/debian/changelog: Removed.
+ * wx/packaging/debian/compat: Removed.
+ * wx/packaging/debian/control: Removed.
+ * wx/packaging/debian/copyright: Removed.
+ * wx/packaging/debian/python-webkitwx.install: Removed.
+ * wx/packaging/debian/rules: Removed.
+ * wx/packaging/wxWebKitInstaller.iss.in: Removed.
+
2013-04-23 Zeno Albisser <[email protected]>
[Qt] Fix test_build_check for Qt on Mac after r148075.
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.h (148979 => 148980)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.h 2013-04-23 19:15:35 UTC (rev 148979)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.h 2013-04-23 19:21:25 UTC (rev 148980)
@@ -40,8 +40,6 @@
#include "DumpRenderTreeWin.h"
#elif PLATFORM(GTK)
#include "DumpRenderTreeGtk.h"
-#elif PLATFORM(WX)
-#include "DumpRenderTreeWx.h"
#elif PLATFORM(EFL)
#include "DumpRenderTreeEfl.h"
#elif PLATFORM(BLACKBERRY)
Modified: trunk/Tools/DumpRenderTree/config.h (148979 => 148980)
--- trunk/Tools/DumpRenderTree/config.h 2013-04-23 19:15:35 UTC (rev 148979)
+++ trunk/Tools/DumpRenderTree/config.h 2013-04-23 19:21:25 UTC (rev 148980)
@@ -32,13 +32,6 @@
#include <wtf/ExportMacros.h>
#include <runtime/JSExportMacros.h>
-// On MSW, wx headers need to be included before windows.h is.
-// The only way we can always ensure this is if we include wx here.
-#if PLATFORM(WX)
-#include <wx/defs.h>
-#endif
-
-
#ifdef __cplusplus
#undef new
#undef delete
Deleted: trunk/Tools/DumpRenderTree/wscript (148979 => 148980)
--- trunk/Tools/DumpRenderTree/wscript 2013-04-23 19:15:35 UTC (rev 148979)
+++ trunk/Tools/DumpRenderTree/wscript 2013-04-23 19:21:25 UTC (rev 148980)
@@ -1,67 +0,0 @@
-#! /usr/bin/env python
-
-# Copyright (C) 2009 Kevin Ollivier All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# wxBrowser sample app build script for the waf build system
-
-import sys
-
-from settings import *
-
-include_paths = [
- os.path.join(output_dir),
- os.path.join(wk_root, 'Source', '_javascript_Core'),
- os.path.join(wk_root, 'Source', 'WTF'),
- os.path.join(wk_root, 'Source', 'WebCore'),
- os.path.join(wk_root, 'Source', 'WebCore', 'bindings', 'wx'),
- os.path.join(wk_root, 'Source', 'WebKit', 'wx'),
- '.',
- 'wx'
- ]
-sources = [
- 'DumpRenderTreeCommon.cpp',
- 'TestRunner.cpp',
- 'WorkQueue.cpp',
- 'wx/DumpRenderTreeWx.cpp',
- 'wx/TestRunnerWx.cpp',
- 'wx/WorkQueueItemWx.cpp'
- ]
-
-def set_options(opt):
- common_set_options(opt)
-
-def configure(conf):
- common_configure(conf)
-
-def build(bld):
- obj = bld.new_task_gen(
- features = 'cxx cprogram',
- includes = ' '.join(include_paths),
- source = sources,
- target = 'DumpRenderTree',
- uselib = 'ICU WX ' + get_config(),
- libpath = [output_dir],
- uselib_local = 'jscore wxwebkit',
- install_path = output_dir)
-
Modified: trunk/Tools/Scripts/build-dumprendertree (148979 => 148980)
--- trunk/Tools/Scripts/build-dumprendertree 2013-04-23 19:15:35 UTC (rev 148979)
+++ trunk/Tools/Scripts/build-dumprendertree 2013-04-23 19:21:25 UTC (rev 148980)
@@ -44,7 +44,6 @@
--clean Clean up the build directory
--gtk Build the GTK+ port
--qt Build the Qt port
- --wx Build the wxWindows port
--chromium Build the Chromium port
--efl Build the EFL port
EOF
@@ -71,8 +70,8 @@
$result = buildXCodeProject("DumpRenderTree", $clean, XcodeOptions(), @ARGV);
} elsif (isAppleWinWebKit()) {
$result = buildVisualStudioProject("DumpRenderTree.sln", $clean);
-} elsif (isQt() || isGtk() || isWx() || isChromium() || isEfl()) {
- # Qt, Gtk wxWindows, Chromium and EFL build everything in one shot. No need to build anything here.
+} elsif (isQt() || isGtk() || isChromium() || isEfl()) {
+ # Qt, Gtk Chromium and EFL build everything in one shot. No need to build anything here.
$result = 0;
} else {
die "Building not defined for this platform!\n";
Modified: trunk/Tools/Scripts/build-jsc (148979 => 148980)
--- trunk/Tools/Scripts/build-jsc 2013-04-23 19:15:35 UTC (rev 148979)
+++ trunk/Tools/Scripts/build-jsc 2013-04-23 19:21:25 UTC (rev 148980)
@@ -86,9 +86,6 @@
} elsif (isGtk()) {
checkForArgumentAndRemoveFromARGV("--gtk");
$result = buildGtkProject($projectName, 0);
- } elsif (isWx()) {
- # Builds everything in one-shot. No need to build anything here.
- $result = 0;
} else {
die "Building not defined for this platform!\n";
}
Modified: trunk/Tools/Scripts/build-webkit (148979 => 148980)
--- trunk/Tools/Scripts/build-webkit 2013-04-23 19:15:35 UTC (rev 148979)
+++ trunk/Tools/Scripts/build-webkit 2013-04-23 19:21:25 UTC (rev 148980)
@@ -281,16 +281,6 @@
my $result = 0;
-if (isWx()) {
- $makeArgs .= " --port=wx";
-
- downloadWafIfNeeded();
- @options = split(/ /, $makeArgs);
- @projects = ();
- $result = buildWafProject('.', $clean, @options);
- exit exitStatus($result) if exitStatus($result);
-}
-
if (isChromium()) {
# Currently chromium does not honour the features passed to build-webkit.
# Until this is solved, we issue a warning about that.
Modified: trunk/Tools/Scripts/old-run-webkit-tests (148979 => 148980)
--- trunk/Tools/Scripts/old-run-webkit-tests 2013-04-23 19:15:35 UTC (rev 148979)
+++ trunk/Tools/Scripts/old-run-webkit-tests 2013-04-23 19:21:25 UTC (rev 148980)
@@ -194,9 +194,6 @@
exit 1;
}
-# Default to --no-http for wx for now.
-$testHTTP = 0 if (isWx());
-
my $perlInterpreter = "perl";
my $expectedTag = "expected";
@@ -236,8 +233,6 @@
$platform = "qt";
} elsif (isGtk()) {
$platform = "gtk";
-} elsif (isWx()) {
- $platform = "wx";
} elsif (isWinCairo()) {
$platform = "wincairo";
} elsif (isCygwin() || isWindows()) {
Modified: trunk/Tools/Scripts/run-launcher (148979 => 148980)
--- trunk/Tools/Scripts/run-launcher 2013-04-23 19:15:35 UTC (rev 148979)
+++ trunk/Tools/Scripts/run-launcher 2013-04-23 19:21:25 UTC (rev 148980)
@@ -83,15 +83,6 @@
unshift(@ARGV, ("--efl", "run"));
}
- if (isWx()) {
- if (isDarwin()) {
- $launcherPath = catdir($launcherPath, 'wxBrowser.app', 'Contents', 'MacOS', 'wxBrowser');
- } else {
- $ENV{LD_LIBRARY_PATH} = $ENV{LD_LIBRARY_PATH} ? "$productDir:$ENV{LD_LIBRARY_PATH}" : $productDir;
- $launcherPath = catdir($launcherPath, 'wxBrowser');
- }
- }
-
print "Starting webkit launcher.\n";
}
Modified: trunk/Tools/Scripts/webkitdirs.pm (148979 => 148980)
--- trunk/Tools/Scripts/webkitdirs.pm 2013-04-23 19:15:35 UTC (rev 148979)
+++ trunk/Tools/Scripts/webkitdirs.pm 2013-04-23 19:21:25 UTC (rev 148980)
@@ -94,9 +94,7 @@
my $isGtk;
my $isWinCE;
my $isWinCairo;
-my $isWx;
my $isEfl;
-my @wxArgs;
my $isBlackBerry;
my $isChromium;
my $isChromiumAndroid;
@@ -397,7 +395,6 @@
push(@args, '--efl') if isEfl();
push(@args, '--wincairo') if isWinCairo();
push(@args, '--wince') if isWinCE();
- push(@args, '--wx') if isWx();
push(@args, '--blackberry') if isBlackBerry();
push(@args, '--chromium') if isChromium() && !isChromiumAndroid();
push(@args, '--chromium-android') if isChromiumAndroid();
@@ -451,7 +448,7 @@
return if defined $configurationProductDir;
determineBaseProductDir();
determineConfiguration();
- if (isAppleWinWebKit() && !isWx()) {
+ if (isAppleWinWebKit()) {
$configurationProductDir = File::Spec->catdir($baseProductDir, configurationForVisualStudio(), "bin");
} else {
if (usesPerConfigurationBuildDirectory()) {
@@ -644,7 +641,7 @@
my $opt = $ARGV[$i];
if ($opt =~ /^--32-bit$/i) {
splice(@ARGV, $i, 1);
- if (isAppleMacWebKit() || isWx()) {
+ if (isAppleMacWebKit()) {
$passedArchitecture = `arch`;
chomp $passedArchitecture;
}
@@ -809,9 +806,6 @@
return $result;
}
- if (isWx()) {
- return "$configurationProductDir/libwxwebkit.dylib";
- }
if (isGtk()) {
# WebKitGTK+ for GTK2, WebKitGTK+ for GTK3, and WebKit2 respectively.
my @libraries = ("libwebkitgtk-1.0", "libwebkitgtk-3.0", "libwebkit2gtk-3.0");
@@ -972,8 +966,8 @@
return;
}
- # The presence of QTDIR only means Qt if --gtk or --wx or --efl or --blackberry or --chromium or --wincairo are not on the command-line
- if (isGtk() || isWx() || isEfl() || isBlackBerry() || isChromium() || isWinCairo()) {
+ # The presence of QTDIR only means Qt if --gtk or --efl or --blackberry or --chromium or --wincairo are not on the command-line
+ if (isGtk() || isEfl() || isBlackBerry() || isChromium() || isWinCairo()) {
$isQt = 0;
return;
}
@@ -1148,35 +1142,6 @@
$isWinCE = checkForArgumentAndRemoveFromARGV("--wince");
}
-sub isWx()
-{
- determineIsWx();
- return $isWx;
-}
-
-sub determineIsWx()
-{
- return if defined($isWx);
- $isWx = checkForArgumentAndRemoveFromARGV("--wx");
-}
-
-sub getWxArgs()
-{
- if (!@wxArgs) {
- @wxArgs = ("");
- my $rawWxArgs = "";
- foreach my $opt (@ARGV) {
- if ($opt =~ /^--wx-args/i ) {
- @ARGV = grep(!/^--wx-args/i, @ARGV);
- $rawWxArgs = $opt;
- $rawWxArgs =~ s/--wx-args=//i;
- }
- }
- @wxArgs = split(/,/, $rawWxArgs);
- }
- return @wxArgs;
-}
-
# Determine if this is debian, ubuntu, linspire, or something similar.
sub isDebianBased()
{
@@ -1386,7 +1351,7 @@
sub isAppleWebKit()
{
- return !(isQt() or isGtk() or isWx() or isChromium() or isEfl() or isWinCE() or isBlackBerry());
+ return !(isQt() or isGtk() or isChromium() or isEfl() or isWinCE() or isBlackBerry());
}
sub isAppleMacWebKit()
@@ -1561,7 +1526,7 @@
sub launcherPath()
{
my $relativeScriptsPath = relativeScriptsDir();
- if (isGtk() || isQt() || isWx() || isEfl() || isWinCE()) {
+ if (isGtk() || isQt() || isEfl() || isWinCE()) {
return "$relativeScriptsPath/run-launcher";
} elsif (isAppleWebKit()) {
return "$relativeScriptsPath/run-safari";
@@ -1574,8 +1539,6 @@
return "GtkLauncher";
} elsif (isQt()) {
return "QtTestBrowser";
- } elsif (isWx()) {
- return "wxBrowser";
} elsif (isAppleWebKit()) {
return "Safari";
} elsif (isEfl()) {
@@ -1608,7 +1571,7 @@
print "http://developer.apple.com/tools/xcode\n";
print "*************************************************************\n";
}
- } elsif (isGtk() or isQt() or isWx() or isEfl()) {
+ } elsif (isGtk() or isQt() or isEfl()) {
my @cmds = qw(bison gperf);
if (isQt() and isWindows()) {
push @cmds, "win_flex";
@@ -1897,50 +1860,6 @@
return system @command;
}
-sub downloadWafIfNeeded
-{
- # get / update waf if needed
- my $waf = "$sourceDir/Tools/waf/waf";
- my $wafURL = 'http://wxwebkit.kosoftworks.com/downloads/deps/waf';
- if (!-f $waf) {
- my $result = system "curl -o $waf $wafURL";
- chmod 0755, $waf;
- }
-}
-
-sub buildWafProject
-{
- my ($project, $shouldClean, @options) = @_;
-
- # set the PYTHONPATH for waf
- my $pythonPath = $ENV{'PYTHONPATH'};
- if (!defined($pythonPath)) {
- $pythonPath = '';
- }
- my $sourceDir = sourceDir();
- my $newPythonPath = "$sourceDir/Tools/waf/build:$pythonPath";
- if (isCygwin()) {
- $newPythonPath = `cygpath --mixed --path $newPythonPath`;
- }
- $ENV{'PYTHONPATH'} = $newPythonPath;
-
- print "Building $project\n";
-
- my $wafCommand = "$sourceDir/Tools/waf/waf";
- if ($ENV{'WXWEBKIT_WAF'}) {
- $wafCommand = $ENV{'WXWEBKIT_WAF'};
- }
- if (isCygwin()) {
- $wafCommand = `cygpath --windows "$wafCommand"`;
- chomp($wafCommand);
- }
- if ($shouldClean) {
- return system $wafCommand, "uninstall", "clean", "distclean";
- }
-
- return system $wafCommand, 'configure', 'build', 'install', @options;
-}
-
sub retrieveQMakespecVar
{
my $mkspec = $_[0];
Modified: trunk/Tools/Scripts/webkitpy/common/config/contributionareas.py (148979 => 148980)
--- trunk/Tools/Scripts/webkitpy/common/config/contributionareas.py 2013-04-23 19:15:35 UTC (rev 148979)
+++ trunk/Tools/Scripts/webkitpy/common/config/contributionareas.py 2013-04-23 19:21:25 UTC (rev 148980)
@@ -144,7 +144,6 @@
_Area('The QtWebKit Port', ['qt']),
_Area('The WinCE Port', ['wince']),
_Area('The WinCairo Port', ['cairo']),
- _Area('The wxWebKit Port', ['wx']),
_Area('Threading', ['thread']),
_Area('Tools'),
_Area('Touch Support', ['touch']),
