Diff
Modified: trunk/ChangeLog (105839 => 105840)
--- trunk/ChangeLog 2012-01-25 01:40:07 UTC (rev 105839)
+++ trunk/ChangeLog 2012-01-25 01:44:57 UTC (rev 105840)
@@ -1,3 +1,12 @@
+2012-01-24 Mark Rowe <[email protected]>
+
+ Death to _javascript_Glue.
+
+ Rubber-stamped by Geoffrey Garen.
+
+ * Source/_javascript_Glue: Removed.
+ * Source/Makefile: Stop building _javascript_Glue.
+
2012-01-24 Simon Hausmann <[email protected]>
Some qmake build files must include Qt5's "quick" module.
Modified: trunk/Source/Makefile (105839 => 105840)
--- trunk/Source/Makefile 2012-01-25 01:40:07 UTC (rev 105839)
+++ trunk/Source/Makefile 2012-01-25 01:44:57 UTC (rev 105840)
@@ -1,4 +1,4 @@
-MODULES = _javascript_Core _javascript_Glue ThirdParty/ANGLE WebCore WebKit WebKit2
+MODULES = _javascript_Core ThirdParty/ANGLE WebCore WebKit WebKit2
all:
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
Modified: trunk/Tools/BuildSlaveSupport/build-launcher-app (105839 => 105840)
--- trunk/Tools/BuildSlaveSupport/build-launcher-app 2012-01-25 01:40:07 UTC (rev 105839)
+++ trunk/Tools/BuildSlaveSupport/build-launcher-app 2012-01-25 01:44:57 UTC (rev 105840)
@@ -104,7 +104,7 @@
print OUT "$branch\n";
close(OUT);
- my @frameworks = ("_javascript_Core", "_javascript_Glue", "WebCore", "WebKit");
+ my @frameworks = ("_javascript_Core", "WebCore", "WebKit");
for my $framework (@frameworks) {
system("ditto", productDir() . "/$framework.framework", "$nightlyLauncherStagingPath/Contents/Resources/$framework.framework") == 0 or die "Failed copying $framework.framework into $nightlyLauncherStagingPath";
}
Modified: trunk/Tools/ChangeLog (105839 => 105840)
--- trunk/Tools/ChangeLog 2012-01-25 01:40:07 UTC (rev 105839)
+++ trunk/Tools/ChangeLog 2012-01-25 01:44:57 UTC (rev 105840)
@@ -1,3 +1,20 @@
+2012-01-24 Mark Rowe <[email protected]>
+
+ Death to _javascript_Glue.
+
+ Rubber-stamped by Geoffrey Garen.
+
+ * BuildSlaveSupport/build-launcher-app:
+ (copyNightlyLauncher):
+ * Scripts/build-webkit:
+ * Scripts/do-file-rename:
+ * Scripts/do-webcore-rename:
+ * Scripts/webkitpy/common/config/build.py:
+ (_should_file_trigger_build):
+ * Scripts/webkitpy/common/config/build_unittest.py: Update the test to use another Mac-specific
+ path in conjunction with a cross-platform path.
+ (ShouldBuildTest):
+
2012-01-24 Kentaro Hara <[email protected]>
webkitperl/prepare-ChangeLog_unittest/parser_unittests.pl should test stdout and stderr
Modified: trunk/Tools/Scripts/build-webkit (105839 => 105840)
--- trunk/Tools/Scripts/build-webkit 2012-01-25 01:40:07 UTC (rev 105839)
+++ trunk/Tools/Scripts/build-webkit 2012-01-25 01:44:57 UTC (rev 105840)
@@ -515,9 +515,6 @@
}
}
- # Apple builds _javascript_Glue, and only on the Mac.
- splice @projects, 1, 0, "Source/_javascript_Glue";
-
# ANGLE must come before WebCore
splice @projects, 0, 0, "Source/ThirdParty/ANGLE";
@@ -683,7 +680,7 @@
} elsif (isAppleMacWebKit()) {
my @local_options = @options;
push @local_options, XcodeCoverageSupportOptions() if $coverageSupport && $project ne "ANGLE";
- my $useGYPProject = $useGYP && ($project =~ "WebCore|_javascript_Core|_javascript_Glue");
+ my $useGYPProject = $useGYP && ($project =~ "WebCore|_javascript_Core");
my $projectPath = $useGYPProject ? "gyp/$project" : $project;
$result = buildXCodeProject($projectPath, $clean, @local_options, @ARGV);
} elsif (isAppleWinWebKit()) {
Modified: trunk/Tools/Scripts/do-file-rename (105839 => 105840)
--- trunk/Tools/Scripts/do-file-rename 2012-01-25 01:40:07 UTC (rev 105839)
+++ trunk/Tools/Scripts/do-file-rename 2012-01-25 01:44:57 UTC (rev 105840)
@@ -44,7 +44,6 @@
my @paths;
find(\&wanted, "Source/_javascript_Core");
-find(\&wanted, "Source/_javascript_Glue");
find(\&wanted, "Source/WebCore");
find(\&wanted, "WebKit");
find(\&wanted, "Source/WebKit2");
Modified: trunk/Tools/Scripts/do-webcore-rename (105839 => 105840)
--- trunk/Tools/Scripts/do-webcore-rename 2012-01-25 01:40:07 UTC (rev 105839)
+++ trunk/Tools/Scripts/do-webcore-rename 2012-01-25 01:44:57 UTC (rev 105840)
@@ -70,7 +70,6 @@
my @paths;
find(\&wanted, "Source/_javascript_Core");
-find(\&wanted, "Source/_javascript_Glue");
find(\&wanted, "Source/WebCore");
find(\&wanted, "Source/WebKit");
find(\&wanted, "Source/WebKit2");
Modified: trunk/Tools/Scripts/webkitpy/common/config/build.py (105839 => 105840)
--- trunk/Tools/Scripts/webkitpy/common/config/build.py 2012-01-25 01:40:07 UTC (rev 105839)
+++ trunk/Tools/Scripts/webkitpy/common/config/build.py 2012-01-25 01:44:57 UTC (rev 105840)
@@ -55,7 +55,6 @@
("wx", []),
# Directories that should trigger builds on only some bots.
- ("Source/_javascript_Glue", ["mac"]),
("Source/WebCore/image-decoders", ["chromium"]),
("LayoutTests/platform/mac", ["mac", "win"]),
("cairo", ["gtk", "wincairo"]),
Modified: trunk/Tools/Scripts/webkitpy/common/config/build_unittest.py (105839 => 105840)
--- trunk/Tools/Scripts/webkitpy/common/config/build_unittest.py 2012-01-25 01:40:07 UTC (rev 105839)
+++ trunk/Tools/Scripts/webkitpy/common/config/build_unittest.py 2012-01-25 01:44:57 UTC (rev 105840)
@@ -33,8 +33,7 @@
(["Websites/bugs.webkit.org/foo"], []),
(["Source/_javascript_Core/_javascript_Core.xcodeproj/foo"], ["mac-leopard", "mac-lion", "mac-snowleopard"]),
(["Source/_javascript_Core/_javascript_Core.vcproj/foo", "Source/WebKit2/win/WebKit2.vcproj", "Source/WebKit/win/WebKit.sln", "Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops"], ["win"]),
- (["Source/_javascript_Glue/foo", "Source/WebCore/bar"], ["*"]),
- (["Source/_javascript_Glue/foo"], ["mac-leopard", "mac-lion", "mac-snowleopard"]),
+ (["LayoutTests/platform/mac/foo", "Source/WebCore/bar"], ["*"]),
(["LayoutTests/foo"], ["*"]),
(["LayoutTests/canvas/philip/tests/size.attributes.parse.exp-expected.txt", "LayoutTests/canvas/philip/tests/size.attributes.parse.exp.html"], ["*"]),
(["LayoutTests/platform/chromium-linux/foo"], ["chromium-linux"]),
