You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/14 23:53:41 UTC
svn commit: r1409505 - in /incubator/ooo/branches/gbuild/main: basebmp/
basebmp/test/ basegfx/ basegfx/test/ sfx2/
Author: arist
Date: Wed Nov 14 22:53:40 2012
New Revision: 1409505
URL: http://svn.apache.org/viewvc?rev=1409505&view=rev
Log:
gnumake4_018_f8f8d6414c70.patch
# HG changeset patch
# User mba
# Date 1298826782 -3600
# Node ID f8f8d6414c7017516b695f670fe120c12c71afe0
# Parent e62681893dca9a6a541bd72ddad37de26c5bcedb
CWS gnumake4: add cppunittests for basebmp and basegfx
Added:
incubator/ooo/branches/gbuild/main/basebmp/CppunitTest_basebmp.mk
Modified:
incubator/ooo/branches/gbuild/main/basebmp/Module_basebmp.mk
incubator/ooo/branches/gbuild/main/basebmp/test/basictest.cxx
incubator/ooo/branches/gbuild/main/basegfx/CppunitTest_basegfx.mk
incubator/ooo/branches/gbuild/main/basegfx/Module_basegfx.mk
incubator/ooo/branches/gbuild/main/basegfx/test/basegfx1d.cxx
incubator/ooo/branches/gbuild/main/sfx2/CppunitTest_sfx2_metadatable.mk
Added: incubator/ooo/branches/gbuild/main/basebmp/CppunitTest_basebmp.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/basebmp/CppunitTest_basebmp.mk?rev=1409505&view=auto
==============================================================================
--- incubator/ooo/branches/gbuild/main/basebmp/CppunitTest_basebmp.mk (added)
+++ incubator/ooo/branches/gbuild/main/basebmp/CppunitTest_basebmp.mk Wed Nov 14 22:53:40 2012
@@ -0,0 +1,65 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_CppunitTest_CppunitTest,basebmp_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,basebmp_test, \
+ basebmp/test/basictest \
+ basebmp/test/bmpmasktest \
+ basebmp/test/bmptest \
+ basebmp/test/cliptest \
+ basebmp/test/filltest \
+ basebmp/test/linetest \
+ basebmp/test/masktest \
+ basebmp/test/polytest \
+ basebmp/test/tools \
+))
+
+# TODO
+# SunStudio 12 (-m64 and -m32 modes): three test cases of the unit tests fail
+# if compiled with default -xalias_level (and optimization level -xO3)
+#.IF "$(OS)"=="SOLARIS"
+# For Sun Studio 8 this switch does not work: compilation fails on bitmapdevice.cxx
+#.IF "$(CCNUMVER)"!="00050005"
+#CDEFS+=-xalias_level=compatible
+#.ENDIF
+#.ENDIF
+
+$(eval $(call gb_CppunitTest_add_linked_libs,basebmp_test, \
+ basebmp \
+ sal \
+ stl \
+ basegfx \
+ cppunit \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,basebmp_test,\
+ $$(INCLUDE) \
+))
+
+# vim: set noet sw=4 ts=4:
Modified: incubator/ooo/branches/gbuild/main/basebmp/Module_basebmp.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/basebmp/Module_basebmp.mk?rev=1409505&r1=1409504&r2=1409505&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/basebmp/Module_basebmp.mk (original)
+++ incubator/ooo/branches/gbuild/main/basebmp/Module_basebmp.mk Wed Nov 14 22:53:40 2012
@@ -32,4 +32,11 @@ $(eval $(call gb_Module_add_targets,base
Package_inc \
))
+ifeq ($(WITH_CPPUNIT),YES)
+$(eval $(call gb_Module_add_check_targets,basebmp,\
+ CppunitTest_basebmp \
+))
+endif
+
+
# vim: set noet sw=4 ts=4:
Modified: incubator/ooo/branches/gbuild/main/basebmp/test/basictest.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/basebmp/test/basictest.cxx?rev=1409505&r1=1409504&r2=1409505&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/basebmp/test/basictest.cxx (original)
+++ incubator/ooo/branches/gbuild/main/basebmp/test/basictest.cxx Wed Nov 14 22:53:40 2012
@@ -24,6 +24,7 @@
// autogenerated file with codegen.pl
#include "preextstl.h"
+#include <sal/cppunit.h>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
Modified: incubator/ooo/branches/gbuild/main/basegfx/CppunitTest_basegfx.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/basegfx/CppunitTest_basegfx.mk?rev=1409505&r1=1409504&r2=1409505&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/basegfx/CppunitTest_basegfx.mk (original)
+++ incubator/ooo/branches/gbuild/main/basegfx/CppunitTest_basegfx.mk Wed Nov 14 22:53:40 2012
@@ -25,17 +25,36 @@
#
#*************************************************************************
-$(eval $(call gb_CppunitTest_CppunitTest,MODULE_NAME))
+$(eval $(call gb_CppunitTest_CppunitTest,basegfx_test))
-$(eval $(call gb_CppunitTest_add_exception_objects,MODULE_NAME, \
+$(eval $(call gb_CppunitTest_add_exception_objects,basegfx_test, \
+ basegfx/test/basegfx1d \
+ basegfx/test/basegfx2d \
+ basegfx/test/basegfx3d \
+ basegfx/test/boxclipper \
+ basegfx/test/basegfxtools \
+ basegfx/test/clipstate \
+ basegfx/test/genericclipper \
+ basegfx/test/testtools \
))
-$(eval $(call gb_CppunitTest_add_linked_libs,MODULE_NAME, \
+$(eval $(call gb_CppunitTest_add_linked_libs,basegfx_test, \
+ basegfx \
+ sal \
+ cppuhelper \
+ cppunit \
+ cppu \
$(gb_STDLIBS) \
))
-$(eval $(call gb_CppunitTest_set_include,MODULE_NAME,\
+$(eval $(call gb_CppunitTest_add_api,basegfx_test,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_CppunitTest_set_include,basegfx_test,\
$$(INCLUDE) \
+ -I$(SRCDIR)/basegfx/inc/pch \
))
# vim: set noet sw=4 ts=4:
Modified: incubator/ooo/branches/gbuild/main/basegfx/Module_basegfx.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/basegfx/Module_basegfx.mk?rev=1409505&r1=1409504&r2=1409505&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/basegfx/Module_basegfx.mk (original)
+++ incubator/ooo/branches/gbuild/main/basegfx/Module_basegfx.mk Wed Nov 14 22:53:40 2012
@@ -32,7 +32,10 @@ $(eval $(call gb_Module_add_targets,base
Package_inc \
))
+ifeq ($(WITH_CPPUNIT),YES)
$(eval $(call gb_Module_add_check_targets,basegfx,\
+ CppunitTest_basegfx \
))
+endif
# vim: set noet sw=4 ts=4:
Modified: incubator/ooo/branches/gbuild/main/basegfx/test/basegfx1d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/basegfx/test/basegfx1d.cxx?rev=1409505&r1=1409504&r2=1409505&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/basegfx/test/basegfx1d.cxx (original)
+++ incubator/ooo/branches/gbuild/main/basegfx/test/basegfx1d.cxx Wed Nov 14 22:53:40 2012
@@ -27,6 +27,7 @@
// autogenerated file with codegen.pl
#include "preextstl.h"
+#include <sal/cppunit.h>
#include "cppunit/TestAssert.h"
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
Modified: incubator/ooo/branches/gbuild/main/sfx2/CppunitTest_sfx2_metadatable.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sfx2/CppunitTest_sfx2_metadatable.mk?rev=1409505&r1=1409504&r2=1409505&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sfx2/CppunitTest_sfx2_metadatable.mk (original)
+++ incubator/ooo/branches/gbuild/main/sfx2/CppunitTest_sfx2_metadatable.mk Wed Nov 14 22:53:40 2012
@@ -39,11 +39,6 @@ $(eval $(call gb_CppunitTest_add_linked_
$(gb_STDLIBS) \
))
-$(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\
- $$(INCLUDE) \
- -I$(OUTDIR)/inc \
-))
-
$(eval $(call gb_CppunitTest_set_ldflags,sfx2_metadatable,\
$$(LDFLAGS) \
-lcppunit \