diff options
| -rw-r--r-- | sd/CppUnitTest_sd_uimpress.mk | 24 | ||||
| -rw-r--r-- | sd/Module_sd.mk | 1 | ||||
| -rw-r--r-- | sd/Package_qa_unit.mk | 41 | ||||
| -rw-r--r-- | sd/qa/unit/Makefile | 48 |
4 files changed, 18 insertions, 96 deletions
diff --git a/sd/CppUnitTest_sd_uimpress.mk b/sd/CppUnitTest_sd_uimpress.mk index 05467d74c96d..a1974c6f079e 100644 --- a/sd/CppUnitTest_sd_uimpress.mk +++ b/sd/CppUnitTest_sd_uimpress.mk @@ -79,15 +79,27 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sd_uimpress,\ $(eval $(call gb_CppunitTest_uses_ure,sd_uimpress)) +$(eval $(call gb_CppunitTest_add_type_rdbs,sd_uimpress,\ + types \ +)) + +$(eval $(call gb_CppunitTest_add_service_rdbs,sd_uimpress,\ + sd_uimpress \ +)) + $(eval $(call gb_CppunitTest_set_args,sd_uimpress,\ --headless \ --invisible \ - "-env:UNO_TYPES=$(foreach binrdb,udkapi.rdb types.rdb,\ - file://$(if $(filter WNT,$(OS)),/)$(OUTDIR)/bin/$(binrdb))" \ - "-env:UNO_SERVICES=$(foreach rdb,$(OUTDIR)/xml/ure/services.rdb $(WORKDIR)/CustomTarget/sd/qa/unit/services.rdb,\ - file://$(if $(filter WNT,$(OS)),/)$(rdb))" \ - $(foreach dir,URE_INTERNAL_LIB_DIR OOO_BASE_DIR BRAND_BASE_DIR,\ - -env:$(dir)=file://$(if $(filter WNT,$(OS)),/$(OUTDIR)/bin,$(OUTDIR)/lib)) \ +)) + +$(eval $(call gb_RdbTarget_RdbTarget,sd_uimpress)) + +$(eval $(call gb_RdbTarget_add_components,sd_uimpress,\ + framework/util/fwk \ +)) + +$(eval $(call gb_RdbTarget_add_old_components,sd_uimpress,\ + i18npool \ )) # vim: set noet sw=4: diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk index 9e03dc62a4ce..bb17b5a0f8bc 100644 --- a/sd/Module_sd.mk +++ b/sd/Module_sd.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Module_add_targets,sd,\ Library_sdfilt \ Library_sdui \ Package_inc \ - Package_qa_unit \ Package_uiconfig \ Package_web \ Package_xml \ diff --git a/sd/Package_qa_unit.mk b/sd/Package_qa_unit.mk deleted file mode 100644 index a440805e768e..000000000000 --- a/sd/Package_qa_unit.mk +++ /dev/null @@ -1,41 +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,sd_qa_unit,$(WORKDIR)/CustomTarget/sd/qa/unit)) - -$(eval $(call gb_Package_add_customtarget,sd_qa_unit,sd/qa/unit)) - -$(eval $(call gb_CustomTarget_add_outdir_dependencies,sd/qa/unit,\ - $(foreach newcomponentfile,\ - framework/util/fwk \ - , $(OUTDIR)/xml/component/$(newcomponentfile).component) \ - $(foreach oldcomponentfile, \ - i18npool \ - , $(OUTDIR)/xml/$(oldcomponentfile).component) \ -)) - -# vim: set noet sw=4: diff --git a/sd/qa/unit/Makefile b/sd/qa/unit/Makefile deleted file mode 100644 index 6327da159097..000000000000 --- a/sd/qa/unit/Makefile +++ /dev/null @@ -1,48 +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. 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 -# Bjoern Michaelsen <bjoern.michaelsen@canonical.com> (Canonical Ltd.) -# Portions created by the Initial Developer are Copyright (C) 2011 the -# Initial Developer. All Rights Reserved. -# -# Contributor(s): Bjoern Michaelsen <bjoern.michaelsen@canonical.com> (Canonical Ltd.) -# -# 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. - -MYDIR := $(realpath $(dir $(firstword $(MAKEFILE_LIST)))) - -all : services.rdb - -services.rdb : $(foreach newcomponentfile,\ - framework/util/fwk \ - , $(OUTDIR)/xml/component/$(newcomponentfile).component) - -services.rdb : $(foreach oldcomponentfile, \ - i18npool \ - , $(OUTDIR)/xml/$(oldcomponentfile).component) - -services.rdb : - echo '<?xml version="1.0"?><components xmlns="http://openoffice.org/2010/uno-components">' > $@ - $(gb_AWK) -- \ - '/^<\?xml version.*/ { next; } \ - { gsub(/vnd.sun.star.expand:\$$OOO_BASE_DIR\/program/, "vnd.sun.star.expand:$$OOO_BASE_DIR",$$0); gsub(/vnd.sun.star.expand:\$$BRAND_BASE_DIR\/program/, "vnd.sun.star.expand:$$BRAND_BASE_DIR",$$0); print; }' \ - $^ >> $@ - echo '</components>' >> $@ - -.PHONY : all - -# vim: set noet sw=4 ts=4: |