[webkit-changes] [147264] branches/dfgFourthTier

Fri, 29 Mar 2013 17:17:25 -0700

Title: [147264] branches/dfgFourthTier
Revision
147264
Author
[email protected]
Date
2013-03-29 17:19:18 -0700 (Fri, 29 Mar 2013)

Log Message

fourthTier: Check in a known-good build of LLVM into WebKitLibraries, and have a story for updating it
https://bugs.webkit.org/show_bug.cgi?id=113452

Rubber stamped by Mark Hahnenberg.

Tools: 

* Scripts/copy-webkitlibraries-to-product-directory:
* Scripts/export-llvm-build:

WebKitLibraries: 

* LLVMIncludesMountainLion.tar.bz2: Added.
* LLVMLibrariesMountainLion.tar.bz2: Added.

Modified Paths

Added Paths

Diff

Modified: branches/dfgFourthTier/Tools/ChangeLog (147263 => 147264)


--- branches/dfgFourthTier/Tools/ChangeLog	2013-03-30 00:04:17 UTC (rev 147263)
+++ branches/dfgFourthTier/Tools/ChangeLog	2013-03-30 00:19:18 UTC (rev 147264)
@@ -1,5 +1,15 @@
 2013-03-29  Filip Pizlo  <[email protected]>
 
+        fourthTier: Check in a known-good build of LLVM into WebKitLibraries, and have a story for updating it
+        https://bugs.webkit.org/show_bug.cgi?id=113452
+
+        Rubber stamped by Mark Hahnenberg.
+
+        * Scripts/copy-webkitlibraries-to-product-directory:
+        * Scripts/export-llvm-build:
+
+2013-03-29  Filip Pizlo  <[email protected]>
+
         fourthTier: FTL JIT should be able run some simple function
         https://bugs.webkit.org/show_bug.cgi?id=113481

Modified: branches/dfgFourthTier/Tools/Scripts/copy-webkitlibraries-to-product-directory (147263 => 147264)


--- branches/dfgFourthTier/Tools/Scripts/copy-webkitlibraries-to-product-directory	2013-03-30 00:04:17 UTC (rev 147263)
+++ branches/dfgFourthTier/Tools/Scripts/copy-webkitlibraries-to-product-directory	2013-03-30 00:19:18 UTC (rev 147264)
@@ -54,14 +54,19 @@
 # Determine where to get LLVM binaries and headers.
 my $majorDarwinVersion = (split /\./, `uname -r`)[0];
 my $llvmLibraryPackage;
-if ($majorDarwinVersion == 11) {
-    $llvmLibraryPackage = "WebKitLibraries/LLVMLion.tar.bz2";
+my $llvmIncludePackage;
+if (defined($ENV{LLVM_LIBRARY_PACKAGE}) && defined($ENV{LLVM_INCLUDE_PACKAGE})) {
+    $llvmLibraryPackage = $ENV{LLVM_LIBRARY_PACKAGE};
+    $llvmIncludePackage = $ENV{LLVM_INCLUDE_PACKAGE};
+} elsif ($majorDarwinVersion == 11) {
+    $llvmLibraryPackage = "WebKitLibraries/LLVMLibrariesLion.tar.bz2";
+    $llvmIncludePackage = "WebKitLibraries/LLVMIncludesLion.tar.bz2";
 } elsif ($majorDarwinVersion == 12) {
-    $llvmLibraryPackage = "WebKitLibraries/LLVMMountainLion.tar.bz2";
-} elsif (defined($ENV{LLVM_LIBRARY_PACKAGE})) {
-    $llvmLibraryPackage = $ENV{LLVM_LIBRARY_PACKAGE};
+    $llvmLibraryPackage = "WebKitLibraries/LLVMLibrariesMountainLion.tar.bz2";
+    $llvmIncludePackage = "WebKitLibraries/LLVMIncludesMountainLion.tar.bz2";
 } else {
     print "Don't know where to find LLVM!\n";
+    print "Try defining LLVM_LIBRARY_PACKAGE and LLVM_INCLUDE_PACKAGE.\n";
     exit 1;
 }
 
@@ -96,9 +101,4 @@
 
 dittoHeaders("WebKitLibraries/WebKitSystemInterface.h", "$productDir/usr/local/include/WebKitSystemInterface.h");
 dittoHeaders("WebKitLibraries/WebCoreSQLite3", "$productDir/WebCoreSQLite3");
-
-if (defined($ENV{LLVM_INCLUDE_PACKAGE})) {
-    unpackIfNecessary("$productDir/usr/local/include", "$productDir/usr/local/include/llvm-c/Core.h", $ENV{LLVM_INCLUDE_PACKAGE}, 0);
-} else {
-    unpackIfNecessary("$productDir/usr/local/include", "$productDir/usr/local/include/llvm-c/Core.h", "WebKitLibraries/LLVMIncludes.tar.bz2", 0);
-}
+unpackIfNecessary("$productDir/usr/local/include", "$productDir/usr/local/include/llvm-c/Core.h", $llvmIncludePackage, 0);

Modified: branches/dfgFourthTier/Tools/Scripts/export-llvm-build (147263 => 147264)


--- branches/dfgFourthTier/Tools/Scripts/export-llvm-build	2013-03-30 00:04:17 UTC (rev 147263)
+++ branches/dfgFourthTier/Tools/Scripts/export-llvm-build	2013-03-30 00:19:18 UTC (rev 147264)
@@ -60,7 +60,7 @@
         usage
     when '--library-package'
         $libraryPackage = Pathname.new(arg)
-    when '--include-path'
+    when '--include-package'
         $includePackage = Pathname.new(arg)
     when '--llvm-build'
         $llvmBuild = arg

Modified: branches/dfgFourthTier/WebKitLibraries/ChangeLog (147263 => 147264)


--- branches/dfgFourthTier/WebKitLibraries/ChangeLog	2013-03-30 00:04:17 UTC (rev 147263)
+++ branches/dfgFourthTier/WebKitLibraries/ChangeLog	2013-03-30 00:19:18 UTC (rev 147264)
@@ -1,3 +1,13 @@
+2013-03-29  Filip Pizlo  <[email protected]>
+
+        fourthTier: Check in a known-good build of LLVM into WebKitLibraries, and have a story for updating it
+        https://bugs.webkit.org/show_bug.cgi?id=113452
+
+        Rubber stamped by Mark Hahnenberg.
+
+        * LLVMIncludesMountainLion.tar.bz2: Added.
+        * LLVMLibrariesMountainLion.tar.bz2: Added.
+
 2013-03-19  Brent Fulgham  <[email protected]>
 
         [WinCairo] Unreviewed build fix.

Added: branches/dfgFourthTier/WebKitLibraries/LLVMIncludesMountainLion.tar.bz2


(Binary files differ)
Property changes on: branches/dfgFourthTier/WebKitLibraries/LLVMIncludesMountainLion.tar.bz2 ___________________________________________________________________

Added: svn:mime-type

Added: branches/dfgFourthTier/WebKitLibraries/LLVMLibrariesMountainLion.tar.bz2


(Binary files differ)
Property changes on: branches/dfgFourthTier/WebKitLibraries/LLVMLibrariesMountainLion.tar.bz2 ___________________________________________________________________

Added: svn:mime-type

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to