[Libreoffice-commits] .: icu/ExternalPackage_icu.mk
icu/ExternalPackage_icu.mk | 12 1 file changed, 12 insertions(+) New commits: commit fbe72cdfbe71a142b5444c82765d489d84b82afa Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Jan 25 11:19:46 2013 +0100 Deliver icu headers Change-Id: Ic62f18c8aa29b0f0b158f3d3a9988703def899d3 diff --git a/icu/ExternalPackage_icu.mk b/icu/ExternalPackage_icu.mk index 0e91f32..5aa2b06 100644 --- a/icu/ExternalPackage_icu.mk +++ b/icu/ExternalPackage_icu.mk @@ -9,6 +9,18 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,icu,icu)) +$(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/layout,\ + source/layout/*.h \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/unicode,\ + source/common/unicode/*.h \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/unicode,\ + source/i18n/unicode/*.h \ +)) + $(eval $(call gb_ExternalPackage_use_external_project,icu,icu)) ifeq ($(OS),WNT) ifeq ($(COM),GCC) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: icu/ExternalPackage_icu.mk
icu/ExternalPackage_icu.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit f4bcb81063ff0d00f4d2843a046c2b1cf04228d6 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Jan 25 11:54:48 2013 +0100 Trying to use wildcard to deliver the headers Change-Id: I684ad3e2050dd07958c4bf2267c20274958c5673 diff --git a/icu/ExternalPackage_icu.mk b/icu/ExternalPackage_icu.mk index 5aa2b06..fb11295 100644 --- a/icu/ExternalPackage_icu.mk +++ b/icu/ExternalPackage_icu.mk @@ -10,15 +10,15 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,icu,icu)) $(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/layout,\ - source/layout/*.h \ + $(wildcard source/layout/*.h) \ )) $(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/unicode,\ - source/common/unicode/*.h \ + $(wildcard source/common/unicode/*.h) \ )) $(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/unicode,\ - source/i18n/unicode/*.h \ + $(wildcard source/i18n/unicode/*.h) \ )) $(eval $(call gb_ExternalPackage_use_external_project,icu,icu)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: icu/ExternalPackage_icu.mk
icu/ExternalPackage_icu.mk | 33 - 1 file changed, 16 insertions(+), 17 deletions(-) New commits: commit 12ee1efbcd53d1550d209c89bf5553bc0d9794a9 Author: Peter Foley pefol...@verizon.net Date: Fri Dec 28 09:22:34 2012 -0500 fix icu build Change-Id: Iacb4deeb29d20d8369e09d55c0b0d36324a48ce8 diff --git a/icu/ExternalPackage_icu.mk b/icu/ExternalPackage_icu.mk index 51544b2..ce5f06d 100644 --- a/icu/ExternalPackage_icu.mk +++ b/icu/ExternalPackage_icu.mk @@ -61,23 +61,22 @@ $(eval $(call gb_ExternalPackage_add_files,icu,lib,\ source/lib/libicutulo.so \ )) else -$(eval $(call gb_ExternalPackage_add_files,icu,lib,\ - source/lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO) \ - source/lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR) \ - source/lib/libicudata$(gb_Library_DLLEXT) \ - source/lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO) \ - source/lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR) \ - source/lib/libicuuc$(gb_Library_DLLEXT) \ - source/lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO) \ - source/lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR) \ - source/lib/libicui18n$(gb_Library_DLLEXT) \ - source/lib/libicule$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO) \ - source/lib/libicule$(gb_Library_DLLEXT).$(ICU_MAJOR) \ - source/lib/libicule$(gb_Library_DLLEXT) \ - source/lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO) \ - source/lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR) \ - source/lib/libicutu$(gb_Library_DLLEXT) \ -)) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO),source/lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicudata$(gb_Library_DLLEXT),source/lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO),source/lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicuuc$(gb_Library_DLLEXT),source/lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO),source/lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicui18n$(gb_Library_DLLEXT),source/lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicule$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO),source/lib/libicule$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicule$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicule$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicule$(gb_Library_DLLEXT),source/lib/libicule$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO),source/lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicutu$(gb_Library_DLLEXT),source/lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) + $(eval $(call gb_ExternalPackage_add_files,icu,bin,\ source/bin/genccode \ source/bin/genbrk \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: icu/ExternalPackage_icu.mk
icu/ExternalPackage_icu.mk | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) New commits: commit c1be14de66aebfa1ce18ff3872876042c9ad7b1e Author: Peter Foley pefol...@verizon.net Date: Fri Dec 28 09:49:25 2012 -0500 icu typo Change-Id: I5db8ac697c850e555e3edc584ab97e08942e8b54 diff --git a/icu/ExternalPackage_icu.mk b/icu/ExternalPackage_icu.mk index ce5f06d..dcc4a7e 100644 --- a/icu/ExternalPackage_icu.mk +++ b/icu/ExternalPackage_icu.mk @@ -62,20 +62,20 @@ $(eval $(call gb_ExternalPackage_add_files,icu,lib,\ )) else $(eval $(call gb_ExternalPackage_add_file,icu,lib,libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO),source/lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) -$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) -$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicudata$(gb_Library_DLLEXT),source/lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) -$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO),source/lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) -$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) -$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicuuc$(gb_Library_DLLEXT),source/lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) -$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO),source/lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) -$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) -$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicui18n$(gb_Library_DLLEXT),source/lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) -$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicule$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO),source/lib/libicule$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) -$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicule$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicule$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) -$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicule$(gb_Library_DLLEXT),source/lib/libicule$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) -$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO),source/lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) -$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) -$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicutu$(gb_Library_DLLEXT),source/lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicudata$(gb_Library_DLLEXT),source/lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO),source/lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicuuc$(gb_Library_DLLEXT),source/lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO),source/lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicui18n$(gb_Library_DLLEXT),source/lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicule$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO),source/lib/libicule$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call
[Libreoffice-commits] .: icu/ExternalPackage_icu.mk
icu/ExternalPackage_icu.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 479a0be4ec6adb9cc254f597f90388d9cde8b8ec Author: Peter Foley pefol...@verizon.net Date: Fri Dec 28 10:35:45 2012 -0500 fix typo again Change-Id: I9f52afff1bf513a09fd3ca82ba49e84b545347f9 diff --git a/icu/ExternalPackage_icu.mk b/icu/ExternalPackage_icu.mk index dcc4a7e..0e91f32 100644 --- a/icu/ExternalPackage_icu.mk +++ b/icu/ExternalPackage_icu.mk @@ -61,7 +61,7 @@ $(eval $(call gb_ExternalPackage_add_files,icu,lib,\ source/lib/libicutulo.so \ )) else -$(eval $(call gb_ExternalPackage_add_file,icu,lib,libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO),source/lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) +$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO),source/lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) $(eval $(call gb_ExternalPackage_add_file,icu,lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) $(eval $(call gb_ExternalPackage_add_file,icu,lib/libicudata$(gb_Library_DLLEXT),source/lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) $(eval $(call gb_ExternalPackage_add_file,icu,lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO),source/lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR).$(ICU_MINOR).$(ICU_MICRO))) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
