Changeset 172349 in webkit

Timestamp:

Aug 8, 2014 12:20:19 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

make clean does not work in OpenSource, fails in WebKitLibraries
​https://bugs.webkit.org/show_bug.cgi?id=135734

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2014-08-08
Reviewed by David Kilzer.

Tools:

• Scripts/copy-webkitlibraries-to-product-directory:

Add a --clean switch that removes possible WebKitSystemInterface
and LLVM libraries and headers that may have been copied to the
product directory.

WebKitLibraries:

• Makefile:

Add a "clean" target that runs copy-webkitlibraries-to-product-dir
with the new --clean switch.

Location:

trunk

Files:

• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/copy-webkitlibraries-to-product-directory (modified) (4 diffs)
• WebKitLibraries/ChangeLog (modified) (1 diff)
• WebKitLibraries/Makefile (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-08-08  Joseph Pecoraro  <pecoraro@apple.com>
+
+        make clean does not work in OpenSource, fails in WebKitLibraries
+        https://bugs.webkit.org/show_bug.cgi?id=135734
+
+        Reviewed by David Kilzer.
+
+        * Scripts/copy-webkitlibraries-to-product-directory:
+        Add a --clean switch that removes possible WebKitSystemInterface
+        and LLVM libraries and headers that may have been copied to the
+        product directory.
+
 2014-08-08  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory

@@ -34 +34 @@
 my $llvm = 0;
 my $wksi = 0;
+my $clean = 0;
 my $llvmIncludePackage = "";
 my $llvmLibraryPackage = "";
@@ -50 +51 @@
   --[no-]llvm                   Toggle copying LLVM drops (default: $llvm)
   --[no-]wksi                   Toggle copying WebKitSystemInterface drops (default: $wksi)
+  --clean                       Clean the libraries (default: $clean)
   --use-llvm-includes=<path>    Get the LLVM inludes package from <path>
   --use-llvm-libraries=<path>   Get the LLVM libraries package from <path>
@@ -65 +67 @@
     'llvm!' => \$llvm,
     'wksi!' => \$wksi,
+    'clean' => \$clean,
     'use-llvm-includes=s' => \$llvmIncludePackage,
     'use-llvm-libraries=s' => \$llvmLibraryPackage,
@@ -303 +306 @@
 }
 
+if ($clean) {
+    print "Cleaning.\n";    
+    (system("rm", "-rf", "$productDir/usr/local/include/WebKitSystemInterface.h") == 0) or die;
+    (system("rm", "-rf", "$productDir$llvmPrefix") == 0) or die;
+    unlink glob "$productDir/libWebKitSystemInterface*" or die if glob "$productDir/libWebKitSystemInterface*";
+    unlink glob "$productDir/usr/local/lib/libWebKitSystemInterface*" or die if glob "$productDir/usr/local/lib/libWebKitSystemInterface*";
+    unlink glob "$productDir/libLLVM*" or die if glob "$productDir/libLLVM*";
+    unlink glob "$productDir/libLTO*" or die if glob "$productDir/libLTO*";
+}

trunk/WebKitLibraries/ChangeLog

@@ +1 @@
+2014-08-08  Joseph Pecoraro  <pecoraro@apple.com>
+
+        make clean does not work in OpenSource, fails in WebKitLibraries
+        https://bugs.webkit.org/show_bug.cgi?id=135734
+
+        Reviewed by David Kilzer.
+
+        * Makefile:
+        Add a "clean" target that runs copy-webkitlibraries-to-product-dir
+        with the new --clean switch.
+
 2014-08-04  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/WebKitLibraries/Makefile

@@ -4 +4 @@
 libs:
         @true
+cleanlibs:
+        @true
 else
 libs:
         perl $(SCRIPTS_PATH)/copy-webkitlibraries-to-product-directory --wksi --llvm
+cleanlibs:
+        perl $(SCRIPTS_PATH)/copy-webkitlibraries-to-product-directory --clean
 endif
 
@@ -22 +26 @@
         $(SCRIPTS_PATH)/set-webkit-configuration --release
         @$(MAKE) libs
+
+clean:
+        @$(MAKE) cleanlibs