mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

icu: use executables from WORKDIR

Browse Source 
Change-Id: I74b9d1dbcb3e8f7f2cc092dad60266cf60475367
This commit is contained in:
Michael Stahl 2013-10-23 15:19:14 +02:00
parent a92f80fdca
commit e353b2bcc2
4 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
RepositoryExternal.mk
View File

@ -3145,7 +3145,8 @@ endef
else # ! SYSTEM_GENBRK else # ! SYSTEM_GENBRK
define gb_ExternalExecutable__register_genbrk define gb_ExternalExecutable__register_genbrk
$(call gb_ExternalExecutable_set_internal,genbrk,$(OUTDIR_FOR_BUILD)/bin/genbrk$(gb_Executable_EXT_for_build)) $(call gb_ExternalExecutable_set_internal,genbrk,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/genbrk$(gb_Executable_EXT_for_build))
$(call gb_ExternalExecutable_set_precommand,genbrk,$(gb_ICU_PRECOMMAND))
$(call gb_ExternalExecutable_add_dependencies,genbrk,\ $(call gb_ExternalExecutable_add_dependencies,genbrk,\
$(call gb_Package_get_target_for_build,icu) \ $(call gb_Package_get_target_for_build,icu) \
) )
@ -3164,7 +3165,8 @@ endef
else # ! SYSTEM_GENCCODE else # ! SYSTEM_GENCCODE
define gb_ExternalExecutable__register_genccode define gb_ExternalExecutable__register_genccode
$(call gb_ExternalExecutable_set_internal,genccode,$(OUTDIR_FOR_BUILD)/bin/genccode$(gb_Executable_EXT_for_build)) $(call gb_ExternalExecutable_set_internal,genccode,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/genccode$(gb_Executable_EXT_for_build))
$(call gb_ExternalExecutable_set_precommand,genccode,$(gb_ICU_PRECOMMAND))
$(call gb_ExternalExecutable_add_dependencies,genccode,\ $(call gb_ExternalExecutable_add_dependencies,genccode,\
$(call gb_Package_get_target_for_build,icu) \ $(call gb_Package_get_target_for_build,icu) \
) )
@ -3183,7 +3185,8 @@ endef
else # ! SYSTEM_GENCMN else # ! SYSTEM_GENCMN
define gb_ExternalExecutable__register_gencmn define gb_ExternalExecutable__register_gencmn
$(call gb_ExternalExecutable_set_internal,gencmn,$(OUTDIR_FOR_BUILD)/bin/gencmn$(gb_Executable_EXT_for_build)) $(call gb_ExternalExecutable_set_internal,gencmn,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/gencmn$(gb_Executable_EXT_for_build))
$(call gb_ExternalExecutable_set_precommand,gencmn,$(gb_ICU_PRECOMMAND))
$(call gb_ExternalExecutable_add_dependencies,gencmn,\ $(call gb_ExternalExecutable_add_dependencies,gencmn,\
$(call gb_Package_get_target_for_build,icu) \ $(call gb_Package_get_target_for_build,icu) \
) )

16
external/icu/ExternalPackage_icu.mk vendored
View File

@ -23,11 +23,6 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\
source/lib/icuin$(ICU_MAJOR).dll \ source/lib/icuin$(ICU_MAJOR).dll \
source/lib/icutu$(ICU_MAJOR).dll \ source/lib/icutu$(ICU_MAJOR).dll \
)) ))
$(eval $(call gb_ExternalPackage_add_files,icu,bin,\
source/bin/genccode.exe \
source/bin/genbrk.exe \
source/bin/gencmn.exe \
))
else else
$(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\ $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\
source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \
@ -35,11 +30,6 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\
source/lib/icuin$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ source/lib/icuin$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \
source/lib/icutu$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ source/lib/icutu$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \
)) ))
$(eval $(call gb_ExternalPackage_add_files,icu,bin,\
source/bin/genccode.exe \
source/bin/genbrk.exe \
source/bin/gencmn.exe \
))
endif # $(COM) endif # $(COM)
else ifeq ($(OS),ANDROID) else ifeq ($(OS),ANDROID)
@ -58,12 +48,6 @@ $(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicuuc$(gb_Li
$(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION))) $(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION))) $(eval $(call gb_ExternalPackage_add_file,icu,lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION)))
$(eval $(call gb_ExternalPackage_add_files,icu,bin,\
source/bin/genccode \
source/bin/genbrk \
source/bin/gencmn \
))
endif # $(OS) endif # $(OS)
endif # DISABLE_DYNLOADING endif # DISABLE_DYNLOADING

3
solenv/gbuild/platform/com_GCC_class.mk
View File

@ -228,4 +228,7 @@ gb_LinkTarget_get_linksearchpath_for_layer = \
$(patsubst $(layer):%,-L%,\ $(patsubst $(layer):%,-L%,\
$(filter $(layer):%,$(gb_Library_LAYER_DIRS)))) $(filter $(layer):%,$(gb_Library_LAYER_DIRS))))
gb_ICU_PRECOMMAND := $(call gb_Helper_extend_ld_path,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/lib)
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

2
solenv/gbuild/platform/com_MSC_class.mk
View File

@ -572,4 +572,6 @@ gb_UIMenubarTarget_UIMenubarTarget_platform :=
gb_Python_PRECOMMAND := PATH="$(shell cygpath -w $(INSTDIR)/program);$(shell cygpath -w $(OUTDIR)/bin)" PYTHONHOME="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)" PYTHONPATH="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib;$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib/lib-dynload:$(INSTDIR)/program" gb_Python_PRECOMMAND := PATH="$(shell cygpath -w $(INSTDIR)/program);$(shell cygpath -w $(OUTDIR)/bin)" PYTHONHOME="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)" PYTHONPATH="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib;$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib/lib-dynload:$(INSTDIR)/program"
gb_Python_INSTALLED_EXECUTABLE := $(INSTROOT)/$(LIBO_BIN_FOLDER)/python.exe gb_Python_INSTALLED_EXECUTABLE := $(INSTROOT)/$(LIBO_BIN_FOLDER)/python.exe
gb_ICU_PRECOMMAND := PATH="$(shell cygpath -w $(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/lib)"
# vim: set noet sw=4: # vim: set noet sw=4: