Title: [163489] tags/Safari-538.16.2/Tools
Revision
163489
Author
[email protected]
Date
2014-02-05 16:43:40 -0800 (Wed, 05 Feb 2014)

Log Message

Merged r163411.  

Modified Paths

Diff

Modified: tags/Safari-538.16.2/Tools/ChangeLog (163488 => 163489)


--- tags/Safari-538.16.2/Tools/ChangeLog	2014-02-06 00:42:58 UTC (rev 163488)
+++ tags/Safari-538.16.2/Tools/ChangeLog	2014-02-06 00:43:40 UTC (rev 163489)
@@ -1,3 +1,18 @@
+2014-02-05  Lucas Forschler  <[email protected]>
+
+        Merge r163411
+
+    2014-02-04  Filip Pizlo  <[email protected]>
+
+            export-llvm-build should work with git checkouts
+            https://bugs.webkit.org/show_bug.cgi?id=128217
+
+            Reviewed by Mark Hahnenberg.
+
+            If svn export fails, just do ditto.
+
+            * Scripts/export-llvm-build:
+
 2014-02-03  Krzysztof Czech  <[email protected]>
 
         [ATK] Expose aria-controls through ATK_RELATION_CONTROLLER_FOR

Modified: tags/Safari-538.16.2/Tools/Scripts/export-llvm-build (163488 => 163489)


--- tags/Safari-538.16.2/Tools/Scripts/export-llvm-build	2014-02-06 00:42:58 UTC (rev 163488)
+++ tags/Safari-538.16.2/Tools/Scripts/export-llvm-build	2014-02-06 00:43:40 UTC (rev 163489)
@@ -32,7 +32,7 @@
     cmd = cmd.map{|value| value.to_s}
     commandArray = cmd.map{|value| Shellwords.shellescape(value)}.join(' ')
     $stderr.puts ">> #{commandArray}"
-    riase unless system(*cmd)
+    raise unless system(*cmd)
 end
 
 $libraryPackage = Pathname.new("LLVMLibraries.tar.bz2")
@@ -110,7 +110,11 @@
     | directory |
     directory = Pathname.new(directory).realpath
     Dir.chdir($llvmPath) {
-        mysys("svn", "export", "include", (directory + "include").to_s)
+        begin
+            mysys("svn", "export", "include", directory + "include")
+        rescue
+            mysys("ditto", "include", directory + "include")
+        end
     }
     ["include/llvm/Config"].each {
         | genDirName |
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to