From 5dbf6e515e55012e4b2216bdbf9cec2631447c1c Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 26 Feb 2010 23:27:21 +0000 Subject: [PATCH] closing #5039: * 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 --- src/libs/icu/source/data/Jamfile | 17 ++++++++++---- src/libs/icu/source/data/brkitr/Jamfile | 27 ++++++++++++----------- src/libs/icu/source/data/coll/Jamfile | 11 +++++---- src/libs/icu/source/data/locales/Jamfile | 10 ++++----- src/libs/icu/source/data/mappings/Jamfile | 4 ++-- src/libs/icu/source/data/misc/Jamfile | 4 ++-- src/libs/icu/source/data/rbnf/Jamfile | 6 ++--- src/libs/icu/source/data/sprep/Jamfile | 8 +++---- src/libs/icu/source/data/translit/Jamfile | 2 +- src/libs/icu/source/data/unidata/Jamfile | 16 +++++++------- 10 files changed, 57 insertions(+), 48 deletions(-) diff --git a/src/libs/icu/source/data/Jamfile b/src/libs/icu/source/data/Jamfile index 9c20d53fd4..8c8d400ce5 100644 --- a/src/libs/icu/source/data/Jamfile +++ b/src/libs/icu/source/data/Jamfile @@ -33,23 +33,32 @@ Depends ICU_ResourceBundles : ICU_BreakIterators ; rule GenerateIndexedResourceBundles indexName : installableSources : otherSources : targetDir : sourceDir + : additionalDependencies { local sources = $(installableSources) $(otherSources) ; - GenerateResourceBundles $(sources) : $(targetDir) : $(sourceDir) ; + GenerateResourceBundles $(installableSources) : $(targetDir) + : $(sourceDir) ; + GenerateResourceBundles $(otherSources) : $(targetDir) : $(sourceDir) + : $(additionalDependencies) ; + local indexSource = $(indexName:G=$(sourceDir)) ; MakeLocateICUData $(indexSource) : $(targetDir) ; + GenerateResourceIndex $(indexSource) : $(installableSources) + : $(ICU_CLDR_VERSION) ; + local indexTarget = $(indexSource:S=.res) ; - GenerateResourceIndex $(indexSource) - : $(installableSources) : $(ICU_CLDR_VERSION) ; + Depends $(indexTarget) : $(additionalDependencies) ; Depends ICU_ResourceBundles : $(indexTarget) ; GenerateResourceBundle $(indexTarget) : $(indexSource) : $(targetDir) ; } -rule GenerateResourceBundles sources : targetDir : sourceDir +rule GenerateResourceBundles + sources : targetDir : sourceDir : additionalDependencies { for source in $(sources) { local target = $(source:D=:S=.res:G=$(sourceDir)) ; Depends ICU_ResourceBundles : $(target) ; + Depends $(target) : $(additionalDependencies) ; GenerateResourceBundle $(target) : $(source) : $(targetDir) ; } } diff --git a/src/libs/icu/source/data/brkitr/Jamfile b/src/libs/icu/source/data/brkitr/Jamfile index 7f548ec198..6361426be6 100644 --- a/src/libs/icu/source/data/brkitr/Jamfile +++ b/src/libs/icu/source/data/brkitr/Jamfile @@ -10,10 +10,10 @@ ICU_BRK_RES_ALIAS_SOURCE = $(BRK_RES_SYNTHETIC_ALIAS) ; ICU_BRK_CTD_SOURCE = thaidict.txt ; -ICU_BRK_SOURCE = word_POSIX.txt word_ja.txt sent_el.txt char_th.txt char.txt - word.txt line.txt sent.txt title.txt +ICU_BRK_SOURCE = word_POSIX.txt word_ja.txt sent_el.txt char_th.txt char.txt + word.txt line.txt sent.txt title.txt ; - + ICU_BRK_RES_SOURCE = el.txt en.txt en_US.txt en_US_POSIX.txt ja.txt th.txt ; NotFile ICU_BreakIterators ; @@ -36,10 +36,11 @@ actions GenerateBreakIterator1 $(2[1]) -c -i $(ICU_DATA_DIR) -r $(2[2]) -o $(1) >/dev/null } -local brkSources = [ FGristFiles $(ICU_BRK_SOURCE) ] ; -for source in $(brkSources) { - MakeLocate $(source) : $(SUBDIR) ; +local brkitrSources = [ FGristFiles $(ICU_BRK_SOURCE) ] ; +local brkitrTargets ; +for source in $(brkitrSources) { local target = $(source:D=:S=.brk) ; + brkitrTargets += $(target) ; Depends ICU_BreakIterators : $(target) ; GenerateBreakIterator $(target) : $(source) ; } @@ -64,7 +65,6 @@ actions GenerateCtdBreakIterator1 local ctdSources = [ FGristFiles $(ICU_BRK_CTD_SOURCE) ] ; for source in $(ctdSources) { - MakeLocate $(source) : $(SUBDIR) ; local target = $(source:D=:S=.ctd) ; Depends ICU_BreakIterators : $(target) ; GenerateCtdBreakIterator $(target) : $(source) ; @@ -75,13 +75,14 @@ for source in $(ctdSources) { # ----------------------------------------------------------------------------- local installableBrkitrSources = [ FGristFiles $(ICU_BRK_RES_SOURCE) ] ; -local otherBrkitrSources +local otherBrkitrSources = [ FGristFiles root.txt $(ICU_BRK_RES_ALIAS_SOURCE) ] ; -MakeLocate $(installableBrkitrSources) : $(SUBDIR) ; -MakeLocate $(otherBrkitrSources) : $(SUBDIR) ; +SEARCH on $(brkitrSources) = $(SUBDIR) ; +SEARCH on $(ctdSources) = $(SUBDIR) ; +SEARCH on $(installableBrkitrSources) = $(SUBDIR) ; +SEARCH on $(otherBrkitrSources) = $(SUBDIR) ; -GenerateIndexedResourceBundles res_index.txt +GenerateIndexedResourceBundles res_index.txt : $(installableBrkitrSources) : $(otherBrkitrSources) - : brkitr : brkitr ; - + : brkitr : brkitr : $(brkitrTargets) ; diff --git a/src/libs/icu/source/data/coll/Jamfile b/src/libs/icu/source/data/coll/Jamfile index fe9fc528cf..50765368ab 100644 --- a/src/libs/icu/source/data/coll/Jamfile +++ b/src/libs/icu/source/data/coll/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src libs icu source data coll ; # this file has been converted to Jamfile format from colfiles.mk -ICU_COLLATION_SYNTHETIC_ALIAS = de_.txt de__PHONEBOOK.txt es_.txt +ICU_COLLATION_SYNTHETIC_ALIAS = de_.txt de__PHONEBOOK.txt es_.txt es__TRADITIONAL.txt hi_.txt hi__DIRECT.txt in.txt in_ID.txt iw.txt iw_IL.txt no.txt no_NO.txt pa_IN.txt sh.txt @@ -67,12 +67,11 @@ ICU_COLLATION_SOURCE = $(ICU_COLLATION_EMPTY_SOURCE) af.txt ar.txt as.txt az.txt # ----------------------------------------------------------------------------- local installableCollSources = [ FGristFiles $(ICU_COLLATION_SOURCE) ] ; -local otherCollSources +local otherCollSources = [ FGristFiles root.txt $(ICU_COLLATION_ALIAS_SOURCE) ] ; -MakeLocate $(installableCollSources) : $(SUBDIR) ; -MakeLocate $(otherCollSources) : $(SUBDIR) ; +SEARCH on $(installableCollSources) = $(SUBDIR) ; +SEARCH on $(otherCollSources) = $(SUBDIR) ; -GenerateIndexedResourceBundles res_index.txt +GenerateIndexedResourceBundles res_index.txt : $(installableCollSources) : $(otherCollSources) : coll : coll ; - diff --git a/src/libs/icu/source/data/locales/Jamfile b/src/libs/icu/source/data/locales/Jamfile index 9bca474332..aa1177246c 100644 --- a/src/libs/icu/source/data/locales/Jamfile +++ b/src/libs/icu/source/data/locales/Jamfile @@ -8,7 +8,7 @@ ICU_GENRB_SYNTHETIC_ALIAS = en_RH.txt in_ID.txt iw_IL.txt ja_JP_TRADITIONAL.txt no_NO.txt no_NO_NY.txt th_TH_TRADITIONAL.txt ; -ICU_GENRB_ALIAS_SOURCE = $(ICU_GENRB_SYNTHETIC_ALIAS) +ICU_GENRB_ALIAS_SOURCE = $(ICU_GENRB_SYNTHETIC_ALIAS) az_AZ.txt ha_GH.txt ha_NE.txt ha_NG.txt in.txt iw.txt kk_KZ.txt no.txt pa_IN.txt pa_PK.txt sh.txt sh_BA.txt sh_CS.txt sh_YU.txt @@ -77,7 +77,7 @@ ICU_GENRB_SOURCE = af.txt af_NA.txt af_ZA.txt am.txt vi_VN.txt zh.txt zh_Hans.txt zh_Hans_CN.txt zh_Hans_HK.txt zh_Hans_MO.txt zh_Hans_SG.txt zh_Hant.txt zh_Hant_HK.txt zh_Hant_MO.txt zh_Hant_TW.txt zu.txt zu_ZA.txt - ; + ; # ----------------------------------------------------------------------------- # general resource bundles (*.res) @@ -86,8 +86,8 @@ ICU_GENRB_SOURCE = af.txt af_NA.txt af_ZA.txt am.txt local installableLocalesSources = [ FGristFiles $(ICU_GENRB_SOURCE) ] ; local otherLocalesSources = [ FGristFiles root.txt $(ICU_GENRB_ALIAS_SOURCE) ] ; -MakeLocate $(installableLocalesSources) : $(SUBDIR) ; -MakeLocate $(otherLocalesSources) : $(SUBDIR) ; +SEARCH on $(installableLocalesSources) = $(SUBDIR) ; +SEARCH on $(otherLocalesSources) = $(SUBDIR) ; -GenerateIndexedResourceBundles res_index.txt +GenerateIndexedResourceBundles res_index.txt : $(installableLocalesSources) : $(otherLocalesSources) : : locales ; diff --git a/src/libs/icu/source/data/mappings/Jamfile b/src/libs/icu/source/data/mappings/Jamfile index eecdc99ecf..b6dc5c2b29 100644 --- a/src/libs/icu/source/data/mappings/Jamfile +++ b/src/libs/icu/source/data/mappings/Jamfile @@ -133,7 +133,6 @@ NotFile ICU_CharsetConverters ; rule GenerateConvAliases target : source { - MakeLocate $(source) : $(SUBDIR) ; MakeLocateICUData $(target) ; Depends $(target) : gencnval $(source) ; LocalClean clean : $(target) ; @@ -147,6 +146,7 @@ actions GenerateConvAliases1 } local converters = [ FGristFiles convrtrs.txt ] ; +SEARCH on $(converters) = $(SUBDIR) ; GenerateConvAliases cnvalias.icu : $(converters) ; # ----------------------------------------------------------------------------- @@ -155,7 +155,6 @@ GenerateConvAliases cnvalias.icu : $(converters) ; rule GenerateCharsetConverter target : source { - MakeLocate $(source) : $(SUBDIR) ; MakeLocateICUData $(target) ; Depends $(target) : makeconv $(source) ; LocalClean clean : $(target) ; @@ -171,6 +170,7 @@ actions GenerateCharsetConverter1 # local mappingSources = [ FGristFiles $(ICU_UCM_ALL) ] ; # use the above for running the ICU tests local mappingSources = [ FGristFiles $(ICU_UCM_SOURCE_CORE) ] ; +SEARCH on $(mappingSources) = $(SUBDIR) ; local source ; for source in $(mappingSources) { diff --git a/src/libs/icu/source/data/misc/Jamfile b/src/libs/icu/source/data/misc/Jamfile index ec3edb674a..ad86d4513b 100644 --- a/src/libs/icu/source/data/misc/Jamfile +++ b/src/libs/icu/source/data/misc/Jamfile @@ -2,7 +2,7 @@ SubDir HAIKU_TOP src libs icu source data misc ; # this file has been converted to Jamfile format from miscfiles.mk -ICU_MISC_SOURCE = zoneinfo.txt supplementalData.txt metazoneInfo.txt +ICU_MISC_SOURCE = zoneinfo.txt supplementalData.txt metazoneInfo.txt likelySubtags.txt plurals.txt numberingSystems.txt ; @@ -11,5 +11,5 @@ ICU_MISC_SOURCE = zoneinfo.txt supplementalData.txt metazoneInfo.txt # ----------------------------------------------------------------------------- local miscSources = [ FGristFiles $(ICU_MISC_SOURCE) ] ; -MakeLocate $(miscSources) : $(SUBDIR) ; +SEARCH on $(miscSources) = $(SUBDIR) ; GenerateResourceBundles $(miscSources) : : misc ; diff --git a/src/libs/icu/source/data/rbnf/Jamfile b/src/libs/icu/source/data/rbnf/Jamfile index cd4aff3b06..66b0333e83 100644 --- a/src/libs/icu/source/data/rbnf/Jamfile +++ b/src/libs/icu/source/data/rbnf/Jamfile @@ -30,8 +30,8 @@ ICU_RBNF_SOURCE = af.txt am.txt ar.txt az.txt local installableRbnfSources = [ FGristFiles $(ICU_RBNF_SOURCE) ] ; local otherRbnfSources = [ FGristFiles root.txt $(ICU_RBNF_ALIAS_SOURCE) ] ; -MakeLocate $(installableRbnfSources) : $(SUBDIR) ; -MakeLocate $(otherRbnfSources) : $(SUBDIR) ; +SEARCH on $(installableRbnfSources) = $(SUBDIR) ; +SEARCH on $(otherRbnfSources) = $(SUBDIR) ; -GenerateIndexedResourceBundles res_index.txt +GenerateIndexedResourceBundles res_index.txt : $(installableRbnfSources) : $(otherRbnfSources) : rbnf : rbnf ; diff --git a/src/libs/icu/source/data/sprep/Jamfile b/src/libs/icu/source/data/sprep/Jamfile index aa605bee82..fbc1bc857a 100644 --- a/src/libs/icu/source/data/sprep/Jamfile +++ b/src/libs/icu/source/data/sprep/Jamfile @@ -2,8 +2,8 @@ SubDir HAIKU_TOP src libs icu source data sprep ; # this file has been converted to Jamfile format from sprepbrkfiles.mk -ICU_SPREP_SOURCE = rfc3491.txt rfc3530cs.txt rfc3530csci.txt rfc3530mixp.txt - rfc3722.txt rfc3920node.txt rfc3920res.txt rfc4011.txt rfc4013.txt +ICU_SPREP_SOURCE = rfc3491.txt rfc3530cs.txt rfc3530csci.txt rfc3530mixp.txt + rfc3722.txt rfc3920node.txt rfc3920res.txt rfc4011.txt rfc4013.txt rfc4505.txt rfc4518.txt rfc4518ci.txt ; @@ -18,7 +18,7 @@ rule GenerateStringPrep target : source MakeLocateICUData $(target) ; Depends $(target) : gensprep $(source) ; LocalClean clean : $(target) ; - local unidataDir + local unidataDir = [ FDirName $(HAIKU_TOP) src libs icu source data unidata ] ; NotFile $(unidataDir) ; GenerateStringPrep1 $(target) : gensprep $(source) $(unidataDir) ; @@ -32,7 +32,7 @@ actions GenerateStringPrep1 local sprepSources = [ FGristFiles $(ICU_SPREP_SOURCE) ] ; for source in $(sprepSources) { - MakeLocate $(source) : $(SUBDIR) ; + SEARCH on $(source) = $(SUBDIR) ; local target = $(source:D=:S=.spp) ; Depends ICU_StringPreps : $(target) ; GenerateStringPrep $(target) : $(source) ; diff --git a/src/libs/icu/source/data/translit/Jamfile b/src/libs/icu/source/data/translit/Jamfile index 0f16596549..152b23e968 100644 --- a/src/libs/icu/source/data/translit/Jamfile +++ b/src/libs/icu/source/data/translit/Jamfile @@ -9,6 +9,6 @@ ICU_TRANSLIT_SOURCE = root.txt en.txt el.txt ; # ----------------------------------------------------------------------------- local translitSources = [ FGristFiles $(ICU_TRANSLIT_SOURCE) ] ; -MakeLocate $(translitSources) : $(SUBDIR) ; +SEARCH on $(translitSources) = $(SUBDIR) ; GenerateResourceBundles $(translitSources) : translit : translit ; diff --git a/src/libs/icu/source/data/unidata/Jamfile b/src/libs/icu/source/data/unidata/Jamfile index 0af134fee9..87063828a6 100644 --- a/src/libs/icu/source/data/unidata/Jamfile +++ b/src/libs/icu/source/data/unidata/Jamfile @@ -20,13 +20,13 @@ actions GeneratePNames1 $(2) -d $(1:D) } -local propertyFiles +local propertyFiles = [ FGristFiles Blocks.txt PropertyAliases.txt PropertyValueAliases.txt ] ; -MakeLocate $(propertyFiles) : $(SUBDIR) ; +SEARCH on $(propertyFiles) = $(SUBDIR) ; local propertyHeaders = [ FGristFiles uscript.h uchar.h ] ; -MakeLocate $(propertyHeaders) - : [ FDirName $(HAIKU_TOP) headers libs icu unicode ] ; +SEARCH on $(propertyHeaders) + = [ FDirName $(HAIKU_TOP) headers libs icu unicode ] ; GeneratePNames pnames.icu : $(propertyFiles) $(propertyHeaders) ; @@ -49,7 +49,7 @@ actions GenerateUNames1 } local unicodeData = [ FGristFiles UnicodeData.txt ] ; -MakeLocate $(unicodeData) : $(SUBDIR) ; +SEARCH on $(unicodeData) = $(SUBDIR) ; GenerateUNames unames.icu : $(unicodeData) ; # ----------------------------------------------------------------------------- @@ -71,7 +71,7 @@ actions GenerateUcaData1 } local fractionalUCA = [ FGristFiles FractionalUCA.txt ] ; -MakeLocate $(fractionalUCA) : $(SUBDIR) ; +SEARCH on $(fractionalUCA) = $(SUBDIR) ; GenerateUcaData ucadata.icu invuca.icu : $(fractionalUCA) ; # ----------------------------------------------------------------------------- @@ -92,9 +92,9 @@ actions GenerateConfusables1 $(2[1]) -c -i $(ICU_DATA_DIR) -r $(2[2]) -w $(2[3]) -o $(1) >/dev/null } -local confusableSources +local confusableSources = [ FGristFiles confusables.txt confusablesWholeScript.txt ] ; -MakeLocate $(confusableSources) : $(SUBDIR) ; +SEARCH on $(confusableSources) = $(SUBDIR) ; local target = $(confusableSources[1]:D=:S=.cfu) ; Depends ICU_Confusables : $(target) ; GenerateConfusables $(target) : $(confusableSources) ;