[haiku-commits] r35627 - in haiku/trunk/src/libs/icu/source/data: . brkitr coll locales mappings ...
- From: zooey@xxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 27 Feb 2010 00:27:21 +0100 (CET)
Author: zooey
Date: 2010-02-27 00:27:21 +0100 (Sat, 27 Feb 2010)
New Revision: 35627
Changeset: http://dev.haiku-os.org/changeset/35627/haiku
Ticket: http://dev.haiku-os.org/ticket/5039
Modified:
haiku/trunk/src/libs/icu/source/data/Jamfile
haiku/trunk/src/libs/icu/source/data/brkitr/Jamfile
haiku/trunk/src/libs/icu/source/data/coll/Jamfile
haiku/trunk/src/libs/icu/source/data/locales/Jamfile
haiku/trunk/src/libs/icu/source/data/mappings/Jamfile
haiku/trunk/src/libs/icu/source/data/misc/Jamfile
haiku/trunk/src/libs/icu/source/data/rbnf/Jamfile
haiku/trunk/src/libs/icu/source/data/sprep/Jamfile
haiku/trunk/src/libs/icu/source/data/translit/Jamfile
haiku/trunk/src/libs/icu/source/data/unidata/Jamfile
Log:
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)
Modified: haiku/trunk/src/libs/icu/source/data/Jamfile
===================================================================
--- haiku/trunk/src/libs/icu/source/data/Jamfile 2010-02-26 22:14:42 UTC
(rev 35626)
+++ haiku/trunk/src/libs/icu/source/data/Jamfile 2010-02-26 23:27:21 UTC
(rev 35627)
@@ -33,23 +33,32 @@
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) ;
}
}
Modified: haiku/trunk/src/libs/icu/source/data/brkitr/Jamfile
===================================================================
--- haiku/trunk/src/libs/icu/source/data/brkitr/Jamfile 2010-02-26 22:14:42 UTC
(rev 35626)
+++ haiku/trunk/src/libs/icu/source/data/brkitr/Jamfile 2010-02-26 23:27:21 UTC
(rev 35627)
@@ -10,10 +10,10 @@
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 @@
$(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 @@
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 @@
# -----------------------------------------------------------------------------
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) ;
Modified: haiku/trunk/src/libs/icu/source/data/coll/Jamfile
===================================================================
--- haiku/trunk/src/libs/icu/source/data/coll/Jamfile 2010-02-26 22:14:42 UTC
(rev 35626)
+++ haiku/trunk/src/libs/icu/source/data/coll/Jamfile 2010-02-26 23:27:21 UTC
(rev 35627)
@@ -2,7 +2,7 @@
# 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 @@
# -----------------------------------------------------------------------------
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 ;
-
Modified: haiku/trunk/src/libs/icu/source/data/locales/Jamfile
===================================================================
--- haiku/trunk/src/libs/icu/source/data/locales/Jamfile 2010-02-26
22:14:42 UTC (rev 35626)
+++ haiku/trunk/src/libs/icu/source/data/locales/Jamfile 2010-02-26
23:27:21 UTC (rev 35627)
@@ -8,7 +8,7 @@
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 @@
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 @@
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 ;
Modified: haiku/trunk/src/libs/icu/source/data/mappings/Jamfile
===================================================================
--- haiku/trunk/src/libs/icu/source/data/mappings/Jamfile 2010-02-26
22:14:42 UTC (rev 35626)
+++ haiku/trunk/src/libs/icu/source/data/mappings/Jamfile 2010-02-26
23:27:21 UTC (rev 35627)
@@ -133,7 +133,6 @@
rule GenerateConvAliases target : source
{
- MakeLocate $(source) : $(SUBDIR) ;
MakeLocateICUData $(target) ;
Depends $(target) : <build>gencnval $(source) ;
LocalClean clean : $(target) ;
@@ -147,6 +146,7 @@
}
local converters = [ FGristFiles convrtrs.txt ] ;
+SEARCH on $(converters) = $(SUBDIR) ;
GenerateConvAliases cnvalias.icu : $(converters) ;
# -----------------------------------------------------------------------------
@@ -155,7 +155,6 @@
rule GenerateCharsetConverter target : source
{
- MakeLocate $(source) : $(SUBDIR) ;
MakeLocateICUData $(target) ;
Depends $(target) : <build>makeconv $(source) ;
LocalClean clean : $(target) ;
@@ -171,6 +170,7 @@
# 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) {
Modified: haiku/trunk/src/libs/icu/source/data/misc/Jamfile
===================================================================
--- haiku/trunk/src/libs/icu/source/data/misc/Jamfile 2010-02-26 22:14:42 UTC
(rev 35626)
+++ haiku/trunk/src/libs/icu/source/data/misc/Jamfile 2010-02-26 23:27:21 UTC
(rev 35627)
@@ -2,7 +2,7 @@
# 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 @@
# -----------------------------------------------------------------------------
local miscSources = [ FGristFiles $(ICU_MISC_SOURCE) ] ;
-MakeLocate $(miscSources) : $(SUBDIR) ;
+SEARCH on $(miscSources) = $(SUBDIR) ;
GenerateResourceBundles $(miscSources) : : misc ;
Modified: haiku/trunk/src/libs/icu/source/data/rbnf/Jamfile
===================================================================
--- haiku/trunk/src/libs/icu/source/data/rbnf/Jamfile 2010-02-26 22:14:42 UTC
(rev 35626)
+++ haiku/trunk/src/libs/icu/source/data/rbnf/Jamfile 2010-02-26 23:27:21 UTC
(rev 35627)
@@ -30,8 +30,8 @@
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 ;
Modified: haiku/trunk/src/libs/icu/source/data/sprep/Jamfile
===================================================================
--- haiku/trunk/src/libs/icu/source/data/sprep/Jamfile 2010-02-26 22:14:42 UTC
(rev 35626)
+++ haiku/trunk/src/libs/icu/source/data/sprep/Jamfile 2010-02-26 23:27:21 UTC
(rev 35627)
@@ -2,8 +2,8 @@
# 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 @@
MakeLocateICUData $(target) ;
Depends $(target) : <build>gensprep $(source) ;
LocalClean clean : $(target) ;
- local unidataDir
+ local unidataDir
= [ FDirName $(HAIKU_TOP) src libs icu source data unidata ] ;
NotFile $(unidataDir) ;
GenerateStringPrep1 $(target) : <build>gensprep $(source) $(unidataDir)
;
@@ -32,7 +32,7 @@
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) ;
Modified: haiku/trunk/src/libs/icu/source/data/translit/Jamfile
===================================================================
--- haiku/trunk/src/libs/icu/source/data/translit/Jamfile 2010-02-26
22:14:42 UTC (rev 35626)
+++ haiku/trunk/src/libs/icu/source/data/translit/Jamfile 2010-02-26
23:27:21 UTC (rev 35627)
@@ -9,6 +9,6 @@
# -----------------------------------------------------------------------------
local translitSources = [ FGristFiles $(ICU_TRANSLIT_SOURCE) ] ;
-MakeLocate $(translitSources) : $(SUBDIR) ;
+SEARCH on $(translitSources) = $(SUBDIR) ;
GenerateResourceBundles $(translitSources) : translit : translit ;
Modified: haiku/trunk/src/libs/icu/source/data/unidata/Jamfile
===================================================================
--- haiku/trunk/src/libs/icu/source/data/unidata/Jamfile 2010-02-26
22:14:42 UTC (rev 35626)
+++ haiku/trunk/src/libs/icu/source/data/unidata/Jamfile 2010-02-26
23:27:21 UTC (rev 35627)
@@ -20,13 +20,13 @@
$(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 @@
}
local unicodeData = [ FGristFiles UnicodeData.txt ] ;
-MakeLocate $(unicodeData) : $(SUBDIR) ;
+SEARCH on $(unicodeData) = $(SUBDIR) ;
GenerateUNames unames.icu : $(unicodeData) ;
# -----------------------------------------------------------------------------
@@ -71,7 +71,7 @@
}
local fractionalUCA = [ FGristFiles FractionalUCA.txt ] ;
-MakeLocate $(fractionalUCA) : $(SUBDIR) ;
+SEARCH on $(fractionalUCA) = $(SUBDIR) ;
GenerateUcaData ucadata.icu invuca.icu : $(fractionalUCA) ;
# -----------------------------------------------------------------------------
@@ -92,9 +92,9 @@
$(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) ;
Other related posts:
- » [haiku-commits] r35627 - in haiku/trunk/src/libs/icu/source/data: . brkitr coll locales mappings ... - zooey
