[Libreoffice-commits] .: 2 commits - cppunit/cppunit-1.12.1-warnings.patch cppunit/makefile.mk Makefile RepositoryFixes.mk Repository.mk RepositoryModule_ooo.mk unotest/Jar_test.mk unotest/Jar_test-tools.mk unotest/Library_unoexceptionprotector.mk unotest/Library_unotest.mk unotest/Makefile unotest/Module_unotest.mk unotest/Package_inc.mk unotest/prj unotest/source
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Fri Feb 10 04:37:24 PST 2012
Makefile | 2
Repository.mk | 1
RepositoryFixes.mk | 1
RepositoryModule_ooo.mk | 1
cppunit/cppunit-1.12.1-warnings.patch | 19 +++
cppunit/makefile.mk | 4
unotest/Jar_test-tools.mk | 52 ++++++++++
unotest/Jar_test.mk | 58 ++++++++++++
unotest/Library_unoexceptionprotector.mk | 51 ++++++++++
unotest/Library_unotest.mk | 63 +++++++++++++
unotest/Makefile | 7 +
unotest/Module_unotest.mk | 48 ++++++++++
unotest/Package_inc.mk | 39 ++++++++
unotest/prj/build.lst | 5 -
unotest/prj/d.lst | 22 ----
unotest/prj/makefile.mk | 1
unotest/source/cpp/makefile.mk | 67 --------------
unotest/source/cpp/unoexceptionprotector/makefile.mk | 54 -----------
unotest/source/java/org/openoffice/test/makefile.mk | 57 -----------
unotest/source/java/org/openoffice/test/tools/makefile.mk | 49 ----------
20 files changed, 346 insertions(+), 255 deletions(-)
New commits:
commit 8de63bac75a73011b7de19d730413adf1fbfd50f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Feb 10 13:34:57 2012 +0100
-Werror=sign-promo from cppunit
diff --git a/cppunit/cppunit-1.12.1-warnings.patch b/cppunit/cppunit-1.12.1-warnings.patch
new file mode 100644
index 0000000..8941de7
--- /dev/null
+++ b/cppunit/cppunit-1.12.1-warnings.patch
@@ -0,0 +1,19 @@
+--- misc/cppunit-1.12.1/include/cppunit/TestAssert.h 2012-02-10 12:34:26.564961982 +0100
++++ misc/build/cppunit-1.12.1/include/cppunit/TestAssert.h 2012-02-10 12:33:57.660131866 +0100
+@@ -46,7 +46,16 @@
+ static std::string toString( const T& x )
+ {
+ OStringStream ost;
++// Work around "passing 'T' chooses 'int' over 'unsigned int'" warnings when T
++// is an enum type:
++#if defined __GNUC__ && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wsign-promo"
++#endif
+ ost << x;
++#if defined __GNUC__ && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4)
++#pragma GCC diagnostic pop
++#endif
+ return ost.str();
+ }
+ };
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 0be4d45..30734ce 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -34,7 +34,7 @@ TARFILE_MD5=bd30e9cf5523cdfc019b94f5e1d7fd19
# from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/
# cppunit-1.12.1.tar.gz/download>
-PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch ios.patch cppunit-1.12.1-unused-parameters.patch
+PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch ios.patch cppunit-1.12.1-unused-parameters.patch cppunit-1.12.1-warnings.patch
# solarisfinite.patch: see <https://sourceforge.net/tracker/?func=detail&
# aid=2912590&group_id=11795&atid=311795>; upstreamed as
# <http://cgit.freedesktop.org/libreoffice/cppunit/commit/?id=
@@ -55,6 +55,8 @@ PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix
# SAL_UNUSED_PARAMETER in sal/types.h); upstreamed as
# <http://cgit.freedesktop.org/libreoffice/cppunit/commit/?id=
# 7a09bf3a88e99d85c4dec2ad296309dbec2987c3>
+ # cppunit-1.12.1-warnings.patch: work around additional warnings (found when
+ # converting module unotest to gbuild)
.IF "$(OS)" == "ANDROID"
PATCH_FILES += android.patch
commit d06a78c25bcb2672ef55664b495b2891e324bff2
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Fri Feb 10 00:16:55 2012 +0100
unotest: convert to gbuild
diff --git a/Makefile b/Makefile
index 414de90..3f44039 100644
--- a/Makefile
+++ b/Makefile
@@ -106,6 +106,7 @@ ucb\
ucbhelper\
udkapi\
unixODBC\
+unotest\
unotools\
unoxml\
ure\
@@ -233,7 +234,6 @@ translations\
udm\
unodevtools\
unoil\
-unotest\
vigra\
x11_extensions\
xmlhelp\
diff --git a/Repository.mk b/Repository.mk
index 1dd70fe..5adc794 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -353,6 +353,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
ucpftp1 \
ucphier1 \
ucppkg1 \
+ unoexceptionprotector \
unopkgapp \
unotest \
unsafe_uno \
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 336c312..2493897 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -40,6 +40,7 @@ gb_Library_FILENAMES := $(patsubst log_uno:liblog_uno%,log_uno:liblog_uno_uno%,$
gb_Library_FILENAMES := $(patsubst purpenvhelper:libpurpen%,purpenvhelper:libuno_purpen%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst unoexceptionprotector:libuno%,unoexceptionprotector:uno%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst unsafe_uno:libunsafe_uno%,unsafe_uno:libunsafe_uno_uno%,$(gb_Library_FILENAMES))
endif
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 3f0f023..e39ba85 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -103,6 +103,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
udkapi \
unixODBC \
UnoControls \
+ unotest \
unotools \
unoxml \
ure \
diff --git a/unotest/Jar_test-tools.mk b/unotest/Jar_test-tools.mk
new file mode 100644
index 0000000..1088d5d
--- /dev/null
+++ b/unotest/Jar_test-tools.mk
@@ -0,0 +1,52 @@
+# -*- 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 Matúš Kukan <matus.kukan at gmail.com> (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_Jar_Jar,test-tools))
+
+$(eval $(call gb_Jar_set_jarclasspath,test-tools,\
+ juh.jar \
+ ridl.jar \
+ unoil.jar \
+))
+
+$(eval $(call gb_Jar_add_jars,test-tools,\
+ $(OUTDIR)/bin/juh.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,test-tools,org))
+
+$(eval $(call gb_Jar_add_sourcefiles,test-tools,\
+ unotest/source/java/org/openoffice/test/tools/DocumentType \
+ unotest/source/java/org/openoffice/test/tools/OfficeDocument \
+ unotest/source/java/org/openoffice/test/tools/OfficeDocumentView \
+ unotest/source/java/org/openoffice/test/tools/SpreadsheetDocument \
+ unotest/source/java/org/openoffice/test/tools/SpreadsheetView \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/unotest/Jar_test.mk b/unotest/Jar_test.mk
new file mode 100644
index 0000000..eca653f
--- /dev/null
+++ b/unotest/Jar_test.mk
@@ -0,0 +1,58 @@
+# -*- 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 Matúš Kukan <matus.kukan at gmail.com> (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_Jar_Jar,test))
+
+$(eval $(call gb_Jar_set_jarclasspath,test,\
+ juh.jar \
+ ridl.jar \
+ unoil.jar \
+))
+
+$(eval $(call gb_Jar_add_jars,test,\
+ $(OUTDIR)/bin/juh.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/OOoRunner.jar \
+))
+
+$(eval $(call gb_Jar_add_system_jars,test,\
+ $(OOO_JUNIT_JAR) \
+))
+
+$(eval $(call gb_Jar_set_packageroot,test,org))
+
+$(eval $(call gb_Jar_add_sourcefiles,test,\
+ unotest/source/java/org/openoffice/test/Argument \
+ unotest/source/java/org/openoffice/test/FileHelper \
+ unotest/source/java/org/openoffice/test/OfficeConnection \
+ unotest/source/java/org/openoffice/test/OfficeFileUrl \
+ unotest/source/java/org/openoffice/test/TestArgument \
+ unotest/source/java/org/openoffice/test/UnoApiTest \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/unotest/Library_unoexceptionprotector.mk b/unotest/Library_unoexceptionprotector.mk
new file mode 100644
index 0000000..079574b
--- /dev/null
+++ b/unotest/Library_unoexceptionprotector.mk
@@ -0,0 +1,51 @@
+# -*- 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 Matúš Kukan <matus.kukan at gmail.com> (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,unoexceptionprotector))
+
+$(eval $(call gb_Library_add_package_headers,unoexceptionprotector,unotest_inc))
+
+$(eval $(call gb_Library_add_api,unoexceptionprotector,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,unoexceptionprotector,\
+ cppu \
+ cppuhelper \
+ sal \
+))
+
+$(eval $(call gb_Library_use_externals,unoexceptionprotector,\
+ cppunit \
+))
+
+$(eval $(call gb_Library_add_exception_objects,unoexceptionprotector,\
+ unotest/source/cpp/unoexceptionprotector/unoexceptionprotector \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/unotest/Library_unotest.mk b/unotest/Library_unotest.mk
new file mode 100644
index 0000000..9cfd371
--- /dev/null
+++ b/unotest/Library_unotest.mk
@@ -0,0 +1,63 @@
+# -*- 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 Matúš Kukan <matus.kukan at gmail.com> (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,unotest))
+
+$(eval $(call gb_Library_add_package_headers,unotest,unotest_inc))
+
+$(eval $(call gb_Library_add_defs,unotest,\
+ -DOOO_DLLIMPLEMENTATION_UNOTEST \
+))
+
+$(eval $(call gb_Library_add_api,unotest,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,unotest,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+))
+
+$(eval $(call gb_Library_use_externals,unotest,\
+ cppunit \
+))
+
+$(eval $(call gb_Library_add_exception_objects,unotest,\
+ unotest/source/cpp/bootstrapfixturebase \
+ unotest/source/cpp/filters-test \
+ unotest/source/cpp/getargument \
+ unotest/source/cpp/gettestargument \
+ unotest/source/cpp/macros_test \
+ unotest/source/cpp/officeconnection \
+ unotest/source/cpp/toabsolutefileurl \
+ unotest/source/cpp/uniquepipename \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/unotest/Makefile b/unotest/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/unotest/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/unotest/Module_unotest.mk b/unotest/Module_unotest.mk
new file mode 100644
index 0000000..fc9f18c
--- /dev/null
+++ b/unotest/Module_unotest.mk
@@ -0,0 +1,48 @@
+# -*- 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 Matúš Kukan <matus.kukan at gmail.com> (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_Module_Module,unotest))
+
+$(eval $(call gb_Module_add_targets,unotest,\
+ Library_unoexceptionprotector \
+ Library_unotest \
+ Package_inc \
+))
+
+ifneq ($(SOLAR_JAVA),)
+$(eval $(call gb_Module_add_targets,unotest,\
+ Jar_test-tools \
+))
+
+ifneq ($(OOO_JUNIT_JAR),)
+$(eval $(call gb_Module_add_targets,unotest,\
+ Jar_test \
+))
+endif
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/unotest/Package_inc.mk b/unotest/Package_inc.mk
new file mode 100644
index 0000000..2875289
--- /dev/null
+++ b/unotest/Package_inc.mk
@@ -0,0 +1,39 @@
+# -*- 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 Matúš Kukan <matus.kukan at gmail.com> (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_Package_Package,unotest_inc,$(SRCDIR)/unotest/inc/unotest))
+
+$(eval $(call gb_Package_add_file,unotest_inc,inc/unotest/bootstrapfixturebase.hxx,bootstrapfixturebase.hxx))
+$(eval $(call gb_Package_add_file,unotest_inc,inc/unotest/filters-test.hxx,filters-test.hxx))
+$(eval $(call gb_Package_add_file,unotest_inc,inc/unotest/macros_test.hxx,macros_test.hxx))
+$(eval $(call gb_Package_add_file,unotest_inc,inc/unotest/gettestargument.hxx,gettestargument.hxx))
+$(eval $(call gb_Package_add_file,unotest_inc,inc/unotest/officeconnection.hxx,officeconnection.hxx))
+$(eval $(call gb_Package_add_file,unotest_inc,inc/unotest/toabsolutefileurl.hxx,toabsolutefileurl.hxx))
+$(eval $(call gb_Package_add_file,unotest_inc,inc/unotest/uniquepipename.hxx,uniquepipename.hxx))
+$(eval $(call gb_Package_add_file,unotest_inc,inc/unotest/detail/unotestdllapi.hxx,detail/unotestdllapi.hxx))
+
+# vim: set noet sw=4 ts=4:
diff --git a/unotest/prj/build.lst b/unotest/prj/build.lst
index 0a60de3..dc3d423 100644
--- a/unotest/prj/build.lst
+++ b/unotest/prj/build.lst
@@ -1,5 +1,2 @@
unote unotest : BOOST:boost cppu cppuhelper comphelper CPPUNIT:cppunit javaunohelper offapi ridljar sal solenv unoil QADEVOOO:qadevOOo NULL
-unote unotest\source\cpp nmake - all source_cpp NULL
-unote unotest\source\cpp\unoexceptionprotector nmake - all source_cpp_unoexceptionprotector NULL
-unote unotest\source\java\org\openoffice\test nmake - all source_java NULL
-unote unotest\source\java\org\openoffice\test\tools nmake - all source_java_tools NULL
+unote unotest\prj nmake - all unotest_prj NULL
diff --git a/unotest/prj/d.lst b/unotest/prj/d.lst
index 5bf1589..e69de29 100644
--- a/unotest/prj/d.lst
+++ b/unotest/prj/d.lst
@@ -1,22 +0,0 @@
-mkdir: %_DEST%\inc\unotest
-mkdir: %_DEST%\inc\unotest\detail
-..\%__SRC%\bin\unotest.dll %_DEST%\bin\unotest.dll
-..\%__SRC%\bin\unoexceptionprotector.dll %_DEST%\bin\unoexceptionprotector.dll
-..\%__SRC%\lib\iunotest.lib %_DEST%\lib\iunotest.lib
-..\%__SRC%\lib\libunotest.dylib %_DEST%\lib\libunotest.dylib
-..\%__SRC%\lib\libunotest.so %_DEST%\lib\libunotest.so
-..\%__SRC%\lib\libunotest.dll.a %_DEST%\lib\libunotest.dll.a
-..\%__SRC%\lib\libunotest.a %_DEST%\lib\libunotest.a
-..\%__SRC%\lib\unoexceptionprotector.dylib %_DEST%\lib\unoexceptionprotector.dylib
-..\%__SRC%\lib\unoexceptionprotector.so %_DEST%\lib\unoexceptionprotector.so
-..\%__SRC%\lib\libunoexceptionprotector.so %_DEST%\lib\libunoexceptionprotector.so
-..\inc\unotest\detail\unotestdllapi.hxx %_DEST%\inc\unotest\detail\unotestdllapi.hxx
-..\inc\unotest\bootstrapfixturebase.hxx %_DEST%\inc\unotest\bootstrapfixturebase.hxx
-..\inc\unotest\filters-test.hxx %_DEST%\inc\unotest\filters-test.hxx
-..\inc\unotest\macros_test.hxx %_DEST%\inc\unotest\macros_test.hxx
-..\inc\unotest\gettestargument.hxx %_DEST%\inc\unotest\gettestargument.hxx
-..\inc\unotest\officeconnection.hxx %_DEST%\inc\unotest\officeconnection.hxx
-..\inc\unotest\toabsolutefileurl.hxx %_DEST%\inc\unotest\toabsolutefileurl.hxx
-..\inc\unotest\uniquepipename.hxx %_DEST%\inc\unotest\uniquepipename.hxx
-..\%__SRC%\class\test.jar %_DEST%\bin\test.jar
-..\%__SRC%\class\test-tools.jar %_DEST%\bin\test-tools.jar
diff --git a/unotest/prj/makefile.mk b/unotest/prj/makefile.mk
new file mode 100644
index 0000000..0997622
--- /dev/null
+++ b/unotest/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/unotest/source/cpp/makefile.mk b/unotest/source/cpp/makefile.mk
deleted file mode 100644
index be4fe52..0000000
--- a/unotest/source/cpp/makefile.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#***********************************************************************/
-
-PRJ = ../..
-PRJNAME = unotest
-TARGET = cpp
-
-ENABLE_EXCEPTIONS = TRUE
-VISIBILITY_HIDDEN = TRUE
-
-.INCLUDE: settings.mk
-
-# --- Files --------------------------------------------------------
-CDEFS += -DOOO_DLLIMPLEMENTATION_UNOTEST
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-SLOFILES = \
- $(SLO)/bootstrapfixturebase.obj \
- $(SLO)/filters-test.obj \
- $(SLO)/getargument.obj \
- $(SLO)/gettestargument.obj \
- $(SLO)/macros_test.obj \
- $(SLO)/officeconnection.obj \
- $(SLO)/toabsolutefileurl.obj \
- $(SLO)/uniquepipename.obj
-
-.IF "$(CROSS_COMPILING)" == "YES"
-SHL1IMPLIB = $(SHL1TARGET)
-.ELSE
-SHL1IMPLIB = i$(SHL1TARGET)
-.ENDIF
-SHL1OBJS = $(SLOFILES)
-SHL1RPATH = NONE
-SHL1STDLIBS = \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(CPPUNITLIB) \
- $(SALLIB)
-SHL1TARGET = unotest
-SHL1USE_EXPORTS = name
-DEF1NAME = $(SHL1TARGET)
-
-.INCLUDE: target.mk
diff --git a/unotest/source/cpp/unoexceptionprotector/makefile.mk b/unotest/source/cpp/unoexceptionprotector/makefile.mk
deleted file mode 100644
index e20438e..0000000
--- a/unotest/source/cpp/unoexceptionprotector/makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#***********************************************************************/
-
-PRJ = ../../..
-PRJNAME = test
-TARGET = unoexceptionprotector
-
-ENABLE_EXCEPTIONS = TRUE
-VISIBILITY_HIDDEN = TRUE
-
-.INCLUDE: settings.mk
-
-# --- Files --------------------------------------------------------
-DLLPRE =
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-SLOFILES = $(SLO)/unoexceptionprotector.obj
-
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1OBJS = $(SLOFILES)
-SHL1RPATH = NONE
-SHL1STDLIBS = \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(CPPUNITLIB) \
- $(SALLIB)
-SHL1TARGET = $(ENFORCEDSHLPREFIX)unoexceptionprotector
-SHL1USE_EXPORTS = name
-DEF1NAME = $(SHL1TARGET)
-
-.INCLUDE: target.mk
diff --git a/unotest/source/java/org/openoffice/test/makefile.mk b/unotest/source/java/org/openoffice/test/makefile.mk
deleted file mode 100644
index 65b54d1..0000000
--- a/unotest/source/java/org/openoffice/test/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#***********************************************************************/
-
-PRJ = ../../../../..
-PRJNAME = test
-TARGET = test
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-
-PACKAGE = org/openoffice/test
-JAVAFILES = \
- Argument.java \
- FileHelper.java \
- OfficeConnection.java \
- OfficeFileUrl.java \
- TestArgument.java \
- UnoApiTest.java \
-
-JARFILES = juh.jar ridl.jar unoil.jar OOoRunner.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-
-JARTARGET = $(TARGET).jar
-JARCLASSDIRS = $(PACKAGE)
-JARCLASSEXCLUDES = $(PACKAGE)/tools/*
-JARCLASSPATH = $(JARFILES)
- # expect $(OOO_JUNIT_JAR) to be on CLASSPATH wherever test.jar is used (also,
- # on Windows, $(OOO_JUNIT_JAR) could be an absolute pathname with drive letter
- # like X:/path and some JVMs would refuse to load test.jar if its MANIFEST.MF
- # Class-Path contained such a pathname that looks like an unknown URL with
- # scheme X)
-
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
diff --git a/unotest/source/java/org/openoffice/test/tools/makefile.mk b/unotest/source/java/org/openoffice/test/tools/makefile.mk
deleted file mode 100644
index 1464bb9..0000000
--- a/unotest/source/java/org/openoffice/test/tools/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#***********************************************************************/
-
-PRJ = ../../../../../..
-PRJNAME = test
-TARGET = test-tools
-
-PACKAGE = org/openoffice/test/tools
-
-.INCLUDE: settings.mk
-
-JARFILES = juh.jar ridl.jar unoil.jar
-JAVAFILES = \
- OfficeDocument.java \
- OfficeDocumentView.java \
- DocumentType.java \
- SpreadsheetDocument.java \
- SpreadsheetView.java \
-
-JARTARGET = $(TARGET).jar
-JARCLASSDIRS = $(PACKAGE)
-JARCLASSPATH = $(JARFILES)
-
-.INCLUDE: target.mk
-
-test:
- echo $(JAVACLASSFILES)
More information about the Libreoffice-commits
mailing list