.: Add WebKit2 to the lists of modules to build.

Reviewed by Mark Rowe.

* Makefile:

WebKit2: Only build on SnowLeopard and later when using the Makefile.

Reviewed by Mark Rowe.

* Makefile:

WebKitTools: Add MiniBrowser to the lists of modules to build and only build it on
SnowLeopard and later.

Reviewed by Mark Rowe.

* Makefile:
* MiniBrowser/Makefile:

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

diff --git a/ChangeLog b/ChangeLog
index ed2e2e598c0a7cea2ef09b6388cfb7b8675cfde8..581ec5a42b64d54bca3a9fd0c5d8cffd609c640c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-28  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Mark Rowe.
+
+        Add WebKit2 to the lists of modules to build.
+
+        * Makefile:
+
 2010-04-21  Xan Lopez  <xlopez@igalia.com>
 
         Reviewed by Adam Barth.

diff --git a/Makefile b/Makefile
index 24a6f0d94544cf308967bbbcaa815ead81def704..1e50d1d35850ca40925fc5285d2bd4eb2627ef2c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools
+MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools 
 
 all:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index a173b257cb66e38e396cd52c76a9df615ef010c1..b9a9d7d0ea5737872a178faab926ba13dd6f2e25 100644 (file)
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-28  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Mark Rowe.
+
+        Only build on SnowLeopard and later when using the Makefile.
+
+        * Makefile:
+
 2010-04-27  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Maciej Stachowiak.

diff --git a/WebKit2/Makefile b/WebKit2/Makefile
index cb4c11a57c6739a1426a5bb9d812b73001e69d91..99177a684e01d7ffd4de2ec8a3c33a4d41b87a15 100644 (file)
--- a/WebKit2/Makefile
+++ b/WebKit2/Makefile
@@ -1 +1,20 @@
+# Build WebKit2 only on SnowLeopard and later.
+
+OSX_VERSION ?= $(shell sw_vers -productVersion | cut -d. -f 2)
+BUILD_WEBKIT2 = $(shell (( $(OSX_VERSION) >= 6 )) && echo "YES" )
+
+ifeq "$(BUILD_WEBKIT2)" "YES"
+
 include ../Makefile.shared
+
+else
+
+all: ;
+
+debug d development dev develop: ;
+
+release r deployment dep deploy: ;
+
+clean: ;
+
+endif

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f932f91f6628b4c45872b1a837870cf35d6e93e9..90e20943f9d70457d7e979a91894af622af8521d 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-04-28  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Mark Rowe.
+
+        Add MiniBrowser to the lists of modules to build and only build it on
+        SnowLeopard and later.
+
+        * Makefile:
+        * MiniBrowser/Makefile:
+
 2010-04-28  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Mark Rowe.

diff --git a/WebKitTools/Makefile b/WebKitTools/Makefile
index 92f5b25037a97fc23d5d089f912636f3e206fc47..c1f19917e9090101f10326284bb12fe5c81e6c22 100644 (file)
--- a/WebKitTools/Makefile
+++ b/WebKitTools/Makefile
@@ -1,4 +1,4 @@
-MODULES = DumpRenderTree
+MODULES = DumpRenderTree MiniBrowser
 
 all:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \

diff --git a/WebKitTools/MiniBrowser/Makefile b/WebKitTools/MiniBrowser/Makefile
index 1f1dbbcb30fd47748dc187236083301f6dd7b6b5..61cd4756bea63f70a18f8b2c1920c4244153251c 100644 (file)
--- a/WebKitTools/MiniBrowser/Makefile
+++ b/WebKitTools/MiniBrowser/Makefile
@@ -1,2 +1,21 @@
+# Build MiniBrowser only on SnowLeopard and later.
+
+OSX_VERSION ?= $(shell sw_vers -productVersion | cut -d. -f 2)
+BUILD_MINIBROWSER = $(shell (( $(OSX_VERSION) >= 6 )) && echo "YES" )
+
+ifeq "$(BUILD_MINIBROWSER)" "YES"
+
 SCRIPTS_PATH = ../Scripts
 include ../../Makefile.shared
+
+else
+
+all: ;
+
+debug d development dev develop: ;
+
+release r deployment dep deploy: ;
+
+clean: ;
+
+endif