[Libreoffice-commits] .: i18npool/Executable_gencoll_rule.mk i18npool/Executable_genindex_data.mk i18npool/Library_i18npool.mk i18npool/source RepositoryExternal.mk RepositoryFixes.mk

[Jan Holesovsky]

 RepositoryExternal.mk                |   25 +++++++++++++++++++++++++
 RepositoryFixes.mk                   |    3 ++-
 i18npool/Executable_gencoll_rule.mk  |    8 ++++++++
 i18npool/Executable_genindex_data.mk |    8 ++++++++
 i18npool/Library_i18npool.mk         |    7 +++++++
 i18npool/source/collator/Makefile    |    2 +-
 6 files changed, 51 insertions(+), 2 deletions(-)

New commits:
commit 534b3bccfd573a6bf4fa5e652d10c8c3796beb7a
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Aug 19 09:32:18 2011 +0200

    Fix i18npool build on Windows.

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 32ba30a..ee69337 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -372,6 +372,29 @@ endef
 
 else # !SYSTEM_ICU
 
+# icudata and icui18n is called icudt and icuin on Windows :-(
+ifeq ($(OS),WNT)
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+	icudt \
+	icuin \
+	icule \
+	icutu \
+	icuuc \
+))
+
+define gb_LinkTarget__use_icudt
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	icudt \
+)
+
+endef
+define gb_LinkTarget__use_icuin
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+	icuin \
+)
+
+endef
+else
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	icudata \
 	icui18n \
@@ -392,6 +415,8 @@ $(call gb_LinkTarget_add_linked_libs,$(1),\
 )
 
 endef
+endif
+
 define gb_LinkTarget__use_icule
 $(call gb_LinkTarget_add_linked_libs,$(1),\
 	icule \
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 55cb4c7..78244be 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -123,8 +123,9 @@ gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dl
 
 # 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 += icule icuuc \
+gb_Library_NOILIBFILENAMES += \
     graphite2_off \
+	icudt icuin icule icuuc \
     msvcprt \
     nspr4 \
     nss3 \
diff --git a/i18npool/Executable_gencoll_rule.mk b/i18npool/Executable_gencoll_rule.mk
index 53eec59..a899976 100644
--- a/i18npool/Executable_gencoll_rule.mk
+++ b/i18npool/Executable_gencoll_rule.mk
@@ -41,11 +41,19 @@ $(eval $(call gb_Executable_add_linked_libs,gencoll_rule,\
 	$(gb_STDLIBS) \
 ))
 
+ifeq ($(OS),WNT)
+$(eval $(call gb_Executable_use_externals,gencoll_rule,\
+	icudt \
+	icuin \
+	icuuc \
+))
+else
 $(eval $(call gb_Executable_use_externals,gencoll_rule,\
 	icudata \
 	icui18n \
 	icuuc \
 ))
+endif
 
 $(eval $(call gb_Executable_add_exception_objects,gencoll_rule,\
 	i18npool/source/collator/gencoll_rule \
diff --git a/i18npool/Executable_genindex_data.mk b/i18npool/Executable_genindex_data.mk
index 5977241..93f2483 100644
--- a/i18npool/Executable_genindex_data.mk
+++ b/i18npool/Executable_genindex_data.mk
@@ -40,11 +40,19 @@ $(eval $(call gb_Executable_add_linked_libs,genindex_data,\
 	$(gb_STDLIBS) \
 ))
 
+ifeq ($(OS),WNT)
+$(eval $(call gb_Executable_use_externals,gencoll_rule,\
+	icudt \
+	icuin \
+	icuuc \
+))
+else
 $(eval $(call gb_Executable_use_externals,genindex_data,\
 	icudata \
 	icui18n \
 	icuuc \
 ))
+endif
 
 $(eval $(call gb_Executable_add_exception_objects,genindex_data,\
 	i18npool/source/indexentry/genindex_data \
diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index 5769cf9..982e43e 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -56,10 +56,17 @@ $(eval $(call gb_Library_add_linked_libs,i18npool,\
 	$(gb_STDLIBS) \
 ))
 
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_use_externals,i18npool,\
+	icuin \
+	icuuc \
+))
+else
 $(eval $(call gb_Library_use_externals,i18npool,\
 	icui18n \
 	icuuc \
 ))
+endif
 
 $(eval $(call gb_Library_add_exception_objects,i18npool,\
 	i18npool/source/breakiterator/breakiterator_cjk \
diff --git a/i18npool/source/collator/Makefile b/i18npool/source/collator/Makefile
index 87740d2..4d1ed24 100644
--- a/i18npool/source/collator/Makefile
+++ b/i18npool/source/collator/Makefile
@@ -26,7 +26,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-txtlist := $(wildcard $(SRC_ROOT)/i18npool/source/collator/data/*.txt)
+txtlist := $(wildcard $(realpath $(SRC_ROOT)/i18npool/source/collator/data)/*.txt)
 
 all : lrl_include.hxx $(patsubst %.txt,collator_%.cxx,$(notdir $(txtlist)))