[Libreoffice-commits] core.git: connectivity/CppunitTest_connectivity_commontools.mk connectivity/CppunitTest_connectivity_sharedresources.mk emfio/CppunitTest_emfio_emf_test.mk

2019-12-06 Thread Stephan Bergmann (via logerrit) 
 connectivity/CppunitTest_connectivity_commontools.mk |2 ++
 connectivity/CppunitTest_connectivity_sharedresources.mk |2 ++
 emfio/CppunitTest_emfio_emf_test.mk  |1 +
 3 files changed, 5 insertions(+)

New commits:
commit 97b3e455802cfc08568ec5e8379c509efe3e47b1
Author: Stephan Bergmann 
AuthorDate: Fri Dec 6 19:33:59 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Dec 6 21:33:55 2019 +0100

Fix some new dependencies on boost_headers

...caused by a8cd98c437f2c3b5c4f7c139aa7223c5cfb74d1a "use o3tl::optional
instead of pointer", see :

> In file included from 
/Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/connectivity/qa/connectivity/resource/sharedresources_test.cxx:10:
> In file included from 
/Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/test/bootstrapfixture.hxx:16:
> In file included from 
/Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/vcl/salctype.hxx:25:
> In file included from 
/Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/vcl/graph.hxx:27:
> In file included from 
/Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/vcl/bitmapex.hxx:23:
> 
/Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/o3tl/optional.hxx:20:10:
 fatal error: 'boost/none.hpp' file not found
> #include 
>  ^~~~
> In file included from 
/Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/connectivity/qa/connectivity/commontools/FValue_test.cxx:20:
> In file included from 
/Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/test/bootstrapfixture.hxx:16:
> In file included from 
/Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/vcl/salctype.hxx:25:
> In file included from 
/Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/vcl/graph.hxx:27:
> In file included from 
/Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/vcl/bitmapex.hxx:23:
> 
/Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/o3tl/optional.hxx:20:10:
 fatal error: 'boost/none.hpp' file not found
> #include 
>  ^~~~
> In file included from 
/Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/emfio/qa/cppunit/emf/EmfImportTest.cxx:13:
> In file included from 
/Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/test/bootstrapfixture.hxx:16:
> In file included from 
/Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/vcl/salctype.hxx:25:
> In file included from 
/Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/vcl/graph.hxx:27:
> In file included from 
/Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/vcl/bitmapex.hxx:23:
> 
/Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/o3tl/optional.hxx:20:10:
 fatal error: 'boost/none.hpp' file not found
> #include 
>  ^~~~

Change-Id: I86ccc030a8f34b9ee6a853e843c9eb6f2d987406
Reviewed-on: https://gerrit.libreoffice.org/84664
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/connectivity/CppunitTest_connectivity_commontools.mk 
b/connectivity/CppunitTest_connectivity_commontools.mk
index 15a9d7e4633e..81dfe9e6861d 100644
--- a/connectivity/CppunitTest_connectivity_commontools.mk
+++ b/connectivity/CppunitTest_connectivity_commontools.mk
@@ -14,6 +14,8 @@ $(eval $(call 
gb_CppunitTest_set_include,connectivity_commontools,\
$$(INCLUDE) \
 ))
 
+$(eval $(call 
gb_CppunitTest_use_external,connectivity_commontools,boost_headers))
+
 $(eval $(call gb_CppunitTest_use_ure,connectivity_commontools))
 $(eval $(call gb_CppunitTest_use_vcl,connectivity_commontools))
 
diff --git a/connectivity/CppunitTest_connectivity_sharedresources.mk 
b/connectivity/CppunitTest_connectivity_sharedresources.mk
index 78209cfbbdf0..9af3f8ca2442 100644
--- a/connectivity/CppunitTest_connectivity_sharedresources.mk
+++ b/connectivity/CppunitTest_connectivity_sharedresources.mk
@@ -15,6 +15,8 @@ $(eval $(call 
gb_CppunitTest_set_include,connectivity_sharedresources,\
$$(INCLUDE) \
 ))
 
+$(eval $(call 
gb_CppunitTest_use_external,connectivity_sharedresources,boost_headers))
+
 $(eval $(call gb_CppunitTest_use_ure,connectivity_sharedresources))
 $(eval $(call gb_CppunitTest_use_vcl,connectivity_sharedresources))
 
diff --git a/emfio/CppunitTest_emfio_emf_test.mk 
b/emfio/CppunitTest_emfio_emf_test.mk
index 4f892b42c27b..123e4b3549bd 100644
--- a/emfio/CppunitTest_emfio_emf_test.mk
+++ b/emfio/CppunitTest_emfio_emf_test.mk
@@ -10,6 +10,7 @@

[Libreoffice-commits] core.git: connectivity/CppunitTest_connectivity_commontools.mk

2019-05-09 Thread Jens Carl (via logerrit) 
 connectivity/CppunitTest_connectivity_commontools.mk |   46 ++-
 1 file changed, 6 insertions(+), 40 deletions(-)

New commits:
commit 43249c07adaf3f66bf47193c7aa08b941751e8d5
Author: Jens Carl 
AuthorDate: Tue May 7 09:13:18 2019 -0700
Commit: Michael Stahl 
CommitDate: Thu May 9 11:13:26 2019 +0200

Clean up makefile (remove some cargo-cult copied stuff)

Change-Id: Iafbb69a405a3c9ee8d0ae7dbe8a24a75d237519d
Reviewed-on: https://gerrit.libreoffice.org/71924
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/connectivity/CppunitTest_connectivity_commontools.mk 
b/connectivity/CppunitTest_connectivity_commontools.mk
index 80e5d1ce5277..15a9d7e4633e 100644
--- a/connectivity/CppunitTest_connectivity_commontools.mk
+++ b/connectivity/CppunitTest_connectivity_commontools.mk
@@ -17,56 +17,22 @@ $(eval $(call 
gb_CppunitTest_set_include,connectivity_commontools,\
 $(eval $(call gb_CppunitTest_use_ure,connectivity_commontools))
 $(eval $(call gb_CppunitTest_use_vcl,connectivity_commontools))
 
-$(eval $(call 
gb_CppunitTest_use_external,connectivity_commontools,boost_headers))
-
 $(eval $(call gb_CppunitTest_use_sdk_api,connectivity_commontools))
 
-ifeq ($(COM),GCC)
-ifneq ($(COM_IS_CLANG),TRUE)
-$(eval $(call gb_CppunitTest_add_cxxflags,connectivity_commontools,\
-   -fpermissive \
-))
-endif
-endif
-
-# In mergedlibs mode we have multiply-defined symbols, which Visual Studio
-# does not like. There is no good solution, so just force it.
-ifeq ($(COM),MSC)
-ifneq (,$(MERGELIBS))
-$(eval $(call gb_CppunitTest_add_ldflags,connectivity_commontools,\
-/FORCE:MULTIPLE \
-))
-endif
-endif
-
 $(eval $(call gb_CppunitTest_add_exception_objects,connectivity_commontools, \
connectivity/qa/connectivity/commontools/FValue_test \
 ))
 
-$(eval $(call 
gb_CppunitTest_use_library_objects,connectivity_commontools,dbtools))
-
 $(eval $(call gb_CppunitTest_use_libraries,connectivity_commontools, \
-comphelper \
-cppu \
-cppuhelper \
-i18nlangtag \
-$(if $(ENABLE_JAVA), \
-jvmaccess) \
-sal \
-salhelper \
-test \
-unotest \
-utl \
-tl \
-svt \
-vcl \
+   cppu \
+   dbtools \
+   sal \
+   test \
+   unotest \
 ))
 
 $(eval $(call gb_CppunitTest_use_components,connectivity_commontools,\
-configmgr/source/configmgr \
-i18npool/util/i18npool \
-ucb/source/core/ucb1 \
-ucb/source/ucp/file/ucpfile1 \
+   configmgr/source/configmgr \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,connectivity_commontools))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: connectivity/CppunitTest_connectivity_commontools.mk

2014-11-13 Thread Noel Grandin 
 connectivity/CppunitTest_connectivity_commontools.mk |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 3adad743e7702a5403927c89d2d19534509c7085
Author: Noel Grandin n...@peralex.com
Date:   Wed Nov 12 16:31:09 2014 +0200

fix connectivity unit test for --enable-mergedlibs

it's a workaround, but given the conflicting requirements of
MSVC not liking duplicate symbols, but the unit test needing to
link the objects directly to access internal symbols, there is
not much else we can do.

Change-Id: I9bdcc5f2b6ab0712cc3317033c4fbae4791cbb6b
Reviewed-on: https://gerrit.libreoffice.org/12387
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/connectivity/CppunitTest_connectivity_commontools.mk 
b/connectivity/CppunitTest_connectivity_commontools.mk
index e1c899e..e9d6e98 100644
--- a/connectivity/CppunitTest_connectivity_commontools.mk
+++ b/connectivity/CppunitTest_connectivity_commontools.mk
@@ -35,6 +35,16 @@ $(eval $(call 
gb_CppunitTest_add_defs,connectivity_commontools,\
 ))
 endif
 
+# In mergedlibs mode we have multiply-defined symbols, which Visual Studio
+# does not like. There is no good solution, so just force it.
+ifeq ($(COM),MSC)
+ifeq ($(MERGELIBS),CORE)
+$(eval $(call gb_CppunitTest_add_ldflags,connectivity_commontools,\
+/FORCE:MULTIPLE \
+))
+endif
+endif
+
 $(eval $(call gb_CppunitTest_add_exception_objects,connectivity_commontools, \
connectivity/qa/connectivity/commontools/FValue_test \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: connectivity/CppunitTest_connectivity_commontools.mk

2013-02-07 Thread Tor Lillqvist 
 connectivity/CppunitTest_connectivity_commontools.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 042e4606a64233299fdc02d9df32329c452d96d5
Author: Tor Lillqvist t...@iki.fi
Date:   Fri Feb 8 00:03:30 2013 +0200

No jvmaccess library for iOS

Change-Id: I28ee4c77935f81f41fb564fcd0c19a5d02a1aa10

diff --git a/connectivity/CppunitTest_connectivity_commontools.mk 
b/connectivity/CppunitTest_connectivity_commontools.mk
index 6026e80..e0f7752 100644
--- a/connectivity/CppunitTest_connectivity_commontools.mk
+++ b/connectivity/CppunitTest_connectivity_commontools.mk
@@ -45,7 +45,7 @@ $(eval $(call 
gb_CppunitTest_use_libraries,connectivity_commontools, \
 cppu \
 cppuhelper \
 i18nisolang1 \
-jvmaccess \
+$(if $(filter IOS,$(OS)),,jvmaccess) \
 sal \
 salhelper \
 test \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits