Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapt WebPositive build to make use of a webkit optional build package

This commit is contained in:
Alexandre Deckner 2012-07-04 00:58:25 +02:00
parent 79adea9689
commit c4ba387bf8
2 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
build/jam/OptionalBuildFeatures
View File

@ -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)" ;
}

26
src/apps/webpositive/Jamfile
View File

@ -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