[haiku-commits] Re: haiku: hrev44293 - src/apps/webpositive
- From: Matt Madia <mattmadia@xxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 8 Jul 2012 01:30:56 +0000
On 7/4/12, Ingo Weinhold <ingo_weinhold@xxxxxx> wrote:
> On 2012-07-04 at 17:28:05 [+0200], Alexandre Deckner <alex@xxxxxxxxxxxx>
> wrote:
>> > 2012/7/4 Alexandre Deckner <alex@xxxxxxxxxxxx>:
>> >>
>> >> Runtime dependencies still have to be automatically installed via the
>> >> build
>> >> system, hints are welcome.
> Analoguously there should be an optional package WebKit and a respective
> optional build feature. An optional package WebPositive should be declared
> in OptionalPackages -- replacing the previous one which just installs a
> complete archive. Instead the optional package declaration should work
> similar to the one for UserlandFS, installing the generated
> executables/libraries. Declare the WebKit optional package a dependency of
> WebPositive and it will be installed automatically. Curl and whatnot should
>
> have been declared dependencies of WebKit and should therefore be installed
> automatically as well.
>
> Obviously the WebPositive optional package should only be added to the
> image for gcc 4. For gcc 2 hybrid builds it will be added automatically as
> well. I'm not sure about its dependencies, though. Might need some
> tinkering in that case.
Here's a rough patch, I've been working on. Basically, it leverages
AddFilesToAlternativeGCCArchive to make WebPositive get compiled inside
the alternative gcc4 generated directory and added to the image.
Would this be in the right direction?
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 926469f..a54d99e 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -1850,11 +1850,16 @@ if [ IsOptionalHaikuImagePackageAdded WebPositive ] {
} 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 ;
+ if $(HAIKU_GCC_VERSION[1]) < 4 {
+ AddFilesToAlternativeGCCArchive system apps :
WebPositive : WebPositive ;
+ } else {
+ AddFilesToHaikuImage system apps : WebPositive ;
+ }
AddSymlinkToHaikuImage home config settings deskbar Applications
- : /boot/apps/WebPositive/WebPositive ;
+ : /boot/system/apps/WebPositive ;
+ InstallOptionalHaikuImagePackage $(HAIKU_WEBKIT_FILE)
+ : $(baseURL)/$(HAIKU_WEBKIT_FILE)
+ : common ;
}
}
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
--mmadia
Other related posts:
