Makefile.in | 9 +-
basctl/Module_basctl.mk | 2
chart2/Module_chart2.mk | 2
cui/Module_cui.mk | 2
dbaccess/Module_dbaccess.mk | 14 +--
desktop/Module_desktop.mk | 2
extensions/Module_extensions.mk | 4
filter/Module_filter.mk | 2
framework/Module_framework.mk | 2
padmin/Module_padmin.mk | 2
postprocess/Module_postprocess.mk | 4
reportdesign/Module_reportdesign.mk | 2
sc/Module_sc.mk | 2
sd/Module_sd.mk | 4
sfx2/Module_sfx2.mk | 2
solenv/gbuild/AllLangHelp.mk | 3
solenv/gbuild/AllLangPackage.mk | 2
solenv/gbuild/AllLangResTarget.mk | 3
solenv/gbuild/Module.mk | 4
solenv/gbuild/TargetLocations.mk | 1
solenv/gbuild/UIConfig.mk | 3
solenv/gbuild/extensions/post_PackageInfo.mk | 99 ++++++++++++++++++++++++
solenv/gbuild/extensions/post_SpeedUpTargets.mk | 2
starmath/Module_starmath.mk | 2
svtools/Module_svtools.mk | 2
svx/Module_svx.mk | 2
sw/Module_sw.mk | 8 -
uui/Module_uui.mk | 2
vcl/Module_vcl.mk | 2
xmlsecurity/Module_xmlsecurity.mk | 2
30 files changed, 154 insertions(+), 38 deletions(-)
New commits:
commit 59b4f353d867b0dfd37c6166d2b2456495584787
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Thu Nov 21 14:47:20 2013 +0100
initial install-package-foo target for partial installs
make packageinfo target
add uiconfig file translations
add missing l10n config files
add missing help files in packageinfo
Reviewed-on: https://gerrit.libreoffice.org/6754
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Conflicts:
helpcontent2
translations
a2498a118e729276a78ef3a4eb43b5d0b302d326
9bb39bdd677af4be0da621370c51eb9e22ecc33f
a7e654cdeffd832f51016ff51aa180fe3924ff4e
4ee41fdb600cb3a89da387dffe64e6a30192761c
349fb24a388775c58be7a326832b3fc0ec38180f
8a2ca73c02fd6b04ce60e7701c51d2362ef7ec06
Change-Id: Id5f6f5c1f3e46df2d9033ccd5bbf2af6ab38a9e8
Reviewed-on: https://gerrit.libreoffice.org/6982
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com>
diff --git a/Makefile.in b/Makefile.in
index 8c64940..206f5ed 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check
clean clean-build clean-host test-install distclean distro-pack-install docs
download fetch findunusedcode get-submodules id install install-strip
subsequentcheck tags debugrun help slowcheck translations unitcheck
+.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check
clean clean-build clean-host test-install distclean distro-pack-install docs
download fetch findunusedcode get-submodules id install install-strip
subsequentcheck tags debugrun help slowcheck translations unitcheck packageinfo
MAKECMDGOALS?=all
@@ -220,12 +220,12 @@ endif
$(if $(filter build check,$(MAKECMDGOALS)),all) \
$(if $(filter build-nocheck,$(MAKECMDGOALS)),build) \
$(if $(filter check,$(MAKECMDGOALS)),subsequentcheck) \
- $(filter all build-l10n-only build-non-l10n-only debugrun help
slowcheck translations unitcheck subsequentcheck check,$(MAKECMDGOALS))
+ $(filter all build-l10n-only build-non-l10n-only debugrun help
slowcheck translations unitcheck subsequentcheck check
packageinfo,$(MAKECMDGOALS))
ifeq ($(OS),IOS)
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) ios
endif
-build-non-l10n-only build-l10n-only build-nocheck check debugrun help
slowcheck translations unitcheck subsequentcheck : build
+build-non-l10n-only build-l10n-only build-nocheck check debugrun help
slowcheck translations unitcheck subsequentcheck packageinfo: build
cross-toolset: bootstrap fetch
$(GNUMAKE) gb_Side=build -j $(PARALLELISM) $(GMAKE_OPTIONS) -f
$(SRCDIR)/Makefile.gbuild build-tools
@@ -302,6 +302,9 @@ distro-pack-install: install
$(SRCDIR)/bin/distro-install-sdk
$(SRCDIR)/bin/distro-install-file-lists
+install-package-%:
+ $(GNUMAKE) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@
+
id:
@create-ids
diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk
index 5da59c9..92d3553 100644
--- a/basctl/Module_basctl.mk
+++ b/basctl/Module_basctl.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Module_add_l10n_targets,basctl,\
endif
-$(eval $(call gb_Module_add_targets,basctl,\
+$(eval $(call gb_Module_add_l10n_targets,basctl,\
UIConfig_basicide \
))
diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
index 49a8c51..a7751e9 100644
--- a/chart2/Module_chart2.mk
+++ b/chart2/Module_chart2.mk
@@ -12,11 +12,11 @@ $(eval $(call gb_Module_Module,chart2))
$(eval $(call gb_Module_add_targets,chart2,\
Library_chartcontroller \
Library_chartcore \
- UIConfig_chart2 \
))
$(eval $(call gb_Module_add_l10n_targets,chart2,\
AllLangResTarget_chartcontroller \
+ UIConfig_chart2 \
))
$(eval $(call gb_Module_add_slowcheck_targets,chart2,\
diff --git a/cui/Module_cui.mk b/cui/Module_cui.mk
index 62398b3..2a2fca4 100644
--- a/cui/Module_cui.mk
+++ b/cui/Module_cui.mk
@@ -11,11 +11,11 @@ $(eval $(call gb_Module_Module,cui))
$(eval $(call gb_Module_add_targets,cui,\
Library_cui \
- UIConfig_cui \
))
$(eval $(call gb_Module_add_l10n_targets,cui,\
AllLangResTarget_cui \
+ UIConfig_cui \
))
# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 5c05968..b9d7d56 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -18,13 +18,6 @@ $(eval $(call gb_Module_add_targets,dbaccess,\
Library_dbmm \
Library_dbu \
Library_sdbt \
- UIConfig_dbaccess \
- UIConfig_dbapp \
- UIConfig_dbbrowser \
- UIConfig_dbquery \
- UIConfig_dbrelation \
- UIConfig_dbtable \
- UIConfig_dbtdata \
))
$(eval $(call gb_Module_add_l10n_targets,dbaccess,\
@@ -32,6 +25,13 @@ $(eval $(call gb_Module_add_l10n_targets,dbaccess,\
AllLangResTarget_dbmm \
AllLangResTarget_dbu \
AllLangResTarget_sdbt \
+ UIConfig_dbaccess \
+ UIConfig_dbapp \
+ UIConfig_dbbrowser \
+ UIConfig_dbquery \
+ UIConfig_dbrelation \
+ UIConfig_dbtable \
+ UIConfig_dbtdata \
))
ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index c90de67..ed9e4d9 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -20,13 +20,13 @@ $(eval $(call gb_Module_add_targets,desktop,\
$(if $(ENABLE_HEADLESS),,Library_spl) \
Package_branding \
$(if $(CUSTOM_BRAND_DIR),Package_branding_custom) \
- UIConfig_deployment \
))
$(eval $(call gb_Module_add_l10n_targets,desktop,\
AllLangResTarget_deployment \
AllLangResTarget_deploymentgui \
AllLangResTarget_dkt \
+ UIConfig_deployment \
))
ifeq ($(OS),LINUX)
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 4f30191..4761bba 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -34,13 +34,13 @@ $(eval $(call gb_Module_add_targets,extensions,\
Library_bib \
Library_dbp \
Library_pcr \
- UIConfig_sbibliography \
- UIConfig_spropctrlr \
))
$(eval $(call gb_Module_add_l10n_targets,extensions,\
AllLangResTarget_bib \
AllLangResTarget_dbp \
AllLangResTarget_pcr \
+ UIConfig_sbibliography \
+ UIConfig_spropctrlr \
))
endif
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index acff4f8..403184a 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -61,7 +61,6 @@ $(eval $(call gb_Module_add_targets,filter,\
Package_docbook \
Package_xhtml \
Package_xslt \
- UIConfig_xsltdlg \
))
$(eval $(call gb_Module_add_l10n_targets,filter,\
@@ -69,6 +68,7 @@ $(eval $(call gb_Module_add_l10n_targets,filter,\
AllLangResTarget_pdffilter \
AllLangResTarget_t602filter \
AllLangResTarget_xsltdlg \
+ UIConfig_xsltdlg \
))
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
diff --git a/framework/Module_framework.mk b/framework/Module_framework.mk
index b597d34..2e6d5b7 100644
--- a/framework/Module_framework.mk
+++ b/framework/Module_framework.mk
@@ -26,11 +26,11 @@ $(eval $(call gb_Module_add_targets,framework,\
Library_fwl \
Library_fwm \
Package_dtd \
- UIConfig_startmodule \
))
$(eval $(call gb_Module_add_l10n_targets,framework,\
AllLangResTarget_fwe \
+ UIConfig_startmodule \
))
ifneq ($(OOO_JUNIT_JAR),)
diff --git a/padmin/Module_padmin.mk b/padmin/Module_padmin.mk
index 12f3f4c..45db7aa 100644
--- a/padmin/Module_padmin.mk
+++ b/padmin/Module_padmin.mk
@@ -26,11 +26,11 @@ $(eval $(call gb_Module_add_targets,padmin,\
Executable_spadmin.bin \
Library_spa \
Package_padmin \
- UIConfig_spa \
))
$(eval $(call gb_Module_add_l10n_targets,padmin,\
AllLangResTarget_spa \
+ UIConfig_spa \
))
endif
diff --git a/postprocess/Module_postprocess.mk
b/postprocess/Module_postprocess.mk
index 9ed1a75..d3d5a95 100644
--- a/postprocess/Module_postprocess.mk
+++ b/postprocess/Module_postprocess.mk
@@ -16,9 +16,11 @@ $(eval $(call gb_Module_add_targets,postprocess,\
CustomTarget_images \
CustomTarget_registry \
Package_images \
- Package_registry \
Rdb_services \
))
+$(eval $(call gb_Module_add_l10n_targets,postprocess,\
+ Package_registry \
+))
ifeq ($(WINDOWS_BUILD_SIGNING),TRUE)
$(eval $(call gb_Module_add_targets,postprocess,\
diff --git a/reportdesign/Module_reportdesign.mk
b/reportdesign/Module_reportdesign.mk
index 620fbbf..bba86b9 100644
--- a/reportdesign/Module_reportdesign.mk
+++ b/reportdesign/Module_reportdesign.mk
@@ -13,12 +13,12 @@ $(eval $(call gb_Module_add_targets,reportdesign,\
Library_rpt \
Library_rptui \
Library_rptxml \
- UIConfig_dbreport \
))
$(eval $(call gb_Module_add_l10n_targets,reportdesign,\
AllLangResTarget_rpt \
AllLangResTarget_rptui \
+ UIConfig_dbreport \
))
# deactivated since sb123;
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index cc974a0..6730163 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -15,11 +15,11 @@ $(eval $(call gb_Module_add_targets,sc,\
Library_scd \
Library_scfilt \
Library_scui \
- UIConfig_scalc \
))
$(eval $(call gb_Module_add_l10n_targets,sc,\
AllLangResTarget_sc \
+ UIConfig_scalc \
))
ifneq (,$(ENABLE_OPENCL))
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 16e7772..3321279 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -17,12 +17,12 @@ $(eval $(call gb_Module_add_targets,sd,\
Package_opengl \
Package_web \
Package_xml \
- UIConfig_sdraw \
- UIConfig_simpress \
))
$(eval $(call gb_Module_add_l10n_targets,sd,\
AllLangResTarget_sd \
+ UIConfig_sdraw \
+ UIConfig_simpress \
))
ifneq ($(OS),DRAGONFLY)
diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk
index 1164ca4..be82c7c 100644
--- a/sfx2/Module_sfx2.mk
+++ b/sfx2/Module_sfx2.mk
@@ -21,11 +21,11 @@ $(eval $(call gb_Module_Module,sfx2))
$(eval $(call gb_Module_add_targets,sfx2,\
Library_sfx \
- UIConfig_sfx \
))
$(eval $(call gb_Module_add_l10n_targets,sfx2,\
AllLangResTarget_sfx2 \
+ UIConfig_sfx \
))
$(eval $(call gb_Module_add_check_targets,sfx2,\
diff --git a/solenv/gbuild/AllLangHelp.mk b/solenv/gbuild/AllLangHelp.mk
index a5547dd..dca6c70 100644
--- a/solenv/gbuild/AllLangHelp.mk
+++ b/solenv/gbuild/AllLangHelp.mk
@@ -49,7 +49,10 @@ endef
# Create and deliver help packs for a module for all languages.
#
# gb_AllLangHelp_AllLangHelp module
+gb_AllLangHelp_ALLTARGETS :=
+
define gb_AllLangHelp_AllLangHelp
+gb_AllLangHelp_ALLTARGETS += $(1)
$(foreach lang,$(gb_HELP_LANGS),\
$(call gb_AllLangHelp_AllLangHelp__one_lang,$(1),$(lang),$(call
gb_AllLangHelp__get_helpname,$(1),$(lang))))
diff --git a/solenv/gbuild/AllLangPackage.mk b/solenv/gbuild/AllLangPackage.mk
index cc8c0b8..8a691cd 100644
--- a/solenv/gbuild/AllLangPackage.mk
+++ b/solenv/gbuild/AllLangPackage.mk
@@ -68,7 +68,9 @@ endef
# (i.e., if we are building with the language).
#
# gb_AllLangPackage_add_file target destination source
+gb_AllLangPackage_ALLDIRS :=
define gb_AllLangPackage_add_file
+gb_AllLangPackage_ALLDIRS := $(sort $(gb_AllLangPackage_ALLDIRS) $(patsubst
%$(3),%,$(2)))
$(call gb_AllLangPackage__add_file,$(1),$(2),$(3),$(firstword $(subst /,
,$(3))))
endef
diff --git a/solenv/gbuild/AllLangResTarget.mk
b/solenv/gbuild/AllLangResTarget.mk
index c1bf16a..35afd1a 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -401,6 +401,7 @@ $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \
$(gb_ResTarget_RSCCOMMAND) @$${RESPONSEFILE} && \
rm -f $${RESPONSEFILE})
+#$(info $(call gb_ResTarget_get_target,$(1)))
define gb_ResTarget_ResTarget
$(call gb_ResTarget_get_target,$(1)) : LIBRARY = $(2)
$(call gb_ResTarget_get_target,$(1)) : LANGUAGE = $(3)
@@ -457,7 +458,9 @@ $(call gb_AllLangResTarget_get_target,%) :
gb_ResTarget_get_install_target =
$(INSTROOT)/$(LIBO_SHARE_RESOURCE_FOLDER)/$(1).res
+gb_AllLangResTarget_ALLTARGETS :=
define gb_AllLangResTarget_AllLangResTarget
+gb_AllLangResTarget_ALLTARGETS += $(1)
$(foreach lang,$(gb_AllLangResTarget_LANGS),\
$(call gb_ResTarget_ResTarget,$(1)$(lang),$(1),$(lang)))
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index dd35658..d08e5cb 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -227,7 +227,7 @@ endif
endef
define gb_Module_add_target
-$(if $(filter AllLang% Dictionary%,$(2)),$(warning target $(2) should be a
l10n target))
+$(if $(filter AllLang% Dictionary% UIConfig% Package_registry,$(2)),$(warning
target $(2) should be a l10n target))
$(call gb_Module__read_targetfile,$(1),$(2),target)
$(call gb_Module_get_nonl10n_target,$(1)) : $$(gb_Module_CURRENTTARGET)
@@ -236,7 +236,7 @@ $(call gb_Module_get_clean_target,$(1)) :
$$(gb_Module_CURRENTCLEANTARGET)
endef
define gb_Module_add_l10n_target
-$(if $(filter AllLang% Dictionary%,$(2)),,$(warning target $(2) should not be
a l10n target))
+$(if $(filter AllLang% Dictionary% UIConfig% Package_registry,$(2)),,$(warning
target $(2) should not be a l10n target))
$(call gb_Module__read_targetfile,$(1),$(2),target)
$(call gb_Module_get_l10n_target,$(1)) : $$(gb_Module_CURRENTTARGET)
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 8976f44..d7855b3 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -126,6 +126,7 @@ gb_Package_get_preparation_target =
$(WORKDIR)/Package/prepared/$(1)
gb_Package_get_target = $(WORKDIR)/Package/$(1).filelist
gb_Package_get_target_for_build = $(WORKDIR_FOR_BUILD)/Package/$(1).filelist
gb_PackageSet_get_target = $(WORKDIR)/PackageSet/$(1).filelist
+gb_PackageInfo_get_target = $(WORKDIR)/PackageInfo
gb_Postprocess_get_target = $(WORKDIR)/Postprocess/$(1)
gb_PrecompiledHeader_get_dep_target =
$(WORKDIR)/Dep/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.gch.d
gb_PrecompiledHeader_get_target =
$(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.gch
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index 282b5f9..5588234 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -308,12 +308,15 @@ $(call gb_UIConfig__add_translations,$(1),$(2),\
endef
+
+gb_UIConfig_ALLFILES:=
# Adds .ui file to the package
#
# The file is relative to $(SRCDIR) and without extension.
#
# gb_UIConfig_add_uifile target uifile
define gb_UIConfig_add_uifile
+gb_UIConfig_ALLFILES+=$(1):$(notdir $(2))
$(call gb_UIConfig__add_uifile,$(1),$(2))
ifneq ($(gb_UIConfig_LANGS),)
diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk
b/solenv/gbuild/extensions/post_PackageInfo.mk
new file mode 100644
index 0000000..54d6c5f
--- /dev/null
+++ b/solenv/gbuild/extensions/post_PackageInfo.mk
@@ -0,0 +1,99 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+gb_PackageInfo_InstallModules := \
+ base \
+ calc \
+ graphicsfilter \
+ tde \
+ impress \
+ onlineupdate \
+ gnome \
+ kde \
+ math \
+ ooo \
+ writer \
+ ure \
+ activexbinarytable \
+ ooobinarytable \
+ winexplorerextbinarytable \
+
+define gb_PackageInfo_emit_binaries_command
+@touch $(foreach suf,executables libraries
files,$(gb_PackageInfo_get_target)/$(1).$(suf))
+@$(foreach executable,$(gb_Executable_MODULE_$(1)),echo "$(patsubst
$(INSTDIR)/%,%,$(call gb_Executable_get_target,$(executable)))" >>
$(gb_PackageInfo_get_target)/$(1).executables &&) true
+@$(foreach library,$(gb_Library_MODULE_$(1)),echo "$(patsubst
$(INSTDIR)/%,%,$(call gb_Library_get_target,$(library)))" >>
$(gb_PackageInfo_get_target)/$(1).libraries &&) true
+
+endef
+
+define gb_PackageInfo_emit_help_for_one_target
+$(foreach suf,cfg db ht idxl/_0.cfs idxl/segments_3 idxl/segments.gen jar key
tree,$(if $(wildcard $(INSTDIR)/help/$(1).$(suf)),echo "help/$(1).$(suf)" >>
$(2) && )) true
+
+endef
+
+define gb_PackageInfo_emit_help_for_one_lang
+@touch $(foreach suf,executables libraries
files,$(gb_PackageInfo_get_target)/help-$(1).$(suf))
+$(foreach target,$(gb_AllLangHelp_ALLTARGETS),$(call
gb_PackageInfo_emit_help_for_one_target,$(1)/$(target),$(gb_PackageInfo_get_target)/help-$(1).files))
+$(foreach suf,html css,$(foreach file,$(wildcard
$(INSTDIR)/help/$(1)/*.$(suf)),echo "$(patsubst $(INSTDIR)/%,%,$(file))" >>
$(gb_PackageInfo_get_target)/help-$(1).files && )) true
+
+endef
+
+#getting the package files post-hoc with wildcard isnt good and should be done
better
+define gb_PackageInfo_emit_l10n_for_one_alllangpackage
+@$(foreach file,$(shell ls $(INSTDIR)/$(1)/$(2)),echo "$(1)/$(2)/$(file)" >>
$(gb_PackageInfo_get_target)/l10n-$(2).files &&) true
+
+endef
+
+define gb_PackageInfo_emit_l10n_for_one_ressource
+@echo "$(patsubst $(INSTDIR)/%,%,$(call
gb_ResTarget_get_install_target,$(1)$(2)))" >>
$(gb_PackageInfo_get_target)/l10n-$(2).files
+
+endef
+
+define gb_PackageInfo_emit_l10n_for_one_uifile
+@echo "$(gb_UIConfig_INSTDIR)/$(2)/ui/res/$(1)/$(3)" >>
$(gb_PackageInfo_get_target)/l10n-$(1).files
+
+endef
+
+define gb_PackageInfo_emit_l10n_for_one_configfile
+echo "$(LIBO_SHARE_FOLDER)/registry/$(2)$(1).xcd" >>
$(gb_PackageInfo_get_target)/l10n-$(1).files
+
+endef
+
+define gb_PackageInfo_emit_l10n_for_one_lang
+@touch $(foreach suf,executables libraries
files,$(gb_PackageInfo_get_target)/l10n-$(1).$(suf))
+$(if $(filter-out qtz en-US,$(1)),$(foreach packagedir,$(patsubst
%/,%,$(gb_AllLangPackage_ALLDIRS)),$(call
gb_PackageInfo_emit_l10n_for_one_alllangpackage,$(packagedir),$(1))))
+$(if $(filter $(gb_AllLangResTarget_LANGS),$(1)),$(foreach
target,$(gb_AllLangResTarget_ALLTARGETS),$(call
gb_PackageInfo_emit_l10n_for_one_ressource,$(target),$(1))))
+$(foreach uifile,$(gb_UIConfig_ALLFILES),$(call
gb_PackageInfo_emit_l10n_for_one_uifile,$(1),$(firstword $(subst
:,$(WHITESPACE),$(uifile))),$(lastword $(subst :,$(WHITESPACE),$(uifile)))))
+$(if $(filter $(gb_Configuration_LANGS),$(1)),$(foreach configfile,Langpack-
res/fcfg_langpack_ res/registry_,$(call
gb_PackageInfo_emit_l10n_for_one_configfile,$(1),$(configfile))))
+
+endef
+
+.PHONY: packageinfo
+$(foreach filelist,files executables
libraries,$(gb_PackageInfo_get_target)/%.$(filelist)):
+ @rm -rf $(gb_PackageInfo_get_target) && mkdir
$(gb_PackageInfo_get_target)
+ $(foreach installmodule,$(gb_PackageInfo_InstallModules),$(call
gb_PackageInfo_emit_binaries_command,$(installmodule)))
+ $(foreach helplang,$(gb_HELP_LANGS),$(call
gb_PackageInfo_emit_help_for_one_lang,$(helplang)))
+ $(foreach l10nlang,$(if $(strip
$(gb_WITH_LANG)),$(gb_WITH_LANG),en-US),$(call
gb_PackageInfo_emit_l10n_for_one_lang,$(l10nlang)))
+
+packageinfo: $(gb_PackageInfo_get_target)/ure.files
+
+install-package-%: $(foreach filelist,files executables
libraries,$(gb_PackageInfo_get_target)/%.$(filelist))
+ for executable in `cat $(gb_PackageInfo_get_target)/$*.executables`; \
+ do \
+ install -D $(INSTDIR)/$${executable}
$(INSTALLDIR)/$${executable} ;\
+ done
+ for library in `cat $(gb_PackageInfo_get_target)/$*.libraries`; \
+ do \
+ install -D -m644 $(INSTDIR)/$${library}
$(INSTALLDIR)/$${library}; \
+ done
+ for file in `cat $(gb_PackageInfo_get_target)/$*.files`; \
+ do \
+ install -D -m644 $(INSTDIR)/$${file} $(INSTALLDIR)/$${file}; \
+ done
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index 3f3e562..4b97d46 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -24,7 +24,7 @@ ifneq ($(strip $(MAKECMDGOALS)),)
# speed up depending on the target
gb_SpeedUpTargets_LEVEL_4 := debugrun help translations
gb_SpeedUpTargets_LEVEL_3 := showmodules $(gb_SpeedUpTargets_LEVEL_4)
-gb_SpeedUpTargets_LEVEL_2 := $(gb_SpeedUpTargets_LEVEL_3)
+gb_SpeedUpTargets_LEVEL_2 := $(gb_SpeedUpTargets_LEVEL_3) install-package-%
gb_SpeedUpTargets_LEVEL_1 := clean showdeliverables
$(gb_SpeedUpTargets_LEVEL_2)
ifeq (T,$(if $(filter-out $(gb_SpeedUpTargets_LEVEL_1),$(MAKECMDGOALS)),,T))
diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk
index bd434dd..2830a46 100644
--- a/starmath/Module_starmath.mk
+++ b/starmath/Module_starmath.mk
@@ -13,11 +13,11 @@ $(eval $(call gb_Module_Module,starmath))
$(eval $(call gb_Module_add_targets,starmath,\
Library_sm \
Library_smd \
- UIConfig_smath \
))
$(eval $(call gb_Module_add_l10n_targets,starmath,\
AllLangResTarget_sm \
+ UIConfig_smath \
))
$(eval $(call gb_Module_add_check_targets,starmath,\
diff --git a/svtools/Module_svtools.mk b/svtools/Module_svtools.mk
index e2a3512..f96a758 100644
--- a/svtools/Module_svtools.mk
+++ b/svtools/Module_svtools.mk
@@ -22,11 +22,11 @@ $(eval $(call gb_Module_Module,svtools))
$(eval $(call gb_Module_add_targets,svtools,\
Library_hatchwindowfactory \
Library_svt \
- UIConfig_svt \
))
$(eval $(call gb_Module_add_l10n_targets,svtools,\
AllLangResTarget_svt \
+ UIConfig_svt \
))
ifneq ($(CROSS_COMPILING),YES)
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index 071e36f..80f2bd7 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_Module_add_targets,svx,\
Library_svx \
Library_svxcore \
Library_textconversiondlgs \
- UIConfig_svx \
))
$(eval $(call gb_Module_add_l10n_targets,svx,\
@@ -31,6 +30,7 @@ $(eval $(call gb_Module_add_l10n_targets,svx,\
AllLangResTarget_ofa \
AllLangResTarget_gal \
AllLangResTarget_textconversiondlgs \
+ UIConfig_svx \
))
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 2e35087..d5d3f44 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -26,6 +26,10 @@ $(eval $(call gb_Module_add_targets,sw,\
Library_sw \
Library_swd \
Library_swui \
+))
+
+$(eval $(call gb_Module_add_l10n_targets,sw,\
+ AllLangResTarget_sw \
UIConfig_sglobal \
UIConfig_sweb \
UIConfig_swform \
@@ -35,10 +39,6 @@ $(eval $(call gb_Module_add_targets,sw,\
UIConfig_qa \
))
-$(eval $(call gb_Module_add_l10n_targets,sw,\
- AllLangResTarget_sw \
-))
-
ifneq ($(DISABLE_SCRIPTING),TRUE)
$(eval $(call gb_Module_add_targets,sw,\
diff --git a/uui/Module_uui.mk b/uui/Module_uui.mk
index c827e41..193bea5 100644
--- a/uui/Module_uui.mk
+++ b/uui/Module_uui.mk
@@ -11,11 +11,11 @@ $(eval $(call gb_Module_Module,uui))
$(eval $(call gb_Module_add_targets,uui,\
Library_uui \
- UIConfig_uui \
))
$(eval $(call gb_Module_add_l10n_targets,uui,\
AllLangResTarget_uui \
+ UIConfig_uui \
))
# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index a65736d..4dc6434 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -25,11 +25,11 @@ $(eval $(call gb_Module_add_targets,vcl,\
$(if $(filter DESKTOP,$(BUILD_TYPE)), \
StaticLibrary_vclmain \
Executable_ui-previewer) \
- UIConfig_vcl \
))
$(eval $(call gb_Module_add_l10n_targets,vcl,\
AllLangResTarget_vcl \
+ UIConfig_vcl \
))
ifeq ($(GUIBASE),unx)
diff --git a/xmlsecurity/Module_xmlsecurity.mk
b/xmlsecurity/Module_xmlsecurity.mk
index d29444c..e88859d 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -13,11 +13,11 @@ $(eval $(call gb_Module_add_targets,xmlsecurity,\
Library_xmlsecurity \
Library_xsec_fw \
$(if $(filter-out IOS ANDROID,$(OS)),Library_xsec_xmlsec) \
- UIConfig_xmlsec \
))
$(eval $(call gb_Module_add_l10n_targets,xmlsecurity,\
AllLangResTarget_xsec \
+ UIConfig_xmlsec \
))
#FIXME: ^^^, get nss&libxmlsec building on ios and android
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
