Mailing-List: contact commits-help@openoffice.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@openoffice.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1734181 - in /openoffice/branches/gbuild-reintegration:
 ./
 main/basebmp/ main/filter/source/config/cache/ main/framework/test/
 main/idl/ main/starmath/ main/starmath/qa/unoapi/
Date: Wed, 09 Mar 2016 00:12:26 -0000
To: commits@openoffice.apache.org
From: damjan@apache.org
Message-Id: <20160309001226.546673A0052@svn01-us-west.apache.org>

Author: damjan
Date: Wed Mar  9 00:12:25 2016
New Revision: 1734181

URL: http://svn.apache.org/viewvc?rev=1734181&view=rev
Log:
Merge multiple patches from branches/gbuild:
r1409526: gnumake4: idl: link stl
r1409530: gnumake4: basebmp: add necessary workarounds for SunCC
r1409538: gnumake4: starmath: fix unoapi test
r1409539: gnumake4: fix a typo (spotted by gang65)
r1409540: gnumake4: filtercache.cxx: this should not be an assertion

BUILDS


Modified:
    openoffice/branches/gbuild-reintegration/   (props changed)
    openoffice/branches/gbuild-reintegration/main/basebmp/GoogleTest_basebmp.mk
    openoffice/branches/gbuild-reintegration/main/basebmp/Library_basebmp.mk
    openoffice/branches/gbuild-reintegration/main/basebmp/Module_basebmp.mk
    openoffice/branches/gbuild-reintegration/main/filter/source/config/cache/filtercache.cxx
    openoffice/branches/gbuild-reintegration/main/framework/test/test.cxx
    openoffice/branches/gbuild-reintegration/main/idl/Executable_svidl.mk
    openoffice/branches/gbuild-reintegration/main/starmath/JunitTest_sm_unoapi.mk
    openoffice/branches/gbuild-reintegration/main/starmath/qa/unoapi/Test.java

Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar  9 00:12:25 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409495,1409499-1409510,1409513,1409515,1409523,1409529
+/incubator/ooo/branches/gbuild:1409313-1409495,1409499-1409510,1409513,1409515,1409523,1409526,1409529-1409530,1409538-1409540
 /openoffice/branches/AOO400:1503684
 /openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
 /openoffice/branches/alg_writerframes:1556289-1579189

Modified: openoffice/branches/gbuild-reintegration/main/basebmp/GoogleTest_basebmp.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basebmp/GoogleTest_basebmp.mk?rev=1734181&r1=1734180&r2=1734181&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/basebmp/GoogleTest_basebmp.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/basebmp/GoogleTest_basebmp.mk Wed Mar  9 00:12:25 2016
@@ -40,16 +40,6 @@ $(eval $(call gb_GoogleTest_add_exceptio
 	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_GoogleTest_add_linked_libs,basebmp_test, \
 	basebmp \
 	sal \

Modified: openoffice/branches/gbuild-reintegration/main/basebmp/Library_basebmp.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basebmp/Library_basebmp.mk?rev=1734181&r1=1734180&r2=1734181&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/basebmp/Library_basebmp.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/basebmp/Library_basebmp.mk Wed Mar  9 00:12:25 2016
@@ -45,8 +45,6 @@ $(eval $(call gb_Library_set_defs,basebm
 	-DBASEBMP_DLLIMPLEMENTATION \
 ))
 
-# add libraries to be linked to basebmp; again these names need to be given as
-# specified in Repository.mk
 $(eval $(call gb_Library_add_linked_libs,basebmp,\
     sal \
     basegfx \
@@ -54,12 +52,19 @@ $(eval $(call gb_Library_add_linked_libs
     $(gb_STDLIBS) \
 ))
 
-# add all source files that shall be compiled with exceptions enabled
-# the name is relative to $(SRCROOT) and must not contain an extension
+ifeq ($(OS),SOLARIS)
+$(eval $(call gb_Library_add_cxxobjects,basebmp, \
+	basebmp/source/bitmapdevice \
+	basebmp/source/debug \
+	basebmp/source/polypolygonrenderer \
+    , $(gb_COMPILEROPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) -xalias_level=compatible \
+))
+else
 $(eval $(call gb_Library_add_exception_objects,basebmp,\
 	basebmp/source/bitmapdevice \
 	basebmp/source/debug \
 	basebmp/source/polypolygonrenderer \
 ))
+endif
 
 # vim: set noet sw=4 ts=4:

Modified: openoffice/branches/gbuild-reintegration/main/basebmp/Module_basebmp.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basebmp/Module_basebmp.mk?rev=1734181&r1=1734180&r2=1734181&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/basebmp/Module_basebmp.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/basebmp/Module_basebmp.mk Wed Mar  9 00:12:25 2016
@@ -38,5 +38,4 @@ $(eval $(call gb_Module_add_check_target
 ))
 endif
 
-
 # vim: set noet sw=4 ts=4:

Modified: openoffice/branches/gbuild-reintegration/main/filter/source/config/cache/filtercache.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/filter/source/config/cache/filtercache.cxx?rev=1734181&r1=1734180&r2=1734181&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/filter/source/config/cache/filtercache.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/filter/source/config/cache/filtercache.cxx Wed Mar  9 00:12:25 2016
@@ -222,7 +222,7 @@ void FilterCache::load(EFillState eRequi
         )
        )
     {
-        OSL_ENSURE(sal_False, "Who disturbs our \"fill cache on demand\" feature and force loading of ALL data during office startup? Please optimize your code, so a full filled filter cache is not really needed here!");
+        OSL_TRACE("Who disturbs our \"fill cache on demand\" feature and force loading of ALL data during office startup? Please optimize your code, so a full filled filter cache is not really needed here!");
     }
 #endif
 

Modified: openoffice/branches/gbuild-reintegration/main/framework/test/test.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/framework/test/test.cxx?rev=1734181&r1=1734180&r2=1734181&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/framework/test/test.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/framework/test/test.cxx Wed Mar  9 00:12:25 2016
@@ -237,7 +237,7 @@ void TestApplication::Main()
 //	Execute();
 //    xFrame->dispose();
 //    delete pMainWindow;
-	if( bState = sal_True )
+	if( bState == sal_True )
 	{
 		LOG_ERROR( "TestApplication::Main()", "Test successful ..." )
 	}

Modified: openoffice/branches/gbuild-reintegration/main/idl/Executable_svidl.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/idl/Executable_svidl.mk?rev=1734181&r1=1734180&r2=1734181&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/idl/Executable_svidl.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/idl/Executable_svidl.mk Wed Mar  9 00:12:25 2016
@@ -45,8 +45,9 @@ $(eval $(call gb_Executable_set_cxxflags
 ))
 
 $(eval $(call gb_Executable_add_linked_libs,svidl,\
-	sal \
 	tl \
+	sal \
+	stl \
     $(gb_STDLIBS) \
 ))
 

Modified: openoffice/branches/gbuild-reintegration/main/starmath/JunitTest_sm_unoapi.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/starmath/JunitTest_sm_unoapi.mk?rev=1734181&r1=1734180&r2=1734181&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/starmath/JunitTest_sm_unoapi.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/starmath/JunitTest_sm_unoapi.mk Wed Mar  9 00:12:25 2016
@@ -45,8 +45,8 @@ $(eval $(call gb_JunitTest_add_sourcefil
 	starmath/qa/unoapi/Test \
 ))
 
-$(eval $(call gb_JunitTest_add_classes,sw_unoapi,\
-	org.openoffice.sw.qa.unoapi.Test \
+$(eval $(call gb_JunitTest_add_classes,sm_unoapi,\
+	org.openoffice.starmath.qa.unoapi.Test \
 ))
 
 # vim: set noet sw=4 ts=4:

Modified: openoffice/branches/gbuild-reintegration/main/starmath/qa/unoapi/Test.java
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/starmath/qa/unoapi/Test.java?rev=1734181&r1=1734180&r2=1734181&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/starmath/qa/unoapi/Test.java (original)
+++ openoffice/branches/gbuild-reintegration/main/starmath/qa/unoapi/Test.java Wed Mar  9 00:12:25 2016
@@ -25,6 +25,7 @@ package org.openoffice.starmath.qa.unoap
 
 import org.openoffice.Runner;
 import org.openoffice.test.OfficeConnection;
+import org.openoffice.test.Argument;
 import static org.junit.Assert.*;
 
 public final class Test {
@@ -41,8 +42,8 @@ public final class Test {
     @org.junit.Test public void test() {
         assertTrue(
             Runner.run(
-                "-sce", "sm.sce", "-xcl", "knownissues.xcl", "-cs",
-                connection.getDescription()));
+                "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"),
+                "-cs", connection.getDescription()));
     }
 
     private final OfficeConnection connection = new OfficeConnection();