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

move instsetoo_native to gbuild

Browse Source 
Change-Id: Ie4deddc426356636b76ad4fc27552c6d3a1dd815
Reviewed-on: https://gerrit.libreoffice.org/2429
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Bjoern Michaelsen 2013-02-26 17:42:05 +01:00 committed by Caolán McNamara
parent 7312c381a5
commit 87c57d871c
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Module_tail_build.mk
View File

@ -95,6 +95,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
$(call gb_Helper_optional,ICU,icu) \
idl \
$(call gb_Helper_optional,DESKTOP,idlc) \
instsetoo_native \
io \
javaunohelper \
$(call gb_Helper_optional,JFREEREPORT,jfreereport) \

9
instsetoo_native/CustomTarget_install.mk
View File

@ -28,7 +28,8 @@ $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/install,\
$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: \
$(SOLARENV)/bin/make_installer.pl \
$(foreach ulf,$(instsetoo_ULFLIST),$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/$(ulf).ulf)
$(foreach ulf,$(instsetoo_ULFLIST),$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/$(ulf).ulf) \
$(call gb_Postprocess_get_target,AllModulesButInstsetNative)
$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/bin/find-requires-%.sh: $(SRCDIR)/instsetoo_native/inc_openoffice/unix/find-requires-%.sh
cat $< | tr -d "\015" > $@
@ -37,7 +38,8 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/bin/find-requires-%
ifneq ($(WITH_LANG),)
$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf: \
$(SRCDIR)/instsetoo_native/inc_openoffice/windows/msi_languages/%.ulf | \
$(call gb_Executable_get_runtime_dependencies,ulfex)
$(call gb_Executable_get_runtime_dependencies,ulfex) \
$(call gb_Postprocess_get_target,AllModulesButInstsetNative)
$(call gb_Output_announce,$@,$(true),SUM,1)
MERGEINPUT=`$(gb_MKTEMP)` && \
echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/instsetoo_native/inc_openoffice/windows/msi_languages.po) > $${MERGEINPUT} && \
@ -46,7 +48,8 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf:
rm -rf $${MERGEINPUT}
else
$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf: \
$(SRCDIR)/instsetoo_native/inc_openoffice/windows/msi_languages/%.ulf
$(SRCDIR)/instsetoo_native/inc_openoffice/windows/msi_languages/%.ulf \
$(call gb_Postprocess_get_target,AllModulesButInstsetNative)
cp $< $@
endif

5
solenv/gbuild/Module.mk
View File

@ -154,6 +154,7 @@ gb_Module__debug_enabled = \
$(filter all $(1)/,$(ENABLE_DEBUGINFO_FOR)))
define gb_Module_Module
$(if $(filter-out tail_build instsetoo_native,$(1)),$(call gb_Postprocess_get_target,AllModulesButInstsetNative) : $(call gb_Module_get_target,$(1)))
gb_Module_ALLMODULES += $(1)
gb_Module_MODULELOCATIONS += $(1):$(dir $(realpath $(lastword $(MAKEFILE_LIST))))
gb_Module_TARGETSTACK := $(call gb_Module_get_target,$(1)) $(gb_Module_TARGETSTACK)
@ -290,4 +291,8 @@ endif
$$(eval $$(gb_Extensions_final_hook))
endef
$(call gb_Postprocess_get_target,AllModulesButInstsetNative) :
$(call gb_Output_announce,All modules but instset: $^,$(true),ALL)
$(call gb_Helper_abbreviate_dirs,mkdir -p $(dir $@) && touch $@)
# vim: set noet sw=4: