diff options
author | David Ostrovsky <David.Ostrovsky@gmx.de> | 2012-05-15 00:55:02 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2012-05-29 07:34:50 +0200 |
commit | fa94dbf210e85db744473be8404eb66be6799a15 (patch) | |
tree | b3b8344405d6978e7074544294aa0cf56733223e | |
parent | bridgetest.rdb path fixed (diff) | |
download | core-fa94dbf210e85db744473be8404eb66be6799a15.tar.gz core-fa94dbf210e85db744473be8404eb66be6799a15.zip |
bridgetest further targets migrated
Change-Id: I9e1b13b8f0454aa65d3b0b6a0b26e54bd2b3a21f
-rw-r--r-- | Repository.mk | 4 | ||||
-rw-r--r-- | testtools/CustomTarget_bridgetest_climaker.mk | 65 | ||||
-rw-r--r-- | testtools/CustomTarget_uno_services.mk | 60 | ||||
-rw-r--r-- | testtools/Library_bridgetest.mk | 59 | ||||
-rw-r--r-- | testtools/Library_constructors.mk | 55 | ||||
-rw-r--r-- | testtools/Library_cppobj.mk | 59 | ||||
-rw-r--r-- | testtools/Module_testtools.mk | 25 | ||||
-rw-r--r-- | testtools/Rdb_cppobj.mk | 33 | ||||
-rw-r--r-- | testtools/StaticLibrary_bridgetest.mk | 49 |
9 files changed, 403 insertions, 6 deletions
diff --git a/Repository.mk b/Repository.mk index 172703bb0f40..a113a6bd060c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -590,6 +590,9 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ endif $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \ + cppobj \ + bridgetest \ + constructors \ acceptor \ binaryurp \ bootstrap \ @@ -644,6 +647,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ shlxthandler_common \ shlxthandler_common_x64 \ salcpprt \ + testtools_bridgetest \ transex \ ulingu \ vclmain \ diff --git a/testtools/CustomTarget_bridgetest_climaker.mk b/testtools/CustomTarget_bridgetest_climaker.mk new file mode 100644 index 000000000000..2796b7579535 --- /dev/null +++ b/testtools/CustomTarget_bridgetest_climaker.mk @@ -0,0 +1,65 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# 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. +# +# Major Contributor(s): +# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer) +# +# All Rights Reserved. +# +# 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_CustomTarget_CustomTarget,testtools/bridgetest_climaker)) + +TTBC := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_climaker) + +$(call gb_CustomTarget_get_target,testtools/bridgetest_climaker) : \ + $(TTBC)/cli_types_bridgetest.dll + +$(UICM)/cli_types_bridgetest.dll : $(OUTDIR)/bin/bridgetest.rdb \ + $(OUTDIR)/bin/types.rdb $(OUTDIR)/bin/cli_uretypes.dll \ + $(call gb_Executable_get_target_for_build,climaker) | $(TTBC)/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1) + $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_execute,climaker \ + $(if $(filter -s,$(MAKEFLAGS)),,--verbose) \ + --out $@ \ + -X $(OUTDIR)/bin/types.rdb \ + -r $(OUTDIR)/bin/cli_uretypes.dll \ + $< > /dev/null) + +# +# shamelessly stolen in unoil module +# do we need this here? +# +#$(UICM)/cli_oootypes.config : $(SRCDIR)/unoil/climaker/cli_oootypes_config \ +# $(SRCDIR)/unoil/climaker/version.txt | $(UICM)/.dir +# $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) +# $(call gb_Helper_abbreviate_dirs_native, \ +# perl $(SRCDIR)/solenv/bin/clipatchconfig.pl $^ $@) +# +#$(UICM)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll : $(UICM)/cli_oootypes.config \ +# $(UICM)/cli_oootypes.dll $(OUTDIR)/bin/cliuno.snk +# $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AL ,1) +# $(call gb_Helper_abbreviate_dirs_native, \ +# al -out:$@ \ +# -version:$(CLI_OOOTYPES_POLICY_VERSION) \ +# -keyfile:$(OUTDIR)/bin/cliuno.snk \ +# -link:$<) + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/testtools/CustomTarget_uno_services.mk b/testtools/CustomTarget_uno_services.mk new file mode 100644 index 000000000000..570cc14293de --- /dev/null +++ b/testtools/CustomTarget_uno_services.mk @@ -0,0 +1,60 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# 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. +# +# Major Contributor(s): +# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer) +# +# All Rights Reserved. +# +# 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_CustomTarget_CustomTarget,testtools/uno_services)) + +TTUS := $(call gb_CustomTarget_get_workdir,testtools/uno_services) + +$(call gb_CustomTarget_get_target,testtools/uno_services) : $(TTUS)/uno_services.rdb + +#$(call gb_CustomTarget_get_target,i18npool/localedata) : \ +# $(patsubst %.xml,$(IPLD)/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) +# $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SAX,1) +# $(call gb_Helper_abbreviate_dirs_native, \ +# $(call gb_Helper_execute,saxparser) $* $< $@.tmp \ +# $(call gb_Helper_make_url,$(IPLD)/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) + +$(TTUS)/uno_services.rdb : $(TTUS)/uno_services.input \ + $(gb_XSLTPROCTARGET) $(SOLARENV)/bin/packcomponents.xslt + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),RDB,1) + $(call gb_Helper_abbreviate_dirs_native, \ + $(gb_XSLTPROC) --nonet --stringparam prefix $(OUTDIR_FOR_BUILD)/xml/ \ + -o $@ $(SOLARENV)/bin/packcomponents.xslt $<) + +$(TTUS)/uno_services.input :| $(TTUS)/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + echo '<list>$(my_components:^"<filename>":+".component</filename>")</list>' > $@ + +# vim: set noet sw=4 ts=4: diff --git a/testtools/Library_bridgetest.mk b/testtools/Library_bridgetest.mk new file mode 100644 index 000000000000..466fd03a46f3 --- /dev/null +++ b/testtools/Library_bridgetest.mk @@ -0,0 +1,59 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# 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. +# +# Major Contributor(s): +# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer) +# +# All Rights Reserved. +# +# 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_Library_Library,bridgetest)) + +$(eval $(call gb_Library_set_componentfile,bridgetest,testtools/source/bridgetest/bridgetest)) + +$(eval $(call gb_Executable_set_include,bridgetest,\ + -I$(SRCDIR)/testtools/source/bridgetest \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_use_internal_api,bridgetest,\ + bridgetest \ +)) + +$(eval $(call gb_Library_use_api,bridgetest,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_use_static_libraries,bridgetest,\ + testtools_bridgetest \ +)) + +$(eval $(call gb_Library_use_libraries,bridgetest,\ + cppu \ + cppuhelper \ + sal \ +)) + +$(eval $(call gb_Library_add_exception_objects,bridgetest,\ + testtools/source/bridgetest/bridgetest \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/testtools/Library_constructors.mk b/testtools/Library_constructors.mk new file mode 100644 index 000000000000..fc6f7765832f --- /dev/null +++ b/testtools/Library_constructors.mk @@ -0,0 +1,55 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# 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. +# +# Major Contributor(s): +# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer) +# +# All Rights Reserved. +# +# 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_Library_Library,constructors)) + +$(eval $(call gb_Library_set_componentfile,constructors,testtools/source/bridgetest/constructors)) + +$(eval $(call gb_Executable_set_include,constructors,\ + -I$(SRCDIR)/testtools/source/bridgetest \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_use_internal_api,constructors,\ + bridgetest \ +)) + +$(eval $(call gb_Library_use_api,constructors,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_use_libraries,constructors,\ + cppu \ + cppuhelper \ + sal \ +)) + +$(eval $(call gb_Library_add_exception_objects,constructors,\ + testtools/source/bridgetest/constructors \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/testtools/Library_cppobj.mk b/testtools/Library_cppobj.mk new file mode 100644 index 000000000000..538395eb8f1a --- /dev/null +++ b/testtools/Library_cppobj.mk @@ -0,0 +1,59 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# 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. +# +# Major Contributor(s): +# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer) +# +# All Rights Reserved. +# +# 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_Library_Library,cppobj)) + +$(eval $(call gb_Library_set_componentfile,cppobj,testtools/source/bridgetest/cppobj)) + +$(eval $(call gb_Executable_set_include,cppobj,\ + -I$(SRCDIR)/testtools/source/bridgetest \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_use_internal_api,cppobj,\ + bridgetest \ +)) + +$(eval $(call gb_Library_use_api,cppobj,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_use_static_libraries,cppobj,\ + testtools_bridgetest \ +)) + +$(eval $(call gb_Library_use_libraries,cppobj,\ + cppu \ + cppuhelper \ + sal \ +)) + +$(eval $(call gb_Library_add_exception_objects,cppobj,\ + testtools/source/bridgetest/cppobj \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk index 16da8e38f264..5c1480322f25 100644 --- a/testtools/Module_testtools.mk +++ b/testtools/Module_testtools.mk @@ -28,14 +28,27 @@ $(eval $(call gb_Module_Module,testtools)) $(eval $(call gb_Module_add_targets,testtools,\ InternalUnoApi_bridgetest \ - CustomTarget_bridgetest_javamaker \ + Library_cppobj \ + Library_bridgetest \ + Library_constructors \ + StaticLibrary_bridgetest \ + CustomTarget_uno_services \ + Rdb_cppobj \ )) -#ifneq ($(SOLAR_JAVA),) -#$(eval $(call gb_Module_add_targets,testtools,\ -# Jar_testComponent \ -#)) -#endif +ifneq ($(SOLAR_JAVA),) +$(eval $(call gb_Module_add_targets,testtools,\ + CustomTarget_bridgetest_javamaker \ +)) +endif + +# Jar_testComponent \ + +ifeq ($(COM),MSC) +$(eval $(call gb_Module_add_targets,testtools,\ + CustomTarget_bridgetest_climaker \ +)) +endif # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/testtools/Rdb_cppobj.mk b/testtools/Rdb_cppobj.mk new file mode 100644 index 000000000000..0f35627daedd --- /dev/null +++ b/testtools/Rdb_cppobj.mk @@ -0,0 +1,33 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# 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. +# +# Major Contributor(s): +# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer) +# +# All Rights Reserved. +# +# 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_Rdb_Rdb,cppobj)) + +$(eval $(call gb_Rdb_add_components,cppobj,\ + testtools/source/bridgetest/cppobj \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/testtools/StaticLibrary_bridgetest.mk b/testtools/StaticLibrary_bridgetest.mk new file mode 100644 index 000000000000..56fc5bf08f92 --- /dev/null +++ b/testtools/StaticLibrary_bridgetest.mk @@ -0,0 +1,49 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +# +# 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. +# +# Major Contributor(s): +# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer) +# +# All Rights Reserved. +# +# 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_StaticLibrary_StaticLibrary,testtools_bridgetest)) + +$(eval $(call gb_StaticLibrary_set_include,cppobj,\ + -I$(SRCDIR)/testtools/source/bridgetest \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_StaticLibrary_use_internal_api,testtools_bridgetest,\ + bridgetest \ +)) + +$(eval $(call gb_StaticLibrary_use_api,testtools_bridgetest,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_StaticLibrary_add_exception_objects,testtools_bridgetest,\ + testtools/source/bridgetest/currentcontextchecker \ + testtools/source/bridgetest/multi \ +)) + +# vim: set noet sw=4 ts=4: |