From 5cad04efab9723ba64186a920ec6db500853d93e Mon Sep 17 00:00:00 2001
From: Matt Madia <mattmadia@gmail.com>
Date: Tue, 10 Jul 2012 19:18:50 +0000
Subject: [PATCH 2/2] Changes relating to building WebPositive from 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.
---
build/jam/OptionalPackageDependencies | 2 +-
build/jam/OptionalPackages | 32 ++++++++++++++++++++++++--------
2 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies
index 92d475d..650783d 100644
a
|
b
|
OptionalPackageDependencies SDLLibs : XiphLibs libmad libmikmod Libmng libmodplu
|
35 | 35 | OptionalPackageDependencies Subversion : APR-util Neon LibIconv LibXML2 OpenSSL SQLite ; |
36 | 36 | OptionalPackageDependencies Transmission : LibEvent Curl OpenSSL LibIconv ; |
37 | 37 | OptionalPackageDependencies Vim : GetText LibIconv ; |
38 | | OptionalPackageDependencies WebPositive : Curl LibXML2 SQLite WebPositiveBookmarks ; |
| 38 | OptionalPackageDependencies WebPositive : Curl LibXML2 SQLite WebKit WebPositiveBookmarks ; |
39 | 39 | OptionalPackageDependencies wpa_supplicant : OpenSSL ; |
40 | 40 | OptionalPackageDependencies XZ-Utils : Tar ; |
41 | 41 | |
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 926469f..ad77d54 100644
a
|
b
|
if [ IsOptionalHaikuImagePackageAdded Vision ] {
|
1843 | 1843 | } |
1844 | 1844 | |
1845 | 1845 | |
| 1846 | # WebKit |
| 1847 | if [ IsOptionalHaikuImagePackageAdded WebKit ] { |
| 1848 | if $(TARGET_ARCH) != x86 { |
| 1849 | Echo "No optional package WebKit available for $(TARGET_ARCH)" ; |
| 1850 | } else if $(HAIKU_GCC_VERSION[1]) < 4 && ! $(isHybridBuild) { |
| 1851 | Echo "No optional package WebKit available for gcc2" ; |
| 1852 | } else { |
| 1853 | InstallOptionalHaikuImagePackage $(HAIKU_WEBKIT_FILE) |
| 1854 | : $(baseURL)/$(HAIKU_WEBKIT_FILE) |
| 1855 | : common ; |
| 1856 | } |
| 1857 | } |
| 1858 | |
| 1859 | |
1846 | 1860 | # WebPositive |
1847 | 1861 | if [ IsOptionalHaikuImagePackageAdded WebPositive ] { |
1848 | 1862 | if $(TARGET_ARCH) != x86 { |
1849 | 1863 | Echo "No optional package WebPositive available for $(TARGET_ARCH)" ; |
1850 | | } else if $(HAIKU_GCC_VERSION[1]) < 4 && ! $(isHybridBuild) { |
1851 | | Echo "No optional package WebPositive available for gcc2" ; |
1852 | | } else { |
1853 | | InstallOptionalHaikuImagePackage |
1854 | | WebPositive-gcc4-x86-r586-2012-03-31.zip |
1855 | | : $(baseURL)/WebPositive-gcc4-x86-r586-2012-03-31.zip ; |
1856 | | AddSymlinkToHaikuImage home config settings deskbar Applications |
1857 | | : /boot/apps/WebPositive/WebPositive ; |
| 1864 | } else if $(HAIKU_GCC_VERSION[1]) < 4 { |
| 1865 | if ! $(isHybridBuild) { |
| 1866 | Echo "No optional package WebPositive available for gcc2" ; |
| 1867 | } else { |
| 1868 | Echo "WebPositive will be compiled by gcc4 inside $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR)" ; |
| 1869 | } |
| 1870 | } else if $(HAIKU_GCC_VERSION[1]) >= 4 { |
| 1871 | AddFilesToHaikuHybridImage apps : WebPositive ; |
| 1872 | AddSymlinkToHaikuHybridImage home config settings deskbar Applications |
| 1873 | : /boot/apps/WebPositive ; |
1858 | 1874 | } |
1859 | 1875 | } |
1860 | 1876 | |