[haiku-commits] r37512 - in haiku/trunk: . build/jam

From: pulkomandy@xxxxxxxxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Wed, 14 Jul 2010 12:34:07 +0200 (CEST)
Author: pulkomandy
Date: 2010-07-14 12:34:06 +0200 (Wed, 14 Jul 2010)
New Revision: 37512
Changeset: http://dev.haiku-os.org/changeset/37512

Modified:
   haiku/trunk/Jamfile
   haiku/trunk/build/jam/OptionalBuildFeatures
   haiku/trunk/build/jam/OptionalPackageDependencies
   haiku/trunk/build/jam/OptionalPackages
Log:
 * Actually include ICU 4.4 in the image we build
Note this doesn't fix everything yet, apparently there is a problem with ICU 
genereating an invalid opcode exception.


Modified: haiku/trunk/Jamfile
===================================================================
--- haiku/trunk/Jamfile 2010-07-14 07:02:38 UTC (rev 37511)
+++ haiku/trunk/Jamfile 2010-07-14 10:34:06 UTC (rev 37512)
@@ -147,6 +147,8 @@
        AddOptionalHaikuImagePackages OpenSSL ;
 }
 
+AddOptionalHaikuImagePackages ICU ;
+
 # Evaluate optional package dependencies 
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) OptionalPackageDependencies ] ; 
 

Modified: haiku/trunk/build/jam/OptionalBuildFeatures
===================================================================
--- haiku/trunk/build/jam/OptionalBuildFeatures 2010-07-14 07:02:38 UTC (rev 
37511)
+++ haiku/trunk/build/jam/OptionalBuildFeatures 2010-07-14 10:34:06 UTC (rev 
37512)
@@ -89,6 +89,6 @@
                : $(zipFile)
        ] ;
 
-       HAIKU_ICU_HEADERS
-               = [ FDirName $(HAIKU_ICU_DIR) common include ] ;
+       #HAIKU_ICU_HEADERS
+       #       = [ FDirName $(HAIKU_ICU_DIR) common include ] ;
 }

Modified: haiku/trunk/build/jam/OptionalPackageDependencies
===================================================================
--- haiku/trunk/build/jam/OptionalPackageDependencies   2010-07-14 07:02:38 UTC 
(rev 37511)
+++ haiku/trunk/build/jam/OptionalPackageDependencies   2010-07-14 10:34:06 UTC 
(rev 37512)
@@ -15,7 +15,7 @@
 OptionalPackageDependencies ICU-devel : Development ;
 OptionalPackageDependencies LibLayout : DevelopmentBase ;
 OptionalPackageDependencies Tar : LibIconv ;
-OptionalPackageDependencies MandatoryPackages : Sed Tar ;
+OptionalPackageDependencies MandatoryPackages : ICU Sed Tar ;
 OptionalPackageDependencies Python : Bzip ;
 OptionalPackageDependencies Mercurial : Python ;
 OptionalPackageDependencies NetFS : UserlandFS ;

Modified: haiku/trunk/build/jam/OptionalPackages
===================================================================
--- haiku/trunk/build/jam/OptionalPackages      2010-07-14 07:02:38 UTC (rev 
37511)
+++ haiku/trunk/build/jam/OptionalPackages      2010-07-14 10:34:06 UTC (rev 
37512)
@@ -749,6 +749,21 @@
 }
 
 
+# ICU
+if [ IsOptionalHaikuImagePackageAdded ICU ] {
+       if $(TARGET_ARCH) != x86 {
+               Echo "No optional package ICU available for $(TARGET_ARCH)" ;
+       } else {
+               InstallOptionalHaikuImagePackage $(HAIKU_ICU_PACKAGE)
+                       : $(HAIKU_ICU_URL)
+                       :
+                       :
+                       : true
+               ;
+       }
+}
+
+
 # KeymapSwitcher
 if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] {
        if $(TARGET_ARCH) != x86 {
[haiku-commits] r37512 - in haiku/trunk: . build/jam

Other related posts:
