[Libreoffice-commits] core.git: Branch 'aoo/trunk' - RepositoryFixes.mk set_soenv.in solenv/gbuild solenv/inc
Damjan Jovanovic
damjan at apache.org
Sun Oct 11 03:08:03 PDT 2015
RepositoryFixes.mk | 3
set_soenv.in | 4 -
solenv/gbuild/CppunitTest.mk | 96 -------------------------
solenv/gbuild/TargetLocations.mk | 3
solenv/gbuild/gbuild.mk | 1
solenv/gbuild/platform/freebsd.mk | 20 -----
solenv/gbuild/platform/linux.mk | 20 -----
solenv/gbuild/platform/macosx.mk | 25 +-----
solenv/gbuild/platform/os2.mk | 31 --------
solenv/gbuild/platform/solaris.mk | 20 -----
solenv/gbuild/platform/windows.mk | 29 -------
solenv/gbuild/platform/winmingw.mk | 22 -----
solenv/inc/_cppunit.mk | 140 -------------------------------------
solenv/inc/cppunit.mk | 52 -------------
solenv/inc/installationtest.mk | 21 -----
solenv/inc/libs.mk | 6 -
solenv/inc/settings.mk | 5 -
17 files changed, 23 insertions(+), 475 deletions(-)
New commits:
commit bfd8ec054df17a4776bdfe7463c2bb50576c8607
Author: Damjan Jovanovic <damjan at apache.org>
Date: Sun Oct 11 08:09:10 2015 +0000
#i125003# Eliminate cppunit from our tree completely.
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index eaee8c7..31371b6 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -60,7 +60,6 @@ endif
ifeq ($(OS),WNT)
ifneq ($(USE_MINGW),)
gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:libcppunit.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst i18nisolang1:iii18nisolang1%,i18nisolang1:iii18nisolang%,$(gb_Library_FILENAMES))
@@ -105,7 +104,6 @@ gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
else
gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:icppunit_dll%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst i18nisolang1:iii18nisolang1%,i18nisolang1:iii18nisolang%,$(gb_Library_FILENAMES))
@@ -164,7 +162,6 @@ ifeq ($(OS),OS2)
gb_Library_FILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelpgcc3%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cppu:cppu%,cppu:cppu3%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cppuhelper:cppuhelper%,cppuhelper:cppuh3%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:cppunit%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cui:iicuc%,cui:icuc%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst i18nisolang1:i18nisolang1%,i18nisolang1:i18nisolang1gcc3%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst jvmaccess:jvmaccess%,jvmaccess:jvmaccess3gcc3%,$(gb_Library_FILENAMES))
diff --git a/set_soenv.in b/set_soenv.in
index 33036c9..2d8f2fa 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1905,10 +1905,6 @@ ToFile( "CAIRO_LIBS", "@CAIRO_LIBS@", "e" );
ToFile( "XRANDR_CFLAGS", "@XRANDR_CFLAGS@", "e" );
ToFile( "XRANDR_LIBS", "@XRANDR_LIBS@", "e" );
ToFile( "XRANDR_DLOPEN", "@XRANDR_DLOPEN@", "e" );
-ToFile( "SYSTEM_CPPUNIT", "@SYSTEM_CPPUNIT@", "e" );
-ToFile( "CPPUNIT_CFLAGS", "@CPPUNIT_CFLAGS@", "e" );
-ToFile( "CPPUNIT_LIBS", "@CPPUNIT_LIBS@", "e" );
-ToFile( "WITH_CPPUNIT", "@WITH_CPPUNIT@", "e" );
ToFile( "ENABLE_UNIT_TESTS", "@ENABLE_UNIT_TESTS@", "e" );
ToFile( "SYSTEM_LIBXML", "@SYSTEM_LIBXML@", "e" );
ToFile( "USE_FT_EMBOLDEN", "@USE_FT_EMBOLDEN@", "e" );
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
deleted file mode 100644
index b29cd21..0000000
--- a/solenv/gbuild/CppunitTest.mk
+++ /dev/null
@@ -1,96 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-
-# CppunitTest class
-
-# in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell
-DBGSV_ERROR_OUT := shell
-export DBGSV_ERROR_OUT
-
-# defined by platform
-# gb_CppunitTest_TARGETTYPE
-# gb_CppunitTest_get_filename
-gb_CppunitTest_CPPTESTTARGET := $(call gb_Executable_get_target,cppunittester)
-gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) $(gb_CppunitTest_CPPTESTTARGET)
-gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1))
-
-.PHONY : $(call gb_CppunitTest_get_clean_target,%)
-$(call gb_CppunitTest_get_clean_target,%) :
- $(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_CppunitTest_get_target,$*) $(call gb_CppunitTest_get_target,$*).log)
-
-.PHONY : $(call gb_CppunitTest_get_target,%)
-$(call gb_CppunitTest_get_target,%) : $(gb_CppunitTest_CPPTESTTARGET)
- $(call gb_Output_announce,$*,$(true),CUT,2)
- $(call gb_Helper_abbreviate_dirs_native,\
- mkdir -p $(dir $@) && \
- $(gb_CppunitTest_CPPTESTCOMMAND) $(call gb_LinkTarget_get_target,CppunitTest/$(call gb_CppunitTest_get_libfilename,$*)) > $@.log 2>&1 || (cat $@.log && false))
-
-define gb_CppunitTest_CppunitTest
-$(call gb_CppunitTest__CppunitTest_impl,$(1),$(call gb_CppunitTest__get_linktargetname,$(1)))
-
-endef
-
-define gb_CppunitTest__CppunitTest_impl
-$(call gb_LinkTarget_LinkTarget,$(2))
-$(call gb_LinkTarget_set_targettype,$(2),CppunitTest)
-$(call gb_LinkTarget_add_linked_libs,$(2),cppunit)
-$(call gb_CppunitTest_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
-$(call gb_CppunitTest_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
-$(call gb_CppunitTest_CppunitTest_platform,$(1),$(2),$(gb_CppunitTest_DLLDIR)/$(call gb_CppunitTest_get_libfilename,$(1)))
-$$(eval $$(call gb_Module_register_target,$(call gb_CppunitTest_get_target,$(1)),$(call gb_CppunitTest_get_clean_target,$(1))))
-
-endef
-
-define gb_CppunitTest__forward_to_Linktarget
-gb_CppunitTest_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_CppunitTest__get_linktargetname,$$(1)),$$(2),$$(3))
-
-endef
-
-$(eval $(foreach method,\
- add_cobject \
- add_cobjects \
- add_cxxobject \
- add_cxxobjects \
- add_objcxxobject \
- add_objcxxobjects \
- add_exception_objects \
- add_noexception_objects \
- set_cflags \
- set_cxxflags \
- set_objcxxflags \
- set_defs \
- set_include \
- set_ldflags \
- set_library_path_flags \
- add_linked_libs \
- add_linked_static_libs \
- add_package_headers \
- add_sdi_headers \
- add_precompiled_header \
-,\
- $(call gb_CppunitTest__forward_to_Linktarget,$(method))\
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 5ac6766..533fcb0 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -44,7 +44,6 @@ endef
gb_AllLangResTarget_get_target = $(WORKDIR)/AllLangRes/$(1)
gb_CObject_get_target = $(WORKDIR)/CObject/$(1).o
gb_ComponentTarget_get_target = $(WORKDIR)/ComponentTarget/$(1).component
-gb_CppunitTest_get_target = $(WORKDIR)/CppunitTest/$(1).test
gb_CustomTarget_get_repo_target = $(WORKDIR)/CustomTarget/$(2)_$(1).done
gb_CustomTarget_get_target = $(WORKDIR)/CustomTarget/$(1).done
gb_CustomTarget_get_workdir = $(WORKDIR)/CustomTarget/$(1)
@@ -110,7 +109,6 @@ $(eval $(call gb_Helper_make_clean_targets,\
ResTarget \
SdiTarget \
SrsTarget \
- CppunitTest \
GoogleTest \
CustomTarget \
))
@@ -156,7 +154,6 @@ endef
gb_Library_OUTDIRLOCATION = $(OUTDIR)/lib
gb_Library_DLLDIR = $(WORKDIR)/LinkTarget/Library
-gb_CppunitTest_DLLDIR = $(WORKDIR)/LinkTarget/CppunitTest
gb_StaticLibrary_OUTDIRLOCATION = $(OUTDIR)/lib
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index d7667cb..b551b2c 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -236,7 +236,6 @@ include $(foreach class, \
Package \
CustomTarget \
PrecompiledHeaders \
- CppunitTest \
GoogleTest \
JavaClassSet \
JunitTest \
diff --git a/solenv/gbuild/platform/freebsd.mk b/solenv/gbuild/platform/freebsd.mk
index 881dee0..a277769 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -245,7 +245,7 @@ define gb_LinkTarget__command_dynamiclink
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_CXX) \
- $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
+ $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(subst \d,$$,$(RPATH)) $(LDFLAGS) \
$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
$(patsubst %,-l%,$(EXTERNAL_LIBS)) \
@@ -268,7 +268,7 @@ endef
define gb_LinkTarget__command
$(call gb_Output_announce,$(2),$(true),LNK,4)
-$(if $(filter Library CppunitTest GoogleTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1)))
+$(if $(filter Library GoogleTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1)))
$(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1)))
endef
@@ -305,8 +305,7 @@ gb_Library_PLAINLIBS_NONE += \
Xext \
SM \
ICE \
- z \
- cppunit
+ z
gb_Library_FILENAMES := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
@@ -389,19 +388,6 @@ define gb_GoogleTest_GoogleTest_platform
$(call gb_LinkTarget_get_target,$(2)) : RPATH := -Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)
endef
-# CppunitTest class
-
-gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-gb_CppunitTest_SYSPRE := libtest_
-gb_CppunitTest_EXT := .so
-gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
-gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
-
-define gb_CppunitTest_CppunitTest_platform
-$(call gb_LinkTarget_get_target,$(2)) : RPATH :=
-
-endef
-
# JunitTest class
define gb_JunitTest_JunitTest_platform
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 3f14e5d..eb4a8c0 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -222,7 +222,7 @@ define gb_LinkTarget__command_dynamiclink
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_CXX) \
- $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
+ $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(subst \d,$$,$(RPATH)) $(LDFLAGS) \
$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
@@ -245,7 +245,7 @@ endef
define gb_LinkTarget__command
$(call gb_Output_announce,$(2),$(true),LNK,4)
-$(if $(filter Library CppunitTest GoogleTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1)))
+$(if $(filter Library GoogleTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1)))
$(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1)))
endef
@@ -282,8 +282,7 @@ gb_Library_PLAINLIBS_NONE += \
Xext \
SM \
ICE \
- z \
- cppunit
+ z
gb_Library_FILENAMES := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
@@ -366,19 +365,6 @@ define gb_GoogleTest_GoogleTest_platform
$(call gb_LinkTarget_get_target,$(2)) : RPATH := -Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)
endef
-# CppunitTest class
-
-gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-gb_CppunitTest_SYSPRE := libtest_
-gb_CppunitTest_EXT := .so
-gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
-gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
-
-define gb_CppunitTest_CppunitTest_platform
-$(call gb_LinkTarget_get_target,$(2)) : RPATH :=
-
-endef
-
# JunitTest class
define gb_JunitTest_JunitTest_platform
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 8e77566..2432b95 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -263,14 +263,14 @@ $(call gb_Helper_abbreviate_dirs,\
DYLIB_FILE=`$(gb_MKTEMP)` && \
$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
$(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
- $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
+ $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(subst \d,$$,$(RPATH)) $(LDFLAGS) \
$(patsubst lib%.dylib,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
$(patsubst %,-l%,$(EXTERNAL_LIBS)) \
> $${DYLIB_FILE} && \
$(gb_CXX) \
$(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
- $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
+ $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(subst \d,$$,$(RPATH)) $(LDFLAGS) \
$(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \
$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
@@ -280,7 +280,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
-o $(1) \
`cat $${DYLIB_FILE}` && \
- $(if $(filter Library CppunitTest,$(TARGETTYPE)),\
+ $(if $(filter Library,$(TARGETTYPE)),\
$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER) $(1) && \
ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&) \
rm -f $${DYLIB_FILE})
@@ -300,7 +300,7 @@ endef
define gb_LinkTarget__command
$(call gb_Output_announce,$(2),$(true),LNK,4)
-$(if $(filter Library CppunitTest GoogleTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1),$(2)))
+$(if $(filter Library GoogleTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1),$(2)))
$(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1)))
endef
@@ -326,8 +326,7 @@ gb_Library_PLAINLIBS_NONE += \
jpeg \
m \
pthread \
- z \
- cppunit
+ z
gb_Library_FILENAMES := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
@@ -411,20 +410,6 @@ define gb_GoogleTest_GoogleTest_platform
$(call gb_LinkTarget_get_target,$(2)) : RPATH :=
endef
-# CppunitTest class
-
-gb_CppunitTest_CPPTESTPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
-gb_CppunitTest_SYSPRE := libtest_
-gb_CppunitTest_EXT := .dylib
-gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
-gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
-
-define gb_CppunitTest_CppunitTest_platform
-$(call gb_LinkTarget_get_target,$(2)) : RPATH :=
-$(call gb_LinkTarget_get_target,$(2)) : LAYER := NONE
-
-endef
-
# JunitTest class
define gb_JunitTest_JunitTest_platform
diff --git a/solenv/gbuild/platform/os2.mk b/solenv/gbuild/platform/os2.mk
index 8fdbd79..97d947e 100644
--- a/solenv/gbuild/platform/os2.mk
+++ b/solenv/gbuild/platform/os2.mk
@@ -316,7 +316,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(if $(DLLTARGET), echo EXPORTS >> $(DLLDEF) &&) \
$(if $(DLLTARGET), emxexp @$${RESPONSEFILE} | fix_exp_file | sort | uniq | fix_def_ord >> $(DLLDEF) &&) \
$(gb_LINK) \
- $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
+ $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(if $(filter StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \
$(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
$(LDFLAGS) \
@@ -348,7 +348,7 @@ endef
define gb_LinkTarget__command
$(call gb_Output_announce,$(2),$(true),LNK,4)
$(if $(filter GoogleTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclinkexecutable,$(1),$(2)))
-$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclinkexecutable,$(1),$(2)))
+$(if $(filter Library,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclinkexecutable,$(1),$(2)))
$(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlinklibrary,$(1)))
endef
@@ -370,8 +370,7 @@ gb_Library_PLAINLIBS_NONE += \
jpeg \
m \
z \
- pthread \
- cppunit
+ pthread
gb_Library_LAYER := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
@@ -515,30 +514,6 @@ gb_GoogleTest_get_filename = $(1)$(gb_Executable_EXT)
define gb_GoogleTest_GoogleTest_platform
endef
-# CppunitTest class
-
-gb_CppunitTest_CPPTESTPRECOMMAND :=
-gb_CppunitTest_SYSPRE := itest_
-gb_CppunitTest_EXT := .lib
-gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
-gb_CppunitTest_get_libfilename = test_$(1).dll
-
-define gb_CppunitTest_CppunitTest_platform
-$(call gb_LinkTarget_set_dlltarget,$(2),$(3))
-
-#$(call gb_LinkTarget_set_auxtargets,$(2),\
- $(patsubst %.lib,%.exp,$(call gb_LinkTarget_get_target,$(2))) \
- $(3).manifest \
- $(patsubst %.dll,%.pdb,$(3)) \
- $(call gb_LinkTarget_get_pdbfile,$(2)) \
- $(patsubst %.dll,%.ilk,$(3)) \
-)
-
-$(call gb_LinkTarget_get_target,$(2)) \
-$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2))
-
-endef
-
# JunitTest class
gb_defaultlangiso := en-US
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 26e451e..6aa55b3 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -198,7 +198,7 @@ define gb_LinkTarget__command_dynamiclink
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
$(gb_CXX) \
- $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
+ $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(subst \d,$$,$(RPATH)) $(LDFLAGS) \
$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
$(patsubst %,-l%,$(EXTERNAL_LIBS)) \
@@ -221,7 +221,7 @@ endef
define gb_LinkTarget__command
$(call gb_Output_announce,$(2),$(true),LNK,4)
-$(if $(filter Library CppunitTest GoogleTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1)))
+$(if $(filter Library GoogleTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1)))
$(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1)))
endef
@@ -262,8 +262,7 @@ gb_Library_PLAINLIBS_NONE += \
Xext \
SM \
ICE \
- z \
- cppunit
+ z
gb_Library_FILENAMES := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
@@ -344,19 +343,6 @@ define gb_GoogleTest_GoogleTest_platform
$(call gb_LinkTarget_get_target,$(2)) : RPATH :=
endef
-# CppunitTest class
-
-gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
-gb_CppunitTest_SYSPRE := libtest_
-gb_CppunitTest_EXT := .so
-gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
-gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
-
-define gb_CppunitTest_CppunitTest_platform
-$(call gb_LinkTarget_get_target,$(2)) : RPATH :=
-
-endef
-
# JunitTest class
define gb_JunitTest_JunitTest_platform
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index e497031..4799bbd 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -418,7 +418,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
$(PCHOBJS) $(NATIVERES))) && \
$(gb_LINK) \
- $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
+ $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(if $(filter StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \
$(if $(filter GoogleTest Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
$(LDFLAGS) \
@@ -458,8 +458,7 @@ gb_Library_PLAINLIBS_NONE += \
uuid \
uwinapi \
winspool \
- z \
- cppunit
+ z
gb_Library_LAYER := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
@@ -621,30 +620,6 @@ gb_GoogleTest_get_filename = $(1)$(gb_Executable_EXT)
define gb_GoogleTest_GoogleTest_platform
endef
-# CppunitTest class
-
-gb_CppunitTest_CPPTESTPRECOMMAND :=
-gb_CppunitTest_SYSPRE := itest_
-gb_CppunitTest_EXT := .lib
-gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
-gb_CppunitTest_get_libfilename = test_$(1).dll
-
-define gb_CppunitTest_CppunitTest_platform
-$(call gb_LinkTarget_set_dlltarget,$(2),$(3))
-
-$(call gb_LinkTarget_set_auxtargets,$(2),\
- $(patsubst %.lib,%.exp,$(call gb_LinkTarget_get_target,$(2))) \
- $(3).manifest \
- $(patsubst %.dll,%.pdb,$(3)) \
- $(call gb_LinkTarget_get_pdbfile,$(2)) \
- $(patsubst %.dll,%.ilk,$(3)) \
-)
-
-$(call gb_LinkTarget_get_target,$(2)) \
-$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2))
-
-endef
-
# JunitTest class
gb_defaultlangiso := en-US
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 314f9cc..cdc1847 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -449,7 +449,7 @@ endef
define gb_LinkTarget__command
$(call gb_Output_announce,$(2),$(true),LNK,4)
$(if $(filter GoogleTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclinkexecutable,$(1),$(2)))
-$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclinklibrary,$(1),$(2)))
+$(if $(filter Library,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclinklibrary,$(1),$(2)))
$(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlinklibrary,$(1)))
endef
@@ -486,8 +486,7 @@ gb_Library_PLAINLIBS_NONE += \
uuid \
uwinapi \
winspool \
- z \
- cppunit
+ z
gb_Library_LAYER := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
@@ -602,23 +601,6 @@ gb_GoogleTest_get_filename = $(1)$(gb_Executable_EXT)
define gb_GoogleTest_GoogleTest_platform
endef
-# CppunitTest class
-
-gb_CppunitTest_CPPTESTPRECOMMAND :=
-gb_CppunitTest_SYSPRE := itest_
-gb_CppunitTest_EXT := .lib
-gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
-gb_CppunitTest_get_libfilename = test_$(1).dll
-
-define gb_CppunitTest_CppunitTest_platform
-$(call gb_LinkTarget_set_dlltarget,$(2),$(3))
-
-$(call gb_LinkTarget_set_auxtargets,$(2),\
- $(patsubst %.dll,%.map,$(3)) \
-)
-
-endef
-
# SdiTarget class
gb_SdiTarget_SVIDLPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
diff --git a/solenv/inc/_cppunit.mk b/solenv/inc/_cppunit.mk
deleted file mode 100644
index 9ff9932..0000000
--- a/solenv/inc/_cppunit.mk
+++ /dev/null
@@ -1,140 +0,0 @@
-# *************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# *************************************************************
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL1TARGETN)"!=""
-ALLTAR : test1
-test1 .PHONY : $(SHL1TARGETN)
- @echo ----------------------------------------------------------
- @echo - start unit test \#1 on library $(SHL1TARGETN)
- @echo ----------------------------------------------------------
- $(CPPUNITTESTER) $(SHL1TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL2TARGETN)"!=""
-ALLTAR : test2
-test2 .PHONY : $(SHL2TARGETN)
- @echo ----------------------------------------------------------
- @echo - start unit test \#2 on library $(SHL2TARGETN)
- @echo ----------------------------------------------------------
- $(CPPUNITTESTER) $(SHL2TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL3TARGETN)"!=""
-ALLTAR : test3
-test3 .PHONY : $(SHL3TARGETN)
- @echo ----------------------------------------------------------
- @echo - start unit test \#3 on library $(SHL3TARGETN)
- @echo ----------------------------------------------------------
- $(CPPUNITTESTER) $(SHL3TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL4TARGETN)"!=""
-ALLTAR : test4
-test4 .PHONY : $(SHL4TARGETN)
- @echo ----------------------------------------------------------
- @echo - start unit test \#4 on library $(SHL4TARGETN)
- @echo ----------------------------------------------------------
- $(CPPUNITTESTER) $(SHL4TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL5TARGETN)"!=""
-ALLTAR : test5
-test5 .PHONY : $(SHL5TARGETN)
- @echo ----------------------------------------------------------
- @echo - start unit test \#5 on library $(SHL5TARGETN)
- @echo ----------------------------------------------------------
- $(CPPUNITTESTER) $(SHL5TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL6TARGETN)"!=""
-ALLTAR : test6
-test6 .PHONY : $(SHL6TARGETN)
- @echo ----------------------------------------------------------
- @echo - start unit test \#6 on library $(SHL6TARGETN)
- @echo ----------------------------------------------------------
- $(CPPUNITTESTER) $(SHL6TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL7TARGETN)"!=""
-ALLTAR : test7
-test7 .PHONY : $(SHL7TARGETN)
- @echo ----------------------------------------------------------
- @echo - start unit test \#7 on library $(SHL7TARGETN)
- @echo ----------------------------------------------------------
- $(CPPUNITTESTER) $(SHL7TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL8TARGETN)"!=""
-ALLTAR : test8
-test8 .PHONY : $(SHL8TARGETN)
- @echo ----------------------------------------------------------
- @echo - start unit test \#8 on library $(SHL8TARGETN)
- @echo ----------------------------------------------------------
- $(CPPUNITTESTER) $(SHL8TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL9TARGETN)"!=""
-ALLTAR : test9
-test9 .PHONY : $(SHL9TARGETN)
- @echo ----------------------------------------------------------
- @echo - start unit test \#9 on library $(SHL9TARGETN)
- @echo ----------------------------------------------------------
- $(CPPUNITTESTER) $(SHL9TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL10TARGETN)"!=""
-ALLTAR : test10
-test10 .PHONY : $(SHL10TARGETN)
- @echo ----------------------------------------------------------
- @echo - start unit test \#10 on library $(SHL10TARGETN)
- @echo ----------------------------------------------------------
- $(CPPUNITTESTER) $(SHL10TARGETN)
-.ENDIF
-
diff --git a/solenv/inc/cppunit.mk b/solenv/inc/cppunit.mk
deleted file mode 100644
index d53b14e..0000000
--- a/solenv/inc/cppunit.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-# Helper makefile additional, to support
-# dmake test
-# for cppunittester (cppunit testing)
-# for simple start all generated libraries:
-# dmake test
-#
-# for library 1 & 2:
-# or dmake test1 test2
-
-# This file have to be unroll by
-# cat cppunit.mk | mkunroll >_cppunit.mk
-# all between begin and end will repeat n times (at the moment n=10) to create such iterations
-# $(TNR) is the number
-# $(SHL$(TNR)TARGETN) is the same like $(OUT)/bin/$(SHL1TARGET) for every number, within unix, "bin" is replaced by "lib"
-
-################################################################################
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL$(TNR)TARGETN)"!=""
-ALLTAR : test$(TNR)
-test$(TNR) .PHONY : $(SHL$(TNR)TARGETN)
- @echo ----------------------------------------------------------
- @echo - start unit test \#$(TNR) on library $(SHL$(TNR)TARGETN)
- @echo ----------------------------------------------------------
- $(CPPUNITTESTER) $(SHL$(TNR)TARGETN)
-.ENDIF
-
-# unroll end
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
index 30fb343..7f55340 100644
--- a/solenv/inc/installationtest.mk
+++ b/solenv/inc/installationtest.mk
@@ -49,11 +49,11 @@ my_file = file://
.IF "$(UPDATER)" == "YES" && "$(SHIPDRIVE)" != "" && \
"$(CWS_WORK_STAMP)" == "" && "$(SOLARENV:s/$(SOL_TMP)//" == "$(SOLARENV)"
my_instsets = $(shell ls -dt \
- $(SHIPDRIVE)/$(INPATH)/OpenOffice/archive/$(WORK_STAMP)_$(LAST_MINOR)_native_packed-*_$(defaultlangiso).$(BUILD))
+ $(SHIPDRIVE)/$(INPATH)/Apache_OpenOffice/archive/$(WORK_STAMP)_$(LAST_MINOR)_native_packed-*_$(defaultlangiso).$(BUILD))
installationtest_instset = $(my_instsets:1)
.ELSE
installationtest_instset = \
- $(SOLARSRC)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(defaultlangiso)
+ $(SOLARSRC)/instsetoo_native/$(INPATH)/Apache_OpenOffice/archive/install/$(defaultlangiso)
.END
.IF "$(OS)" == "WNT"
@@ -102,23 +102,6 @@ $(MISC)/$(TARGET)/installation.flag : $(shell \
$(COMMAND_ECHO)echo "$(OOO_EXTRACT_TO)" > $@
.END
-cpptest .PHONY :
- $(COMMAND_ECHO)$(RM) -r $(MISC)/$(TARGET)/user
- $(COMMAND_ECHO)$(MKDIRHIER) $(MISC)/$(TARGET)/user
- $(CPPUNITTESTER) \
- -env:UNO_SERVICES=$(my_file)$(SOLARXMLDIR)/ure/services.rdb \
- -env:UNO_TYPES=$(my_file)$(SOLARBINDIR)/types.rdb \
- -env:arg-soffice=$(my_soffice) -env:arg-user=$(MISC)/$(TARGET)/user \
- $(my_cppenv) $(TEST_ARGUMENTS:^"-env:arg-testarg.") --protector \
- $(SOLARSHAREDBIN)/unoexceptionprotector$(DLLPOST) \
- unoexceptionprotector $(CPPTEST_LIBRARY)
-# As a workaround for #i111400#, ignore failure of $(RM):
- $(COMMAND_ECHO)- $(RM) -r $(MISC)/$(TARGET)/user
-.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == ""
- $(COMMAND_ECHO)$(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag
-cpptest : $(MISC)/$(TARGET)/installation.flag
-.END
-
.IF "$(SOLAR_JAVA)" == "TRUE" && "$(OOO_JUNIT_JAR)" != ""
javatest_% .PHONY : $(JAVATARGET)
$(COMMAND_ECHO)$(RM) -r $(MISC)/$(TARGET)/user
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 361d9ce..da02ca2 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -273,11 +273,6 @@ JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID)
.ELSE # "$(GUI)$(COM)"=="WNTGCC"
JVMACCESSLIB = -ljvmaccess$(COMID)
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CPPUNITLIB = $(CPPUNIT_LIBS)
-.ELSE
-CPPUNITLIB = -lcppunit
-.ENDIF
GTESTLIB= -lgtest
@@ -474,7 +469,6 @@ PKGCHKLIB=ipkgchk.lib
HELPLINKERLIB=ihelplinker.lib
JVMACCESSLIB = ijvmaccess.lib
XSLTLIB = libxslt.lib $(LIBXML2LIB)
-CPPUNITLIB = icppunit_dll.lib
GTESTLIB = igtest.lib
REDLANDLIB = librdf.lib
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index bc1b648..f5e1526 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1053,7 +1053,6 @@ JAVAMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/javamaker
RDBMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/rdbmaker
CLIMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/climaker
-CPPUNITTESTER=$(AUGMENT_LIBRARY_PATH_LOCAL) $(SOLARBINDIR)/cppunittester
HELPEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/helpex
LNGCONVEX=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/lngconvex
HELPLINKER=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/HelpLinker
@@ -1353,10 +1352,6 @@ $(COMP9TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/x
XML_APIS_JAR*=$(SOLARBINDIR)/xml-apis.jar
XERCES_JAR*=$(SOLARBINDIR)/xercesImpl.jar
-.IF "$(SYSTEM_CPPUNIT)" != "YES"
-CPPUNIT_CFLAGS =
-.END
-
COMPONENTPREFIX_URE_NATIVE = vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/
COMPONENTPREFIX_URE_JAVA = vnd.sun.star.expand:$$URE_INTERNAL_JAVA_DIR/
#.IF "$(OS)" == "WNT" || "$(OS)" == "OS2"
More information about the Libreoffice-commits
mailing list