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

Sam Weinig · Sam Weinig · commit b59d2a60e08a · 2010-04-28T23:58:33.000Z
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: Canonical link: https://commits.webkit.org/49712@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@58443 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools`
	`1`	`+MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools`
`2`	`2`
`3`	`3`	`all:`
`4`	`4`	`@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-MODULES = DumpRenderTree`
	`1`	`+MODULES = DumpRenderTree MiniBrowser`
`2`	`2`
`3`	`3`	`all:`
`4`	`4`	`@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \`