[Libreoffice-commits] .: 3 commits - external/Package_mingw_dlls.mk external/Package_msms.mk external/Package_msvc_dlls.mk i18npool/CustomTarget_breakiterator.mk mythes/ExternalPackage_mythes.mk RepositoryExternal.mk Repository.mk

[Libreoffice Gerrit user]

 Repository.mk                          |    1 -
 RepositoryExternal.mk                  |   16 ----------------
 i18npool/CustomTarget_breakiterator.mk |   10 ++++++++--
 mythes/ExternalPackage_mythes.mk       |    3 ---
 4 files changed, 8 insertions(+), 22 deletions(-)

New commits:
commit 27a66ce174d8c5c2947056cbf39533be55e14170
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Dec 29 14:23:49 2012 +0100

    gendict is internal tool, not part of ICU
    
    Change-Id: Ica89dc89663ed3fa611e36245732b296386b5bf7

diff --git a/Repository.mk b/Repository.mk
index 5bf2c36..751d226 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -757,7 +757,6 @@ $(eval $(call gb_ExternalExecutable_register_executables,\
 	genbrk \
 	genccode \
 	gencmn \
-	gendict \
 	python \
 	ucpp \
 	xmllint \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 088a9a7..4ae6745 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2588,20 +2588,4 @@ endef
 
 endif
 
-ifeq ($(SYSTEM_ICU),YES)
-
-gb_ExternalExecutable__register_gendict :=
-
-else
-
-define gb_ExternalExecutable__register_gendict
-$(call gb_ExternalExecutable_set_internal,gendict)
-$(call gb_ExternalExecutable_add_dependencies,gendict,\
-	$(call gb_Package_get_target_for_build,icu) \
-)
-
-endef
-
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk
index 636406b..f23dad0 100644
--- a/i18npool/CustomTarget_breakiterator.mk
+++ b/i18npool/CustomTarget_breakiterator.mk
@@ -30,16 +30,22 @@ $(eval $(call gb_CustomTarget_CustomTarget,i18npool/breakiterator))
 
 i18npool_BIDIR := $(call gb_CustomTarget_get_workdir,i18npool/breakiterator)
 
+ifeq ($(SYSTEM_ICU),NO)
+i18npool_ICUTARGET := $(call gb_ExternalPackage_get_target,icu)
+else
+i18npool_ICUTARGET :=
+endif
+
 $(call gb_CustomTarget_get_target,i18npool/breakiterator) : \
 	$(i18npool_BIDIR)/dict_ja.cxx $(i18npool_BIDIR)/dict_zh.cxx $(i18npool_BIDIR)/OpenOffice_dat.c
 
 $(i18npool_BIDIR)/dict_%.cxx : \
 		$(SRCDIR)/i18npool/source/breakiterator/data/%.dic \
-		$(call gb_ExternalExecutable_get_dependencies,gendict) \
+		$(call gb_Executable_get_target_for_build,gendict) $(i18npool_ICUTARGET) \
 		| $(i18npool_BIDIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DIC,1)
 	$(call gb_Helper_abbreviate_dirs,\
-		$(call gb_ExternalExecutable_get_command,gendict) $< $@ $(patsubst $(i18npool_BIDIR)/dict_%.cxx,%,$@))
+		$(call gb_Helper_execute,gendict) $< $@ $(patsubst $(i18npool_BIDIR)/dict_%.cxx,%,$@))
 
 i18npool_BRKTXTS := \
     char_in.brk \
commit d7f1952b3f41b072763da5b2ebcc1779fa8457bf
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Dec 29 14:20:52 2012 +0100

    we use idxdict these days
    
    Change-Id: I89ba8543191b3c5eea95a3a0906af121726c1bcd

diff --git a/mythes/ExternalPackage_mythes.mk b/mythes/ExternalPackage_mythes.mk
index 553af2e..9935661 100644
--- a/mythes/ExternalPackage_mythes.mk
+++ b/mythes/ExternalPackage_mythes.mk
@@ -17,9 +17,6 @@ $(eval $(call gb_ExternalPackage_add_file,mythes,lib/libmythes.a,.libs/libmythes
 
 endif
 
-$(eval $(call gb_ExternalPackage_add_files,mythes,bin,\
-	th_gen_idx.pl \
-))
 $(eval $(call gb_ExternalPackage_add_unpacked_files,mythes,inc,\
     mythes.hxx \
 ))
commit fad69045a041be33d3c4c5a2114f82e18eeca6cb
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Dec 29 13:43:54 2012 +0100

    drop executable bit
    
    Change-Id: I6661b25be4a181b255b3e0da0fddfd6cd111dbb2

diff --git a/external/Package_mingw_dlls.mk b/external/Package_mingw_dlls.mk
old mode 100755
new mode 100644
diff --git a/external/Package_msms.mk b/external/Package_msms.mk
old mode 100755
new mode 100644
diff --git a/external/Package_msvc_dlls.mk b/external/Package_msvc_dlls.mk
old mode 100755
new mode 100644