diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-05-09 23:15:42 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-05-10 10:47:44 +0200 |
commit | a9550f63cd7a7e064901b2c997375ed384781eea (patch) | |
tree | b35a7bf6077c5b40390cbde11dffe30ef90d57c9 /i18npool | |
parent | error handling in SortTree custom action (diff) | |
download | core-a9550f63cd7a7e064901b2c997375ed384781eea.tar.gz core-a9550f63cd7a7e064901b2c997375ed384781eea.zip |
normalize variable names in gbuild user makefiles
Variables should have module name as prefix to prevent collisions.
Diffstat (limited to 'i18npool')
-rw-r--r-- | i18npool/CustomTarget_breakiterator.mk | 57 | ||||
-rw-r--r-- | i18npool/CustomTarget_collator.mk | 19 | ||||
-rw-r--r-- | i18npool/CustomTarget_indexentry.mk | 10 | ||||
-rw-r--r-- | i18npool/CustomTarget_localedata.mk | 15 | ||||
-rw-r--r-- | i18npool/CustomTarget_textconversion.mk | 10 |
5 files changed, 60 insertions, 51 deletions
diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk index 55c655401a27..fcb1aaa5ec17 100644 --- a/i18npool/CustomTarget_breakiterator.mk +++ b/i18npool/CustomTarget_breakiterator.mk @@ -28,75 +28,80 @@ $(eval $(call gb_CustomTarget_CustomTarget,i18npool/breakiterator)) -IPBI := $(call gb_CustomTarget_get_workdir,i18npool/breakiterator) +i18npool_BIDIR := $(call gb_CustomTarget_get_workdir,i18npool/breakiterator) $(call gb_CustomTarget_get_target,i18npool/breakiterator) : \ - $(IPBI)/dict_ja.cxx $(IPBI)/dict_zh.cxx $(IPBI)/OpenOffice_dat.c + $(i18npool_BIDIR)/dict_ja.cxx $(i18npool_BIDIR)/dict_zh.cxx $(i18npool_BIDIR)/OpenOffice_dat.c -$(IPBI)/dict_%.cxx : $(SRCDIR)/i18npool/source/breakiterator/data/%.dic \ - $(call gb_Executable_get_target_for_build,gendict) | $(IPBI)/.dir +$(i18npool_BIDIR)/dict_%.cxx : \ + $(SRCDIR)/i18npool/source/breakiterator/data/%.dic \ + $(call gb_Executable_get_target_for_build,gendict) \ + | $(i18npool_BIDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DIC,1) $(call gb_Helper_abbreviate_dirs,\ - $(call gb_Helper_execute,gendict) $< $@ $(patsubst $(IPBI)/dict_%.cxx,%,$@)) + $(call gb_Helper_execute,gendict) $< $@ $(patsubst $(i18npool_BIDIR)/dict_%.cxx,%,$@)) ifeq ($(SYSTEM_GENBRK),) -GENBRKTARGET := $(call gb_Executable_get_target_for_build,genbrk) -GENBRK := $(call gb_Helper_execute,genbrk) +i18npool_GENBRKTARGET := $(call gb_Executable_get_target_for_build,genbrk) +i18npool_GENBRK := $(call gb_Helper_execute,genbrk) else -GENBRKTARGET := -GENBRK := $(SYSTEM_GENBRK) +i18npool_GENBRKTARGET := +i18npool_GENBRK := $(SYSTEM_GENBRK) endif ifeq ($(SYSTEM_GENCCODE),) -GENCCODETARGET := $(call gb_Executable_get_target_for_build,genccode) -GENCCODE := $(call gb_Helper_execute,genccode) +i18npool_GENCCODETARGET := $(call gb_Executable_get_target_for_build,genccode) +i18npool_GENCCODE := $(call gb_Helper_execute,genccode) else -GENCCODETARGET := -GENCCODE := $(SYSTEM_GENCCODE) +i18npool_GENCCODETARGET := +i18npool_GENCCODE := $(SYSTEM_GENCCODE) endif ifeq ($(SYSTEM_GENCMN),) -GENCMNTARGET := $(call gb_Executable_get_target_for_build,gencmn) -GENCMN := $(call gb_Helper_execute,gencmn) +i18npool_GENCMNTARGET := $(call gb_Executable_get_target_for_build,gencmn) +i18npool_GENCMN := $(call gb_Helper_execute,gencmn) else -GENCMNTARGET := -GENCMN := $(SYSTEM_GENCMN) +i18npool_GENCMNTARGET := +i18npool_GENCMN := $(SYSTEM_GENCMN) endif -BRKFILES := $(subst .txt,.brk,$(notdir \ +i18npool_BRKFILES := $(subst .txt,.brk,$(notdir \ $(wildcard $(SRCDIR)/i18npool/source/breakiterator/data/*.txt))) # 'gencmn', 'genbrk' and 'genccode' are tools generated and delivered by icu project to process icu breakiterator rules. # The output of gencmn generates warnings under Windows. We want to minimize the patches to external tools, # so the output (OpenOffice_dat.c) is changed here to include a pragma to disable the warnings. # Output of gencmn is redirected to OpenOffice_tmp.c with the -t switch. -$(IPBI)/OpenOffice_dat.c : $(patsubst %.brk,$(IPBI)/%_brk.c,$(BRKFILES)) $(GENCMNTARGET) +$(i18npool_BIDIR)/OpenOffice_dat.c : \ + $(patsubst %.brk,$(i18npool_BIDIR)/%_brk.c,$(i18npool_BRKFILES)) \ + $(i18npool_GENCMNTARGET) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CMN,1) $(call gb_Helper_abbreviate_dirs,\ RESPONSEFILE=$(shell $(gb_MKTEMP)) && \ - $(foreach brk,$(BRKFILES),echo '$(brk)' >> $${RESPONSEFILE} && ) \ - $(GENCMN) -n OpenOffice -t tmp -S -d $(IPBI)/ 0 $${RESPONSEFILE} && \ + $(foreach brk,$(i18npool_BRKFILES),echo '$(brk)' >> $${RESPONSEFILE} && ) \ + $(i18npool_GENCMN) -n OpenOffice -t tmp -S -d $(i18npool_BIDIR)/ 0 $${RESPONSEFILE} && \ rm -f $${RESPONSEFILE} && \ echo '#ifdef _MSC_VER' > $@ && \ echo '#pragma warning( disable : 4229 4668 )' >> $@ && \ echo '#endif' >> $@ && \ cat $(subst _dat,_tmp,$@) >> $@) -$(IPBI)/%_brk.c : $(IPBI)/%.brk $(GENCCODETARGET) +$(i18npool_BIDIR)/%_brk.c : $(i18npool_BIDIR)/%.brk $(i18npool_GENCCODETARGET) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CCD,1) $(call gb_Helper_abbreviate_dirs,\ - $(GENCCODE) -n OpenOffice -d $(IPBI)/ $< \ + $(i18npool_GENCCODE) -n OpenOffice -d $(i18npool_BIDIR)/ $< \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) -$(IPBI)/%.brk : $(IPBI)/%.txt $(GENBRKTARGET) +$(i18npool_BIDIR)/%.brk : $(i18npool_BIDIR)/%.txt $(i18npool_GENBRKTARGET) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),BRK,1) $(call gb_Helper_abbreviate_dirs,\ - $(GENBRK) -r $< -o $@ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) + $(i18npool_GENBRK) -r $< -o $@ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) # fdo#31271 ")" reclassified in more recent Unicode Standards / ICU 4.4 # Prepend set empty as of Unicode Version 6.1 / ICU 4.9, which bails out if used. # NOTE: strips every line with _word_ 'Prepend', including $Prepend -$(IPBI)/%.txt : $(SRCDIR)/i18npool/source/breakiterator/data/%.txt | $(IPBI)/.dir +$(i18npool_BIDIR)/%.txt : \ + $(SRCDIR)/i18npool/source/breakiterator/data/%.txt | $(i18npool_BIDIR)/.dir ifeq ($(ICU_RECLASSIFIED_CLOSE_PARENTHESIS),YES) ifeq ($(ICU_RECLASSIFIED_PREPEND_SET_EMPTY),YES) sed "s#\[:LineBreak = Close_Punctuation:\]#\[\[:LineBreak = Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#;/\<Prepend\>/d" $< > $@ diff --git a/i18npool/CustomTarget_collator.mk b/i18npool/CustomTarget_collator.mk index 413767ca13b2..95cf190632a3 100644 --- a/i18npool/CustomTarget_collator.mk +++ b/i18npool/CustomTarget_collator.mk @@ -28,22 +28,25 @@ $(eval $(call gb_CustomTarget_CustomTarget,i18npool/collator)) -IPCO := $(call gb_CustomTarget_get_workdir,i18npool/collator) -TXTLIST := $(notdir $(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt)) +i18npool_CODIR := $(call gb_CustomTarget_get_workdir,i18npool/collator) +i18npool_COTXTS := $(notdir $(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt)) $(call gb_CustomTarget_get_target,i18npool/collator) : \ - $(IPCO)/lrl_include.hxx $(foreach txt,$(TXTLIST), \ - $(patsubst %.txt,$(IPCO)/collator_%.cxx,$(txt))) + $(i18npool_CODIR)/lrl_include.hxx $(foreach txt,$(i18npool_COTXTS), \ + $(patsubst %.txt,$(i18npool_CODIR)/collator_%.cxx,$(txt))) -$(IPCO)/collator_%.cxx : $(SRCDIR)/i18npool/source/collator/data/%.txt \ - $(call gb_Executable_get_target_for_build,gencoll_rule) | $(IPCO)/.dir +$(i18npool_CODIR)/collator_%.cxx : \ + $(SRCDIR)/i18npool/source/collator/data/%.txt \ + $(call gb_Executable_get_target_for_build,gencoll_rule) \ + | $(i18npool_CODIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLR,1) $(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_execute,gencoll_rule) $< $@ $*) -$(IPCO)/lrl_include.hxx : $(SRCDIR)/i18npool/source/collator/data | $(IPCO)/.dir +$(i18npool_CODIR)/lrl_include.hxx : \ + $(SRCDIR)/i18npool/source/collator/data | $(i18npool_CODIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) - echo '#define LOCAL_RULE_LANGS "$(sort $(foreach txt,$(TXTLIST), \ + echo '#define LOCAL_RULE_LANGS "$(sort $(foreach txt,$(i18npool_COTXTS), \ $(firstword $(subst _, ,$(txt)))))"' > $@ # vim: set noet sw=4 ts=4: diff --git a/i18npool/CustomTarget_indexentry.mk b/i18npool/CustomTarget_indexentry.mk index 1968fb6c65ca..8a6a63c971ab 100644 --- a/i18npool/CustomTarget_indexentry.mk +++ b/i18npool/CustomTarget_indexentry.mk @@ -28,14 +28,14 @@ $(eval $(call gb_CustomTarget_CustomTarget,i18npool/indexentry)) -IPIE := $(call gb_CustomTarget_get_workdir,i18npool/indexentry) - $(call gb_CustomTarget_get_target,i18npool/indexentry) : \ - $(patsubst %.txt,$(IPIE)/%.cxx,$(notdir \ + $(patsubst %.txt,$(call gb_CustomTarget_get_workdir,i18npool/indexentry)/%.cxx,$(notdir \ $(wildcard $(SRCDIR)/i18npool/source/indexentry/data/*.txt))) -$(IPIE)/%.cxx : $(SRCDIR)/i18npool/source/indexentry/data/%.txt \ - $(call gb_Executable_get_target_for_build,genindex_data) | $(IPIE)/.dir +$(call gb_CustomTarget_get_workdir,i18npool/indexentry)/%.cxx : \ + $(SRCDIR)/i18npool/source/indexentry/data/%.txt \ + $(call gb_Executable_get_target_for_build,genindex_data) \ + | $(call gb_CustomTarget_get_workdir,i18npool/indexentry)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),IND,1) $(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_execute,genindex_data) $< $@.tmp $* && \ diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk index c4e8dc9c2b2e..d63d3e49c7a0 100644 --- a/i18npool/CustomTarget_localedata.mk +++ b/i18npool/CustomTarget_localedata.mk @@ -28,32 +28,33 @@ $(eval $(call gb_CustomTarget_CustomTarget,i18npool/localedata)) -IPLD := $(call gb_CustomTarget_get_workdir,i18npool/localedata) +i18npool_LDDIR := $(call gb_CustomTarget_get_workdir,i18npool/localedata) $(call gb_CustomTarget_get_target,i18npool/localedata) : \ - $(patsubst %.xml,$(IPLD)/localedata_%.cxx, \ + $(patsubst %.xml,$(i18npool_LDDIR)/localedata_%.cxx, \ $(notdir $(wildcard $(SRCDIR)/i18npool/source/localedata/data/*.xml))) -$(IPLD)/localedata_%.cxx : $(SRCDIR)/i18npool/source/localedata/data/%.xml \ - $(IPLD)/saxparser.rdb $(call gb_Executable_get_target_for_build,saxparser) +$(i18npool_LDDIR)/localedata_%.cxx : \ + $(SRCDIR)/i18npool/source/localedata/data/%.xml \ + $(i18npool_LDDIR)/saxparser.rdb $(call gb_Executable_get_target_for_build,saxparser) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SAX,1) $(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_execute,saxparser) $* $< $@.tmp \ - $(call gb_Helper_make_url,$(IPLD)/saxparser.rdb) \ + $(call gb_Helper_make_url,$(i18npool_LDDIR)/saxparser.rdb) \ $(call gb_Helper_make_url,$(OUTDIR_FOR_BUILD)/bin/types.rdb) \ -env:LO_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR)) \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null 2>&1) && \ sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp > $@ && \ rm $@.tmp) -$(IPLD)/saxparser.rdb : $(IPLD)/saxparser.input \ +$(i18npool_LDDIR)/saxparser.rdb : $(i18npool_LDDIR)/saxparser.input \ $(gb_XSLTPROCTARGET) $(SOLARENV)/bin/packcomponents.xslt $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),RDB,1) $(call gb_Helper_abbreviate_dirs, \ $(gb_XSLTPROC) --nonet --stringparam prefix $(OUTDIR_FOR_BUILD)/xml/ \ -o $@ $(SOLARENV)/bin/packcomponents.xslt $<) -$(IPLD)/saxparser.input :| $(IPLD)/.dir +$(i18npool_LDDIR)/saxparser.input :| $(i18npool_LDDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) echo '<list><filename>component/sax/source/expatwrap/expwrap.component</filename></list>' > $@ diff --git a/i18npool/CustomTarget_textconversion.mk b/i18npool/CustomTarget_textconversion.mk index 6a5f10d79468..30dc2d767244 100644 --- a/i18npool/CustomTarget_textconversion.mk +++ b/i18npool/CustomTarget_textconversion.mk @@ -28,14 +28,14 @@ $(eval $(call gb_CustomTarget_CustomTarget,i18npool/textconversion)) -IPTC := $(call gb_CustomTarget_get_workdir,i18npool/textconversion) - $(call gb_CustomTarget_get_target,i18npool/textconversion) : \ - $(patsubst %.dic,$(IPTC)/%.cxx,$(notdir \ + $(patsubst %.dic,$(call gb_CustomTarget_get_workdir,i18npool/textconversion)/%.cxx,$(notdir \ $(wildcard $(SRCDIR)/i18npool/source/textconversion/data/*.dic))) -$(IPTC)/%.cxx : $(SRCDIR)/i18npool/source/textconversion/data/%.dic \ - $(call gb_Executable_get_target_for_build,genconv_dict) | $(IPTC)/.dir +$(call gb_CustomTarget_get_workdir,i18npool/textconversion)/%.cxx : \ + $(SRCDIR)/i18npool/source/textconversion/data/%.dic \ + $(call gb_Executable_get_target_for_build,genconv_dict) \ + | $(call gb_CustomTarget_get_workdir,i18npool/textconversion)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CDC,1) $(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_execute,genconv_dict) $* $< $@.tmp && \ |