[Libreoffice-commits] .: Branch 'feature/gnumake4' - 4 commits - starmath/JunitTest_sm_unoapi.mk starmath/qa sw/JunitTest_sw_complex.mk sw/JunitTest_sw_unoapi.mk sw/Library_msword.mk sw/Library_sw.mk sw/Library_vbaswobj.mk

[Bjoern Michaelsen]

 starmath/JunitTest_sm_unoapi.mk |    6 +++---
 starmath/qa/unoapi/Test.java    |    5 +++--
 sw/JunitTest_sw_complex.mk      |    2 +-
 sw/JunitTest_sw_unoapi.mk       |    2 +-
 sw/Library_msword.mk            |    3 ++-
 sw/Library_sw.mk                |    3 ++-
 sw/Library_vbaswobj.mk          |    4 +---
 7 files changed, 13 insertions(+), 12 deletions(-)

New commits:
commit 292f55429069cad75d373421d9cf4575ee8f649d
Author: Michael Stahl <mst at openoffice.org>
Date:   Mon Apr 11 13:23:37 2011 +0000

    gnumake4: #i116959#: user defined LDFLAGS: [hg:5ed23c4158ac]
    
    rename target local variable LDFLAGS.
    add gb_LinkTarget_add_ldflags.
    include user defined LDFLAGS in target local T_LDFLAGS.

diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
index 140dd38..f3ed77c 100644
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -114,10 +114,8 @@ $(eval $(call gb_Library_add_exception_objects,vbaswobj,\
 ))
 
 ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_set_ldflags,vbaswobj,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vbaswobj,\
     -Wl$(COMMA)-O1 \
-    -Wl$(COMMA)-z$(COMMA)noexecstack \
 ))
 endif
 
commit ef46a5c82297802dd81d7844fdcd03f8e5ef8ef7
Author: Michael Stahl <mst at openoffice.org>
Date:   Fri Apr 1 20:49:35 2011 +0000

    gnumake4: #i117610#: add RepositoryExternal.mk, and use it. [hg:62e2f8dc95a7]

diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index 530fa53..b47fe49 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -54,7 +54,6 @@ $(eval $(call gb_Library_add_linked_libs,msword,\
     editeng \
     i18nisolang1 \
     i18nutil \
-    icuuc \
     msfilter \
     sal \
     sfx \
@@ -74,6 +73,8 @@ $(eval $(call gb_Library_add_linked_libs,msword,\
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_external,msword,icuuc)
+
 $(eval $(call gb_Library_add_exception_objects,msword,\
     sw/source/filter/rtf/rtffld \
     sw/source/filter/rtf/rtffly \
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index d097896..4dde29a 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -61,7 +61,6 @@ $(eval $(call gb_Library_add_linked_libs,sw,\
     editeng \
     i18nisolang1 \
     i18nutil \
-    icuuc \
     lng \
     sal \
     salhelper \
@@ -84,6 +83,8 @@ $(eval $(call gb_Library_add_linked_libs,sw,\
     $(gb_STDLIBS) \
 ))
 
+$(call gb_Library_use_external,sw,icuuc)
+
 $(eval $(call gb_Library_add_exception_objects,sw,\
     sw/source/core/SwNumberTree/SwNodeNum \
     sw/source/core/SwNumberTree/SwNumberTree \
commit 0ebb8a734d0e58f790b589a766835f4b4e46d774
Author: Michael Stahl <mst at openoffice.org>
Date:   Fri Apr 1 20:47:04 2011 +0000

    gnumake4: #i117340#: JavaClassSet: adapt users [hg:efb3d33ce8ca]

diff --git a/starmath/JunitTest_sm_unoapi.mk b/starmath/JunitTest_sm_unoapi.mk
index 8aa85a0..5e36a7b 100644
--- a/starmath/JunitTest_sm_unoapi.mk
+++ b/starmath/JunitTest_sm_unoapi.mk
@@ -25,7 +25,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,sm_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,sm_unoapi,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,sm_unoapi,\
 	$$(DEFS) \
diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
index bbd05ff..1a8efd6 100755
--- a/sw/JunitTest_sw_complex.mk
+++ b/sw/JunitTest_sw_complex.mk
@@ -25,7 +25,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,sw_complex))
+$(eval $(call gb_JunitTest_JunitTest,sw_complex,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,sw_complex,\
     $$(DEFS) \
diff --git a/sw/JunitTest_sw_unoapi.mk b/sw/JunitTest_sw_unoapi.mk
index d41ebcd..5e18565 100755
--- a/sw/JunitTest_sw_unoapi.mk
+++ b/sw/JunitTest_sw_unoapi.mk
@@ -25,7 +25,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,sw_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,sw_unoapi,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,sw_unoapi,\
     $$(DEFS) \
commit 9c1c5758d6fc5a1a47546b722aa1d4de7ae4a27c
Author: Michael Stahl <mst at openoffice.org>
Date:   Fri Apr 1 20:47:04 2011 +0000

    gnumake4: starmath: fix unoapi test [hg:83ae8c87a0ea]

diff --git a/starmath/JunitTest_sm_unoapi.mk b/starmath/JunitTest_sm_unoapi.mk
index 6a98bbf..8aa85a0 100644
--- a/starmath/JunitTest_sm_unoapi.mk
+++ b/starmath/JunitTest_sm_unoapi.mk
@@ -45,8 +45,8 @@ $(eval $(call gb_JunitTest_add_sourcefiles,sm_unoapi,\
 	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:
diff --git a/starmath/qa/unoapi/Test.java b/starmath/qa/unoapi/Test.java
index 520491d..bd2a77d 100644
--- a/starmath/qa/unoapi/Test.java
+++ b/starmath/qa/unoapi/Test.java
@@ -27,6 +27,7 @@ package org.openoffice.starmath.qa.unoapi;
 
 import org.openoffice.Runner;
 import org.openoffice.test.OfficeConnection;
+import org.openoffice.test.Argument;
 import static org.junit.Assert.*;
 
 public final class Test {
@@ -43,8 +44,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();