diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-11-13 02:12:48 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-11-14 16:45:02 +0100 |
| commit | 04dead1c6b9fd8ea24b27d2c5824ae889a2fac66 (patch) | |
| tree | d6eded8f961d23f042e012f0644dac1fe2b0a32b | |
| parent | 75748b5c800cea2170e9bb26430ff6a9fc55c608 (diff) | |
make l10n buildable separately
- this renames the 'almost' module target to non-l10n
- and adds a l10n target which is intended to only build l10n parts of
the product
- packagers should then be able to build l10n and non-l10n parts of the
product independently, thus:
- enable quicker rebuilds
- distribution of load
- updates to l10n without a full rebuild
- security fixes to binaries without rebuilding all l10n
- the new targets are called build-l10n-only and build-non-l10n-only
- note this is not intended to move a concept of split packages
upstream -- while this exsists in distros, the number of test
scenarios for this would explode upstream
Change-Id: Ib8ccc9bc52718d9b0ebbfee76ad93dc29c260863
Conflicts:
filter/Module_filter.mk
37 files changed, 231 insertions, 83 deletions
diff --git a/Makefile.in b/Makefile.in index cb3efcb4f7a1..95bf5b37473f 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 build check clean clean-build clean-host test-install distclean distro-pack-install docs download fetch findunusedcode get-submodules id install install-strip subsequentcheck tags +.PHONY : all bootstrap 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 ifeq ($(MAKECMDGOALS),) MAKECMDGOALS:=all @@ -246,6 +246,9 @@ endif build-nocheck: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset) $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild build +build-l10n-only build-non-l10n-only: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset) + $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $@ + cross-toolset: bootstrap fetch $(GNUMAKE) gb_Side=build -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild build-tools diff --git a/accessibility/Module_accessibility.mk b/accessibility/Module_accessibility.mk index f6615b8ce1c7..e5e090ca89ee 100644 --- a/accessibility/Module_accessibility.mk +++ b/accessibility/Module_accessibility.mk @@ -10,10 +10,13 @@ $(eval $(call gb_Module_Module,accessibility)) $(eval $(call gb_Module_add_targets,accessibility,\ - AllLangResTarget_acc \ Library_acc \ )) +$(eval $(call gb_Module_add_l10n_targets,accessibility,\ + AllLangResTarget_acc \ +)) + ifneq ($(ENABLE_JAVA),) ifeq ($(OS),WNT) $(eval $(call gb_Module_add_targets,accessibility,\ diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk index 68d2e74c38df..8f6270e49d5e 100644 --- a/avmedia/Module_avmedia.mk +++ b/avmedia/Module_avmedia.mk @@ -10,10 +10,13 @@ $(eval $(call gb_Module_Module,avmedia)) $(eval $(call gb_Module_add_targets,avmedia,\ - AllLangResTarget_avmedia \ Library_avmedia \ )) +$(eval $(call gb_Module_add_l10n_targets,avmedia,\ + AllLangResTarget_avmedia \ +)) + ifeq ($(ENABLE_GSTREAMER),TRUE) $(eval $(call gb_Module_add_targets,avmedia,\ Library_avmediagst \ diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk index 0a205b34c499..5da59c903f5c 100644 --- a/basctl/Module_basctl.mk +++ b/basctl/Module_basctl.mk @@ -22,10 +22,13 @@ $(eval $(call gb_Module_Module,basctl)) ifneq ($(DISABLE_SCRIPTING),TRUE) $(eval $(call gb_Module_add_targets,basctl,\ - AllLangResTarget_basctl \ Library_basctl \ )) +$(eval $(call gb_Module_add_l10n_targets,basctl,\ + AllLangResTarget_basctl \ +)) + endif $(eval $(call gb_Module_add_targets,basctl,\ diff --git a/basic/Module_basic.mk b/basic/Module_basic.mk index 3dc300535079..0f74a2746431 100644 --- a/basic/Module_basic.mk +++ b/basic/Module_basic.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Module_Module,basic)) ifneq ($(DISABLE_SCRIPTING),TRUE) -$(eval $(call gb_Module_add_targets,basic,\ +$(eval $(call gb_Module_add_l10n_targets,basic,\ AllLangResTarget_sb \ )) diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk index 03c7cf39a955..49a8c51b96e3 100644 --- a/chart2/Module_chart2.mk +++ b/chart2/Module_chart2.mk @@ -10,12 +10,15 @@ $(eval $(call gb_Module_Module,chart2)) $(eval $(call gb_Module_add_targets,chart2,\ - AllLangResTarget_chartcontroller \ Library_chartcontroller \ Library_chartcore \ UIConfig_chart2 \ )) +$(eval $(call gb_Module_add_l10n_targets,chart2,\ + AllLangResTarget_chartcontroller \ +)) + $(eval $(call gb_Module_add_slowcheck_targets,chart2,\ CppunitTest_chart2_export \ CppunitTest_chart2_import \ diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index 4b8e93199aaf..b49a9ad6fd4f 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -11,9 +11,6 @@ $(eval $(call gb_Module_Module,connectivity)) $(eval $(call gb_Module_add_targets,connectivity,\ - AllLangResTarget_cnr \ - AllLangResTarget_sdbcl \ - AllLangResTarget_sdberr \ Configuration_calc \ Configuration_dbase \ Configuration_flat \ @@ -32,6 +29,12 @@ $(eval $(call gb_Module_add_targets,connectivity,\ Library_sdbc2 \ )) +$(eval $(call gb_Module_add_l10n_targets,connectivity,\ + AllLangResTarget_cnr \ + AllLangResTarget_sdbcl \ + AllLangResTarget_sdberr \ +)) + ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,connectivity,\ Configuration_hsqldb \ diff --git a/cui/Module_cui.mk b/cui/Module_cui.mk index 05093db6627a..62398b318205 100644 --- a/cui/Module_cui.mk +++ b/cui/Module_cui.mk @@ -10,9 +10,12 @@ $(eval $(call gb_Module_Module,cui)) $(eval $(call gb_Module_add_targets,cui,\ - AllLangResTarget_cui \ Library_cui \ UIConfig_cui \ )) +$(eval $(call gb_Module_add_l10n_targets,cui,\ + AllLangResTarget_cui \ +)) + # vim: set noet sw=4 ts=4: diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk index 868cd81e34d7..5c05968bf587 100644 --- a/dbaccess/Module_dbaccess.mk +++ b/dbaccess/Module_dbaccess.mk @@ -12,17 +12,13 @@ $(eval $(call gb_Module_Module,dbaccess)) ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,dbaccess,\ - AllLangResTarget_dba \ - AllLangResTarget_dbmm \ - AllLangResTarget_dbu \ - AllLangResTarget_sdbt \ - $(if $(filter WNT,$(OS)),Executable_odbcconfig) \ - Library_dba \ - Library_dbaxml \ - Library_dbmm \ - Library_dbu \ - Library_sdbt \ - UIConfig_dbaccess \ + $(if $(filter WNT,$(OS)),Executable_odbcconfig) \ + Library_dba \ + Library_dbaxml \ + Library_dbmm \ + Library_dbu \ + Library_sdbt \ + UIConfig_dbaccess \ UIConfig_dbapp \ UIConfig_dbbrowser \ UIConfig_dbquery \ @@ -31,6 +27,13 @@ $(eval $(call gb_Module_add_targets,dbaccess,\ UIConfig_dbtdata \ )) +$(eval $(call gb_Module_add_l10n_targets,dbaccess,\ + AllLangResTarget_dba \ + AllLangResTarget_dbmm \ + AllLangResTarget_dbu \ + AllLangResTarget_sdbt \ +)) + ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) $(eval $(call gb_Module_add_check_targets,dbaccess,\ CppunitTest_dbaccess_firebird_test \ diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index 46f061e46c96..c90de672aa6d 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -10,9 +10,6 @@ $(eval $(call gb_Module_Module,desktop)) $(eval $(call gb_Module_add_targets,desktop,\ - AllLangResTarget_deployment \ - AllLangResTarget_deploymentgui \ - AllLangResTarget_dkt \ CustomTarget_desktop_unopackages_install \ GeneratedPackage_desktop_unopackages_install \ Library_deployment \ @@ -26,6 +23,12 @@ $(eval $(call gb_Module_add_targets,desktop,\ UIConfig_deployment \ )) +$(eval $(call gb_Module_add_l10n_targets,desktop,\ + AllLangResTarget_deployment \ + AllLangResTarget_deploymentgui \ + AllLangResTarget_dkt \ +)) + ifeq ($(OS),LINUX) $(eval $(call gb_Module_add_targets,desktop,\ Library_libreoffice \ diff --git a/editeng/Module_editeng.mk b/editeng/Module_editeng.mk index 4c760bf0a100..409967384989 100644 --- a/editeng/Module_editeng.mk +++ b/editeng/Module_editeng.mk @@ -20,10 +20,13 @@ $(eval $(call gb_Module_Module,editeng)) $(eval $(call gb_Module_add_targets,editeng,\ - AllLangResTarget_editeng \ Library_editeng \ )) +$(eval $(call gb_Module_add_l10n_targets,editeng,\ + AllLangResTarget_editeng \ +)) + # add any runtime tests (unit tests) here # remove if no tests $(eval $(call gb_Module_add_check_targets,editeng,\ diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 20fc58ceefa1..4f3019100004 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -10,9 +10,6 @@ $(eval $(call gb_Module_Module,extensions)) $(eval $(call gb_Module_add_targets,extensions,\ - AllLangResTarget_abp \ - AllLangResTarget_scn \ - AllLangResTarget_upd \ Library_res \ $(if $(filter IOS ANDROID,$(OS)),, \ Library_abp \ @@ -20,6 +17,12 @@ $(eval $(call gb_Module_add_targets,extensions,\ Library_scn) \ )) +$(eval $(call gb_Module_add_l10n_targets,extensions,\ + AllLangResTarget_abp \ + AllLangResTarget_scn \ + AllLangResTarget_upd \ +)) + ifneq ($(filter-out IOS ANDROID,$(OS)),) $(eval $(call gb_Module_add_targets,extensions,\ Library_ldapbe2 \ @@ -28,15 +31,17 @@ endif ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,extensions,\ - AllLangResTarget_bib \ - AllLangResTarget_dbp \ - AllLangResTarget_pcr \ Library_bib \ Library_dbp \ Library_pcr \ UIConfig_sbibliography \ UIConfig_spropctrlr \ )) +$(eval $(call gb_Module_add_l10n_targets,extensions,\ + AllLangResTarget_bib \ + AllLangResTarget_dbp \ + AllLangResTarget_pcr \ +)) endif ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) @@ -46,11 +51,13 @@ $(eval $(call gb_Module_add_targets,extensions,\ ifeq ($(ENABLE_ONLINE_UPDATE),TRUE) $(eval $(call gb_Module_add_targets,extensions,\ - AllLangResTarget_updchk \ Configuration_updchk \ Library_updatecheckui \ Library_updchk \ )) +$(eval $(call gb_Module_add_l10n_targets,extensions,\ + AllLangResTarget_updchk \ +)) $(eval $(call gb_Module_add_check_targets,extensions,\ CppunitTest_extensions_test_update \ diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk index 6f5f644c83ea..c84d77669ba3 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -10,7 +10,6 @@ $(eval $(call gb_Module_Module,extras)) $(eval $(call gb_Module_add_targets,extras,\ - AllLangPackage_autotextshare \ CustomTarget_autocorr \ CustomTarget_glade \ Package_autocorr \ @@ -43,6 +42,10 @@ $(eval $(call gb_Module_add_targets,extras,\ Package_wordbook \ )) +$(eval $(call gb_Module_add_l10n_targets,extras,\ + AllLangPackage_autotextshare \ +)) + ifeq ($(WITH_GALLERY_BUILD),YES) $(eval $(call gb_Module_add_targets,extras,\ Gallery_arrows \ diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk index a2d09f375383..a4175d8f57fa 100644 --- a/filter/Module_filter.mk +++ b/filter/Module_filter.mk @@ -19,10 +19,6 @@ $(eval $(call gb_Module_Module,filter)) $(eval $(call gb_Module_add_targets,filter,\ - AllLangResTarget_eps \ - AllLangResTarget_pdffilter \ - AllLangResTarget_t602filter \ - AllLangResTarget_xsltdlg \ Configuration_filter \ CustomTarget_svg \ $(if $(filter EXPORT,$(BUILD_TYPE)), \ @@ -68,6 +64,14 @@ $(eval $(call gb_Module_add_targets,filter,\ UIConfig_xsltdlg \ )) +$(eval $(call gb_Module_add_l10n_targets,filter,\ + AllLangResTarget_eps \ + AllLangResTarget_flash \ + AllLangResTarget_pdffilter \ + AllLangResTarget_t602filter \ + AllLangResTarget_xsltdlg \ +)) + ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,filter,\ Executable_svg2odf \ diff --git a/forms/Module_forms.mk b/forms/Module_forms.mk index bc636b0e5388..45a6773e9d0f 100644 --- a/forms/Module_forms.mk +++ b/forms/Module_forms.mk @@ -10,10 +10,13 @@ $(eval $(call gb_Module_Module,forms)) $(eval $(call gb_Module_add_targets,forms,\ - AllLangResTarget_frm \ Library_frm \ )) +$(eval $(call gb_Module_add_l10n_targets,forms,\ + AllLangResTarget_frm \ +)) + $(eval $(call gb_Module_add_subsequentcheck_targets,forms,\ JunitTest_forms_unoapi \ JunitTest_forms_complex \ diff --git a/formula/Module_formula.mk b/formula/Module_formula.mk index a19406f6685b..fcfb8b7d8c85 100644 --- a/formula/Module_formula.mk +++ b/formula/Module_formula.mk @@ -10,10 +10,13 @@ $(eval $(call gb_Module_Module,formula)) $(eval $(call gb_Module_add_targets,formula,\ - AllLangResTarget_for \ - AllLangResTarget_forui \ Library_for \ Library_forui \ )) +$(eval $(call gb_Module_add_l10n_targets,formula,\ + AllLangResTarget_for \ + AllLangResTarget_forui \ +)) + # vim: set noet sw=4 ts=4: diff --git a/fpicker/Module_fpicker.mk b/fpicker/Module_fpicker.mk index d4a1e1f23200..913439848a6a 100644 --- a/fpicker/Module_fpicker.mk +++ b/fpicker/Module_fpicker.mk @@ -11,10 +11,13 @@ $(eval $(call gb_Module_Module,fpicker)) $(eval $(call gb_Module_add_targets,fpicker,\ - AllLangResTarget_fps_office \ Library_fps_office \ )) +$(eval $(call gb_Module_add_l10n_targets,fpicker,\ + AllLangResTarget_fps_office \ +)) + ifeq ($(OS),MACOSX) $(eval $(call gb_Module_add_targets,fpicker,\ Library_fps_aqua \ diff --git a/framework/Module_framework.mk b/framework/Module_framework.mk index a95d9f2052ba..b597d34e7fb4 100644 --- a/framework/Module_framework.mk +++ b/framework/Module_framework.mk @@ -20,7 +20,6 @@ $(eval $(call gb_Module_Module,framework)) $(eval $(call gb_Module_add_targets,framework,\ - AllLangResTarget_fwe \ Library_fwe \ Library_fwi \ Library_fwk \ @@ -30,6 +29,10 @@ $(eval $(call gb_Module_add_targets,framework,\ UIConfig_startmodule \ )) +$(eval $(call gb_Module_add_l10n_targets,framework,\ + AllLangResTarget_fwe \ +)) + ifneq ($(OOO_JUNIT_JAR),) $(eval $(call gb_Module_add_subsequentcheck_targets,framework,\ JunitTest_framework_complex \ diff --git a/padmin/Module_padmin.mk b/padmin/Module_padmin.mk index 2b5e07b6d66d..12f3f4c65471 100644 --- a/padmin/Module_padmin.mk +++ b/padmin/Module_padmin.mk @@ -25,10 +25,14 @@ ifeq ($(GUIBASE),unx) $(eval $(call gb_Module_add_targets,padmin,\ Executable_spadmin.bin \ Library_spa \ - AllLangResTarget_spa \ Package_padmin \ UIConfig_spa \ )) + +$(eval $(call gb_Module_add_l10n_targets,padmin,\ + AllLangResTarget_spa \ +)) + endif # vim: set noet sw=4 ts=4: diff --git a/reportdesign/Module_reportdesign.mk b/reportdesign/Module_reportdesign.mk index 8fd151abaee8..620fbbfa365b 100644 --- a/reportdesign/Module_reportdesign.mk +++ b/reportdesign/Module_reportdesign.mk @@ -10,14 +10,17 @@ $(eval $(call gb_Module_Module,reportdesign)) $(eval $(call gb_Module_add_targets,reportdesign,\ - AllLangResTarget_rpt \ - AllLangResTarget_rptui \ Library_rpt \ Library_rptui \ Library_rptxml \ UIConfig_dbreport \ )) +$(eval $(call gb_Module_add_l10n_targets,reportdesign,\ + AllLangResTarget_rpt \ + AllLangResTarget_rptui \ +)) + # deactivated since sb123; # apparently fails because OOo does not find JVM? #$(eval $(call gb_Module_add_subsequentcheck_targets,reportdesign,\ diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 9e345214a675..f27e1047fc7d 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -11,7 +11,6 @@ $(eval $(call gb_Module_Module,sc)) $(eval $(call gb_Module_add_targets,sc,\ - AllLangResTarget_sc \ Library_sc \ Library_scd \ Library_scfilt \ @@ -19,6 +18,10 @@ $(eval $(call gb_Module_add_targets,sc,\ UIConfig_scalc \ )) +$(eval $(call gb_Module_add_l10n_targets,sc,\ + AllLangResTarget_sc \ +)) + ifneq (,$(ENABLE_OPENCL)) $(eval $(call gb_Module_add_targets,sc,\ Library_scopencl \ diff --git a/scaddins/Module_scaddins.mk b/scaddins/Module_scaddins.mk index 95f667f3cd2f..3c89952f323b 100644 --- a/scaddins/Module_scaddins.mk +++ b/scaddins/Module_scaddins.mk @@ -20,13 +20,16 @@ $(eval $(call gb_Module_Module,scaddins)) $(eval $(call gb_Module_add_targets,scaddins,\ - AllLangResTarget_analysis \ - AllLangResTarget_date \ - AllLangResTarget_pricing \ - InternalUnoApi_scaddins \ + InternalUnoApi_scaddins \ Library_analysis \ Library_date \ Library_pricing \ )) +$(eval $(call gb_Module_add_l10n_targets,scaddins,\ + AllLangResTarget_analysis \ + AllLangResTarget_date \ + AllLangResTarget_pricing \ +)) + # vim: set noet sw=4 ts=4: diff --git a/sccomp/Module_sccomp.mk b/sccomp/Module_sccomp.mk index 15d9a6c6eeea..dd56f872ecac 100644 --- a/sccomp/Module_sccomp.mk +++ b/sccomp/Module_sccomp.mk @@ -22,10 +22,13 @@ $(eval $(call gb_Module_Module,sccomp)) ifeq ($(ENABLE_LPSOLVE),TRUE) $(eval $(call gb_Module_add_targets,sccomp,\ - AllLangResTarget_solver \ Library_solver \ )) +$(eval $(call gb_Module_add_l10n_targets,sccomp,\ + AllLangResTarget_solver \ +)) + endif # vim: set noet sw=4 ts=4: diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk index 27cbffa7242c..16e777284f7d 100644 --- a/sd/Module_sd.mk +++ b/sd/Module_sd.mk @@ -10,7 +10,6 @@ $(eval $(call gb_Module_Module,sd)) $(eval $(call gb_Module_add_targets,sd,\ - AllLangResTarget_sd \ Library_sd \ Library_sdd \ Library_sdfilt \ @@ -22,6 +21,10 @@ $(eval $(call gb_Module_add_targets,sd,\ UIConfig_simpress \ )) +$(eval $(call gb_Module_add_l10n_targets,sd,\ + AllLangResTarget_sd \ +)) + ifneq ($(OS),DRAGONFLY) $(eval $(call gb_Module_add_check_targets,sd,\ CppunitTest_sd_uimpress \ diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk index 5666825bf68a..1164ca4d46a6 100644 --- a/sfx2/Module_sfx2.mk +++ b/sfx2/Module_sfx2.mk @@ -20,11 +20,14 @@ $(eval $(call gb_Module_Module,sfx2)) $(eval $(call gb_Module_add_targets,sfx2,\ - AllLangResTarget_sfx2 \ Library_sfx \ UIConfig_sfx \ )) +$(eval $(call gb_Module_add_l10n_targets,sfx2,\ + AllLangResTarget_sfx2 \ +)) + $(eval $(call gb_Module_add_check_targets,sfx2,\ CppunitTest_sfx2_metadatable \ )) diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index 8105c1fb3f1b..382062f8070c 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -40,6 +40,7 @@ gb_Module_ALLMODULES := gb_Module_MODULELOCATIONS := gb_Module_TARGETSTACK := +gb_Module_L10NTARGETSTACK := gb_Module_CHECKTARGETSTACK := gb_Module_SLOWCHECKTARGETSTACK := gb_Module_SUBSEQUENTCHECKTARGETSTACK := @@ -53,8 +54,8 @@ gb_Module_CLEANTARGETSTACK := # on $(MAKEFILE_LIST). gb_Module_CURRENTMAKEFILE := -$(call gb_Module_get_almost_target,%) : - $(call gb_Output_announce,$*,$(true),ALM,5) +$(call gb_Module_get_nonl10n_target,%) : + $(call gb_Output_announce,$*,$(true),BIN,5) -$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ touch $@) @@ -64,7 +65,14 @@ $(call gb_Module_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),MOD,5) $(call gb_Output_announce_title,module $* cleared.) -$(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_Module_get_target,$*) $(call gb_Module_get_almost_target,$*) $(call gb_Module_get_check_target,$*) $(call gb_Module_get_slowcheck_target,$*) $(call gb_Module_get_subsequentcheck_target,$*)) + rm -f $(call gb_Module_get_target,$*) $(call gb_Module_get_nonl10n_target,$*) $(call gb_Module_get_l10n_target,$*) $(call gb_Module_get_check_target,$*) $(call gb_Module_get_slowcheck_target,$*) $(call gb_Module_get_subsequentcheck_target,$*) + +$(call gb_Module_get_l10n_target,%) : + $(call gb_Output_announce,$*,$(true),LOC,5) + $(call gb_Output_announce_title,module $* done.) + -$(call gb_Helper_abbreviate_dirs,\ + mkdir -p $(dir $@) && \ + touch $@) $(call gb_Module_get_check_target,%) : $(call gb_Output_announce,$*,$(true),CHK,5) @@ -94,7 +102,7 @@ $(call gb_Module_get_target,%) : mkdir -p $(dir $@) && \ touch $@) -.PHONY : all build unitcheck slowcheck subsequentcheck clean check debugrun help showmodules translations +.PHONY : all build build-l10n-only build-non-l10n-only unitcheck slowcheck subsequentcheck clean check debugrun help showmodules translations .DEFAULT_GOAL := all all : build $(if $(CROSS_COMPILING),,unitcheck $(if $(gb_PARTIAL_BUILD),,slowcheck)) @@ -110,6 +118,18 @@ build : $(call gb_Output_announce_title,build done.) $(call gb_Output_announce_bell) +build-l10n-only : + $(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),$(true),LOC,6) + $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),LOC,6) + $(call gb_Output_announce_title,l10n done.) + $(call gb_Output_announce_bell) + +build-non-l10n-only : + $(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),$(true),NLC,6) + $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),BIN,6) + $(call gb_Output_announce_title,non-l10n done.) + $(call gb_Output_announce_bell) + unitcheck : $(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),CHK,6) $(call gb_Output_announce_title,all unittests checked.) @@ -167,6 +187,7 @@ define gb_Module_Module 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) +gb_Module_L10NTARGETSTACK := $(call gb_Module_get_l10n_target,$(1)) $(gb_Module_L10NTARGETSTACK) gb_Module_CHECKTARGETSTACK := $(call gb_Module_get_check_target,$(1)) $(gb_Module_CHECKTARGETSTACK) gb_Module_SLOWCHECKTARGETSTACK := $(call gb_Module_get_slowcheck_target,$(1)) $(gb_Module_SLOWCHECKTARGETSTACK) gb_Module_SUBSEQUENTCHECKTARGETSTACK := $(call gb_Module_get_subsequentcheck_target,$(1)) $(gb_Module_SUBSEQUENTCHECKTARGETSTACK) @@ -206,9 +227,19 @@ endif endef define gb_Module_add_target +$(if $(filter AllLang% Dictionary%,$(2)),$(warning target $(2) should be a l10n target)) $(call gb_Module__read_targetfile,$(1),$(2),target) -$(call gb_Module_get_almost_target,$(1)) : $$(gb_Module_CURRENTTARGET) +$(call gb_Module_get_nonl10n_target,$(1)) : $$(gb_Module_CURRENTTARGET) +$(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)) +$(call gb_Module__read_targetfile,$(1),$(2),target) + +$(call gb_Module_get_l10n_target,$(1)) : $$(gb_Module_CURRENTTARGET) $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET) endef @@ -244,11 +275,13 @@ endef define gb_Module_add_moduledir include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))/$(2)/Module_$(2).mk $(call gb_Module_get_target,$(1)) : $$(firstword $$(gb_Module_TARGETSTACK)) +$(call gb_Module_get_l10n_target,$(1)) : $$(firstword $$(gb_Module_L10NTARGETSTACK)) $(call gb_Module_get_check_target,$(1)) : $$(firstword $$(gb_Module_CHECKTARGETSTACK)) $(call gb_Module_get_slowcheck_target,$(1)) : $$(firstword $$(gb_Module_SLOWCHECKTARGETSTACK)) $(call gb_Module_get_subsequentcheck_target,$(1)) : $$(firstword $$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)) $(call gb_Module_get_clean_target,$(1)) : $$(firstword $$(gb_Module_CLEANTARGETSTACK)) gb_Module_TARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_TARGETSTACK)),$$(gb_Module_TARGETSTACK)) +gb_Module_L10NTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_L10NTARGETSTACK)),$$(gb_Module_L10NTARGETSTACK)) gb_Module_CHECKTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_CHECKTARGETSTACK)),$$(gb_Module_CHECKTARGETSTACK)) gb_Module_SLOWCHECKTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_SLOWCHECKTARGETSTACK)),$$(gb_Module_SLOWCHECKTARGETSTACK)) gb_Module_SUBSEQUENTCHECKTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)),$$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)) @@ -257,11 +290,17 @@ gb_Module_CLEANTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_CLEANTARGETSTA endef define gb_Module_add_targets -$(call gb_Module_get_target,$(1)) : $(call gb_Module_get_almost_target,$(1)) +$(call gb_Module_get_target,$(1)) : $(call gb_Module_get_nonl10n_target,$(1)) $(foreach target,$(2),$(call gb_Module_add_target,$(1),$(target))) endef +define gb_Module_add_l10n_targets +$(call gb_Module_get_target,$(1)) : $(call gb_Module_get_l10n_target,$(1)) +$(foreach target,$(2),$(call gb_Module_add_l10n_target,$(1),$(target))) + +endef + gb_Module_add_targets_for_build = $(call gb_Module_add_targets,$(1),$(2)) define gb_Module_add_check_targets @@ -291,7 +330,9 @@ endif include $(1) -build : $$(firstword $$(gb_Module_TARGETSTACK)) +build : build-non-l10n-only build-l10n-only +build-non-l10n-only : $$(firstword $$(gb_Module_TARGETSTACK)) +build-l10n-only : $$(firstword $$(gb_Module_L10NTARGETSTACK)) unitcheck : $$(firstword $$(gb_Module_CHECKTARGETSTACK)) slowcheck : $$(firstword $$(gb_Module_SLOWCHECKTARGETSTACK)) subsequentcheck : $$(firstword $$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)) @@ -302,12 +343,13 @@ $$(eval $$(call gb_Output_error,Corrupted module target stack! $(gb_Module_TARGE endif gb_Module_TARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_TARGETSTACK)),$$(gb_Module_TARGETSTACK)) +gb_Module_L10NTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_L10NTARGETSTACK)),$$(gb_Module_L10NTARGETSTACK)) gb_Module_CHECKTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_CHECKTARGETSTACK)),$$(gb_Module_CHECKTARGETSTACK)) gb_Module_SLOWCHECKTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_SLOWCHECKTARGETSTACK)),$$(gb_Module_SLOWCHECKTARGETSTACK)) gb_Module_SUBSEQUENTCHECKTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)),$$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)) gb_Module_CLEANTARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_CLEANTARGETSTACK)),$$(gb_Module_CLEANTARGETSTACK)) -ifneq ($$(and $$(gb_Module_TARGETSTACK),$$(gb_Module_CHECKTARGETSTACK),$$(gb_Module_SLOWCHECKTARGETSTACK),$$(gb_Module_SUBSEQUENTCHECKTARGETSTACK)),) +ifneq ($$(and $$(gb_Module_TARGETSTACK),$$(gb_Module_CHECKTARGETSTACK),$$(gb_Module_SLOWCHECKTARGETSTACK),$$(gb_Module_SUBSEQUENTCHECKTARGETSTACK),$$(gb_Module_L10NTARGETSTACK)),) $$(eval $$(call gb_Output_error,Corrupted module target stack!3)) endif diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index ebd4960a0d6c..8976f446ad4e 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -113,7 +113,8 @@ gb_LinkTarget_get_dep_target = \ gb_LinkTarget_get_clean_target = \ $(WORKDIR)/Clean/LinkTarget/$(call gb_LinkTarget__get_workdir_linktargetname,$(1)) gb_LinkTarget_get_target = $(lastword $(subst <>, ,$(1))) -gb_Module_get_almost_target = $(WORKDIR)/Module/almost/$(1) +gb_Module_get_nonl10n_target = $(WORKDIR)/Module/nonl10n/$(1) +gb_Module_get_l10n_target = $(WORKDIR)/Module/l10n/$(1) gb_Module_get_check_target = $(WORKDIR)/Module/check/$(1) gb_Module_get_slowcheck_target = $(WORKDIR)/Module/slowcheck/$(1) gb_Module_get_subsequentcheck_target = $(WORKDIR)/Module/subsequentcheck/$(1) diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk index a07368b18bf9..066f8ff88827 100644 --- a/solenv/gbuild/UnpackedTarball.mk +++ b/solenv/gbuild/UnpackedTarball.mk @@ -243,7 +243,7 @@ $(if $(findstring in,$(5)), $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_IS_BIN_TARBALL := YES $(call gb_ExternalProject_get_state_target,$(1),%) : UNPACKED_IS_BIN_TARBALL := YES) $(if $(findstring out,$(5)),$(call gb_Module_get_target,$(4)) : $(gb_UnpackedTarget_TARFILE_LOCATION)/$(6) -$(gb_UnpackedTarget_TARFILE_LOCATION)/$(6) : $(call gb_Module_get_almost_target,$(4)) +$(gb_UnpackedTarget_TARFILE_LOCATION)/$(6) : $(call gb_Module_get_nonl10n_target,$(4)) $$(call gb_Output_announce,$(6),$(true),PKB,3) if test ! -f "$$@" ; then cd $(call gb_UnpackedTarball_get_dir,) && $(GNUTAR) -czf "$$@" $(1)/ || $(GNUTAR) -czf "$$@" $(1)/ ; else touch "$$@" ; fi) diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk index 18c87bf60f3c..bd434dda6c88 100644 --- a/starmath/Module_starmath.mk +++ b/starmath/Module_starmath.mk @@ -11,12 +11,15 @@ $(eval $(call gb_Module_Module,starmath)) $(eval $(call gb_Module_add_targets,starmath,\ - AllLangResTarget_sm \ Library_sm \ Library_smd \ UIConfig_smath \ )) +$(eval $(call gb_Module_add_l10n_targets,starmath,\ + AllLangResTarget_sm \ +)) + $(eval $(call gb_Module_add_check_targets,starmath,\ CppunitTest_starmath_qa_cppunit \ )) diff --git a/svl/Module_svl.mk b/svl/Module_svl.mk index d4fc672a64ac..684642c188ea 100644 --- a/svl/Module_svl.mk +++ b/svl/Module_svl.mk @@ -20,12 +20,15 @@ $(eval $(call gb_Module_Module,svl)) $(eval $(call gb_Module_add_targets,svl,\ - AllLangResTarget_svl \ Library_fsstorage \ Library_passwordcontainer \ Library_svl \ )) +$(eval $(call gb_Module_add_l10n_targets,svl,\ + AllLangResTarget_svl \ +)) + $(eval $(call gb_Module_add_check_targets,svl,\ CppunitTest_svl_lngmisc \ CppunitTest_svl_qa_cppunit \ diff --git a/svtools/Module_svtools.mk b/svtools/Module_svtools.mk index 796d034ff55c..e2a3512c7caf 100644 --- a/svtools/Module_svtools.mk +++ b/svtools/Module_svtools.mk @@ -20,12 +20,15 @@ $(eval $(call gb_Module_Module,svtools)) $(eval $(call gb_Module_add_targets,svtools,\ - AllLangResTarget_svt \ Library_hatchwindowfactory \ Library_svt \ UIConfig_svt \ )) +$(eval $(call gb_Module_add_l10n_targets,svtools,\ + AllLangResTarget_svt \ +)) + ifneq ($(CROSS_COMPILING),YES) ifneq ($(OS),WNT) diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk index dce20c0297d6..071e36fc2668 100644 --- a/svx/Module_svx.mk +++ b/svx/Module_svx.mk @@ -23,11 +23,14 @@ $(eval $(call gb_Module_add_targets,svx,\ Library_svx \ Library_svxcore \ Library_textconversiondlgs \ + UIConfig_svx \ +)) + +$(eval $(call gb_Module_add_l10n_targets,svx,\ AllLangResTarget_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 020049f7c22b..2e350872bcf3 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -20,20 +20,23 @@ $(eval $(call gb_Module_Module,sw)) $(eval $(call gb_Module_add_targets,sw,\ - AllLangResTarget_sw \ - $(if $(filter DESKTOP,$(BUILD_TYPE)), \ - Executable_tiledrendering) \ - Library_msword \ - Library_sw \ - Library_swd \ - Library_swui \ + $(if $(filter DESKTOP,$(BUILD_TYPE)), \ + Executable_tiledrendering) \ + Library_msword \ + Library_sw \ + Library_swd \ + Library_swui \ UIConfig_sglobal \ UIConfig_sweb \ UIConfig_swform \ UIConfig_swreport \ UIConfig_swriter \ UIConfig_swxform \ - UIConfig_qa \ + UIConfig_qa \ +)) + +$(eval $(call gb_Module_add_l10n_targets,sw,\ + AllLangResTarget_sw \ )) ifneq ($(DISABLE_SCRIPTING),TRUE) diff --git a/uui/Module_uui.mk b/uui/Module_uui.mk index d7d5031412a6..c827e41649f7 100644 --- a/uui/Module_uui.mk +++ b/uui/Module_uui.mk @@ -10,9 +10,12 @@ $(eval $(call gb_Module_Module,uui)) $(eval $(call gb_Module_add_targets,uui,\ - AllLangResTarget_uui \ Library_uui \ UIConfig_uui \ )) +$(eval $(call gb_Module_add_l10n_targets,uui,\ + AllLangResTarget_uui \ +)) + # vim: set noet sw=4 ts=4: diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 961a958b6996..a65736d2a99d 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -20,7 +20,6 @@ $(eval $(call gb_Module_Module,vcl)) $(eval $(call gb_Module_add_targets,vcl,\ - AllLangResTarget_vcl \ CustomTarget_afm_hash \ Library_vcl \ $(if $(filter DESKTOP,$(BUILD_TYPE)), \ @@ -29,6 +28,10 @@ $(eval $(call gb_Module_add_targets,vcl,\ UIConfig_vcl \ )) +$(eval $(call gb_Module_add_l10n_targets,vcl,\ + AllLangResTarget_vcl \ +)) + ifeq ($(GUIBASE),unx) $(eval $(call gb_Module_add_targets,vcl,\ Library_vclplug_svp \ diff --git a/wizards/Module_wizards.mk b/wizards/Module_wizards.mk index 0a7438a4e115..652033de0a33 100644 --- a/wizards/Module_wizards.mk +++ b/wizards/Module_wizards.mk @@ -20,11 +20,6 @@ $(eval $(call gb_Module_Module,wizards)) $(eval $(call gb_Module_add_targets,wizards,\ - AllLangResTarget_dbw \ - AllLangResTarget_eur \ - AllLangResTarget_imp \ - AllLangResTarget_tpl \ - AllLangResTarget_wzi \ Package_access2base \ Package_depot \ Package_euro \ @@ -44,6 +39,14 @@ $(eval $(call gb_Module_add_targets,wizards,\ Pyuno_commonwizards \ )) +$(eval $(call gb_Module_add_l10n_targets,wizards,\ + AllLangResTarget_dbw \ + AllLangResTarget_eur \ + AllLangResTarget_imp \ + AllLangResTarget_tpl \ + AllLangResTarget_wzi \ +)) + ifeq ($(ENABLE_JAVA),TRUE) $(eval $(call gb_Module_add_targets,wizards,\ Jar_commonwizards \ diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk index 65a0ecb1a5d2..d29444c5924e 100644 --- a/xmlsecurity/Module_xmlsecurity.mk +++ b/xmlsecurity/Module_xmlsecurity.mk @@ -10,13 +10,16 @@ $(eval $(call gb_Module_Module,xmlsecurity)) $(eval $(call gb_Module_add_targets,xmlsecurity,\ - AllLangResTarget_xsec \ 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 \ +)) + #FIXME: ^^^, get nss&libxmlsec building on ios and android # failing |