i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some more ICU-related improvements:

Browse Source 
* updated icu-devel package to 4.4.1
* create appropriate devel lib links when icu-devel is being installed
  (which only works during build, not when using installoptionalpackage)
* dropped ICU headers from repository and instead fetch them from the
  icu-devel package when needed during the build
* adjusted Jamfiles that make use of ICU-headers accordingly (hopefully
  I didn't miss any)
* fixed license in OptionalPackage description of icu packages


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37531 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe
2010-07-15 21:23:45 +00:00
parent 369b4ff1e3
commit 7ad694e346
155 changed files with 100 additions and 86177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/OptionalBuildFeatures
+17 -9
View File
@@ -50,8 +50,9 @@ if $(HAIKU_BUILD_FEATURE_SSL) {
# ICU
# Note ICU isn't actually optional, but is still an external package
HAIKU_ICU_GCC_2_PACKAGE = icu-4.4.1-x86-gcc2-2010-07-14.zip ;
HAIKU_ICU_GCC_4_PACKAGE = icu-4.4.1-x86-gcc4-2010-07-14.zip ;
HAIKU_ICU_GCC_2_PACKAGE = icu-4.4.1-x86-gcc2-2010-07-15.zip ;
HAIKU_ICU_GCC_4_PACKAGE = icu-4.4.1-x86-gcc4-2010-07-15.zip ;
HAIKU_ICU_DEVEL_PACKAGE = icu-devel-4.4.1-2010-07-15.zip ;
if $(TARGET_ARCH) != x86 {
Echo "ICU not available for $(TARGET_ARCH)" ;
@@ -71,10 +72,7 @@ if $(TARGET_ARCH) != x86 {
HAIKU_ICU_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
$(icu_package:B) ] ;
# extract headers and libraries
# HAIKU_ICU_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_ICU_DIR)
# : common/include/ : $(zipFile) ] ;
# extract libraries
HAIKU_ICU_LIBS = [ ExtractArchive $(HAIKU_ICU_DIR)
:
libicudata.so.44
@@ -86,7 +84,17 @@ if $(TARGET_ARCH) != x86 {
libicuuc.so.44
: $(zipFile)
] ;
#HAIKU_ICU_HEADERS
# = [ FDirName $(HAIKU_ICU_DIR) common include ] ;
}
# zip file and output directory
HAIKU_ICU_DEVEL_ZIP_FILE = [ DownloadFile $(HAIKU_ICU_DEVEL_PACKAGE)
: $(baseURL)/$(HAIKU_ICU_DEVEL_PACKAGE) ] ;
HAIKU_ICU_DEVEL_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
$(HAIKU_ICU_DEVEL_PACKAGE:B) ] ;
# extract headers
HAIKU_ICU_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_ICU_DEVEL_DIR)
: develop/headers/3rdparty : $(HAIKU_ICU_DEVEL_ZIP_FILE) ] ;
HAIKU_ICU_HEADERS
= [ FDirName $(HAIKU_ICU_DEVEL_DIR) develop headers 3rdparty ] ;
build/jam/OptionalPackageDependencies
+2 -2
View File
@@ -12,10 +12,9 @@ OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
OptionalPackageDependencies Development : DevelopmentBase Perl ;
OptionalPackageDependencies GetText : LibIconv ;
OptionalPackageDependencies Git : Expat Curl OpenSSL LibIconv ;
OptionalPackageDependencies ICU-devel : Development ;
OptionalPackageDependencies ICU-devel : DevelopmentBase ;
OptionalPackageDependencies LibLayout : DevelopmentBase ;
OptionalPackageDependencies Tar : LibIconv ;
OptionalPackageDependencies MandatoryPackages : ICU Sed Tar ;
OptionalPackageDependencies Python : Bzip ;
OptionalPackageDependencies Mercurial : Python ;
OptionalPackageDependencies NetFS : UserlandFS ;
@@ -28,3 +27,4 @@ OptionalPackageDependencies Vim : LibIconv ;
OptionalPackageDependencies WebPositive : Curl LibXML2 SQLite ;
OptionalPackageDependencies XZ-Utils : Tar ;
OptionalPackageDependencies MandatoryPackages : ICU Sed Tar ;
build/jam/OptionalPackages
+20 -23
View File
@@ -39,7 +39,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
# GetText - a framework to help produce multi-lingual messages.
# Git - the distributed version control system
# GPerf - the perfect hash function generator.
# ICU-devel - the headers for ICU (for development)
# ICU-devel - the headers and lib-links for ICU (for development)
# KeymapSwitcher - Easy to use keymap switcher
# LibEvent - An event notification library
# LibIconv - text encoding conversion library
@@ -727,28 +727,6 @@ if [ IsOptionalHaikuImagePackageAdded GPerf ] {
}
# ICU-devel
if [ IsOptionalHaikuImagePackageAdded ICU-devel ] {
InstallOptionalHaikuImagePackage icu-devel-4.2-2010-01-26.zip
: $(baseURL)/icu-devel-4.2-2010-01-26.zip
;
local arch = $(TARGET_ARCH) ;
local abi = gcc$(HAIKU_GCC_VERSION[1]) ;
local libs = common data i18n ;
for lib in $(libs) {
lib = libicu-$(lib).so ;
local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) ] ;
if $(abiVersion) {
local abiVersionedLib = $(lib).$(abiVersion) ;
AddSymlinkToHaikuHybridImage develop abi $(arch) $(abi) lib
: /system/lib $(abiVersionedLib) : : true ;
}
AddSymlinkToHaikuHybridImage develop abi $(arch) $(abi) lib
: /system/lib $(lib) : : true ;
}
}
# ICU
if [ IsOptionalHaikuImagePackageAdded ICU ] {
if $(TARGET_ARCH) != x86 {
@@ -783,6 +761,25 @@ if [ IsOptionalHaikuImagePackageAdded ICU ] {
}
# ICU-devel
if [ IsOptionalHaikuImagePackageAdded ICU-devel ] {
InstallOptionalHaikuImagePackage icu-devel-4.4.1-2010-07-15.zip
: $(baseURL)/icu-devel-4.4.1-2010-07-15.zip
;
local arch = $(TARGET_ARCH) ;
local abi = gcc$(HAIKU_GCC_VERSION[1]) ;
for abiVersionedLib in $(HAIKU_ICU_LIBS) {
abiVersionedLib = $(abiVersionedLib:G=) ;
local lib = $(abiVersionedLib:B) ;
AddSymlinkToHaikuHybridImage develop abi $(arch) $(abi) lib
: /system/lib $(abiVersionedLib) : : true ;
AddSymlinkToHaikuHybridImage develop abi $(arch) $(abi) lib
: $(abiVersionedLib) : $(lib) ;
}
}
# KeymapSwitcher
if [ IsOptionalHaikuImagePackageAdded KeymapSwitcher ] {
if $(TARGET_ARCH) != x86 {