Title: [99428] trunk
- Revision
- 99428
- Author
- [email protected]
- Date
- 2011-11-07 08:51:15 -0800 (Mon, 07 Nov 2011)
Log Message
[Qt] Put the jsc binary in 'bin' instead of leaving it deep in the build tree
Allows us to not package up the whole Source/_javascript_Core directory for the
buildbots.
Reviewed-by Simon Hausmann.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (99427 => 99428)
--- trunk/Source/_javascript_Core/ChangeLog 2011-11-07 16:48:35 UTC (rev 99427)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-11-07 16:51:15 UTC (rev 99428)
@@ -1,3 +1,14 @@
+2011-11-07 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Put the jsc binary in 'bin' instead of leaving it deep in the build tree
+
+ Allows us to not package up the whole Source/_javascript_Core directory for the
+ buildbots.
+
+ Reviewed-by Simon Hausmann.
+
+ * jsc.pro:
+
2011-11-06 Filip Pizlo <[email protected]>
REGRESSION(r99374): GTK+ build of the jsc binary doesn't like the call
Modified: trunk/Source/_javascript_Core/jsc.pro (99427 => 99428)
--- trunk/Source/_javascript_Core/jsc.pro 2011-11-07 16:48:35 UTC (rev 99427)
+++ trunk/Source/_javascript_Core/jsc.pro 2011-11-07 16:51:15 UTC (rev 99428)
@@ -7,7 +7,7 @@
TEMPLATE = app
TARGET = jsc
-DESTDIR = .
+DESTDIR = $${ROOT_BUILD_DIR}/bin
QT -= gui
Modified: trunk/Tools/BuildSlaveSupport/built-product-archive (99427 => 99428)
--- trunk/Tools/BuildSlaveSupport/built-product-archive 2011-11-07 16:48:35 UTC (rev 99427)
+++ trunk/Tools/BuildSlaveSupport/built-product-archive 2011-11-07 16:51:15 UTC (rev 99428)
@@ -90,7 +90,7 @@
os.mkdir(thinDirectory)
if platform == 'qt':
- neededDirectories = ["bin", "lib", "_javascript_Core"]
+ neededDirectories = ["bin", "lib"]
elif platform == 'gtk':
neededDirectories = ["Programs", ".libs"]
Modified: trunk/Tools/ChangeLog (99427 => 99428)
--- trunk/Tools/ChangeLog 2011-11-07 16:48:35 UTC (rev 99427)
+++ trunk/Tools/ChangeLog 2011-11-07 16:51:15 UTC (rev 99428)
@@ -1,5 +1,18 @@
2011-11-07 Tor Arne Vestbø <[email protected]>
+ [Qt] Put the jsc binary in 'bin' instead of leaving it deep in the build tree
+
+ Allows us to not package up the whole Source/_javascript_Core directory for the
+ buildbots.
+
+ Reviewed-by Simon Hausmann.
+
+ * BuildSlaveSupport/built-product-archive:
+ * Scripts/webkitdirs.pm:
+ (jscProductDir):
+
+2011-11-07 Tor Arne Vestbø <[email protected]>
+
[Qt] Ensure we always export symbols for the QtWebKit API when building WebKit
Reviewed-by Simon Hausmann.
Modified: trunk/Tools/Scripts/webkitdirs.pm (99427 => 99428)
--- trunk/Tools/Scripts/webkitdirs.pm 2011-11-07 16:48:35 UTC (rev 99427)
+++ trunk/Tools/Scripts/webkitdirs.pm 2011-11-07 16:51:15 UTC (rev 99428)
@@ -389,8 +389,7 @@
sub jscProductDir
{
my $productDir = productDir();
- $productDir .= "/Source/_javascript_Core" if isQt();
- $productDir .= "/$configuration" if (isQt() && isWindows());
+ $productDir .= "/bin" if isQt();
$productDir .= "/Programs" if (isGtk() || isEfl());
return $productDir;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
