[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 7 commits - cui/source RepositoryExternal.mk solenv/gbuild ucb/Library_ucpexpand1.mk ucb/source
Damjan Jovanovic
damjan at apache.org
Sun Jan 8 16:08:24 UTC 2017
RepositoryExternal.mk | 72 ++++--
cui/source/dialogs/winpluginlib.cpp | 222 --------------------
cui/source/dialogs/winpluginlib.cxx | 223 +++++++++++++++++++++
solenv/gbuild/platform/windows.mk | 1
solenv/gbuild/platform/winmingw.mk | 1
ucb/Library_ucpexpand1.mk | 2
ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx | 3
7 files changed, 274 insertions(+), 250 deletions(-)
New commits:
commit b70d73f84c1a02336b1cdac4bcb7c5f7a66dd712
Author: Damjan Jovanovic <damjan at apache.org>
Date: Sat Jan 7 07:55:32 2017 +0000
The internal CoinMP comes as a single library on Windows.
Patch by: me
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index ffa3dfc..40bcd9a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -515,8 +515,9 @@ endef
else # !SYSTEM_COINMP
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
- CoinMP \
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,CoinMP))
+ifneq ($(OS),WNT)
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
CoinUtils \
Clp \
Cbc \
@@ -525,14 +526,16 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
Cgl \
CbcSolver \
))
+endif
define gb_LinkTarget__use_coinmp
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
-I$(OUTDIR)/inc/coinmp \
)
+$(call gb_LinkTarget_add_linked_libs,$(1),CoinMP)
+ifneq ($(OS),WNT)
$(call gb_LinkTarget_add_linked_libs,$(1),\
- CoinMP \
CoinUtils \
Clp \
Cbc \
@@ -541,6 +544,7 @@ $(call gb_LinkTarget_add_linked_libs,$(1),\
Cgl \
CbcSolver \
)
+endif
endef
endif # SYSTEM_COINMP
commit 9dccbe10903c7981eac587efe00dacfa423c7aae
Author: Damjan Jovanovic <damjan at apache.org>
Date: Sat Jan 7 02:32:49 2017 +0000
Fix inclusion of a precompiled header.
Patch by: me
diff --git a/cui/source/dialogs/winpluginlib.cxx b/cui/source/dialogs/winpluginlib.cxx
index 4666929..a0c14c8 100644
--- a/cui/source/dialogs/winpluginlib.cxx
+++ b/cui/source/dialogs/winpluginlib.cxx
@@ -19,7 +19,8 @@
*
*************************************************************/
-
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_cui.hxx"
#if defined _MSC_VER
#pragma warning(push, 1)
commit 520cc54956a4e8a9b8c8e7f590c6ac5e6d1fbc2c
Author: Damjan Jovanovic <damjan at apache.org>
Date: Sat Jan 7 02:31:21 2017 +0000
Gbuild requires .cxx filename extensions.
Patch by: me
diff --git a/cui/source/dialogs/winpluginlib.cpp b/cui/source/dialogs/winpluginlib.cxx
similarity index 100%
rename from cui/source/dialogs/winpluginlib.cpp
rename to cui/source/dialogs/winpluginlib.cxx
commit 3e50f819011be5e8881dc8f90ad7b34bd8860418
Author: Damjan Jovanovic <damjan at apache.org>
Date: Sat Jan 7 02:16:40 2017 +0000
Fix repository and name for apr, apr-util, serf and curl
on Windows.
Patch by: me
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a4a0b6a..ffa3dfc 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -377,18 +377,22 @@ endef
else # !SYSTEM_APR
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
- apr-1 \
-))
+ifeq ($(OS),WNT)
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,libapr-1))
+else
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,apr-1))
+endif
define gb_LinkTarget__use_apr
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
-I$(OUTDIR)/inc/apr \
)
-$(call gb_LinkTarget_add_linked_libs,$(1),\
- apr-1 \
-)
+ifeq ($(OS),WNT)
+$(call gb_LinkTarget_add_linked_libs,$(1),libapr-1)
+else
+$(call gb_LinkTarget_add_linked_libs,$(1),apr-1)
+endif
endef
endif # SYSTEM_APR
@@ -409,18 +413,21 @@ endef
else # !SYSTEM_APR_UTIL
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
- aprutil-1 \
-))
+# on Windows apr-util is registered by ext_libraries/Repository.mk
+ifneq ($(OS),WNT)
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,aprutil-1))
+endif
define gb_LinkTarget__use_apr_util
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
-I$(OUTDIR)/inc/apr-util \
)
-$(call gb_LinkTarget_add_linked_libs,$(1),\
- aprutil-1 \
-)
+ifeq ($(OS),WNT)
+$(call gb_LinkTarget_add_linked_libs,$(1),apr-util)
+else
+$(call gb_LinkTarget_add_linked_libs,$(1),aprutil-1)
+endif
endef
endif # SYSTEM_APR_UTIL
@@ -441,18 +448,21 @@ endef
else # !SYSTEM_SERF
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
- serf-1 \
-))
+# on Windows serf is registered by ext_libraries/Repository.mk
+ifneq ($(OS),WNT)
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,serf-1))
+endif
define gb_LinkTarget__use_serf
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
-I$(OUTDIR)/inc/serf \
)
-$(call gb_LinkTarget_add_linked_libs,$(1),\
- serf-1 \
-)
+ifeq ($(OS),WNT)
+$(call gb_LinkTarget_add_linked_libs,$(1),serf)
+else
+$(call gb_LinkTarget_add_linked_libs,$(1),serf-1)
+endif
endef
endif # SYSTEM_SERF
@@ -473,14 +483,18 @@ endef
else # !SYSTEM_CURL
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
- curl \
-))
+ifeq ($(OS),WNT)
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,libcurl))
+else
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,curl))
+endif
define gb_LinkTarget__use_curl
-$(call gb_LinkTarget_add_linked_libs,$(1),\
- curl \
-)
+ifeq ($(OS),WNT)
+$(call gb_LinkTarget_add_linked_libs,$(1),libcurl)
+else
+$(call gb_LinkTarget_add_linked_libs,$(1),curl)
+endif
endef
endif # SYSTEM_CURL
commit c3ee123d8178094e7e4e737918f9e2c611e89f77
Author: Damjan Jovanovic <damjan at apache.org>
Date: Sat Jan 7 01:41:49 2017 +0000
Add a missing precompiled header include.
Patch by: me
diff --git a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx
index d2419c5..281bc5d 100644
--- a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx
@@ -19,6 +19,9 @@
*
*************************************************************/
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_webdav.hxx"
+
#include "SerfRequestProcessorImpl.hxx"
#include "webdavuseragent.hxx"
commit ec8d983f1b8a14028102c54646bdefb9d35a6c06
Author: Damjan Jovanovic <damjan at apache.org>
Date: Sat Jan 7 01:28:50 2017 +0000
Use the correct precompiled header for ucpexpand.
Patch by: me
diff --git a/ucb/Library_ucpexpand1.mk b/ucb/Library_ucpexpand1.mk
index 27bc698..153285d 100644
--- a/ucb/Library_ucpexpand1.mk
+++ b/ucb/Library_ucpexpand1.mk
@@ -23,7 +23,7 @@
$(eval $(call gb_Library_Library,ucpexpand1))
-$(eval $(call gb_Library_add_precompiled_header,ucpexpand1,$(SRCDIR)/ucb/inc/pch/precompiled_ftp))
+$(eval $(call gb_Library_add_precompiled_header,ucpexpand1,$(SRCDIR)/ucb/inc/pch/precompiled_expand))
$(eval $(call gb_Library_set_componentfile,ucpexpand1,ucb/source/ucp/expand/ucpexpand1))
commit ea30030d91bd20eaadd71e7219293309d863a4fa
Author: Damjan Jovanovic <damjan at apache.org>
Date: Sat Jan 7 01:22:54 2017 +0000
Add shlwapi to our list of known DLLs.
Patch by: me
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 8001f21..a96f5d1 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -459,6 +459,7 @@ gb_Library_PLAINLIBS_NONE += \
oleaut32 \
opengl32 \
shell32 \
+ shlwapi \
strmiids \
user32 \
uuid \
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index e90a616..5ddea1dc 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -480,6 +480,7 @@ gb_Library_PLAINLIBS_NONE += \
oleaut32 \
opengl32 \
shell32 \
+ shlwapi \
strmiids \
user32 \
uuid \
More information about the Libreoffice-commits
mailing list