diff options
| author | Matt Madia <mattmadia@gmail.com> | 2012-07-10 19:18:50 +0000 |
|---|---|---|
| committer | Matt Madia <mattmadia@gmail.com> | 2012-07-12 19:45:32 +0000 |
| commit | 29c5696ed7995bc6ed21e243b66d95402d0115c7 (patch) | |
| tree | 31756b2f88fc822e02ae236cf50ec06ca1769f99 | |
| parent | dada4f4116b93ea595dc2badddf49945bbffa105 (diff) | |
Changes relating to building WebPositive from source.hrev44328
* 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.
| -rw-r--r-- | build/jam/OptionalPackageDependencies | 2 | ||||
| -rw-r--r-- | build/jam/OptionalPackages | 32 |
2 files changed, 25 insertions, 9 deletions
diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies index 92d475d54d..650783dc8f 100644 --- a/build/jam/OptionalPackageDependencies +++ b/build/jam/OptionalPackageDependencies @@ -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 ; diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 926469fda5..ad77d54041 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -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 ; } } |