From ooo-commits-return-6921-apmail-incubator-ooo-commits-archive=incubator.apache.org@incubator.apache.org Thu Feb 16 14:42:18 2012 Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4105595B5 for ; Thu, 16 Feb 2012 14:42:18 +0000 (UTC) Received: (qmail 58867 invoked by uid 500); 16 Feb 2012 14:42:18 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 58832 invoked by uid 500); 16 Feb 2012 14:42:18 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 58825 invoked by uid 99); 16 Feb 2012 14:42:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Feb 2012 14:42:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Feb 2012 14:42:09 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EADAE2388865; Thu, 16 Feb 2012 14:41:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1244999 - in /incubator/ooo/trunk/main: basebmp/test/makefile.mk basegfx/test/makefile.mk sax/qa/cppunit/makefile.mk Date: Thu, 16 Feb 2012 14:41:48 -0000 To: ooo-commits@incubator.apache.org From: ydario@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120216144148.EADAE2388865@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ydario Date: Thu Feb 16 14:41:48 2012 New Revision: 1244999 URL: http://svn.apache.org/viewvc?rev=1244999&view=rev Log: i118923 - OS/2 port: cppunit is no longer broken. Modified: incubator/ooo/trunk/main/basebmp/test/makefile.mk incubator/ooo/trunk/main/basegfx/test/makefile.mk incubator/ooo/trunk/main/sax/qa/cppunit/makefile.mk Modified: incubator/ooo/trunk/main/basebmp/test/makefile.mk URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/basebmp/test/makefile.mk?rev=1244999&r1=1244998&r2=1244999&view=diff ============================================================================== --- incubator/ooo/trunk/main/basebmp/test/makefile.mk (original) +++ incubator/ooo/trunk/main/basebmp/test/makefile.mk Thu Feb 16 14:41:48 2012 @@ -29,14 +29,10 @@ TARGETTYPE=GUI ENABLE_EXCEPTIONS=TRUE -.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" +.IF "$(WITH_CPPUNIT)" != "YES" @all: -.IF "$(GUI)" == "OS2" - @echo "Skipping, cppunit broken." -.ELIF "$(WITH_CPPUNIT)" != "YES" @echo "cppunit disabled. nothing do do." -.END .ELSE @@ -138,4 +134,4 @@ SLOFILES=$(SHL1OBJS) .INCLUDE : _cppunit.mk .ENDIF -.ENDIF # "$(GUI)" == "OS2" +.ENDIF # "$(WITH_CPPUNIT)" != "YES" Modified: incubator/ooo/trunk/main/basegfx/test/makefile.mk URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/basegfx/test/makefile.mk?rev=1244999&r1=1244998&r2=1244999&view=diff ============================================================================== --- incubator/ooo/trunk/main/basegfx/test/makefile.mk (original) +++ incubator/ooo/trunk/main/basegfx/test/makefile.mk Thu Feb 16 14:41:48 2012 @@ -32,16 +32,12 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" +.IF "$(WITH_CPPUNIT)" != "YES" @all: -.IF "$(GUI)" == "OS2" - @echo "Skipping, cppunit broken." -.ELIF "$(WITH_CPPUNIT)" != "YES" @echo "cppunit disabled. nothing do do." -.END -.ELSE # "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" +.ELSE # "$(WITH_CPPUNIT)" != "YES" #building with stlport, but cppunit was not built with stlport .IF "$(USE_SYSTEM_STL)"!="YES" @@ -86,7 +82,7 @@ SLOFILES=$(SHL1OBJS) # --- Targets ------------------------------------------------------ -.ENDIF # "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" +.ENDIF # "$(WITH_CPPUNIT)" != "YES" .INCLUDE : target.mk .INCLUDE : _cppunit.mk 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=1244999&r1=1244998&r2=1244999&view=diff ============================================================================== --- incubator/ooo/trunk/main/sax/qa/cppunit/makefile.mk (original) +++ incubator/ooo/trunk/main/sax/qa/cppunit/makefile.mk Thu Feb 16 14:41:48 2012 @@ -31,16 +31,12 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" +.IF "$(WITH_CPPUNIT)" != "YES" @all: -.IF "$(GUI)" == "OS2" - @echo "Skipping, cppunit broken." -.ELIF "$(WITH_CPPUNIT)" != "YES" @echo "cppunit disabled. nothing do do." -.END -.ELSE # "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" +.ELSE # "$(WITH_CPPUNIT)" != "YES" #building with stlport, but cppunit was not built with stlport .IF "$(USE_SYSTEM_STL)"!="YES" @@ -80,7 +76,7 @@ SLOFILES= \ # --- Targets ------------------------------------------------------ -.ENDIF # "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" +.ENDIF # "$(WITH_CPPUNIT)" != "YES" .INCLUDE : target.mk .INCLUDE : _cppunit.mk