Tools: Update LLVM export scrpt to handle the build directory being different from the

source directory.

Rubber stamped by Geoffrey Garen.

* Scripts/export-llvm-build:

WebKitLibraries: Add LLVM binary drops for Mavericks using LLVM r206312.

Rubber stamped by Geoffrey Garen.

* LLVMIncludesMavericks.tar.bz2: Added.
* LLVMLibrariesMavericks.tar.bz2: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@167334 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 148cfd85ef01e43ed92902bf009ff4b314c7cbfb..5462ea48505e97871c1c30930faabccd49744cf3 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2014-04-15  Filip Pizlo  <fpizlo@apple.com>
+
+        Update LLVM export scrpt to handle the build directory being different from the
+        source directory.
+
+        Rubber stamped by Geoffrey Garen.
+
+        * Scripts/export-llvm-build:
+
 2014-04-15  Ryosuke Niwa  <rniwa@webkit.org>
 
         Update the hyperlink to waterfall views of perf bots on build.webkit.org

diff --git a/Tools/Scripts/export-llvm-build b/Tools/Scripts/export-llvm-build
index 3a292e9fbc075d8303f48757f66c530c0f611ed4..ef46f38533fa168454191a2904972c3cad048c67 100755 (executable)
--- a/Tools/Scripts/export-llvm-build
+++ b/Tools/Scripts/export-llvm-build
@@ -28,27 +28,41 @@ require 'pathname'
 require 'shellwords'
 require 'tmpdir'
 
+def mychdir(path)
+    puts "-> #{path.to_s}"
+    Dir.chdir(path) {
+        yield
+    }
+    puts "<- #{path.to_s}"
+end
+
 def mysys(*cmd)
     cmd = cmd.map{|value| value.to_s}
     commandArray = cmd.map{|value| Shellwords.shellescape(value)}.join(' ')
-    $stderr.puts ">> #{commandArray}"
+    $stderr.puts " $ #{commandArray}"
     raise unless system(*cmd)
 end
 
 $libraryPackage = Pathname.new("LLVMLibraries.tar.bz2")
 $includePackage = Pathname.new("LLVMIncludes.tar.bz2")
-$llvmBuild = "Release+Asserts"
+$llvmBuild = Pathname.new("./llvm")
+$llvmBinary = Pathname.new("./llvm/Release")
+$llvmSource = Pathname.new("./llvm")
 $compression = "bzip2"
 
 def usage
-    puts "export-llvm-build <LLVM directory>"
+    puts "export-llvm-build"
     puts
     puts "--library-package  (-l)   Change where to put the compressed library package."
     puts "                          Default is #{$libraryPackage}."
     puts "--include-package  (-i)   Change wehre to put the compressed header package."
     puts "                          Default is #{$includePackage}."
-    puts "--llvm-build       (-b)   Change which LLVM build to use."
+    puts "--llvm-build       (-b)   Change which LLVM build directory to use."
     puts "                          Default is #{$llvmBuild}."
+    puts "--llvm-binary      (-B)   Change which LLVM binary directory to use."
+    puts "                          Default is #{$llvmBinary}."
+    puts "--llvm-source      (-s)   Change which LLVM source directory to use."
+    puts "                          Default is #{$llvmSource}."
     puts "--compression             Change what compression to do. Can be one of gzip,"
     puts "                          bzip2, or none."
     puts "                          Default is #{$compression}."
@@ -59,6 +73,8 @@ GetoptLong.new(['--help', '-h', GetoptLong::NO_ARGUMENT],
                ['--library-package', '-l', GetoptLong::REQUIRED_ARGUMENT],
                ['--include-package', '-i', GetoptLong::REQUIRED_ARGUMENT],
                ['--llvm-build', '-b', GetoptLong::REQUIRED_ARGUMENT],
+               ['--llvm-binary', '-B', GetoptLong::REQUIRED_ARGUMENT],
+               ['--llvm-source', '-s', GetoptLong::REQUIRED_ARGUMENT],
                ['--compression', GetoptLong::REQUIRED_ARGUMENT]).each {
     | opt, arg |
     case opt
@@ -69,7 +85,11 @@ GetoptLong.new(['--help', '-h', GetoptLong::NO_ARGUMENT],
     when '--include-package'
         $includePackage = Pathname.new(arg)
     when '--llvm-build'
-        $llvmBuild = arg
+        $llvmBuild = Pathname.new(arg)
+    when '--llvm-binary'
+        $llvmBinary = Pathname.new(arg)
+    when '--llvm-source'
+        $llvmSource = Pathname.new(arg)
     when '--compression'
         $compression = arg
     else
@@ -77,12 +97,6 @@ GetoptLong.new(['--help', '-h', GetoptLong::NO_ARGUMENT],
     end
 }
 
-if ARGV.length != 1
-    usage
-end
-
-$llvmPath = Pathname.new(ARGV[0])
-
 $currentPath = Pathname.pwd
 
 def compressionChar
@@ -98,7 +112,7 @@ def compressionChar
     end
 end
 
-Dir.chdir($llvmPath + $llvmBuild + "lib") {
+mychdir($llvmBinary + "lib") {
     mysys("tar", "-c#{compressionChar}vf", ($currentPath + $libraryPackage).to_s,
           *Dir.entries('.').select {
               | value |
@@ -109,7 +123,7 @@ Dir.chdir($llvmPath + $llvmBuild + "lib") {
 Dir.mktmpdir {
     | directory |
     directory = Pathname.new(directory).realpath
-    Dir.chdir($llvmPath) {
+    mychdir($llvmSource) {
         begin
             mysys("svn", "export", "include", directory + "include")
         rescue
@@ -118,7 +132,8 @@ Dir.mktmpdir {
     }
     ["include/llvm/Config"].each {
         | genDirName |
-        configSrcPath = $llvmPath + genDirName
+        configSrcPath = $llvmBuild + genDirName
+        raise unless configSrcPath.directory?
         configDstPath = directory + genDirName
         Dir.foreach(configSrcPath) {
             | filename |
@@ -128,9 +143,9 @@ Dir.mktmpdir {
     }
     ["include/llvm/Support/DataTypes.h"].each {
         | genFileName |
-        mysys("cp", $llvmPath + genFileName, directory + genFileName)
+        mysys("cp", $llvmBuild + genFileName, directory + genFileName)
     }
-    Dir.chdir(directory + "include") {
+    mychdir(directory + "include") {
         mysys("tar", "-cyvf", $currentPath + $includePackage, ".")
     }
 }

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 785d550c47da64ee73a2f136abfe899fb66837b7..46f5373ea1cff8b2c2c8c172032bba0303ae7cc2 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,12 @@
+2014-04-15  Filip Pizlo  <fpizlo@apple.com>
+
+        Add LLVM binary drops for Mavericks using LLVM r206312.
+
+        Rubber stamped by Geoffrey Garen.
+
+        * LLVMIncludesMavericks.tar.bz2: Added.
+        * LLVMLibrariesMavericks.tar.bz2: Added.
+
 2014-04-03  Brent Fulgham  <bfulgham@apple.com>
 
         [Win] Enable the CSS_GRID_LAYOUT feature.

diff --git a/WebKitLibraries/LLVMIncludesMavericks.tar.bz2 b/WebKitLibraries/LLVMIncludesMavericks.tar.bz2
new file mode 100644 (file)
index 0000000..784e288
Binary files /dev/null and b/WebKitLibraries/LLVMIncludesMavericks.tar.bz2 differ

diff --git a/WebKitLibraries/LLVMLibrariesMavericks.tar.bz2 b/WebKitLibraries/LLVMLibrariesMavericks.tar.bz2
new file mode 100644 (file)
index 0000000..7823ccd
Binary files /dev/null and b/WebKitLibraries/LLVMLibrariesMavericks.tar.bz2 differ