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

Changes relating to building WebPositive from source.

Browse Source 
* Add WebKit optional package.
 * Make WebKit a dependency of WebPositive
 * Enable building of WebPositive from source.

Note: WebKit currently expands to lib/.  Alternative gcc-subdirectories
are not taken into consideration. Though it is trivial to change.
This commit is contained in:
Matt Madia 2012-07-10 19:18:50 +00:00
parent dada4f4116
commit 29c5696ed7
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/jam/OptionalPackageDependencies
View File

@ -35,7 +35,7 @@ OptionalPackageDependencies SDLLibs : XiphLibs libmad libmikmod Libmng libmodplu
OptionalPackageDependencies Subversion : APR-util Neon LibIconv LibXML2 OpenSSL SQLite ;
OptionalPackageDependencies Transmission : LibEvent Curl OpenSSL LibIconv ;
OptionalPackageDependencies Vim : GetText LibIconv ;
OptionalPackageDependencies WebPositive : Curl LibXML2 SQLite WebPositiveBookmarks ;
OptionalPackageDependencies WebPositive : Curl LibXML2 SQLite WebKit WebPositiveBookmarks ;
OptionalPackageDependencies wpa_supplicant : OpenSSL ;
OptionalPackageDependencies XZ-Utils : Tar ;

32
build/jam/OptionalPackages
View File

@ -1843,18 +1843,34 @@ if [ IsOptionalHaikuImagePackageAdded Vision ] {
}
# WebKit
if [ IsOptionalHaikuImagePackageAdded WebKit ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package WebKit available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) < 4 && ! $(isHybridBuild) {
Echo "No optional package WebKit available for gcc2" ;
} else {
InstallOptionalHaikuImagePackage $(HAIKU_WEBKIT_FILE)
: $(baseURL)/$(HAIKU_WEBKIT_FILE)
: common ;
}
}
# WebPositive
if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
if $(TARGET_ARCH) != x86 {
Echo "No optional package WebPositive available for $(TARGET_ARCH)" ;
} else if $(HAIKU_GCC_VERSION[1]) < 4 && ! $(isHybridBuild) {
Echo "No optional package WebPositive available for gcc2" ;
} else {
InstallOptionalHaikuImagePackage
WebPositive-gcc4-x86-r586-2012-03-31.zip
: $(baseURL)/WebPositive-gcc4-x86-r586-2012-03-31.zip ;
AddSymlinkToHaikuImage home config settings deskbar Applications
: /boot/apps/WebPositive/WebPositive ;
} else if $(HAIKU_GCC_VERSION[1]) < 4 {
if ! $(isHybridBuild) {
Echo "No optional package WebPositive available for gcc2" ;
} else {
Echo "WebPositive will be compiled by gcc4 inside $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR)" ;
}
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
AddFilesToHaikuHybridImage apps : WebPositive ;
AddSymlinkToHaikuHybridImage home config settings deskbar Applications
: /boot/apps/WebPositive ;
}
}