[prev in list] [next in list] [prev in thread] [next in thread] 

List:       haiku-commits
Subject:    Re: [Haiku-commits] r33373 - haiku/trunk/build/jam
From:       Stephan Assmus <superstippi () gmx ! de>
Date:       2009-09-30 19:44:08
Message-ID: 20090930214408.3798.5 () bepc ! 1254327043 ! fake
[Download RAW message or body]


On 2009-09-30 at 21:06:37 [+0200], zooey at BerliOS <zooey@mail.berlios.de> 
wrote:
> Author: zooey
> Date: 2009-09-30 21:06:36 +0200 (Wed, 30 Sep 2009) New Revision: 33373
> ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=33373&view=rev
> 
> Modified:
>    haiku/trunk/build/jam/OptionalPackageDependencies
>    haiku/trunk/build/jam/OptionalPackages
> Log:
> * added new optional package PCRE (for both gcc2 and
>   gcc4 as it contains C++)
> * fixed Beam dependencies to specify PCRE directly
> 
> 
> Modified: haiku/trunk/build/jam/OptionalPackageDependencies 
> ===================================================================
> --- haiku/trunk/build/jam/OptionalPackageDependencies    2009-09-30 
> 18:37:57 UTC (rev 33372)
> +++ haiku/trunk/build/jam/OptionalPackageDependencies    2009-09-30 
> 19:06:36 UTC (rev 33373)
> @@ -5,7 +5,7 @@
>  
>  OptionalPackageDependencies Subversion : APR-util Neon LibIconv LibXML2 
>  OpenSSL SQLite ; OptionalPackageDependencies APR-util : APR Expat ;
> -OptionalPackageDependencies Beam : LibIconv LibLayout OpenSSL Pe ;  # 
> FIXME: Pe for PCRE-libs
> +OptionalPackageDependencies Beam : LibIconv LibLayout OpenSSL PCRE ;
>  OptionalPackageDependencies BeHappy : BeBook NetSurf ; 
>  OptionalPackageDependencies Development : DevelopmentBase Perl ; 
>  OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin 
>  Yasm ;
> 
> Modified: haiku/trunk/build/jam/OptionalPackages
> ===================================================================
> --- haiku/trunk/build/jam/OptionalPackages    2009-09-30 18:37:57 UTC 
> (rev 33372)
> +++ haiku/trunk/build/jam/OptionalPackages    2009-09-30 19:06:36 UTC 
> (rev 33373)
> @@ -45,6 +45,7 @@
>  #    OpenSSH                - the secure shell
>  #    OpenSSL                - secure sockets library
>  #    P7zip                - file archiving utility
> +#    PCRE                - the (Perl-compatible) regex engine
>  #    Pe                    - the powerful native Programmer's Editor #   
>   Perl                - the scripting language
>  #    Python                - the scripting language
> @@ -712,6 +713,29 @@
>  }
>  
>  
> +# PCRE regex engine
> +if [ IsOptionalHaikuImagePackageAdded PCRE ] {
> +    if $(TARGET_ARCH) != x86 {
> +        Echo "No optional package PCRE available for $(TARGET_ARCH)" ;
> +    } else {
> +        if $(HAIKU_GCC_VERSION[1]) >= 4 {
> +            InstallOptionalHaikuImagePackage pcre-7.9-x86-gcc4-2009-09-30
> +                : $(baseURL)/pcre-7.9-x86-gcc4-2009-09-30.zip
> +            ;
> +        } else {
> +            InstallOptionalHaikuImagePackage pcre-7.9-x86-gcc2-2009-09-30
> +                : $(baseURL)/pcre-7.9-x86-gcc2-2009-09-30.zip
> +            ;
> +        }
> +
> +        AddSymlinkToHaikuImage home config be Applications
> +            : /boot/apps/Pe/Pe ;
> +        AddSymlinkToHaikuImage common bin
> +            : /boot/apps/Pe/lpe ;
> +    }
> +}
> +
> +
>  # Pe text editor
>  if [ IsOptionalHaikuImagePackageAdded Pe ] {
>      if $(TARGET_ARCH) != x86 {
> @@ -726,11 +750,6 @@
>                  : $(baseURL)/Pe-2.4.2-r593-r1a1-x86-gcc2-2009-09-08.zip
>              ;
>          }
> -
> -        AddSymlinkToHaikuImage home config be Applications
> -            : /boot/apps/Pe/Pe ;
> -        AddSymlinkToHaikuImage common bin
> -            : /boot/apps/Pe/lpe ;
>      }
>  }

Hi Oliver, it looks like you accidentally moved too many lines... :-)

Best regards,
-Stephan
_______________________________________________
Haiku-commits mailing list
Haiku-commits@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/haiku-commits
[prev in list] [next in list] [prev in thread] [next in thread]