CWS gnumake3: merge minibranches

5 files changed, 211 insertions, 139 deletions

diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 1c09deefb102..3c5934dbeb7a 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -102,7 +102,7 @@ endif
 
 
 define gb_SrsPartTarget_SrsPartTarget
-ifeq ($(strip $(WITH_LANG)),)
+ifeq ($(strip $(gb_WITH_LANG)),)
 $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := 
 else
 $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := $(call gb_SrsPartMergeTarget_get_target,$(1))
@@ -282,7 +282,7 @@ endef
 
 # AllLangResTarget
 
-gb_AllLangResTarget_LANGS := en-US $(WITH_LANG)
+gb_AllLangResTarget_LANGS := en-US $(filter-out en-US,$(gb_WITH_LANG))
 
 define gb_AllLangResTarget_set_langs
 gb_AllLangResTarget_LANGS := $(1)
diff --git a/solenv/gbuild/extensions/pre_SharedLangList.mk b/solenv/gbuild/extensions/pre_SharedLangList.mk
new file mode 100644
index 000000000000..47669daa0a13
--- /dev/null
+++ b/solenv/gbuild/extensions/pre_SharedLangList.mk
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# share language list with dmake build system
+include $(SOLARENV)/inc/langlist.mk
+
+ifneq ($(WITH_LANG),ALL)
+gb_WITH_LANG=$(WITH_LANG)
+else
+# expand ALL based on language list)
+gb_WITH_LANG=$(completelangiso)
+endif
+
+# vim: set noet ts=4 sw=4:
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 9a71942286bc..7880bb91b2ac 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -62,6 +62,11 @@ endef
 
 COMMA :=,
 
+# optional extensions that should never be essential
+ifneq ($(wildcard $(GBUILDDIR)/extensions/pre_*.mk),)
+include $(wildcard $(GBUILDDIR)/extensions/pre_*.mk)
+endif
+
 include $(GBUILDDIR)/Output.mk
 
 # BuildDirs uses the Output functions already
@@ -224,8 +229,8 @@ include $(foreach class, \
 ,$(GBUILDDIR)/$(class).mk)
 
 # optional extensions that should never be essential
-ifneq ($(wildcard $(GBUILDDIR)/extensions/*.mk),)
-include $(wildcard $(GBUILDDIR)/extensions/*.mk)
+ifneq ($(wildcard $(GBUILDDIR)/extensions/post_*.mk),)
+include $(wildcard $(GBUILDDIR)/extensions/post_*.mk)
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
new file mode 100644
index 000000000000..32045cbf6262
--- /dev/null
+++ b/solenv/inc/langlist.mk
@@ -0,0 +1,163 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+
+completelangiso=af \
+ar \
+as \
+as-IN \
+ast \
+be-BY \
+bo \
+bg \
+br \
+brx \
+bn \
+bn-BD \
+bn-IN \
+bs \
+by \
+ca \
+ca-XV \
+cs \
+cy \
+da \
+de \
+dgo \
+dz \
+el \
+en-GB \
+en-US \
+en-ZA \
+eo \
+es \
+et \
+eu \
+fa \
+fi \
+fr \
+ga \
+gd \
+gl \
+gu \
+gu-IN \
+he \
+hi \
+hi-IN \
+hr \
+hu \
+is \
+it \
+ja \
+kid \
+ky \
+ka \
+kab \
+kk \
+km \
+kn \
+ko \
+kok \
+ks \
+ku \
+lo \
+lt \
+lv \
+mai \
+mk \
+mn \
+mni \
+ms \
+ml \
+ml-IN \
+mr \
+mr-IN \
+my \
+ne \
+nb \
+nl \
+nn \
+nr \
+ns \
+nso \
+om \
+oms \
+oc \
+or \
+or-IN \
+pap \
+pa \
+pa-IN \
+pl \
+ps \
+pt \
+pt-BR \
+gug \
+pyg \
+ro \
+ru \
+rw \
+sat \
+sa \
+sa-IN \
+si \
+sc \
+sd \
+sq \
+sk \
+sl \
+sh \
+son \
+sr \
+ss \
+st \
+sv \
+sw \
+sw-TZ \
+te \
+te-IN \
+ti \
+ti-ER \
+ta \
+ta-IN \
+tlh \
+th \
+tn \
+tr \
+ts \
+tg \
+ug \
+ur \
+ur-IN \
+uk \
+uz \
+ve \
+vi \
+xh \
+zh-CN \
+zh-TW \
+zu
diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk
index 888098fde3df..59d37a95405e 100644
--- a/solenv/inc/postset.mk
+++ b/solenv/inc/postset.mk
@@ -30,140 +30,6 @@
 defaultlangiso=en-US
 
 # Complete list of all supported ISO codes
-completelangiso=af \
-ar \
-as \
-as-IN \
-ast \
-be-BY \
-bo \
-bg \
-br \
-brx \
-bn \
-bn-BD \
-bn-IN \
-bs \
-by \
-ca \
-ca-XV \
-cs \
-cy \
-da \
-de \
-dgo \
-dz \
-el \
-en-GB \
-en-US \
-en-ZA \
-eo \
-es \
-et \
-eu \
-fa \
-fi \
-fr \
-ga \
-gd \
-gl \
-gu \
-gu-IN \
-he \
-hi \
-hi-IN \
-hr \
-hu \
-is \
-it \
-ja \
-kid \
-ky \
-ka \
-kab \
-kk \
-km \
-kn \
-ko \
-kok \
-ks \
-ku \
-lo \
-lt \
-lv \
-mai \
-mk \
-mn \
-mni \
-ms \
-ml \
-ml-IN \
-mr \
-mr-IN \
-my \
-ne \
-nb \
-nl \
-nn \
-nr \
-ns \
-nso \
-om \
-oms \
-oc \
-or \
-or-IN \
-pap \
-pa \
-pa-IN \
-pl \
-ps \
-pt \
-pt-BR \
-gug \
-pyg \
-ro \
-ru \
-rw \
-sat \
-sa \
-sa-IN \
-si \
-sc \
-sd \
-sq \
-sk \
-sl \
-sh \
-son \
-sr \
-ss \
-st \
-sv \
-sw \
-sw-TZ \
-te \
-te-IN \
-ti \
-ti-ER \
-ta \
-ta-IN \
-tlh \
-th \
-tn \
-tr \
-ts \
-tg \
-ug \
-ur \
-ur-IN \
-uk \
-uz \
-ve \
-vi \
-xh \
-zh-CN \
-zh-TW \
-zu
+.INCLUDE : langlist.mk
 
 alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG)))))