[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
weinig at apple.com
weinig at apple.com
Wed Dec 22 14:02:49 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit d6b9a61a73c7c32d8581505c7f3b1813d3774405
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 1 20:44:35 2010 +0000
Add makefile for TestWebKitAPI and call it from the base makefile.
Reviewed by Dan Bernstein.
* Makefile:
* TestWebKitAPI/Makefile: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68922 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b78dbec..136caa8 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,14 @@
2010-10-01 Sam Weinig <sam at webkit.org>
+ Reviewed by Dan Bernstein.
+
+ Add makefile for TestWebKitAPI and call it from the base makefile.
+
+ * Makefile:
+ * TestWebKitAPI/Makefile: Added.
+
+2010-10-01 Sam Weinig <sam at webkit.org>
+
Reviewed by Adam Roben.
Remove unnecessary ForwardingHeaders from test runners.
diff --git a/WebKitTools/Makefile b/WebKitTools/Makefile
index 57ea097..51ac703 100644
--- a/WebKitTools/Makefile
+++ b/WebKitTools/Makefile
@@ -1,4 +1,4 @@
-MODULES = DumpRenderTree WebKitTestRunner MiniBrowser
+MODULES = DumpRenderTree WebKitTestRunner MiniBrowser TestWebKitAPI
all:
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
diff --git a/WebKitTools/TestWebKitAPI/Makefile b/WebKitTools/TestWebKitAPI/Makefile
new file mode 100644
index 0000000..ed01cce
--- /dev/null
+++ b/WebKitTools/TestWebKitAPI/Makefile
@@ -0,0 +1,21 @@
+# Build TestWebKitAPI only on Snow Leopard and later.
+
+OSX_VERSION ?= $(shell sw_vers -productVersion | cut -d. -f 2)
+BUILD_TESTWEBKITAPI = $(shell (( $(OSX_VERSION) >= 6 )) && echo "YES" )
+
+ifeq "$(BUILD_TESTWEBKITAPI)" "YES"
+
+SCRIPTS_PATH = ../Scripts
+include ../../Makefile.shared
+
+else
+
+all: ;
+
+debug d development dev develop: ;
+
+release r deployment dep deploy: ;
+
+clean: ;
+
+endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list