diff options
| -rw-r--r-- | unotools/JunitTest_unotools_complex.mk | 50 | ||||
| -rw-r--r-- | unotools/Makefile (renamed from unotools/qa/complex/tempfile/makefile.mk) | 35 | ||||
| -rw-r--r-- | unotools/Module_unotools.mk | 34 | ||||
| -rw-r--r-- | unotools/prj/build.lst | 2 |
4 files changed, 92 insertions, 29 deletions
diff --git a/unotools/JunitTest_unotools_complex.mk b/unotools/JunitTest_unotools_complex.mk new file mode 100644 index 000000000000..18af03408953 --- /dev/null +++ b/unotools/JunitTest_unotools_complex.mk @@ -0,0 +1,50 @@ +# 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 +# Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen@canonical.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_JunitTest_JunitTest,unotools_complex)) + +$(eval $(call gb_JunitTest_add_jars,unotools_complex,\ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ + $(OUTDIR)/bin/unoil.jar \ + $(OUTDIR)/bin/jurt.jar \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,unotools_complex,\ + unotools/qa/complex/tempfile/TempFileUnitTest \ + unotools/qa/complex/tempfile/Test01 \ + unotools/qa/complex/tempfile/Test02 \ + unotools/qa/complex/tempfile/TempFileTest \ + unotools/qa/complex/tempfile/TestHelper \ +)) + +$(eval $(call gb_JunitTest_add_classes,unotools_complex,\ + complex.tempfile.TempFileUnitTest \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/unotools/qa/complex/tempfile/makefile.mk b/unotools/Makefile index 30a5eb7261ec..a79aff831024 100644 --- a/unotools/qa/complex/tempfile/makefile.mk +++ b/unotools/Makefile @@ -25,33 +25,14 @@ # #************************************************************************* -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif -PRJ = ../../.. -PRJNAME = unotools -TARGET = qa_complex_tempfile +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/tempfile -JAVATESTFILES = \ - TempFileUnitTest.java +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) -JAVAFILES = $(JAVATESTFILES) \ - TempFileTest.java \ - Test01.java \ - Test02.java \ - TestHelper.java - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar jurt.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END +# vim: set noet sw=4 ts=4: diff --git a/unotools/Module_unotools.mk b/unotools/Module_unotools.mk new file mode 100644 index 000000000000..e5d92eb677a6 --- /dev/null +++ b/unotools/Module_unotools.mk @@ -0,0 +1,34 @@ +# 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 +# Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen@canonical.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_Module_Module,unotools)) + +$(eval $(call gb_Module_add_subsequentcheck_targets,unotools,\ + JunitTest_unotools_complex \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/unotools/prj/build.lst b/unotools/prj/build.lst index 9d6cb45951a3..2d57eb6754aa 100644 --- a/unotools/prj/build.lst +++ b/unotools/prj/build.lst @@ -10,5 +10,3 @@ ut unotools\source\i18n nmake - all ut_i18n ut_inc NULL ut unotools\source\property nmake - all ut_property ut_inc NULL ut unotools\source\accessibility nmake - all ut_accessibility ut_inc NULL ut unotools\util nmake - all ut_util ut_config ut_i18n ut_misc ut_procfact ut_streaming ut_ucbhelper ut_property ut_accessibility NULL -# fd#35693 disabled because it hangs on exit -#ut unotools\qa\complex\tempfile nmake - all ut_qa_complex ut_util NULL |