[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cui/Library_cui.mk RepositoryFixes.mk

[Damjan Jovanovic]

 RepositoryFixes.mk |   26 +++++++++++++++++++++-----
 cui/Library_cui.mk |    5 ++++-
 2 files changed, 25 insertions(+), 6 deletions(-)

New commits:
commit 21f210aaf26636e2c258cdd52478d1a6d925f921
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Sun Jan 8 19:57:08 2017 +0000

    Fix a Windows naming clash between main/cui, whose library, icuin.lib,
    
    was clashing with main/icu's icuin.lib once we started using gbuild,
    which places libraries in a common directory. The main/cui library is
    now just icui.lib, and main/icu's is still icuin.lib.
    
    Also update RepositoryFixes.mk with all the main/icu libraries.
    
    Patch by: me

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 17873dd..a59ab76 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -70,7 +70,6 @@ ifeq ($(OS),WNT)
 ifneq ($(USE_MINGW),)
 
 gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst i18nisolang1:iii18nisolang1%,i18nisolang1:iii18nisolang%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
@@ -93,7 +92,10 @@ gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES
 # all other libraries built by OOo and all platform libraries (exceptions see below) are used without an import library
 # we link against their dlls in gcc format directly
 gb_Library_NOILIBFILENAMES:=\
+    icudt \
+    icuin \
     icule \
+    icutu \
     icuuc \
     uwinapi \
     winmm \
@@ -112,7 +114,10 @@ gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_ILIBFILENAMES
 gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):$(PSDK_HOME)/lib/$(lib)$(gb_Library_ILIBEXT))
 
 gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst icudt:icudt%,icudt:icudt40%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst icuin:icuin%,icuin:icuin40%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst icule:icule%,icule:icule40%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst icutu:icutu%,icutu:icutu40%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst jvmaccess:jvmaccess%,jvmaccess:jvmaccess$(gb_Library_MAJORVER)%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
@@ -123,7 +128,6 @@ gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
 else #ifneq ($(USE_MINGW),)
 
 gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst i18nisolang1:iii18nisolang1%,i18nisolang1:iii18nisolang%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
@@ -143,7 +147,12 @@ gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES
 
 # change the names of all import libraries that don't have an "i" prefix as in our standard naming schema
 gb_Library_NOILIBFILENAMES := $(gb_Library_PLAINLIBS_NONE)
-gb_Library_NOILIBFILENAMES += icuuc icule
+gb_Library_NOILIBFILENAMES += \
+    icudt \
+    icuin \
+    icule \
+    icutu \
+    icuuc
 
 gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
@@ -154,6 +163,10 @@ gb_Library_FILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_FILENAMES))
 #endif
 
 gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst icudt:icudt%,icudt:icudt40%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst icuin:icuin%,icuin:icuin40%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst icule:icule%,icule:icule40%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst icutu:icutu%,icutu:icutu40%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
 
@@ -200,8 +213,11 @@ gb_Library_DLLFILENAMES := $(patsubst sfx:test_sfx2_metadatable%,sfx:tstsfx2m%,$
 
 gb_Library_NOILIBFILENAMES:=\
     ft2lib \
-    icuuc \
-    icule
+    icudt \
+    icuin \
+    icule \
+    icutu \
+    icuuc
 
 gb_Library_ILIBFILENAMES:=\
     ft2lib \
commit ccfeae67446ca436de18623af54c564266026289
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Sun Jan 8 19:24:20 2017 +0000

    Only set the BUILD_VER_STRING define if it is available
    
    as an environment variable and non-empty. At least the
    Windows build breaks without this when --with-build-version
    is not used.
    
    Patch by: me

diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index a334708..8d448ad 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -33,8 +33,11 @@ $(eval $(call gb_Library_set_include,cui,\
 	-I$(SRCDIR)/cui/source/inc \
 ))
 
+ifneq ($(BUILD_VER_STRING),)
+$(eval $(call gb_Library_add_defs,cui,-DBUILD_VER_STRING="$(BUILD_VER_STRING"))
+endif
+
 $(eval $(call gb_Library_add_defs,cui,\
-	-DBUILD_VER_STRING="$(BUILD_VER_STRING)" \
 	-DCOPYRIGHT_YEAR=$(shell perl -e 'use POSIX qw(strftime); print strftime("%Y", gmtime($$ENV{SOURCE_DATE_EPOCH} || time));') \
 ))