Title: [172349] trunk
- Revision
- 172349
- Author
- [email protected]
- Date
- 2014-08-08 12:20:19 -0700 (Fri, 08 Aug 2014)
Log Message
make clean does not work in OpenSource, fails in WebKitLibraries
https://bugs.webkit.org/show_bug.cgi?id=135734
Patch by Joseph Pecoraro <[email protected]> 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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (172348 => 172349)
--- trunk/Tools/ChangeLog 2014-08-08 18:55:51 UTC (rev 172348)
+++ trunk/Tools/ChangeLog 2014-08-08 19:20:19 UTC (rev 172349)
@@ -1,5 +1,17 @@
2014-08-08 Joseph Pecoraro <[email protected]>
+ 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 <[email protected]>
+
commit-log-message has extra blank line at the top of pre-populated message
https://bugs.webkit.org/show_bug.cgi?id=135744
Modified: trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory (172348 => 172349)
--- trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-08-08 18:55:51 UTC (rev 172348)
+++ trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2014-08-08 19:20:19 UTC (rev 172349)
@@ -33,6 +33,7 @@
my $showHelp = 0;
my $llvm = 0;
my $wksi = 0;
+my $clean = 0;
my $llvmIncludePackage = "";
my $llvmLibraryPackage = "";
my $useFullLibPaths = 0;
@@ -49,6 +50,7 @@
--help Show this help message
--[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>
--[no-]use-full-lib-paths Toggle using full library paths
@@ -64,6 +66,7 @@
'help' => \$showHelp,
'llvm!' => \$llvm,
'wksi!' => \$wksi,
+ 'clean' => \$clean,
'use-llvm-includes=s' => \$llvmIncludePackage,
'use-llvm-libraries=s' => \$llvmLibraryPackage,
'use-full-lib-paths!' => \$useFullLibPaths,
@@ -302,3 +305,12 @@
}
}
+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*";
+}
Modified: trunk/WebKitLibraries/ChangeLog (172348 => 172349)
--- trunk/WebKitLibraries/ChangeLog 2014-08-08 18:55:51 UTC (rev 172348)
+++ trunk/WebKitLibraries/ChangeLog 2014-08-08 19:20:19 UTC (rev 172349)
@@ -1,3 +1,14 @@
+2014-08-08 Joseph Pecoraro <[email protected]>
+
+ 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 <[email protected]>
Add a flag for the CSS Selectors level 4 implementation
Modified: trunk/WebKitLibraries/Makefile (172348 => 172349)
--- trunk/WebKitLibraries/Makefile 2014-08-08 18:55:51 UTC (rev 172348)
+++ trunk/WebKitLibraries/Makefile 2014-08-08 19:20:19 UTC (rev 172349)
@@ -3,9 +3,13 @@
ifeq ($(shell sw_vers -productVersion | cut -d. -f-2), 10.10)
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
all: libs
@@ -20,4 +24,7 @@
analyze:
$(SCRIPTS_PATH)/set-webkit-configuration --release
- @$(MAKE) libs
\ No newline at end of file
+ @$(MAKE) libs
+
+clean:
+ @$(MAKE) cleanlibs
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
