diff options
| author | Daniel Sikeler <d.sikeler94@gmail.com> | 2014-12-17 12:43:06 +0000 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-12-22 13:28:37 +0100 |
| commit | 2116f511bd97b4e7ee3137735f3937db1f2e97ab (patch) | |
| tree | 5785771371540fdb6b21d7862d07a294d8062b53 /oox/CustomTarget_generated.mk | |
| parent | c6fd07e0e46fa6ecba38cf7bd2f0e0312eaf7600 (diff) | |
Refactor building perfect hash tabels for tokens
moved the defines to be usable in more modules
moved perl-script to be usable in more modules
Change-Id: If893e4b7e9dc670646bdf097cb6fa5710e45f1ac
Diffstat (limited to 'oox/CustomTarget_generated.mk')
| -rw-r--r-- | oox/CustomTarget_generated.mk | 40 |
1 files changed, 5 insertions, 35 deletions
diff --git a/oox/CustomTarget_generated.mk b/oox/CustomTarget_generated.mk index 640f4e4232c3..462aef2e03a3 100644 --- a/oox/CustomTarget_generated.mk +++ b/oox/CustomTarget_generated.mk @@ -9,10 +9,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,oox/generated)) -oox_SRC := $(SRCDIR)/oox/source/token oox_MISC := $(call gb_CustomTarget_get_workdir,oox/generated)/misc -oox_INC := $(call gb_CustomTarget_get_workdir,oox/generated) -oox_GENHEADERPATH := $(oox_INC)/oox/token $(oox_MISC)/vml-shape-types : \ $(SRCDIR)/oox/source/export/preset-definitions-to-shape-types.pl \ @@ -32,42 +29,15 @@ $(oox_MISC)/oox-drawingml-adj-names : \ mkdir -p $(dir $@) perl $< --drawingml-adj-names-data $(filter-out $<,$^) > $@.in_progress 2> $@.log && mv $@.in_progress $@ -$(oox_INC)/tokenhash.inc : $(oox_MISC)/tokenhash.gperf - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,GPF,1) - $(GPERF) --compare-strncmp --switch=2 --readonly-tables $< | sed -e 's/(char\*)0/(char\*)0, 0/g' | grep -v '^#line' > $@ +# Generate tokens for oox +$(eval $(call gb_CustomTarget_token_hash,oox/generated,tokenhash.inc,tokenhash.gperf)) -define oox_GenTarget -$(oox_MISC)/$(2)ids.inc $(oox_INC)/$(2)names.inc $(if $(3),$(oox_MISC)/$(3)) $(if $(4),$(oox_INC)/$(4)names.inc) : \ - $(oox_GENHEADERPATH)/$(1).hxx - @touch $$@ - -$(oox_GENHEADERPATH)/$(1).hxx : $(oox_SRC)/$(1).pl $(oox_SRC)/$(1).txt \ - $(oox_SRC)/$(1).hxx.head $(oox_SRC)/$(1).hxx.tail - $$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),build,PRL,1) - mkdir -p $(oox_MISC) $(oox_INC) $(oox_GENHEADERPATH) - perl $(oox_SRC)/$(1).pl $(oox_SRC)/$(1).txt $(oox_MISC)/$(2)ids.inc \ - $(oox_INC)/$(2)names.inc $(if $(3),$(oox_MISC)/$(3)) \ - $(if $(4),$(oox_SRC)/$(4).txt $(oox_INC)/$(4)names.inc) \ - && cat $(oox_SRC)/$(1).hxx.head $(oox_MISC)/$(2)ids.inc \ - $(oox_SRC)/$(1).hxx.tail > $(oox_GENHEADERPATH)/$(1).hxx \ - && touch $$@ -endef - -$(eval $(call oox_GenTarget,namespaces,namespace,namespaces.txt,namespaces-strict)) -$(eval $(call oox_GenTarget,properties,property,)) -$(eval $(call oox_GenTarget,tokens,token,tokenhash.gperf)) +$(eval $(call gb_CustomTarget_generate_tokens,oox/generated,oox,oox/source/token,namespaces,namespace,namespaces.txt,namespaces-strict,namespaces.pl)) +$(eval $(call gb_CustomTarget_generate_tokens,oox/generated,oox,oox/source/token,properties,property,,,properties.pl)) +$(eval $(call gb_CustomTarget_generate_tokens,oox/generated,oox,oox/source/token,tokens,token,tokenhash.gperf)) $(call gb_CustomTarget_get_target,oox/generated) : \ $(oox_MISC)/oox-drawingml-adj-names \ $(oox_MISC)/vml-shape-types \ - $(oox_INC)/tokenhash.inc \ - $(oox_INC)/tokennames.inc \ - $(oox_INC)/namespacenames.inc \ - $(oox_INC)/namespaces-strictnames.inc \ - $(oox_INC)/propertynames.inc \ - $(oox_GENHEADERPATH)/tokens.hxx \ - $(oox_GENHEADERPATH)/namespaces.hxx \ - $(oox_GENHEADERPATH)/properties.hxx \ - $(oox_MISC)/namespaces.txt \ # vim: set noet sw=4 ts=4: |