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

closing #5039:

Browse Source 
* fix ICU jamfiles to no longer MakeLocate on source files and added some 
  missing dependency declarations for break-iterators - now building with
  -j16 no longer fails (it did before, for me too)


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35627 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe
2010-02-26 23:27:21 +00:00
parent c35e2c70cb
commit 5dbf6e515e
10 changed files with 57 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/icu/source/data/Jamfile
+13 -4
View File
@@ -33,23 +33,32 @@ Depends ICU_ResourceBundles : ICU_BreakIterators ;
rule GenerateIndexedResourceBundles rule GenerateIndexedResourceBundles
indexName : installableSources : otherSources : targetDir : sourceDir indexName : installableSources : otherSources : targetDir : sourceDir
: additionalDependencies
{ {
local sources = $(installableSources) $(otherSources) ; local sources = $(installableSources) $(otherSources) ;
GenerateResourceBundles $(sources) : $(targetDir) : $(sourceDir) ; GenerateResourceBundles $(installableSources) : $(targetDir)
: $(sourceDir) ;
GenerateResourceBundles $(otherSources) : $(targetDir) : $(sourceDir)
: $(additionalDependencies) ;
local indexSource = $(indexName:G=$(sourceDir)) ; local indexSource = $(indexName:G=$(sourceDir)) ;
MakeLocateICUData $(indexSource) : $(targetDir) ; MakeLocateICUData $(indexSource) : $(targetDir) ;
GenerateResourceIndex $(indexSource) : $(installableSources)
: $(ICU_CLDR_VERSION) ;
local indexTarget = $(indexSource:S=.res) ; local indexTarget = $(indexSource:S=.res) ;
GenerateResourceIndex $(indexSource) Depends $(indexTarget) : $(additionalDependencies) ;
: $(installableSources) : $(ICU_CLDR_VERSION) ;
Depends ICU_ResourceBundles : $(indexTarget) ; Depends ICU_ResourceBundles : $(indexTarget) ;
GenerateResourceBundle $(indexTarget) : $(indexSource) : $(targetDir) ; GenerateResourceBundle $(indexTarget) : $(indexSource) : $(targetDir) ;
} }
rule GenerateResourceBundles sources : targetDir : sourceDir rule GenerateResourceBundles
sources : targetDir : sourceDir : additionalDependencies
{ {
for source in $(sources) { for source in $(sources) {
local target = $(source:D=:S=.res:G=$(sourceDir)) ; local target = $(source:D=:S=.res:G=$(sourceDir)) ;
Depends ICU_ResourceBundles : $(target) ; Depends ICU_ResourceBundles : $(target) ;
Depends $(target) : $(additionalDependencies) ;
GenerateResourceBundle $(target) : $(source) : $(targetDir) ; GenerateResourceBundle $(target) : $(source) : $(targetDir) ;
} }
} }
src/libs/icu/source/data/brkitr/Jamfile
+9 -8
View File
@@ -36,10 +36,11 @@ actions GenerateBreakIterator1
$(2[1]) -c -i $(ICU_DATA_DIR) -r $(2[2]) -o $(1) >/dev/null $(2[1]) -c -i $(ICU_DATA_DIR) -r $(2[2]) -o $(1) >/dev/null
} }
local brkSources = [ FGristFiles $(ICU_BRK_SOURCE) ] ; local brkitrSources = [ FGristFiles $(ICU_BRK_SOURCE) ] ;
for source in $(brkSources) { local brkitrTargets ;
MakeLocate $(source) : $(SUBDIR) ; for source in $(brkitrSources) {
local target = $(source:D=:S=.brk) ; local target = $(source:D=:S=.brk) ;
brkitrTargets += $(target) ;
Depends ICU_BreakIterators : $(target) ; Depends ICU_BreakIterators : $(target) ;
GenerateBreakIterator $(target) : $(source) ; GenerateBreakIterator $(target) : $(source) ;
} }
@@ -64,7 +65,6 @@ actions GenerateCtdBreakIterator1
local ctdSources = [ FGristFiles $(ICU_BRK_CTD_SOURCE) ] ; local ctdSources = [ FGristFiles $(ICU_BRK_CTD_SOURCE) ] ;
for source in $(ctdSources) { for source in $(ctdSources) {
MakeLocate $(source) : $(SUBDIR) ;
local target = $(source:D=:S=.ctd) ; local target = $(source:D=:S=.ctd) ;
Depends ICU_BreakIterators : $(target) ; Depends ICU_BreakIterators : $(target) ;
GenerateCtdBreakIterator $(target) : $(source) ; GenerateCtdBreakIterator $(target) : $(source) ;
@@ -78,10 +78,11 @@ local installableBrkitrSources = [ FGristFiles $(ICU_BRK_RES_SOURCE) ] ;
local otherBrkitrSources local otherBrkitrSources
= [ FGristFiles root.txt $(ICU_BRK_RES_ALIAS_SOURCE) ] ; = [ FGristFiles root.txt $(ICU_BRK_RES_ALIAS_SOURCE) ] ;
MakeLocate $(installableBrkitrSources) : $(SUBDIR) ; SEARCH on $(brkitrSources) = $(SUBDIR) ;
MakeLocate $(otherBrkitrSources) : $(SUBDIR) ; SEARCH on $(ctdSources) = $(SUBDIR) ;
SEARCH on $(installableBrkitrSources) = $(SUBDIR) ;
SEARCH on $(otherBrkitrSources) = $(SUBDIR) ;
GenerateIndexedResourceBundles res_index.txt GenerateIndexedResourceBundles res_index.txt
: $(installableBrkitrSources) : $(otherBrkitrSources) : $(installableBrkitrSources) : $(otherBrkitrSources)
: brkitr : brkitr ; : brkitr : brkitr : $(brkitrTargets) ;
src/libs/icu/source/data/coll/Jamfile
+2 -3
View File
@@ -70,9 +70,8 @@ local installableCollSources = [ FGristFiles $(ICU_COLLATION_SOURCE) ] ;
local otherCollSources local otherCollSources
= [ FGristFiles root.txt $(ICU_COLLATION_ALIAS_SOURCE) ] ; = [ FGristFiles root.txt $(ICU_COLLATION_ALIAS_SOURCE) ] ;
MakeLocate $(installableCollSources) : $(SUBDIR) ; SEARCH on $(installableCollSources) = $(SUBDIR) ;
MakeLocate $(otherCollSources) : $(SUBDIR) ; SEARCH on $(otherCollSources) = $(SUBDIR) ;
GenerateIndexedResourceBundles res_index.txt GenerateIndexedResourceBundles res_index.txt
: $(installableCollSources) : $(otherCollSources) : coll : coll ; : $(installableCollSources) : $(otherCollSources) : coll : coll ;
src/libs/icu/source/data/locales/Jamfile
+2 -2
View File
@@ -86,8 +86,8 @@ ICU_GENRB_SOURCE = af.txt af_NA.txt af_ZA.txt am.txt
local installableLocalesSources = [ FGristFiles $(ICU_GENRB_SOURCE) ] ; local installableLocalesSources = [ FGristFiles $(ICU_GENRB_SOURCE) ] ;
local otherLocalesSources = [ FGristFiles root.txt $(ICU_GENRB_ALIAS_SOURCE) ] ; local otherLocalesSources = [ FGristFiles root.txt $(ICU_GENRB_ALIAS_SOURCE) ] ;
MakeLocate $(installableLocalesSources) : $(SUBDIR) ; SEARCH on $(installableLocalesSources) = $(SUBDIR) ;
MakeLocate $(otherLocalesSources) : $(SUBDIR) ; SEARCH on $(otherLocalesSources) = $(SUBDIR) ;
GenerateIndexedResourceBundles res_index.txt GenerateIndexedResourceBundles res_index.txt
: $(installableLocalesSources) : $(otherLocalesSources) : : locales ; : $(installableLocalesSources) : $(otherLocalesSources) : : locales ;
src/libs/icu/source/data/mappings/Jamfile
+2 -2
View File
@@ -133,7 +133,6 @@ NotFile ICU_CharsetConverters ;
rule GenerateConvAliases target : source rule GenerateConvAliases target : source
{ {
MakeLocate $(source) : $(SUBDIR) ;
MakeLocateICUData $(target) ; MakeLocateICUData $(target) ;
Depends $(target) : <build>gencnval $(source) ; Depends $(target) : <build>gencnval $(source) ;
LocalClean clean : $(target) ; LocalClean clean : $(target) ;
@@ -147,6 +146,7 @@ actions GenerateConvAliases1
} }
local converters = [ FGristFiles convrtrs.txt ] ; local converters = [ FGristFiles convrtrs.txt ] ;
SEARCH on $(converters) = $(SUBDIR) ;
GenerateConvAliases cnvalias.icu : $(converters) ; GenerateConvAliases cnvalias.icu : $(converters) ;
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@@ -155,7 +155,6 @@ GenerateConvAliases cnvalias.icu : $(converters) ;
rule GenerateCharsetConverter target : source rule GenerateCharsetConverter target : source
{ {
MakeLocate $(source) : $(SUBDIR) ;
MakeLocateICUData $(target) ; MakeLocateICUData $(target) ;
Depends $(target) : <build>makeconv $(source) ; Depends $(target) : <build>makeconv $(source) ;
LocalClean clean : $(target) ; LocalClean clean : $(target) ;
@@ -171,6 +170,7 @@ actions GenerateCharsetConverter1
# local mappingSources = [ FGristFiles $(ICU_UCM_ALL) ] ; # local mappingSources = [ FGristFiles $(ICU_UCM_ALL) ] ;
# use the above for running the ICU tests # use the above for running the ICU tests
local mappingSources = [ FGristFiles $(ICU_UCM_SOURCE_CORE) ] ; local mappingSources = [ FGristFiles $(ICU_UCM_SOURCE_CORE) ] ;
SEARCH on $(mappingSources) = $(SUBDIR) ;
local source ; local source ;
for source in $(mappingSources) { for source in $(mappingSources) {
src/libs/icu/source/data/misc/Jamfile
+1 -1
View File
@@ -11,5 +11,5 @@ ICU_MISC_SOURCE = zoneinfo.txt supplementalData.txt metazoneInfo.txt
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
local miscSources = [ FGristFiles $(ICU_MISC_SOURCE) ] ; local miscSources = [ FGristFiles $(ICU_MISC_SOURCE) ] ;
MakeLocate $(miscSources) : $(SUBDIR) ; SEARCH on $(miscSources) = $(SUBDIR) ;
GenerateResourceBundles $(miscSources) : : misc ; GenerateResourceBundles $(miscSources) : : misc ;
src/libs/icu/source/data/rbnf/Jamfile
+2 -2
View File
@@ -30,8 +30,8 @@ ICU_RBNF_SOURCE = af.txt am.txt ar.txt az.txt
local installableRbnfSources = [ FGristFiles $(ICU_RBNF_SOURCE) ] ; local installableRbnfSources = [ FGristFiles $(ICU_RBNF_SOURCE) ] ;
local otherRbnfSources = [ FGristFiles root.txt $(ICU_RBNF_ALIAS_SOURCE) ] ; local otherRbnfSources = [ FGristFiles root.txt $(ICU_RBNF_ALIAS_SOURCE) ] ;
MakeLocate $(installableRbnfSources) : $(SUBDIR) ; SEARCH on $(installableRbnfSources) = $(SUBDIR) ;
MakeLocate $(otherRbnfSources) : $(SUBDIR) ; SEARCH on $(otherRbnfSources) = $(SUBDIR) ;
GenerateIndexedResourceBundles res_index.txt GenerateIndexedResourceBundles res_index.txt
: $(installableRbnfSources) : $(otherRbnfSources) : rbnf : rbnf ; : $(installableRbnfSources) : $(otherRbnfSources) : rbnf : rbnf ;
src/libs/icu/source/data/sprep/Jamfile
+1 -1
View File
@@ -32,7 +32,7 @@ actions GenerateStringPrep1
local sprepSources = [ FGristFiles $(ICU_SPREP_SOURCE) ] ; local sprepSources = [ FGristFiles $(ICU_SPREP_SOURCE) ] ;
for source in $(sprepSources) { for source in $(sprepSources) {
MakeLocate $(source) : $(SUBDIR) ; SEARCH on $(source) = $(SUBDIR) ;
local target = $(source:D=:S=.spp) ; local target = $(source:D=:S=.spp) ;
Depends ICU_StringPreps : $(target) ; Depends ICU_StringPreps : $(target) ;
GenerateStringPrep $(target) : $(source) ; GenerateStringPrep $(target) : $(source) ;
src/libs/icu/source/data/translit/Jamfile
+1 -1
View File
@@ -9,6 +9,6 @@ ICU_TRANSLIT_SOURCE = root.txt en.txt el.txt ;
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
local translitSources = [ FGristFiles $(ICU_TRANSLIT_SOURCE) ] ; local translitSources = [ FGristFiles $(ICU_TRANSLIT_SOURCE) ] ;
MakeLocate $(translitSources) : $(SUBDIR) ; SEARCH on $(translitSources) = $(SUBDIR) ;
GenerateResourceBundles $(translitSources) : translit : translit ; GenerateResourceBundles $(translitSources) : translit : translit ;
src/libs/icu/source/data/unidata/Jamfile
+6 -6
View File
@@ -22,11 +22,11 @@ actions GeneratePNames1
local propertyFiles local propertyFiles
= [ FGristFiles Blocks.txt PropertyAliases.txt PropertyValueAliases.txt ] ; = [ FGristFiles Blocks.txt PropertyAliases.txt PropertyValueAliases.txt ] ;
MakeLocate $(propertyFiles) : $(SUBDIR) ; SEARCH on $(propertyFiles) = $(SUBDIR) ;
local propertyHeaders = [ FGristFiles uscript.h uchar.h ] ; local propertyHeaders = [ FGristFiles uscript.h uchar.h ] ;
MakeLocate $(propertyHeaders) SEARCH on $(propertyHeaders)
: [ FDirName $(HAIKU_TOP) headers libs icu unicode ] ; = [ FDirName $(HAIKU_TOP) headers libs icu unicode ] ;
GeneratePNames pnames.icu : $(propertyFiles) $(propertyHeaders) ; GeneratePNames pnames.icu : $(propertyFiles) $(propertyHeaders) ;
@@ -49,7 +49,7 @@ actions GenerateUNames1
} }
local unicodeData = [ FGristFiles UnicodeData.txt ] ; local unicodeData = [ FGristFiles UnicodeData.txt ] ;
MakeLocate $(unicodeData) : $(SUBDIR) ; SEARCH on $(unicodeData) = $(SUBDIR) ;
GenerateUNames unames.icu : $(unicodeData) ; GenerateUNames unames.icu : $(unicodeData) ;
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@@ -71,7 +71,7 @@ actions GenerateUcaData1
} }
local fractionalUCA = [ FGristFiles FractionalUCA.txt ] ; local fractionalUCA = [ FGristFiles FractionalUCA.txt ] ;
MakeLocate $(fractionalUCA) : $(SUBDIR) ; SEARCH on $(fractionalUCA) = $(SUBDIR) ;
GenerateUcaData ucadata.icu invuca.icu : $(fractionalUCA) ; GenerateUcaData ucadata.icu invuca.icu : $(fractionalUCA) ;
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@@ -94,7 +94,7 @@ actions GenerateConfusables1
local confusableSources local confusableSources
= [ FGristFiles confusables.txt confusablesWholeScript.txt ] ; = [ FGristFiles confusables.txt confusablesWholeScript.txt ] ;
MakeLocate $(confusableSources) : $(SUBDIR) ; SEARCH on $(confusableSources) = $(SUBDIR) ;
local target = $(confusableSources[1]:D=:S=.cfu) ; local target = $(confusableSources[1]:D=:S=.cfu) ;
Depends ICU_Confusables : $(target) ; Depends ICU_Confusables : $(target) ;
GenerateConfusables $(target) : $(confusableSources) ; GenerateConfusables $(target) : $(confusableSources) ;