Title: [116501] trunk/Tools
- Revision
- 116501
- Author
- [email protected]
- Date
- 2012-05-09 00:46:28 -0700 (Wed, 09 May 2012)
Log Message
Made build-webkit copy WebKitLibraries to the right location again after r116257
Reviewed by Mark Rowe.
* Scripts/build-webkit: Pass the built product directory to copy-webkitlibraries-to-product-directory.
* Scripts/copy-webkitlibraries-to-product-directory: Use the first argument, if present, as the
product directory.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (116500 => 116501)
--- trunk/Tools/ChangeLog 2012-05-09 07:42:52 UTC (rev 116500)
+++ trunk/Tools/ChangeLog 2012-05-09 07:46:28 UTC (rev 116501)
@@ -1,3 +1,13 @@
+2012-05-09 Dan Bernstein <[email protected]>
+
+ Made build-webkit copy WebKitLibraries to the right location again after r116257
+
+ Reviewed by Mark Rowe.
+
+ * Scripts/build-webkit: Pass the built product directory to copy-webkitlibraries-to-product-directory.
+ * Scripts/copy-webkitlibraries-to-product-directory: Use the first argument, if present, as the
+ product directory.
+
2012-05-08 Ojan Vafai <[email protected]>
Show the chromium non-layout test bots in garden-o-matic
Modified: trunk/Tools/Scripts/build-webkit (116500 => 116501)
--- trunk/Tools/Scripts/build-webkit 2012-05-09 07:42:52 UTC (rev 116500)
+++ trunk/Tools/Scripts/build-webkit 2012-05-09 07:46:28 UTC (rev 116501)
@@ -245,7 +245,7 @@
push @projects, ("Source/WebKit2", "Tools/MiniBrowser") if osXVersion()->{"minor"} >= 6 and !$noWebKit2;
# Copy library and header from WebKitLibraries to a findable place in the product directory.
- (system("perl Tools/Scripts/copy-webkitlibraries-to-product-directory") == 0) or die;
+ (system("perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory", $productDir) == 0) or die;
} elsif (isWinCairo()) {
(system("perl Tools/Scripts/update-webkit-wincairo-libs") == 0) or die;
} elsif (isAppleWinWebKit()) {
Modified: trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory (116500 => 116501)
--- trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2012-05-09 07:42:52 UTC (rev 116500)
+++ trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2012-05-09 07:46:28 UTC (rev 116501)
@@ -28,8 +28,8 @@
use lib $FindBin::Bin;
use webkitdirs;
-my $productDir = $ENV{BUILT_PRODUCTS_DIR};
-$productDir = productDir() if !$productDir;
+my $productDir = shift @ARGV;
+$productDir = $ENV{BUILT_PRODUCTS_DIR} if !productDir;
chdirWebKit();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
