You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pf...@apache.org on 2011/11/24 17:21:26 UTC
svn commit: r1205912 - in /incubator/ooo/trunk/main: ./ basebmp/test/
basegfx/prj/ basegfx/test/ binaryurp/qa/ cppunit/
desktop/qa/deployment_misc/ o3tl/prj/ o3tl/qa/ sal/cppunittester/ sal/prj/
sax/qa/cppunit/ sfx2/ shell/qa/zip/ solenv/gbuild/platfor...
Author: pfg
Date: Thu Nov 24 16:21:24 2011
New Revision: 1205912
URL: http://svn.apache.org/viewvc?rev=1205912&view=rev
Log:
i118608 - IP clearance: Remove internal cppunit source, use system-cppunit instead. Patch by Andre Fischer (af).
Removed:
incubator/ooo/trunk/main/cppunit/
Modified:
incubator/ooo/trunk/main/Repository.mk
incubator/ooo/trunk/main/basebmp/test/makefile.mk
incubator/ooo/trunk/main/basegfx/prj/build.lst
incubator/ooo/trunk/main/basegfx/test/makefile.mk
incubator/ooo/trunk/main/binaryurp/qa/makefile.mk
incubator/ooo/trunk/main/configure.in
incubator/ooo/trunk/main/desktop/qa/deployment_misc/makefile.mk
incubator/ooo/trunk/main/o3tl/prj/build.lst
incubator/ooo/trunk/main/o3tl/qa/makefile.mk
incubator/ooo/trunk/main/sal/cppunittester/makefile.mk
incubator/ooo/trunk/main/sal/prj/build.lst
incubator/ooo/trunk/main/sax/qa/cppunit/makefile.mk
incubator/ooo/trunk/main/set_soenv.in
incubator/ooo/trunk/main/sfx2/CppunitTest_sfx2_metadatable.mk
incubator/ooo/trunk/main/sfx2/Module_sfx2.mk
incubator/ooo/trunk/main/shell/qa/zip/makefile.mk
incubator/ooo/trunk/main/solenv/gbuild/platform/freebsd.mk
incubator/ooo/trunk/main/solenv/gbuild/platform/linux.mk
incubator/ooo/trunk/main/solenv/gbuild/platform/macosx.mk
incubator/ooo/trunk/main/solenv/gbuild/platform/os2.mk
incubator/ooo/trunk/main/solenv/gbuild/platform/solaris.mk
incubator/ooo/trunk/main/solenv/gbuild/platform/windows.mk
incubator/ooo/trunk/main/solenv/gbuild/platform/winmingw.mk
incubator/ooo/trunk/main/test/prj/build.lst
incubator/ooo/trunk/main/test/source/cpp/makefile.mk
incubator/ooo/trunk/main/test/source/cpp/unoexceptionprotector/makefile.mk
Modified: incubator/ooo/trunk/main/Repository.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/Repository.mk?rev=1205912&r1=1205911&r2=1205912&view=diff
==============================================================================
--- incubator/ooo/trunk/main/Repository.mk (original)
+++ incubator/ooo/trunk/main/Repository.mk Thu Nov 24 16:21:24 2011
@@ -98,10 +98,8 @@ $(eval $(call gb_Helper_register_librari
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
- cppunit \
icuuc \
icule \
- cppunit \
rdf \
xslt \
))
Modified: incubator/ooo/trunk/main/basebmp/test/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/basebmp/test/makefile.mk?rev=1205912&r1=1205911&r2=1205912&view=diff
==============================================================================
--- incubator/ooo/trunk/main/basebmp/test/makefile.mk (original)
+++ incubator/ooo/trunk/main/basebmp/test/makefile.mk Thu Nov 24 16:21:24 2011
@@ -33,10 +33,14 @@ TARGETTYPE=GUI
ENABLE_EXCEPTIONS=TRUE
-.IF "$(GUI)" == "OS2"
+.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
@all:
+.IF "$(GUI)" == "OS2"
@echo "Skipping, cppunit broken."
+.ELIF "$(WITH_CPPUNIT)" != "YES"
+ @echo "cppunit disabled. nothing do do."
+.END
.ELSE
Modified: incubator/ooo/trunk/main/basegfx/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/basegfx/prj/build.lst?rev=1205912&r1=1205911&r2=1205912&view=diff
==============================================================================
--- incubator/ooo/trunk/main/basegfx/prj/build.lst (original)
+++ incubator/ooo/trunk/main/basegfx/prj/build.lst Thu Nov 24 16:21:24 2011
@@ -1,4 +1,4 @@
-fx basegfx : o3tl sal offuh cppuhelper cppu CPPUNIT:cppunit NULL
+fx basegfx : o3tl sal offuh cppuhelper cppu NULL
fx basegfx usr1 - all fx_mkout NULL
fx basegfx\inc nmake - all fx_inc NULL
fx basegfx\prj get - all fx_prj NULL
Modified: incubator/ooo/trunk/main/basegfx/test/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/basegfx/test/makefile.mk?rev=1205912&r1=1205911&r2=1205912&view=diff
==============================================================================
--- incubator/ooo/trunk/main/basegfx/test/makefile.mk (original)
+++ incubator/ooo/trunk/main/basegfx/test/makefile.mk Thu Nov 24 16:21:24 2011
@@ -36,12 +36,16 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-.IF "$(GUI)" == "OS2"
+.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
@all:
+.IF "$(GUI)" == "OS2"
@echo "Skipping, cppunit broken."
+.ELIF "$(WITH_CPPUNIT)" != "YES"
+ @echo "cppunit disabled. nothing do do."
+.END
-.ELSE
+.ELSE # "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
#building with stlport, but cppunit was not built with stlport
.IF "$(USE_SYSTEM_STL)"!="YES"
@@ -86,7 +90,7 @@ SLOFILES=$(SHL1OBJS)
# --- Targets ------------------------------------------------------
-.ENDIF # "$(GUI)" == "OS2"
+.ENDIF # "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
.INCLUDE : target.mk
.INCLUDE : _cppunit.mk
Modified: incubator/ooo/trunk/main/binaryurp/qa/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/binaryurp/qa/makefile.mk?rev=1205912&r1=1205911&r2=1205912&view=diff
==============================================================================
--- incubator/ooo/trunk/main/binaryurp/qa/makefile.mk (original)
+++ incubator/ooo/trunk/main/binaryurp/qa/makefile.mk Thu Nov 24 16:21:24 2011
@@ -33,10 +33,14 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE: settings.mk
-.IF "$(GUI)" == "OS2"
+.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
@all:
+.IF "$(GUI)" == "OS2"
@echo "Skipping, cppunit broken."
+.ELIF "$(WITH_CPPUNIT)" != "YES"
+ @echo "cppunit disabled. nothing do do."
+.END
.ELSE
Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1205912&r1=1205911&r2=1205912&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Thu Nov 24 16:21:24 2011
@@ -3727,6 +3727,9 @@ if test -n "$with_system_libwpd" -o -n "
AC_MSG_RESULT([external])
SYSTEM_LIBWPD=YES
PKG_CHECK_MODULES( LIBWPD, libwpd-0.8 )
+else
+ AC_MSG_RESULT([no])
+ SYSTEM_LIBWPD=
fi
AC_SUBST(SYSTEM_LIBWPD)
AC_SUBST(LIBWPD_CFLAGS)
@@ -3735,21 +3738,30 @@ AC_SUBST(LIBWPD_LIBS)
dnl ===================================================================
dnl Check for system cppunit
dnl ===================================================================
+WITH_CPPUNIT=
AC_MSG_CHECKING([which cppunit to use])
if test -n "$with_system_cppunit" -o -n "$with_system_libs" && \
test "$with_system_cppunit" != "no"; then
- AC_MSG_RESULT([external])
SYSTEM_CPPUNIT=YES
# might work for earlier, too but go sure:
- PKG_CHECK_MODULES( CPPUNIT, cppunit >= 1.12.0 )
+ PKG_CHECK_MODULES( CPPUNIT,
+ cppunit >= 1.12.0,
+ WITH_CPPUNIT="YES",
+ WITH_CPPUNIT=")
+ if test -n "$WITH_CPPUNIT"; then
+ AC_MSG_RESULT([found system cppunit $CPPUNIT])
+ else
+ AC_MSG_WARN([dit not find system cppunit version 1.12.0 or later])
+ fi
+
else
- AC_MSG_RESULT([internal])
+ AC_MSG_WARN([not using cppunit])
SYSTEM_CPPUNIT=NO
- BUILD_TYPE="$BUILD_TYPE CPPUNIT"
fi
AC_SUBST(SYSTEM_CPPUNIT)
AC_SUBST(CPPUNIT_CFLAGS)
AC_SUBST(CPPUNIT_LIBS)
+AC_SUBST(WITH_CPPUNIT)
dnl ===================================================================
dnl Check whether freetype is available
Modified: incubator/ooo/trunk/main/desktop/qa/deployment_misc/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/qa/deployment_misc/makefile.mk?rev=1205912&r1=1205911&r2=1205912&view=diff
==============================================================================
--- incubator/ooo/trunk/main/desktop/qa/deployment_misc/makefile.mk (original)
+++ incubator/ooo/trunk/main/desktop/qa/deployment_misc/makefile.mk Thu Nov 24 16:21:24 2011
@@ -25,12 +25,16 @@
#
#*************************************************************************
-.IF "$(GUI)" == "OS2"
+.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
@all:
+.IF "$(GUI)" == "OS2"
@echo "Skipping, cppunit broken."
+.ELIF "$(WITH_CPPUNIT)" != "YES"
+ @echo "cppunit disabled. nothing do do."
+.END
-.ENDIF # "$(GUI)" == "OS2"
+.ENDIF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
PRJ := ..$/..
PRJNAME := desktop
Modified: incubator/ooo/trunk/main/o3tl/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/o3tl/prj/build.lst?rev=1205912&r1=1205911&r2=1205912&view=diff
==============================================================================
--- incubator/ooo/trunk/main/o3tl/prj/build.lst (original)
+++ incubator/ooo/trunk/main/o3tl/prj/build.lst Thu Nov 24 16:21:24 2011
@@ -1,4 +1,4 @@
-ot o3tl : sal CPPUNIT:cppunit BOOST:boost NULL
+ot o3tl : sal BOOST:boost NULL
ot o3tl usr1 - all ot_mkout NULL
ot o3tl\inc get - all ot_inc NULL
ot o3tl\prj get - all ot_prj NULL
Modified: incubator/ooo/trunk/main/o3tl/qa/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/o3tl/qa/makefile.mk?rev=1205912&r1=1205911&r2=1205912&view=diff
==============================================================================
--- incubator/ooo/trunk/main/o3tl/qa/makefile.mk (original)
+++ incubator/ooo/trunk/main/o3tl/qa/makefile.mk Thu Nov 24 16:21:24 2011
@@ -25,12 +25,16 @@
#
#*************************************************************************
-.IF "$(GUI)" == "OS2"
+.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
@all:
+.IF "$(GUI)" == "OS2"
@echo "Skipping, cppunit broken."
+.ELIF "$(WITH_CPPUNIT)" != "YES"
+ @echo "cppunit disabled. nothing do do."
+.END
-.ENDIF # "$(GUI)" == "OS2"
+.ELSE # "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
PRJ=..
@@ -89,3 +93,4 @@ SLOFILES=$(SHL1OBJS)
.INCLUDE : _cppunit.mk
.ENDIF # L10N_framework
+.ENDIF # "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
Modified: incubator/ooo/trunk/main/sal/cppunittester/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sal/cppunittester/makefile.mk?rev=1205912&r1=1205911&r2=1205912&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sal/cppunittester/makefile.mk (original)
+++ incubator/ooo/trunk/main/sal/cppunittester/makefile.mk Thu Nov 24 16:21:24 2011
@@ -33,6 +33,12 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE: settings.mk
+.IF "$(WITH_CPPUNIT)" != "YES"
+all:
+ @echo cppunit disabled. nothing to do.
+
+.ELSE
+
#building with stlport, but cppunit was not built with stlport
.IF "$(USE_SYSTEM_STL)"!="YES"
.IF "$(SYSTEM_CPPUNIT)"=="YES"
@@ -50,3 +56,5 @@ APP1STDLIBS = $(CPPUNITLIB) $(SALLIB)
APP1TARGET = cppunittester
.INCLUDE: target.mk
+
+.ENDIF
Modified: incubator/ooo/trunk/main/sal/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sal/prj/build.lst?rev=1205912&r1=1205911&r2=1205912&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sal/prj/build.lst (original)
+++ incubator/ooo/trunk/main/sal/prj/build.lst Thu Nov 24 16:21:24 2011
@@ -1,4 +1,4 @@
-sa sal : xml2cmp stlport external BOOST:boost CPPUNIT:cppunit NULL
+sa sal : xml2cmp stlport external BOOST:boost NULL
sa sal usr1 - all sa_mkout NULL
sa sal\inc nmake - all sa_inc NULL
sa sal\typesconfig nmake - u sa_tc sa_inc NULL
Modified: incubator/ooo/trunk/main/sax/qa/cppunit/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sax/qa/cppunit/makefile.mk?rev=1205912&r1=1205911&r2=1205912&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sax/qa/cppunit/makefile.mk (original)
+++ incubator/ooo/trunk/main/sax/qa/cppunit/makefile.mk Thu Nov 24 16:21:24 2011
@@ -35,12 +35,16 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-.IF "$(GUI)" == "OS2"
+.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
@all:
+.IF "$(GUI)" == "OS2"
@echo "Skipping, cppunit broken."
+.ELIF "$(WITH_CPPUNIT)" != "YES"
+ @echo "cppunit disabled. nothing do do."
+.END
-.ELSE
+.ELSE # "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
#building with stlport, but cppunit was not built with stlport
.IF "$(USE_SYSTEM_STL)"!="YES"
@@ -80,7 +84,7 @@ SLOFILES= \
# --- Targets ------------------------------------------------------
-.ENDIF # "$(GUI)" == "OS2"
+.ENDIF # "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
.INCLUDE : target.mk
.INCLUDE : _cppunit.mk
Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1205912&r1=1205911&r2=1205912&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Thu Nov 24 16:21:24 2011
@@ -1923,6 +1923,7 @@ ToFile( "LIBWPD_LIBS", "@LIBWPD_LI
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( "SYSTEM_LIBXML", "@SYSTEM_LIBXML@", "e" );
ToFile( "USE_FT_EMBOLDEN", "@USE_FT_EMBOLDEN@", "e" );
ToFile( "LIBXML_CFLAGS", "@LIBXML_CFLAGS@", "e" );
Modified: incubator/ooo/trunk/main/sfx2/CppunitTest_sfx2_metadatable.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sfx2/CppunitTest_sfx2_metadatable.mk?rev=1205912&r1=1205911&r2=1205912&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sfx2/CppunitTest_sfx2_metadatable.mk (original)
+++ incubator/ooo/trunk/main/sfx2/CppunitTest_sfx2_metadatable.mk Thu Nov 24 16:21:24 2011
@@ -32,8 +32,8 @@ $(eval $(call gb_CppunitTest_add_excepti
))
$(eval $(call gb_CppunitTest_add_linked_libs,sfx2_metadatable, \
- sal \
- sfx \
+ sal \
+ sfx \
stl \
$(gb_STDLIBS) \
))
@@ -44,4 +44,9 @@ $(eval $(call gb_CppunitTest_set_include
-I$(OUTDIR)/inc \
))
+$(eval $(call gb_CppunitTest_set_ldflags,sfx2_metadatable,\
+ $$(LDFLAGS) \
+ -lcppunit \
+))
+
# vim: set noet sw=4 ts=4:
Modified: incubator/ooo/trunk/main/sfx2/Module_sfx2.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sfx2/Module_sfx2.mk?rev=1205912&r1=1205911&r2=1205912&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sfx2/Module_sfx2.mk (original)
+++ incubator/ooo/trunk/main/sfx2/Module_sfx2.mk Thu Nov 24 16:21:24 2011
@@ -34,9 +34,11 @@ $(eval $(call gb_Module_add_targets,sfx2
Package_sdi \
))
+ifeq ($(WITH_CPPUNIT),YES)
$(eval $(call gb_Module_add_check_targets,sfx2,\
CppunitTest_sfx2_metadatable \
))
+endif
$(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\
JunitTest_sfx2_complex \
Modified: incubator/ooo/trunk/main/shell/qa/zip/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/shell/qa/zip/makefile.mk?rev=1205912&r1=1205911&r2=1205912&view=diff
==============================================================================
--- incubator/ooo/trunk/main/shell/qa/zip/makefile.mk (original)
+++ incubator/ooo/trunk/main/shell/qa/zip/makefile.mk Thu Nov 24 16:21:24 2011
@@ -34,6 +34,17 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
+.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
+
+@all:
+.IF "$(GUI)" == "OS2"
+ @echo "Skipping, cppunit broken."
+.ELIF "$(WITH_CPPUNIT)" != "YES"
+ @echo "cppunit disabled. nothing do do."
+.END
+
+.ELSE
+
CFLAGSCXX += $(CPPUNIT_CFLAGS)
SHL1OBJS = $(SLOFILES)
@@ -45,6 +56,8 @@ SHL1VERSIONMAP = $(PRJ)/qa/zip/export.ma
DEF1NAME=$(SHL1TARGET)
SLOFILES=$(SLO)$/ziptest.obj
+.ENDIF
+
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
Modified: incubator/ooo/trunk/main/solenv/gbuild/platform/freebsd.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/gbuild/platform/freebsd.mk?rev=1205912&r1=1205911&r2=1205912&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/gbuild/platform/freebsd.mk (original)
+++ incubator/ooo/trunk/main/solenv/gbuild/platform/freebsd.mk Thu Nov 24 16:21:24 2011
@@ -271,15 +271,16 @@ endif
gb_Library_PLAINLIBS_NONE += \
dl \
- freetype \
+ freetype \
jpeg \
m \
pthread \
X11 \
- Xext \
- SM \
- ICE \
- z
+ Xext \
+ SM \
+ ICE \
+ z \
+ cppunit
gb_Library_FILENAMES := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
Modified: incubator/ooo/trunk/main/solenv/gbuild/platform/linux.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/gbuild/platform/linux.mk?rev=1205912&r1=1205911&r2=1205912&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/gbuild/platform/linux.mk (original)
+++ incubator/ooo/trunk/main/solenv/gbuild/platform/linux.mk Thu Nov 24 16:21:24 2011
@@ -277,15 +277,16 @@ endif
gb_Library_PLAINLIBS_NONE += \
dl \
- freetype \
+ freetype \
jpeg \
m \
pthread \
X11 \
- Xext \
- SM \
- ICE \
- z
+ Xext \
+ SM \
+ ICE \
+ z \
+ cppunit
gb_Library_FILENAMES := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
Modified: incubator/ooo/trunk/main/solenv/gbuild/platform/macosx.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/gbuild/platform/macosx.mk?rev=1205912&r1=1205911&r2=1205912&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/gbuild/platform/macosx.mk (original)
+++ incubator/ooo/trunk/main/solenv/gbuild/platform/macosx.mk Thu Nov 24 16:21:24 2011
@@ -328,6 +328,7 @@ gb_Library_PLAINLIBS_NONE += \
m \
pthread \
z \
+ cppunit
gb_Library_FILENAMES := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
Modified: incubator/ooo/trunk/main/solenv/gbuild/platform/os2.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/gbuild/platform/os2.mk?rev=1205912&r1=1205911&r2=1205912&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/gbuild/platform/os2.mk (original)
+++ incubator/ooo/trunk/main/solenv/gbuild/platform/os2.mk Thu Nov 24 16:21:24 2011
@@ -389,7 +389,8 @@ gb_Library_PLAINLIBS_NONE += \
jpeg \
m \
z \
- pthread
+ pthread \
+ cppunit
gb_Library_LAYER := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
Modified: incubator/ooo/trunk/main/solenv/gbuild/platform/solaris.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/gbuild/platform/solaris.mk?rev=1205912&r1=1205911&r2=1205912&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/gbuild/platform/solaris.mk (original)
+++ incubator/ooo/trunk/main/solenv/gbuild/platform/solaris.mk Thu Nov 24 16:21:24 2011
@@ -265,7 +265,8 @@ gb_Library_PLAINLIBS_NONE += \
Xext \
SM \
ICE \
- z
+ z \
+ cppunit
gb_Library_FILENAMES := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
Modified: incubator/ooo/trunk/main/solenv/gbuild/platform/windows.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/gbuild/platform/windows.mk?rev=1205912&r1=1205911&r2=1205912&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/gbuild/platform/windows.mk (original)
+++ incubator/ooo/trunk/main/solenv/gbuild/platform/windows.mk Thu Nov 24 16:21:24 2011
@@ -466,6 +466,7 @@ gb_Library_PLAINLIBS_NONE += \
uwinapi \
winspool \
z \
+ cppunit
gb_Library_LAYER := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
Modified: incubator/ooo/trunk/main/solenv/gbuild/platform/winmingw.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/gbuild/platform/winmingw.mk?rev=1205912&r1=1205911&r2=1205912&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/gbuild/platform/winmingw.mk (original)
+++ incubator/ooo/trunk/main/solenv/gbuild/platform/winmingw.mk Thu Nov 24 16:21:24 2011
@@ -151,7 +151,7 @@ gb_PrecompiledHeader_EXCEPTIONFLAGS := $
gb_LinkTarget_NOEXCEPTIONFLAGS := \
-DEXCEPTIONS_OFF \
-fno-exceptions \
-
+
gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS)
gb_LinkTarget_LDFLAGS := \
@@ -490,6 +490,7 @@ gb_Library_PLAINLIBS_NONE += \
uwinapi \
winspool \
z \
+ cppunit
gb_Library_LAYER := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
Modified: incubator/ooo/trunk/main/test/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/prj/build.lst?rev=1205912&r1=1205911&r2=1205912&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/prj/build.lst (original)
+++ incubator/ooo/trunk/main/test/prj/build.lst Thu Nov 24 16:21:24 2011
@@ -1,4 +1,4 @@
-te test : BOOST:boost cppu cppuhelper CPPUNIT:cppunit javaunohelper offuh ridljar sal solenv stlport unoil NULL
+te test : BOOST:boost cppu cppuhelper javaunohelper offuh ridljar sal solenv stlport unoil NULL
te test\inc nmake - all inc NULL
te test\source\cpp nmake - all source_cpp inc NULL
te test\source\cpp\unoexceptionprotector nmake - all source_cpp_unoexceptionprotector inc NULL
Modified: incubator/ooo/trunk/main/test/source/cpp/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/source/cpp/makefile.mk?rev=1205912&r1=1205911&r2=1205912&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/source/cpp/makefile.mk (original)
+++ incubator/ooo/trunk/main/test/source/cpp/makefile.mk Thu Nov 24 16:21:24 2011
@@ -32,6 +32,17 @@ VISIBILITY_HIDDEN = TRUE
.INCLUDE: settings.mk
+.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
+
+@all:
+.IF "$(GUI)" == "OS2"
+ @echo "Skipping, cppunit broken."
+.ELIF "$(WITH_CPPUNIT)" != "YES"
+ @echo "cppunit disabled. nothing do do."
+.END
+
+.ELSE
+
CDEFS += -DOOO_DLLIMPLEMENTATION_TEST
CFLAGSCXX += $(CPPUNIT_CFLAGS)
@@ -58,4 +69,6 @@ SHL1TARGET = test
SHL1USE_EXPORTS = name
DEF1NAME = $(SHL1TARGET)
+.ENDIF
+
.INCLUDE: target.mk
Modified: incubator/ooo/trunk/main/test/source/cpp/unoexceptionprotector/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/source/cpp/unoexceptionprotector/makefile.mk?rev=1205912&r1=1205911&r2=1205912&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/source/cpp/unoexceptionprotector/makefile.mk (original)
+++ incubator/ooo/trunk/main/test/source/cpp/unoexceptionprotector/makefile.mk Thu Nov 24 16:21:24 2011
@@ -32,6 +32,17 @@ VISIBILITY_HIDDEN = TRUE
.INCLUDE: settings.mk
+.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
+
+@all:
+.IF "$(GUI)" == "OS2"
+ @echo "Skipping, cppunit broken."
+.ELIF "$(WITH_CPPUNIT)" != "YES"
+ @echo "cppunit disabled. nothing do do."
+.END
+
+.ELSE
+
DLLPRE =
CFLAGSCXX += $(CPPUNIT_CFLAGS)
@@ -54,3 +65,5 @@ SHL1USE_EXPORTS = name
DEF1NAME = $(SHL1TARGET)
.INCLUDE: target.mk
+
+.ENDIF