[Libreoffice-commits] core.git: 2 commits - config_host.mk.in configure.ac readlicense_oo/Module_readlicense_oo.mk readlicense_oo/Package_readlicense_oo_readmes.mk

[Stephan Bergmann]

 config_host.mk.in                                |    1 +
 configure.ac                                     |    6 +++++-
 readlicense_oo/Module_readlicense_oo.mk          |    1 +
 readlicense_oo/Package_readlicense_oo_readmes.mk |   17 +++++++++++++++++
 4 files changed, 24 insertions(+), 1 deletion(-)

New commits:
commit e035b03a91324c7856577c64bcb715a1f36f6c8b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jan 7 13:47:22 2016 +0100

    Add readmes to instdir, too
    
    ...to reduce unnecessary differences between instdir and instsets.
    (Maybe CustomTarget_readmes could even generate the README_* directly into instdir?)
    
    Change-Id: If243a229e6f0e401abe6708899964f7b5949cc09

diff --git a/config_host.mk.in b/config_host.mk.in
index 06ea207..c5ec25e 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -339,6 +339,7 @@ export LIBO_SHARE_FOLDER=@LIBO_SHARE_FOLDER@
 export LIBO_SHARE_HELP_FOLDER=@LIBO_SHARE_HELP_FOLDER@
 export LIBO_SHARE_JAVA_FOLDER=@LIBO_SHARE_JAVA_FOLDER@
 export LIBO_SHARE_PRESETS_FOLDER=@LIBO_SHARE_PRESETS_FOLDER@
+export LIBO_SHARE_READMES_FOLDER=@LIBO_SHARE_READMES_FOLDER@
 export LIBO_SHARE_RESOURCE_FOLDER=@LIBO_SHARE_RESOURCE_FOLDER@
 export LIBO_URE_BIN_FOLDER=@LIBO_URE_BIN_FOLDER@
 export LIBO_URE_ETC_FOLDER=@LIBO_URE_ETC_FOLDER@
diff --git a/configure.ac b/configure.ac
index 5c4aa27..2493e13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3145,6 +3145,7 @@ if test $_os = Darwin; then
     LIBO_SHARE_HELP_FOLDER=Resources/help
     LIBO_SHARE_JAVA_FOLDER=Resources/java
     LIBO_SHARE_PRESETS_FOLDER=Resources/presets
+    LIBO_SHARE_READMES_FOLDER=Resources/readmes
     LIBO_SHARE_RESOURCE_FOLDER=Resources/resource
     LIBO_SHARE_SHELL_FOLDER=Resources/shell
     LIBO_URE_BIN_FOLDER=MacOS
@@ -3162,6 +3163,7 @@ elif test $_os = WINNT; then
     LIBO_SHARE_HELP_FOLDER=help
     LIBO_SHARE_JAVA_FOLDER=program/classes
     LIBO_SHARE_PRESETS_FOLDER=presets
+    LIBO_SHARE_READMES_FOLDER=readmes
     LIBO_SHARE_RESOURCE_FOLDER=program/resource
     LIBO_SHARE_SHELL_FOLDER=program/shell
     LIBO_URE_BIN_FOLDER=program
@@ -3179,6 +3181,7 @@ else
     LIBO_SHARE_HELP_FOLDER=help
     LIBO_SHARE_JAVA_FOLDER=program/classes
     LIBO_SHARE_PRESETS_FOLDER=presets
+    LIBO_SHARE_READMES_FOLDER=readmes
     LIBO_SHARE_RESOURCE_FOLDER=program/resource
     LIBO_SHARE_SHELL_FOLDER=program/shell
     LIBO_URE_BIN_FOLDER=program
@@ -3213,6 +3216,7 @@ AC_SUBST(LIBO_SHARE_FOLDER)
 AC_SUBST(LIBO_SHARE_HELP_FOLDER)
 AC_SUBST(LIBO_SHARE_JAVA_FOLDER)
 AC_SUBST(LIBO_SHARE_PRESETS_FOLDER)
+AC_SUBST(LIBO_SHARE_READMES_FOLDER)
 AC_SUBST(LIBO_SHARE_RESOURCE_FOLDER)
 AC_SUBST(LIBO_URE_BIN_FOLDER)
 AC_SUBST(LIBO_URE_ETC_FOLDER)
diff --git a/readlicense_oo/Module_readlicense_oo.mk b/readlicense_oo/Module_readlicense_oo.mk
index 3170e13..f3f2a7d 100644
--- a/readlicense_oo/Module_readlicense_oo.mk
+++ b/readlicense_oo/Module_readlicense_oo.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,readlicense_oo))
 $(eval $(call gb_Module_add_targets,readlicense_oo,\
     CustomTarget_readme \
     Package_files \
+    Package_readlicense_oo_readmes \
 ))
 
 ifeq (WNT,$(OS))
diff --git a/readlicense_oo/Package_readlicense_oo_readmes.mk b/readlicense_oo/Package_readlicense_oo_readmes.mk
new file mode 100644
index 0000000..bce3c0c
--- /dev/null
+++ b/readlicense_oo/Package_readlicense_oo_readmes.mk
@@ -0,0 +1,17 @@
+# -*- 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/.
+#
+
+$(eval $(call gb_Package_Package,readlicense_oo_readmes,$(call gb_CustomTarget_get_workdir,readlicense_oo/readme)))
+
+$(eval $(call gb_Package_add_files,readlicense_oo_readmes,$(LIBO_SHARE_READMES_FOLDER), \
+    $(foreach lang,$(readlicense_oo_LANGS),$(call gb_README,$(lang))) \
+))
+    # readlicense_oo_LANGS from readlicense_oo/CustomTarget_readme.mk
+
+# vim: set noet sw=4 ts=4:
commit 5124dc4ae6f5e4c9497f2aecaddf364f3c7a1757
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jan 7 13:31:42 2016 +0100

    sort lines
    
    Change-Id: I2b19708952dace09621724f5420dbc0e300f960c

diff --git a/configure.ac b/configure.ac
index 35cffc1..5c4aa27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3140,11 +3140,11 @@ if test $_os = Darwin; then
     LIBO_ETC_FOLDER=Resources
     LIBO_LIBEXEC_FOLDER=MacOS
     LIBO_LIB_FOLDER=Frameworks
+    LIBO_LIB_PYUNO_FOLDER=Resources
     LIBO_SHARE_FOLDER=Resources
     LIBO_SHARE_HELP_FOLDER=Resources/help
     LIBO_SHARE_JAVA_FOLDER=Resources/java
     LIBO_SHARE_PRESETS_FOLDER=Resources/presets
-    LIBO_LIB_PYUNO_FOLDER=Resources
     LIBO_SHARE_RESOURCE_FOLDER=Resources/resource
     LIBO_SHARE_SHELL_FOLDER=Resources/shell
     LIBO_URE_BIN_FOLDER=MacOS