diff options
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/Library_doctok.mk | 68 | ||||
| -rw-r--r-- | writerfilter/Library_ooxml.mk | 196 | ||||
| -rw-r--r-- | writerfilter/Library_resourcemodel.mk | 29 | ||||
| -rw-r--r-- | writerfilter/Library_rtftok.mk | 2 | ||||
| -rw-r--r-- | writerfilter/Library_writerfilter.mk | 1 | ||||
| -rw-r--r-- | writerfilter/Module_writerfilter.mk | 4 | ||||
| -rw-r--r-- | writerfilter/Package_generated.mk | 32 | ||||
| -rw-r--r-- | writerfilter/Package_writerfilter_generated.mk | 6 | ||||
| -rw-r--r-- | writerfilter/inc/resourcemodel/QNameToString.hxx | 1 | ||||
| -rw-r--r-- | writerfilter/source/Makefile | 29 |
10 files changed, 27 insertions, 341 deletions
diff --git a/writerfilter/Library_doctok.mk b/writerfilter/Library_doctok.mk index 0782d5d8c6b9..1b56bb8f9c91 100644 --- a/writerfilter/Library_doctok.mk +++ b/writerfilter/Library_doctok.mk @@ -30,9 +30,11 @@ $(eval $(call gb_Library_Library,doctok)) $(eval $(call gb_Library_set_include,doctok,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/writerfilter/inc) \ + -I$(realpath $(SRCDIR)/writerfilter/source) \ -I$(realpath $(SRCDIR)/writerfilter/source/doctok) \ - -I$(WORKDIR)/writerfilter/inc \ - -I$(WORKDIR)/writerfilter/inc/doctok \ + -I$(WORKDIR)/CustomTarget/writerfilter/source \ + -I$(WORKDIR)/CustomTarget/writerfilter/source/ooxml \ + -I$(WORKDIR)/CustomTarget/writerfilter/source/doctok \ $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \ -I$(OUTDIR)/inc \ )) @@ -84,67 +86,7 @@ $(eval $(call gb_Library_add_exception_objects,doctok,\ )) $(eval $(call gb_Library_add_generated_exception_objects,doctok,\ - writerfilter/source/doctok/resources \ + CustomTarget/writerfilter/source/resources \ )) -doctok_GENDIR := $(WORKDIR)/writerfilter -doctok_HXXOUTDIR := $(doctok_GENDIR)/inc/doctok -doctok_HXXOUTDIRCREATED := $(doctok_HXXOUTDIR)/created - -ooxml_BASEDIR := $(realpath $(SRCDIR)/writerfilter) - -doctok_QNAMETOSTRXSL := $(ooxml_BASEDIR)/source/doctok/qnametostr.xsl -doctok_RESOURCEIDSXSL := $(ooxml_BASEDIR)/source/doctok/resourceids.xsl -doctok_RESOURCESIMPLXSL := $(ooxml_BASEDIR)/source/doctok/resourcesimpl.xsl -doctok_RESOURCESXSL := $(ooxml_BASEDIR)/source/doctok/resources.xsl -doctok_RESOURCETOOLSXSL := $(ooxml_BASEDIR)/source/doctok/resourcetools.xsl -doctok_SPRMCODETOSTRXSL := $(ooxml_BASEDIR)/source/doctok/sprmcodetostr.xsl -doctok_SPRMIDSXSL := $(ooxml_BASEDIR)/source/doctok/sprmids.xsl - -doctok_MODEL := $(ooxml_BASEDIR)/source/doctok/resources.xmi - -doctok_RESOURCEIDSHXX := $(doctok_HXXOUTDIR)/resourceids.hxx -doctok_SPRMIDSHXX := $(doctok_HXXOUTDIR)/sprmids.hxx -doctok_RESOURCESHXX := $(doctok_HXXOUTDIR)/resources.hxx -doctok_RESOURCESCXX := $(call gb_GenCxxObject_get_source,writerfilter/source/doctok/resources) - -doctok_QNAMETOSTRTMP := $(doctok_GENDIR)/doctok_qnameToStr.tmp -doctok_SPRPMCODETOSTRTMP := $(doctok_GENDIR)/sprmcodetostr.tmp - -doctok_GENHEADERS = \ - $(doctok_RESOURCEIDSHXX) \ - $(doctok_SPRMIDSHXX) \ - $(doctok_RESOURCESHXX) - -doctok_GENFILES = \ - $(doctok_GENHEADERS) \ - $(doctok_QNAMETOSTRTMP) \ - $(doctok_RESOURCESCXX) \ - $(doctok_SPRPMCODETOSTRTMP) - -$(doctok_HXXOUTDIRCREATED) : - mkdir -p $(dir $@) && touch $@ - -$(doctok_GENHEADERS) : $(doctok_HXXOUTDIRCREATED) - -define doctok_xsl_process_model -$(1) : $(2) $(doctok_MODEL) - mkdir -p $(dir $(1)) && $$(call gb_Helper_abbreviate_dirs_native,$(gb_XSLTPROC) --nonet $(2) $(doctok_MODEL)) > $(1) -endef - -$(eval $(call doctok_xsl_process_model,$(doctok_RESOURCESHXX),$(doctok_RESOURCESXSL))) -$(eval $(call doctok_xsl_process_model,$(doctok_QNAMETOSTRTMP),$(doctok_QNAMETOSTRXSL))) -$(eval $(call doctok_xsl_process_model,$(doctok_SPRMIDSHXX),$(doctok_SPRMIDSXSL))) -$(eval $(call doctok_xsl_process_model,$(doctok_RESOURCESCXX),$(doctok_RESOURCESIMPLXSL))) -$(eval $(call doctok_xsl_process_model,$(doctok_RESOURCEIDSHXX),$(doctok_RESOURCEIDSXSL))) -$(eval $(call doctok_xsl_process_model,$(doctok_SPRPMCODETOSTRTMP),$(doctok_SPRMCODETOSTRXSL))) - -$(doctok_RESOURCESCXX) : $(doctok_GENHEADERS) $(doctok_RESOURCETOOLSXSL) - -doctok_clean: - rm -rf $(doctok_GENFILES) $(doctok_HXXOUTDIR) -.PHONY: doctok_clean - -$(call gb_Library_get_clean_target,doctok) : doctok_clean - # vim: set noet ts=4 sw=4: diff --git a/writerfilter/Library_ooxml.mk b/writerfilter/Library_ooxml.mk index dcfa6784c5d8..902703da74dc 100644 --- a/writerfilter/Library_ooxml.mk +++ b/writerfilter/Library_ooxml.mk @@ -25,21 +25,27 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. +include $(realpath $(SRCDIR)/writerfilter/debug_setup.mk) +include $(realpath $(SRCDIR)/writerfilter/source/generated.mk) + $(eval $(call gb_Library_Library,ooxml)) +$(eval $(call gb_Library_add_package_headers,ooxml,writerfilter_generated)) + $(eval $(call gb_Library_set_include,ooxml,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/writerfilter/inc) \ -I$(realpath $(SRCDIR)/writerfilter/source/ooxml) \ -I$(realpath $(SRCDIR)/writerfilter/source/dmapper) \ + -I$(WORKDIR)/CustomTarget/writerfilter/source \ + -I$(WORKDIR)/CustomTarget/writerfilter/source/ooxml \ + -I$(WORKDIR)/CustomTarget/writerfilter/source/doctok \ -I$(WORKDIR)/writerfilter/inc \ -I$(WORKDIR)/writerfilter/inc/ooxml \ $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \ -I$(OUTDIR)/inc \ )) -include $(realpath $(SRCDIR)/writerfilter/debug_setup.mk) - $(eval $(call gb_Library_add_defs,ooxml,\ -DWRITERFILTER_OOXML_DLLIMPLEMENTATION \ $(writerfilter_debug_flags) \ @@ -55,6 +61,7 @@ $(eval $(call gb_Library_add_linked_libs,ooxml,\ comphelper \ cppu \ cppuhelper \ + doctok \ i18nisolang1 \ i18npaper \ resourcemodel \ @@ -105,189 +112,10 @@ $(eval $(call gb_Library_add_exception_objects,ooxml,\ writerfilter/source/ooxml/OOXMLStreamImpl \ )) -ooxml_NAMESPACES := \ - dml-baseStylesheet \ - dml-baseTypes \ - dml-chartDrawing \ - dml-documentProperties \ - dml-graphicalObject \ - dml-shape3DCamera \ - dml-shape3DLighting \ - dml-shape3DScene \ - dml-shape3DStyles \ - dml-shapeEffects \ - dml-shapeGeometry \ - dml-shapeLineProperties \ - dml-shapeProperties \ - dml-styleDefaults \ - dml-stylesheet \ - dml-textCharacter \ - dml-wordprocessingDrawing \ - shared-math \ - shared-relationshipReference \ - sml-customXmlMappings \ - vml-main \ - vml-officeDrawing \ - vml-wordprocessingDrawing \ - wml - -ooxml_factory_source_stem = writerfilter/source/ooxml/OOXMLFactory_$(1) - -define ooxml_factory_source -$(call gb_GenCxxObject_get_source,$(call ooxml_factory_source_stem,$(1))) -endef - -define ooxml_namespace_sources -$(foreach namespace,$(ooxml_NAMESPACES),$(call ooxml_factory_source,$(namespace))) -endef - $(eval $(call gb_Library_add_generated_exception_objects,ooxml,\ - writerfilter/source/ooxml/OOXMLFactory_generated \ - writerfilter/source/ooxml/OOXMLFactory_values \ - $(foreach namespace,$(ooxml_NAMESPACES),$(call ooxml_factory_source_stem,$(namespace))) \ + $(patsubst %,CustomTarget/writerfilter/source/OOXMLFactory_%,$(WRITERFILTER_OOXMLNAMESPACES)) \ + CustomTarget/writerfilter/source/OOXMLFactory_generated \ + CustomTarget/writerfilter/source/OOXMLFactory_values \ )) -SLOFACTORIESNAMESPACES= \ - $(SLO)/ooxml_Factory_{$(NAMESPACES)}.obj - -ooxml_HXXOUTDIR := $(WORKDIR)/writerfilter/inc/ooxml -ooxml_CXXOUTDIR := $(dir $(call ooxml_factory_source,generated)) -ooxml_MISCDIR := $(WORKDIR)/writerfilter/ooxml - -ooxml_HXXOUTDIRCREATED := $(ooxml_HXXOUTDIR)/created - -define ooxml_factory_header -$(ooxml_HXXOUTDIR)/OOXMLFactory_$(1).hxx -endef - -define ooxml_namespace_headers -$(foreach namespace,$(ooxml_NAMESPACES),$(call ooxml_factory_header,$(namespace))) -endef - -ooxml_BASEDIR := $(realpath $(SRCDIR)/writerfilter) - -ooxml_MODEL := $(ooxml_BASEDIR)/source/ooxml/model.xml - -ooxml_FACTORYIMPLNSXSL := $(ooxml_BASEDIR)/source/ooxml/factoryimpl_ns.xsl -ooxml_FACTORYIMPLXSL := $(ooxml_BASEDIR)/source/ooxml/factoryimpl.xsl -ooxml_FACTORYINCXSL := $(ooxml_BASEDIR)/source/ooxml/factoryinc.xsl -ooxml_FACTORYNSXSL := $(ooxml_BASEDIR)/source/ooxml/factory_ns.xsl -ooxml_FACTORYTOOLSXSL := $(ooxml_BASEDIR)/source/ooxml/factorytools.xsl -ooxml_FACTORYVALUESIMPLXSL := $(ooxml_BASEDIR)/source/ooxml/factoryimpl_values.xsl -ooxml_FACTORYVALUESXSL := $(ooxml_BASEDIR)/source/ooxml/factory_values.xsl -ooxml_FASTTOKENSXSL := $(ooxml_BASEDIR)/source/ooxml/fasttokens.xsl -ooxml_GPERFFASTTOKENXSL := $(ooxml_BASEDIR)/source/ooxml/gperffasttokenhandler.xsl -ooxml_NAMESPACEIDSXSL := $(ooxml_BASEDIR)/source/ooxml/namespaceids.xsl -ooxml_PREPROCESSXSL := $(ooxml_BASEDIR)/source/ooxml/modelpreprocess.xsl -ooxml_QNAMETOSTRXSL := $(ooxml_BASEDIR)/source/ooxml/qnametostr.xsl -ooxml_RESORUCETOKENSXSL := $(ooxml_BASEDIR)/source/ooxml/resourcestokens.xsl -ooxml_RESOURCEIDSXSL := $(ooxml_BASEDIR)/source/ooxml/resourceids.xsl -ooxml_RESOURCESIMPLXSL := $(ooxml_BASEDIR)/source/ooxml/resourcesimpl.xsl - -ooxml_NSPROCESS := $(SRCDIR)/writerfilter/source/resourcemodel/namespace_preprocess.pl - -ooxml_RESOURCEIDSHXX := $(ooxml_HXXOUTDIR)/resourceids.hxx - -ooxml_TOKENXML := $(ooxml_MISCDIR)/token.xml -ooxml_TOKENXMLTMP := $(ooxml_MISCDIR)/token.tmp - -ooxml_FACTORYGENERATEDHXX := $(call ooxml_factory_header,generated) -ooxml_FACTORYGENERATEDCXX := $(call ooxml_factory_source,generated) -ooxml_FASTTOKENSHXX := $(ooxml_HXXOUTDIR)/OOXMLFastTokens.hxx -ooxml_NAMESPACEIDSHXX := $(ooxml_HXXOUTDIR)/OOXMLnamespaceids.hxx -ooxml_FACTORYVALUESHXX := $(call ooxml_factory_header,values) -ooxml_FACTORYVALUESCXX := $(call ooxml_factory_source,values) -ooxml_GPERFFASTTOKENHXX := $(ooxml_HXXOUTDIR)/gperffasttoken.hxx -ooxml_GPERFFASTTOKENTMP := $(ooxml_MISCDIR)/gperffasttoken.tmp -ooxml_QNAMETOSTRTMP := $(WORKDIR)/writerfilter/ooxml_qnameToStr.tmp - -ooxml_MODELPROCESSED := $(ooxml_MISCDIR)/model_preprocessed.xml -ooxml_NSXSL := $(ooxml_MISCDIR)/namespacesmap.xsl -ooxml_PREPROCESSXSLCOPIED := $(ooxml_MISCDIR)/modelpreprocess.xsl - -ooxml_NAMESPACESTXT := $(OUTDIR)/inc/oox/namespaces.txt - -ooxml_GENHEADERS = \ - $(ooxml_FACTORYGENERATEDHXX) \ - $(ooxml_FASTTOKENSHXX) \ - $(ooxml_FACTORYVALUESHXX) \ - $(ooxml_GPERFFASTTOKENHXX) \ - $(ooxml_RESOURCEIDSHXX) \ - $(ooxml_NAMESPACEIDSHXX) \ - $(ooxml_namespace_headers) - -ooxml_GENERATEDFILES = \ - $(ooxml_GENHEADERS) \ - $(ooxml_GPERFFASTTOKENTMP) \ - $(ooxml_FACTORYGENERATEDCXX) \ - $(ooxml_MODELPROCESSED) \ - $(ooxml_namespace_sources) \ - $(ooxml_NSXSL) \ - $(ooxml_FACTORYVALUESCXX) \ - $(ooxml_PREPROCESSXSLCOPIED) \ - $(ooxml_QNAMETOSTRTMP) \ - $(ooxml_TOKENXMLTMP) \ - $(ooxml_TOKENXML) - -$(ooxml_TOKENXMLTMP) : $(OUTDIR)/inc/oox/tokens.txt - mkdir -p $(dir $@) && sed -e 's#.*#<fasttoken>&</fasttoken>#' $< > $@ - -$(ooxml_TOKENXML) : $(SRCDIR)/writerfilter/source/ooxml/tokenxmlheader $(ooxml_TOKENXMLTMP) $(SRCDIR)/writerfilter/source/ooxml/tokenxmlfooter - mkdir -p $(dir $@) && cat $(SRCDIR)/writerfilter/source/ooxml/tokenxmlheader $(ooxml_TOKENXMLTMP) $(SRCDIR)/writerfilter/source/ooxml/tokenxmlfooter > $@ - -$(ooxml_HXXOUTDIRCREATED) : - mkdir -p $(dir $@) && touch $@ - -$(ooxml_GENHEADERS) : $(ooxml_HXXOUTDIRCREATED) - -$(call ooxml_factory_source,%) :| $(call ooxml_factory_header,%) - -$(call ooxml_factory_source,%) : $(ooxml_FACTORYIMPLNSXSL) $(ooxml_MODELPROCESSED) - mkdir -p $(dir $@) && $(call gb_Helper_abbreviate_dirs_native,$(gb_XSLTPROC) --nonet --stringparam file $@ $(ooxml_FACTORYIMPLNSXSL) $(ooxml_MODELPROCESSED)) > $@ - -$(call ooxml_factory_header,%) : $(ooxml_FACTORYNSXSL) $(ooxml_MODELPROCESSED) - mkdir -p $(dir $@) && $(call gb_Helper_abbreviate_dirs_native,$(gb_XSLTPROC) --nonet --stringparam file $@ $(ooxml_FACTORYNSXSL) $(ooxml_MODELPROCESSED)) > $@ - -define ooxml_xsl_process -$(1) : $(2) $(3) - mkdir -p $(dir $(1)) && $$(call gb_Helper_abbreviate_dirs_native,$(gb_XSLTPROC) --nonet $(2) $(3)) > $(1) -endef - -define ooxml_xsl_process_model -$(call ooxml_xsl_process,$(1),$(2),$(ooxml_MODELPROCESSED)) -endef - -$(eval $(call ooxml_xsl_process,$(ooxml_MODELPROCESSED),$(ooxml_NSXSL),$(ooxml_MODEL))) -$(eval $(call ooxml_xsl_process,$(ooxml_FASTTOKENSHXX),$(ooxml_FASTTOKENSXSL),$(ooxml_TOKENXML))) - -$(eval $(call ooxml_xsl_process_model,$(ooxml_FACTORYGENERATEDHXX),$(ooxml_FACTORYINCXSL))) -$(eval $(call ooxml_xsl_process_model,$(ooxml_FACTORYGENERATEDCXX),$(ooxml_FACTORYIMPLXSL))) -$(eval $(call ooxml_xsl_process_model,$(ooxml_FACTORYVALUESHXX),$(ooxml_FACTORYVALUESXSL))) -$(eval $(call ooxml_xsl_process_model,$(ooxml_FACTORYVALUESCXX),$(ooxml_FACTORYVALUESIMPLXSL))) -$(eval $(call ooxml_xsl_process_model,$(ooxml_QNAMETOSTRTMP),$(ooxml_QNAMETOSTRXSL))) -$(eval $(call ooxml_xsl_process_model,$(ooxml_RESOURCEIDSHXX),$(ooxml_RESOURCEIDSXSL))) -$(eval $(call ooxml_xsl_process_model,$(ooxml_NAMESPACEIDSHXX),$(ooxml_NAMESPACEIDSXSL))) -$(eval $(call ooxml_xsl_process_model,$(ooxml_GPERFFASTTOKENTMP),$(ooxml_GPERFFASTTOKENXSL))) - -$(ooxml_NSXSL) : $(ooxml_NAMESPACESTXT) $(ooxml_NSPROCESS) $(ooxml_PREPROCESSXSLCOPIED) - mkdir -p $(dir $@) && perl $(ooxml_NSPROCESS) $(ooxml_NAMESPACESTXT) > $@ - -# this is included by relative path from $(ooxml_NSXSL) -$(ooxml_PREPROCESSXSLCOPIED) : $(ooxml_PREPROCESSXSL) - mkdir -p $(dir $@) && cp $< $@ - -$(ooxml_GPERFFASTTOKENHXX) : $(ooxml_GPERFFASTTOKENTMP) $(ooxml_HXXOUTDIRCREATED) - tr -d '\r' < $< | gperf -I -t -E -S1 -c -G -LC++ > $@ - -$(ooxml_GENERATEDFILES) : $(ooxml_FACTORYTOOLSXSL) - -$(ooxml_FACTORYVALUESCXX) :| $(ooxml_FACTORYVALUESHXX) -$(ooxml_FACTORYGENERATEDCXX) :| $(ooxml_FACTORYGENERATEDHXX) $(ooxml_GENHEADERS) - -ooxml_clean : - rm -rf $(ooxml_GENERATEDFILES) $(ooxml_HXXOUTDIR) -.PHONY : ooxml_clean - -$(call gb_Library_get_clean_target,ooxml) : ooxml_clean - # vim: set noet ts=4 sw=4: diff --git a/writerfilter/Library_resourcemodel.mk b/writerfilter/Library_resourcemodel.mk index adc637e05972..422d5188f292 100644 --- a/writerfilter/Library_resourcemodel.mk +++ b/writerfilter/Library_resourcemodel.mk @@ -26,12 +26,11 @@ # instead of those above. $(eval $(call gb_Library_Library,resourcemodel)) -$(eval $(call gb_Library_add_package_headers,resourcemodel,writerfilter_generated)) $(eval $(call gb_Library_set_include,resourcemodel,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/writerfilter/inc) \ - -I$(WORKDIR)/writerfilter/inc \ + -I$(WORKDIR)/CustomTarget/writerfilter/source \ $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \ -I$(OUTDIR)/inc \ )) @@ -71,34 +70,12 @@ $(eval $(call gb_Library_add_exception_objects,resourcemodel,\ )) $(eval $(call gb_Library_add_generated_exception_objects,resourcemodel,\ - writerfilter/source/resourcemodel/sprmcodetostr \ + CustomTarget/writerfilter/source/sprmcodetostr \ )) $(eval $(call gb_Library_add_generated_cxxobjects,resourcemodel,\ - writerfilter/source/resourcemodel/qnametostr \ + CustomTarget/writerfilter/source/qnametostr \ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ )) -define resourcemodel_gen_source -$(call gb_GenCxxObject_get_source,$(1)) : $(2) $(SRCDIR)/$(1)header $(SRCDIR)/$(1)footer - mkdir -p $$(dir $$@) && cat $(SRCDIR)/$(1)header $(2) $(SRCDIR)/$(1)footer > $$@ -endef - -# the .tmp files are generated in doctok/ooxml library makefiles -$(eval $(call resourcemodel_gen_source,writerfilter/source/resourcemodel/qnametostr,\ - $(WORKDIR)/writerfilter/doctok_qnameToStr.tmp \ - $(WORKDIR)/writerfilter/ooxml_qnameToStr.tmp \ -)) -$(eval $(call resourcemodel_gen_source,writerfilter/source/resourcemodel/sprmcodetostr,\ - $(WORKDIR)/writerfilter/sprmcodetostr.tmp \ -)) - -resourcemodel_clean : - rm -f \ - $(call gb_GenCxxObject_get_source,writerfilter/source/resourcemodel/qnametostr) \ - $(call gb_GenCxxObject_get_source,writerfilter/source/resourcemodel/sprmcodetostr) -.PHONY : resourcemodel_clean - -$(call gb_Library_get_clean_target,resourcemodel) : resourcemodel_clean - # vim: set noet ts=4 sw=4: diff --git a/writerfilter/Library_rtftok.mk b/writerfilter/Library_rtftok.mk index 4c3ecd13ebab..bfbf8e325ff5 100644 --- a/writerfilter/Library_rtftok.mk +++ b/writerfilter/Library_rtftok.mk @@ -31,7 +31,7 @@ $(eval $(call gb_Library_Library,rtftok)) $(eval $(call gb_Library_set_include,rtftok,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/writerfilter/inc) \ - -I$(WORKDIR)/writerfilter/inc \ + -I$(WORKDIR)/CustomTarget/writerfilter/source \ -I$(OUTDIR)/inc \ -I$(OUTDIR)/inc/offapi \ -I$(OUTDIR)/inc/offuh \ diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 889313398031..073b4ee4373a 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -31,7 +31,6 @@ $(eval $(call gb_Library_set_include,writerfilter,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/writerfilter/inc) \ $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \ - -I$(OUTDIR)/inc \ )) $(eval $(call gb_Library_add_api,writerfilter,\ diff --git a/writerfilter/Module_writerfilter.mk b/writerfilter/Module_writerfilter.mk index 6f2c5320f5c5..87f4b6a5c1af 100644 --- a/writerfilter/Module_writerfilter.mk +++ b/writerfilter/Module_writerfilter.mk @@ -30,11 +30,11 @@ $(eval $(call gb_Module_Module,writerfilter)) $(eval $(call gb_Module_add_targets,writerfilter,\ Library_doctok \ Library_ooxml \ - Library_rtftok \ Library_resourcemodel \ + Library_rtftok \ Library_writerfilter \ Library_writerfilter_uno \ - Package_generated \ + Package_writerfilter_generated \ )) # vim: set noet ts=4 sw=4: diff --git a/writerfilter/Package_generated.mk b/writerfilter/Package_generated.mk deleted file mode 100644 index 682c3c6bbacc..000000000000 --- a/writerfilter/Package_generated.mk +++ /dev/null @@ -1,32 +0,0 @@ -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Initial Developer of the Original Code is -# David Tardon, Red Hat Inc. <dtardon@redhat.com> -# Portions created by the Initial Developer are Copyright (C) 2010 the -# Initial Developer. All Rights Reserved. -# -# Major Contributor(s): -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Package_Package,writerfilter_generated,$(WORKDIR)/writerfilter/inc/doctok)) - -$(eval $(call gb_Package_add_file,writerfilter_generated,inc/writerfilter/doctok/sprmids.hxx,sprmids.hxx)) - -# vim: set noet ts=4 sw=4: diff --git a/writerfilter/Package_writerfilter_generated.mk b/writerfilter/Package_writerfilter_generated.mk index 204e028210d0..3d19a0b46e78 100644 --- a/writerfilter/Package_writerfilter_generated.mk +++ b/writerfilter/Package_writerfilter_generated.mk @@ -34,8 +34,8 @@ $(eval $(call \ $(eval $(call \ gb_CustomTarget_add_outdir_dependencies,writerfilter/source,\ $(gb_XSLTPROCTARGET) \ - $(OUTDIR)/inc$(UPDMINOREXT)/oox/token/tokens.txt \ - $(OUTDIR)/inc$(UPDMINOREXT)/oox/token/namespaces.txt \ + $(OUTDIR)/inc$(UPDMINOREXT)/oox/tokens.txt \ + $(OUTDIR)/inc$(UPDMINOREXT)/oox/namespaces.txt \ )) $(eval $(call \ @@ -62,8 +62,6 @@ $(eval $(call \ writerfilter/source/ooxml/factoryimpl.xsl \ writerfilter/source/ooxml/factoryimpl_ns.xsl \ writerfilter/source/ooxml/factory_ns.xsl \ - writerfilter/source/rtftok/RTFScanner.lex \ - writerfilter/source/rtftok/RTFScanner.skl \ writerfilter/source/doctok/sprmcodetostr.xsl \ writerfilter/source/doctok/qnametostr.xsl \ writerfilter/source/ooxml/qnametostr.xsl \ diff --git a/writerfilter/inc/resourcemodel/QNameToString.hxx b/writerfilter/inc/resourcemodel/QNameToString.hxx index 7a8932b13bcb..57aed5bbc944 100644 --- a/writerfilter/inc/resourcemodel/QNameToString.hxx +++ b/writerfilter/inc/resourcemodel/QNameToString.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_QNAME_TO_STRING_HXX #define INCLUDED_QNAME_TO_STRING_HXX +#include <WriterFilterDllApi.hxx> #include <boost/shared_ptr.hpp> #include <map> #include <string> diff --git a/writerfilter/source/Makefile b/writerfilter/source/Makefile index 487888cf413f..b50ff5df4aa2 100644 --- a/writerfilter/source/Makefile +++ b/writerfilter/source/Makefile @@ -74,12 +74,6 @@ wf_SRC_ooxml_FactoryValuesImpl_xsl=$(WFDIR)ooxml/factoryimpl_values.xsl wf_SRC_ooxml_ResourceIds_xsl=$(WFDIR)ooxml/resourceids.xsl wf_SRC_ooxml_GperfFastTokenHandler_xsl=$(WFDIR)ooxml/gperffasttokenhandler.xsl wf_SRC_ooxml_Analyze_model_xsl=$(WFDIR)ooxml/analyzemodel.xsl -wf_SRC_ooxml_Status_stage1_sh=$(WFDIR)ooxml/stage1.sh -wf_SRC_ooxml_Status_stage2_xsl=$(WFDIR)ooxml/analyzestage2.xsl -wf_SRC_ooxml_Status_stage3_xsl=$(WFDIR)ooxml/analyzestage3.xsl -wf_SRC_ooxml_Status_todo_xsl=$(WFDIR)ooxml/todo.xsl -wf_SRC_ooxml_Status_efforts_xsl=$(WFDIR)ooxml/effort.xsl - wf_GEN_ooxml_ResourceIds_hxx=ooxml/resourceids.hxx wf_GEN_ooxml_token_xml=token.xml @@ -94,11 +88,6 @@ wf_GEN_ooxml_FactoryValues_cxx=OOXMLFactory_values.cxx wf_GEN_ooxml_GperfFastToken_hxx=gperffasttoken.hxx wf_GEN_ooxml_Model_processed=model_preprocessed.xml wf_GEN_ooxml_Model_analyzed=ooxml/model_analyzed.xml -wf_GEN_ooxml_Status_stage1=ooxml/status_stage1.xml -wf_GEN_ooxml_Status_stage2=ooxml/status_stage2.xml -wf_GEN_ooxml_Status_stage3=ooxml/status_stage3.xml -wf_GEN_ooxml_Status_todo=ooxml/todo.xml -wf_GEN_ooxml_Status_efforts=ooxml/efforts.csv $(wf_GEN_ooxml_token_tmp) : $(OUTDIR)/inc$(UPDMINOREXT)/oox/token/tokens.txt cat $(OUTDIR)/inc$(UPDMINOREXT)/oox/token/tokens.txt \ @@ -141,21 +130,6 @@ $(wf_GEN_ooxml_GperfFastToken_hxx) : $(wf_SRC_ooxml_GperfFastTokenHandler_xsl) $ $(wf_GEN_ooxml_Model_analyzed): $(wf_SRC_ooxml_Analyze_model_xsl) $(wf_SRC_ooxml_Model) $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@ -$(wf_GEN_ooxml_Status_stage1) : $(wf_GEN_ooxml_Model_analyzed) $(wf_SRC_ooxml_stage1_sh) - $(wf_SRC_ooxml_Status_stage1_sh) $(wf_GEN_ooxml_Model_analyzed) $(WFDIR)dmapper > $@ - -$(wf_GEN_ooxml_Status_stage2) : $(wf_SRC_ooxml_Status_stage2_xsl) $(wf_GEN_ooxml_Status_stage1) - $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@ - -$(wf_GEN_ooxml_Status_stage3) : $(wf_SRC_ooxml_Status_stage3_xsl) $(wf_GEN_ooxml_Status_stage2) - $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@ - -$(wf_GEN_ooxml_Status_todo) : $(wf_SRC_ooxml_Status_todo_xsl) $(wf_GEN_ooxml_Status_stage3) - $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@ - -$(wf_GEN_ooxml_Status_efforts) : $(wf_SRC_ooxml_Status_efforts_xsl) $(wf_GEN_ooxml_Status_todo) - $(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@ - # rtftok wf_SRC_rtftok_scanner_lex=$(WFDIR)rtftok/RTFScanner.lex @@ -179,7 +153,7 @@ wf_SRC_doctok_QNameToStr_xsl=$(WFDIR)doctok/qnametostr.xsl wf_SRC_ooxml_QNameToStr_xsl=$(WFDIR)ooxml/qnametostr.xsl wf_SRC_model_NamespacePreprocess=$(WFDIR)resourcemodel/namespace_preprocess.pl wf_GEN_ooxml_Namespacesmap_xsl=namespacesmap.xsl -wf_DEP_ooxml_namespaces_txt=$(OUTDIR)/inc$(UPDMINOREXT)/oox/token/namespaces.txt +wf_DEP_ooxml_namespaces_txt=$(OUTDIR)/inc$(UPDMINOREXT)/oox/namespaces.txt wf_GEN_ooxml_preprocess_xsl=modelpreprocess.xsl $(wf_GEN_ooxml_QNameToStr_tmp): $(wf_SRC_ooxml_QNameToStr_xsl) $(wf_GEN_ooxml_Model_processed) @@ -223,7 +197,6 @@ all : \ $(wf_GEN_ooxml_FastTokens_hxx) \ $(wf_GEN_ooxml_GperfFastToken_hxx) \ $(wf_GEN_ooxml_NamespaceIds_hxx) \ - $(wf_GEN_ooxml_Status_efforts) \ $(wf_GEN_model_QNameToStr_cxx) \ $(wf_GEN_model_SprmCodeToStr_cxx) \ $(patsubst %,OOXMLFactory_%.hxx,$(WRITERFILTER_OOXMLNAMESPACES)) \ |