[Libreoffice-commits] .: cppunit/ExternalPackage_cppunit.mk cppunit/ExternalProject_cppunit.mk cppunit/Makefile cppunit/makefile.mk cppunit/Module_cppunit.mk cppunit/ooo-cppunit_dll.mk cppunit/ooo-DllPlugInTester.mk cppunit/prj cppunit/UnpackedTarball_cppunit.mk Module_tail_build.mk RepositoryExternal.mk RepositoryModule_ooo.mk tail_build/prj
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Dec 6 04:55:22 PST 2012
Module_tail_build.mk | 1
RepositoryExternal.mk | 6 +
RepositoryModule_ooo.mk | 1
cppunit/ExternalPackage_cppunit.mk | 43 ++++++++
cppunit/ExternalProject_cppunit.mk | 58 +++++++++++
cppunit/Makefile | 7 +
cppunit/Module_cppunit.mk | 20 +++
cppunit/UnpackedTarball_cppunit.mk | 33 ++++++
cppunit/makefile.mk | 192 -------------------------------------
cppunit/ooo-DllPlugInTester.mk | 50 ---------
cppunit/ooo-cppunit_dll.mk | 100 -------------------
cppunit/prj/d.lst | 44 --------
tail_build/prj/build.lst | 2
13 files changed, 170 insertions(+), 387 deletions(-)
New commits:
commit 143835b928d00b922c29471bbeca4772237b4df9
Author: Peter Foley <pefoley2 at verizon.net>
Date: Sun Nov 25 16:37:40 2012 -0500
convert cppunit to gbuild
Change-Id: Idcba54973940b9f197f2fd84a906b50468d1b166
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 58eb4f5..ed471b8 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
cppcanvas \
cppu \
cppuhelper \
+ $(call gb_Helper_optional,CPPUNIT,cppunit) \
cpputools \
$(call gb_Helper_optional,CT2N,ct2n) \
cui \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index fc307e3..f59c69a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -149,9 +149,15 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
))
define gb_LinkTarget__use_cppunit
+$(call gb_LinkTarget_use_package,$(1),cppunit)
+
$(call gb_LinkTarget_use_libraries,$(1),\
cppunit \
)
+$(call gb_LinkTarget_set_include,$(1),\
+ -I$(call gb_UnpackedTarball_get_dir,cppunit/include)\
+ $$(INCLUDE) \
+)
endef
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index f860317..83347d2 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
cppcanvas \
cppu \
cppuhelper \
+ $(call gb_Helper_optional,CPPUNIT,cppunit) \
cpputools \
$(call gb_Helper_optional,CT2N,ct2n) \
cui \
diff --git a/cppunit/ExternalPackage_cppunit.mk b/cppunit/ExternalPackage_cppunit.mk
new file mode 100644
index 0000000..3d8ab3f
--- /dev/null
+++ b/cppunit/ExternalPackage_cppunit.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,cppunit,cppunit))
+$(eval $(call gb_ExternalPackage_use_external_project,cppunit,cppunit))
+
+ifeq ($(OS),WNT)
+ifeq ($(COM),MSC)
+$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/cppunit_dll.dll,src/cppunit/ReleaseDll/cppunit_dll.dll))
+$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/icppunit_dll.lib,src/cppunit/ReleaseDll/cppunit_dll.lib))
+$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester_dll.exe,src/DllPlugInTester/ReleaseDll/DllPlugInTester_dll.exe))
+else
+$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/libcppunit-1-13-0.dll,src/cppunit/.libs/libcppunit-1-13-0.dll))
+$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/cppunit.dll.a,src/cppunit/.libs/cppunit.dll.a))
+$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester.exe,src/DllPlugInTester/.libs/DllPlugInTester.exe))
+endif
+else
+$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester,src/DllPlugInTester/.libs/DllPlugInTester))
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/libcppunit-1.13.0.dylib,src/cppunit/.libs/libcppunit-1.1.3.0.dylib))
+else ifeq ($(OS),AIX)
+$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit-1.13.a,src/cppunit/.libs/libcppunit-1.13.a))
+else ifeq ($(OS),OPENBSD)
+$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit-1.13.so.0.0,src/cppunit/.libs/libcppunit-1.13.so.0.0))
+$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit.so,src/cppunit/.libs/libcppunit-1.13.so.0.0))
+else ifeq ($(DISABLE_DYNLOADING),TRUE)
+$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit.a,src/cppunit/.libs/libcppunit.a))
+else ifeq ($(OS),ANDROID)
+$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit-1.13.so,src/cppunit/.libs/libcppunit-1.13.so))
+$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit.so,src/cppunit/.libs/libcppunit-1.13.so))
+else
+$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit-1.13.so.0,src/cppunit/.libs/libcppunit-1.13.so.0.0.1))
+$(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit.so,src/cppunit/.libs/libcppunit-1.13.so.0.0.1))
+endif
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppunit/ExternalProject_cppunit.mk b/cppunit/ExternalProject_cppunit.mk
new file mode 100644
index 0000000..b52bb4e
--- /dev/null
+++ b/cppunit/ExternalProject_cppunit.mk
@@ -0,0 +1,58 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalProject_ExternalProject,cppunit))
+
+$(eval $(call gb_ExternalProject_use_unpacked,cppunit,cppunit))
+
+$(eval $(call gb_ExternalProject_register_targets,cppunit,\
+ build \
+))
+
+
+ifeq ($(OS)$(COM),WNTMSC)
+ifeq ($(VCVER),90)
+$(call gb_ExternalProject_get_state_target,cppunit,build) :
+ cd $(EXTERNAL_WORKDIR)/src/cppunit \
+ && $(COMPATH)/vcpackages/vcbuild.exe cppunit_dll.vcproj "Release|Win32" \
+ && cd ../DllPlugInTester \
+ && $(COMPATH)/vcpackages/vcbuild.exe DllPlugInTester.vcproj "Release|Win32" \
+ && touch $@
+else
+$(call gb_ExternalProject_get_state_target,cppunit,build) :
+ cd $(EXTERNAL_WORKDIR)/src/cppunit \
+ && msbuild.exe cppunit_dll.vcxproj /p:Configuration=Release \
+ $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110) \
+ && cd ../DllPlugInTester \
+ && msbuild.exe DllPlugInTester.vcxproj /p:Configuration=Release \
+ $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110) \
+ && touch $@
+endif
+else
+$(call gb_ExternalProject_get_state_target,cppunit,build) :
+ cd $(EXTERNAL_WORKDIR) \
+ && ./configure \
+ --disable-dependency-tracking \
+ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
+ --disable-doxygen \
+ --disable-html-docs \
+ --disable-latex-docs \
+ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
+ $(if $(filter-out WNT,$(OS)),,CXXFLAGS="-mthreads" LDFLAGS="-Wl,--enable-runtime-pseudo-reloc-v2") \
+ $(if $(filter SOLARIS,$(OS)),LIBS="-lm") \
+ $(if $(filter ANDROID,$(OS)),LIBS="-lgnustl_shared -lm") \
+ CXXFLAGS="$(if $(filter GCC,$(COM)),$(if $(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS)),$(if $(filter-out full,$(PRODUCT)),-D_GLIBCXX_DEBUG))) \
+ $(if $(debug),-g)" \
+ && cd src \
+ && $(MAKE) \
+ && touch $@
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppunit/Makefile b/cppunit/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/cppunit/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/cppunit/Module_cppunit.mk b/cppunit/Module_cppunit.mk
new file mode 100644
index 0000000..32a3fb8
--- /dev/null
+++ b/cppunit/Module_cppunit.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Module_Module,cppunit))
+
+ifeq ($(SYSTEM_CPPUNIT),NO)
+$(eval $(call gb_Module_add_targets,cppunit,\
+ UnpackedTarball_cppunit \
+ ExternalPackage_cppunit \
+ ExternalProject_cppunit \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppunit/UnpackedTarball_cppunit.mk b/cppunit/UnpackedTarball_cppunit.mk
new file mode 100644
index 0000000..c8cb69e
--- /dev/null
+++ b/cppunit/UnpackedTarball_cppunit.mk
@@ -0,0 +1,33 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,cppunit))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,cppunit,$(CPPUNIT_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
+ cppunit/windows.patch \
+ cppunit/unix.patch \
+))
+ifeq ($(OS),ANDROID)
+$(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
+ cppunit/android.patch \
+))
+else ifeq ($(OS),IOS)
+$(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
+ cppunit/ios.patch \
+))
+endif
+ifeq ($(DISABLE_DYNLOADING),TRUE)
+$(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
+ cppunit/disable-dynloading.patch \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
deleted file mode 100644
index adeb909..0000000
--- a/cppunit/makefile.mk
+++ /dev/null
@@ -1,192 +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 = cppunit
-TARGET = cppunit
-
-.INCLUDE: settings.mk
-
-TARFILE_NAME=cppunit-1.13.1
-TARFILE_MD5=fa9aa839145cdf860bf596532bb8af97
-
-PATCH_FILES = windows.patch unix.patch
-
-.IF "$(OS)" == "ANDROID"
-PATCH_FILES += android.patch
-.ENDIF
-
-.IF "$(OS)" == "IOS"
-PATCH_FILES += ios.patch
-.ENDIF
-
-.IF "$(DISABLE_DYNLOADING)" == "TRUE"
-PATCH_FILES += disable-dynloading.patch
-.ENDIF
-
-.IF "$(OS)" == "WNT"
-.IF "$(COM)" == "MSC"
-
-# On Windows, CppUnit appears to support either the Unix-style configure/make
-# approach with cygwin and gcc (and libtool fails miserably if gcc is replaced
-# by MSVC cl), or a Visual Studio project (CppUnitLibraries.dsw). However, the
-# latter is too old to work with vcbuild from a wntmsci12 tool chain. So, the
-# easiest way appears to inject hand-crafted dmake makefiles to build the
-# relevant parts. (Another approach would be to manually use the Visual Studio
-# IDE to convert CppUnitLibraries.dsw to modern format, inject the resulting
-# cppunit_dll.vcproj and DllPlugInTester.vcproj and build those with vcbuild.)
-
-CONFIGURE_ACTION = $(SED) -e s:@BACKPATH@:../$(BACK_PATH): \
- < ../$(BACK_PATH)$(PATH_IN_MODULE)/ooo-cppunit_dll.mk \
- > src/cppunit/ooo-cppunit_dll.mk && \
- $(SED) -e s:@BACKPATH@:../$(BACK_PATH): \
- < ../$(BACK_PATH)$(PATH_IN_MODULE)/ooo-DllPlugInTester.mk \
- > src/DllPlugInTester/ooo-DllPlugInTester.mk
-
-BUILD_ACTION = cd src/cppunit && dmake -f ooo-cppunit_dll.mk debug=$(debug) verbose=$(verbose) && \
- cd ../DllPlugInTester && dmake -f ooo-DllPlugInTester.mk debug=$(debug) verbose=$(verbose)
-
-OUTDIR2INC = include/cppunit
-
-.INCLUDE: set_ext.mk
-.INCLUDE: target.mk
-.INCLUDE: tg_ext.mk
-
-$(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE): ooo-cppunit_dll.mk ooo-DllPlugInTester.mk
-
-.ELSE
-.IF "$(COM)" == "GCC"
-EXTRA_CFLAGS += -mthreads
-LDFLAGS += -Wl,--enable-runtime-pseudo-reloc-v2
-
-CONFIGURE_ACTION = ./configure
-CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \
- pwd $(PWDFLAGS))/$(TARFILE_ROOTDIR)/ooo-install \
- --disable-dependency-tracking --disable-static --disable-doxygen \
- --disable-html-docs --disable-latex-docs CC='$(CC)' CXX='$(CXX)' \
- CXXFLAGS='$(EXTRA_CFLAGS)' \
- LDFLAGS='$(LDFLAGS)' \
- LIBS='$(MY_LIBS)'
-
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-
-BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS)
-BUILD_FLAGS = install
-
-OUTDIR2INC = ooo-install/include/cppunit
-
-# WTF? A *Cygwin* DLL?
-#OUT2BIN = ooo-install/bin/DllPlugInTester.exe \
-# ooo-install/bin/cygcppunit-1-13-0.dll
-OUT2BIN = ooo-install/bin/DllPlugInTester.exe \
- ooo-install/bin/libcppunit-1-13-0.dll
-OUT2LIB = ooo-install/lib/libcppunit.dll.a
-
-.INCLUDE: set_ext.mk
-.INCLUDE: target.mk
-.INCLUDE: tg_ext.mk
-
-.ENDIF # "$(COM)" == "GCC"
-.ENDIF # "$(COM)" == "MSC"
-
-.ELSE
-
-# At least on Solaris with Sun CC, linking the cppunit dynamic library fails as
-# TestAssert.o uses fabs but -lm is missing from the command line (cppunit's
-# aclocal.m4 contains an unused AC_CHECK_LIBM, maybe using that would be a
-# better fix):
-.IF "$(OS)" == "SOLARIS" && "$(COM)" == "C52"
-MY_LIBS = -lm
-.END
-
-.IF "$(OS)" == "ANDROID"
-MY_LIBS= -lgnustl_shared -lm
-.ENDIF
-
-CONFIGURE_ACTION = ./configure
-
-.IF "$(COM)" == "GCC"
-.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" || "$(OS)" == "OPENBSD" || "$(OS)" == "NETBSD" || "$(OS)" == "DRAGONFLY" || "$(OS)" == "ANDROID"
-.IF "$(PRODUCT)"!="full"
-# enable debug STL
-EXTRA_CDEFS += -D_GLIBCXX_DEBUG
-.ENDIF # !PRODUCT
-.ENDIF # OS
-.ENDIF # GCC
-
-.IF "$(debug)"!=""
-DEBUGFLAG=-g
-.ENDIF
-
-CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \
- pwd $(PWDFLAGS))/$(TARFILE_ROOTDIR)/ooo-install \
- --libdir=$(shell cd $(PACKAGE_DIR) && \
- pwd $(PWDFLAGS))/$(TARFILE_ROOTDIR)/ooo-install/lib \
- --disable-dependency-tracking --disable-static --disable-doxygen \
- --disable-html-docs --disable-latex-docs CC='$(CC)' CXX='$(CXX)' \
- CXXFLAGS='$(EXTRA_CFLAGS) $(DEBUGFLAG) $(EXTRA_CDEFS)' \
- LDFLAGS='$(LDFLAGS)' \
- LIBS='$(MY_LIBS)'
-
-.IF "$(DISABLE_DYNLOADING)" == "TRUE"
-CONFIGURE_FLAGS+=--disable-shared
-.ELSE
-CONFIGURE_FLAGS+=--disable-static
-.ENDIF
-
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-
-BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS)
-BUILD_FLAGS = install
-
-OUTDIR2INC = ooo-install/include/cppunit ooo-install/lib/pkgconfig
-
-OUT2BIN = ooo-install/bin/DllPlugInTester
-.IF "$(OS)" == "MACOSX"
-OUT2LIB = ooo-install/lib/libcppunit-1.13.0.dylib
-EXTRPATH = NONE
-PACKAGE_DIR = \
- $(MISC)/@.__________________________________________________$(EXTRPATH)
-.ELIF "$(OS)" == "AIX"
-OUT2LIB = ooo-install/lib/libcppunit-1.13.a
-.ELIF "$(OS)" == "OPENBSD"
-OUT2LIB = ooo-install/lib/libcppunit-1.13.so.0.0
-.ELIF "$(DISABLE_DYNLOADING)" == "TRUE"
-OUT2LIB = ooo-install/lib/libcppunit.a
-.ELIF "$(OS)" == "ANDROID"
-OUT2LIB = ooo-install/lib/libcppunit-1.13.so
-.ELSE
-OUT2LIB = ooo-install/lib/libcppunit-1.13.so.0
-.END
-
-.INCLUDE: set_ext.mk
-.INCLUDE: target.mk
-.INCLUDE: tg_ext.mk
-
-.END
diff --git a/cppunit/ooo-DllPlugInTester.mk b/cppunit/ooo-DllPlugInTester.mk
deleted file mode 100644
index 1c8c8a0..0000000
--- a/cppunit/ooo-DllPlugInTester.mk
+++ /dev/null
@@ -1,50 +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 = @BACKPATH at ../..
-PRJNAME = cppunit
-TARGET = DllPlugInTester
-
-ENABLE_EXCEPTIONS = TRUE
-nodep = TRUE
-
-.INCLUDE: settings.mk
-
-CDEFS += -DCPPUNIT_DLL
-CFLAGSCXX += -I../../include
-UWINAPILIB =
-
-OBJFILES = $(APP1OBJS)
-
-APP1OBJS = \
- $(OBJ)/CommandLineParser.obj \
- $(OBJ)/DllPlugInTester.obj
-APP1RPATH = NONE
-APP1STDLIBS = icppunit_dll.lib
-APP1TARGET = DllPlugInTester_dll
-
-.INCLUDE: target.mk
diff --git a/cppunit/ooo-cppunit_dll.mk b/cppunit/ooo-cppunit_dll.mk
deleted file mode 100644
index 048a51e..0000000
--- a/cppunit/ooo-cppunit_dll.mk
+++ /dev/null
@@ -1,100 +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 = @BACKPATH at ../..
-PRJNAME = cppunit
-TARGET = cppunit_dll
-
-ENABLE_EXCEPTIONS = TRUE
-EXTERNAL_WARNINGS_NOT_ERRORS = TRUE
-nodep = TRUE
-
-.INCLUDE: settings.mk
-
-CDEFS += -DCPPUNIT_BUILD_DLL
-CFLAGSCXX += -I../../include
-UWINAPILIB =
-
-SLOFILES = $(SHL1OBJS)
-
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1OBJS = \
- $(SLO)/AdditionalMessage.obj \
- $(SLO)/Asserter.obj \
- $(SLO)/BeosDynamicLibraryManager.obj \
- $(SLO)/BriefTestProgressListener.obj \
- $(SLO)/CompilerOutputter.obj \
- $(SLO)/DefaultProtector.obj \
- $(SLO)/DllMain.obj \
- $(SLO)/DynamicLibraryManager.obj \
- $(SLO)/DynamicLibraryManagerException.obj \
- $(SLO)/Exception.obj \
- $(SLO)/Message.obj \
- $(SLO)/PlugInManager.obj \
- $(SLO)/PlugInParameters.obj \
- $(SLO)/Protector.obj \
- $(SLO)/ProtectorChain.obj \
- $(SLO)/RepeatedTest.obj \
- $(SLO)/SourceLine.obj \
- $(SLO)/StringTools.obj \
- $(SLO)/SynchronizedObject.obj \
- $(SLO)/Test.obj \
- $(SLO)/TestAssert.obj \
- $(SLO)/TestCase.obj \
- $(SLO)/TestCaseDecorator.obj \
- $(SLO)/TestComposite.obj \
- $(SLO)/TestDecorator.obj \
- $(SLO)/TestFactoryRegistry.obj \
- $(SLO)/TestFailure.obj \
- $(SLO)/TestLeaf.obj \
- $(SLO)/TestNamer.obj \
- $(SLO)/TestPath.obj \
- $(SLO)/TestPlugInDefaultImpl.obj \
- $(SLO)/TestResult.obj \
- $(SLO)/TestResultCollector.obj \
- $(SLO)/TestRunner.obj \
- $(SLO)/TestSetUp.obj \
- $(SLO)/TestSuccessListener.obj \
- $(SLO)/TestSuite.obj \
- $(SLO)/TestSuiteBuilderContext.obj \
- $(SLO)/TextOutputter.obj \
- $(SLO)/TextTestProgressListener.obj \
- $(SLO)/TextTestResult.obj \
- $(SLO)/TextTestRunner.obj \
- $(SLO)/TypeInfoHelper.obj \
- $(SLO)/UnixDynamicLibraryManager.obj \
- $(SLO)/Win32DynamicLibraryManager.obj \
- $(SLO)/XmlDocument.obj \
- $(SLO)/XmlElement.obj \
- $(SLO)/XmlOutputter.obj \
- $(SLO)/XmlOutputterHook.obj
-SHL1RPATH = NONE
-SHL1TARGET = cppunit_dll
-SHL1USE_EXPORTS = name
-DEF1NAME = $(SHL1TARGET)
-
-.INCLUDE: target.mk
diff --git a/cppunit/prj/d.lst b/cppunit/prj/d.lst
index 9475d9b..e69de29 100644
--- a/cppunit/prj/d.lst
+++ b/cppunit/prj/d.lst
@@ -1,44 +0,0 @@
-mkdir: %_DEST%\inc\cppunit
-..\%__SRC%\inc\cppunit\*.h %_DEST%\inc\cppunit\*.h
-mkdir: %_DEST%\inc\cppunit\config
-..\%__SRC%\inc\cppunit\config\*.h %_DEST%\inc\cppunit\config\*.h
-mkdir: %_DEST%\inc\cppunit\extensions
-..\%__SRC%\inc\cppunit\extensions\*.h %_DEST%\inc\cppunit\extensions\*.h
-mkdir: %_DEST%\inc\cppunit\plugin
-..\%__SRC%\inc\cppunit\plugin\*.h %_DEST%\inc\cppunit\plugin\*.h
-mkdir: %_DEST%\inc\cppunit\portability
-..\%__SRC%\inc\cppunit\portability\*.h %_DEST%\inc\cppunit\portability\*.h
-mkdir: %_DEST%\inc\cppunit\tools
-..\%__SRC%\inc\cppunit\tools\*.h %_DEST%\inc\cppunit\tools\*.h
-mkdir: %_DEST%\inc\cppunit\ui\text
-..\%__SRC%\inc\cppunit\ui\text\*.h %_DEST%\inc\cppunit\ui\text\*.h
-
-..\%__SRC%\bin\cppunit_dll.dll %_DEST%\bin\cppunit_dll.dll
-..\%__SRC%\lib\icppunit_dll.lib %_DEST%\lib\icppunit_dll.lib
-
-..\%__SRC%\bin\libcppunit-1-13-0.dll %_DEST%\bin\libcppunit-1-13-0.dll
-..\%__SRC%\lib\libcppunit.dll.a %_DEST%\lib\libcppunit.dll.a
-
-..\%__SRC%\lib\libcppunit-1.13.0.dylib %_DEST%\lib\libcppunit-1.13.0.dylib
-symlink: %_DEST%\lib\libcppunit-1.13.0.dylib %_DEST%\lib\libcppunit.dylib
-
-..\%__SRC%\lib\libcppunit-1.13.so %_DEST%\lib\libcppunit-1.13.so
-symlink: %_DEST%\lib\libcppunit-1.13.so %_DEST%\lib\libcppunit.so
-
-..\%__SRC%\lib\libcppunit-1.13.so.0 %_DEST%\lib\libcppunit-1.13.so.0
-symlink: %_DEST%\lib\libcppunit-1.13.so.0 %_DEST%\lib\libcppunit.so
-
-..\%__SRC%\lib\libcppunit-1.13.so.0.0 %_DEST%\lib\libcppunit-1.13.so.0.0
-symlink: %_DEST%\lib\libcppunit-1.13.so.0.0 %_DEST%\lib\libcppunit.so
-
-..\%__SRC%\lib\libcppunit-1.13.a %_DEST%\lib\libcppunit-1.13.a
-symlink: %_DEST%\lib\libcppunit-1.13.a %_DEST%\lib\libcppunit.a
-
-..\%__SRC%\lib\libcppunit.a %_DEST%\lib\libcppunit.a
-
-..\%__SRC%\bin\DllPlugInTester %_DEST%\bin\DllPlugInTester
-..\%__SRC%\bin\DllPlugInTester.exe %_DEST%\bin\DllPlugInTester.exe
-..\%__SRC%\bin\DllPlugInTester_dll.exe %_DEST%\bin\DllPlugInTester_dll.exe
-
-mkdir: %_DEST%\lib\pkgconfig
-..\%__SRC%\inc\pkgconfig\cppunit.pc %_DEST%\lib\pkgconfig\cppunit.pc
diff --git a/cppunit/prj/dmake b/cppunit/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 8090698..1adb285 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : CPPUNIT:cppunit EXPAT:expat FONTCONFIG:fontconfig ICU:icu LIBPNG:libpng LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python3 REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL
+tb tail_build : EXPAT:expat FONTCONFIG:fontconfig ICU:icu LIBPNG:libpng LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python3 REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL
tb tail_build\prj nmake - all tb_prj NULL
More information about the Libreoffice-commits
mailing list