From c4ba387bf8a43bca900c26e8af454a3df40b74c2 Mon Sep 17 00:00:00 2001
From: Alexandre Deckner <alexandre.deckner@uzzl.com>
Date: Wed, 4 Jul 2012 00:58:25 +0200
Subject: [PATCH] Adapt WebPositive build to make use of a webkit optional
 build package

---
 build/jam/OptionalBuildFeatures | 35 +++++++++++++++++++++++++++++++++
 src/apps/webpositive/Jamfile    | 26 +++++++++++++++---------
 2 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures
index 8cdc51972b..509e87f5d7 100644
--- a/build/jam/OptionalBuildFeatures
+++ b/build/jam/OptionalBuildFeatures
@@ -419,3 +419,38 @@ if $(HAIKU_BUILD_FEATURE_TAGLIB) {
 	}
 }
 
+
+# WebKit
+local webkitBaseURL = http://dude.uzzl.net/haiku ;
+if $(TARGET_ARCH) = x86 {
+	if $(HAIKU_GCC_VERSION[1]) >= 4 {
+		HAIKU_WEBKIT_FILE = webkit-0.1.1-x86-gcc4-2012-07-03.zip ;
+	} else {
+		Echo "WebKit support not available on gcc $(HAIKU_GCC_VERSION[1])" ;
+	}
+
+	local zipFile = [ DownloadFile $(HAIKU_WEBKIT_FILE)
+		: $(webkitBaseURL)/$(HAIKU_WEBKIT_FILE) ] ;
+
+	HAIKU_WEBKIT_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
+		$(HAIKU_WEBKIT_FILE:B) ] ;
+
+	echo $(HAIKU_WEBKIT_DIR) ;
+
+	HAIKU_WEBKIT_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_WEBKIT_DIR)
+		: include/ : $(zipFile) : extracted-webkit ] ;
+
+	HAIKU_WEBKIT_LIBS = [ ExtractArchive $(HAIKU_WEBKIT_DIR)
+		:
+		lib/libwtf.so
+		lib/libjavascriptcore.so
+		lib/libwebcore.so
+		lib/libwebkit.so
+		: $(zipFile)
+		: extracted-webkit
+	] ;
+
+	HAIKU_WEBKIT_HEADERS = [ FDirName $(HAIKU_WEBKIT_DIR) include ] ;
+} else {
+	Echo "WebKit support not available on $(TARGET_ARCH)" ;
+}
diff --git a/src/apps/webpositive/Jamfile b/src/apps/webpositive/Jamfile
index 60febdd8d9..c1cb3b00a1 100644
--- a/src/apps/webpositive/Jamfile
+++ b/src/apps/webpositive/Jamfile
@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src apps webpositive ;
 
-UseLibraryHeaders webkit ;
+SubDirSysHdrs $(HAIKU_WEBKIT_HEADERS) ;
 
 SubDirC++Flags $(defines) -Wno-error=sequence-point ;
 SubDirCcFlags $(defines) -Wno-error=sequence-point ;
@@ -17,12 +17,7 @@ for sourceDir in $(sourceDirs) {
 	SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src apps webpositive $(sourceDir) ] ;
 }
 
-# SVN revision
-#local svnRevisionFile = [ FGristFiles svn_revision ] ;
-#MakeLocate $(svnRevisionFile) : $(LOCATE_TARGET) ;
-#CreateSVNRevisionFile $(svnRevisionFile) ;
-
-Application WebPositive :
+local sources =
 	# autocompletion
 	AutoCompleter.cpp
 	AutoCompleterDefaultImpl.cpp
@@ -53,9 +48,22 @@ Application WebPositive :
 	SettingsWindow.cpp
 	svn_revision.cpp
 	URLInputGroup.cpp
+;
+
+
+Includes [ FGristFiles $(sources) ] : $(HAIKU_WEBKIT_HEADERS_DEPENDENCY) ;
+	# Dependency needed to trigger downloading/unzipping the package before
+	# compiling the files.
+
+# SVN revision
+#local svnRevisionFile = [ FGristFiles svn_revision ] ;
+#MakeLocate $(svnRevisionFile) : $(LOCATE_TARGET) ;
+#CreateSVNRevisionFile $(svnRevisionFile) ;
+
+Application WebPositive :
+	$(sources)
 	:
-	# webkit libs
-	javascriptcore webcore webkit wtf
+	$(HAIKU_WEBKIT_LIBS)
 	# dependencies
 	curl icuuc icudata png sqlite3 xml2 z
 	# haiku