[Libreoffice-commits] core.git: extras/Module_extras.mk extras/Persona_dark.mk extras/Persona_gray.mk extras/Persona_green.mk extras/Persona_pink.mk extras/Persona_sand.mk extras/Personas.mk extras/Persona_white.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Oct 27 16:09:34 UTC 2018
extras/Module_extras.mk | 6 ------
extras/Persona_dark.mk | 18 ------------------
extras/Persona_gray.mk | 18 ------------------
extras/Persona_green.mk | 18 ------------------
extras/Persona_pink.mk | 18 ------------------
extras/Persona_sand.mk | 18 ------------------
extras/Persona_white.mk | 18 ------------------
extras/Personas.mk | 16 ++++++++++++++++
8 files changed, 16 insertions(+), 114 deletions(-)
New commits:
commit 3cccff0bbd17ecd4ce386c9eaea06bfa3d14115b
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Sat Oct 27 16:26:04 2018 +0200
Commit: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Sat Oct 27 18:09:11 2018 +0200
simplify personas generation by using a single template
Change-Id: I127181fff198dd865d0d958675db7446c73d09d0
Reviewed-on: https://gerrit.libreoffice.org/62427
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Tested-by: Jenkins
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 9404299c8dbc..01bf26695377 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -74,12 +74,6 @@ endif
$(eval $(call gb_Module_add_targets,extras,\
Personas \
- Persona_dark \
- Persona_gray \
- Persona_green \
- Persona_pink \
- Persona_sand \
- Persona_white \
))
$(eval $(call gb_Module_add_targets,extras,\
diff --git a/extras/Persona_dark.mk b/extras/Persona_dark.mk
deleted file mode 100644
index 9c27dd05c049..000000000000
--- a/extras/Persona_dark.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- 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,extras_persona_dark,$(SRCDIR)/extras/source/gallery/personas/dark))
-
-$(eval $(call gb_Package_add_files,extras_persona_dark,$(LIBO_SHARE_FOLDER)/gallery/personas/dark,\
- footer.png \
- header.png \
- preview.png \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Persona_gray.mk b/extras/Persona_gray.mk
deleted file mode 100644
index 4c2ae61f248d..000000000000
--- a/extras/Persona_gray.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- 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,extras_persona_gray,$(SRCDIR)/extras/source/gallery/personas/gray))
-
-$(eval $(call gb_Package_add_files,extras_persona_gray,$(LIBO_SHARE_FOLDER)/gallery/personas/gray,\
- footer.png \
- header.png \
- preview.png \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Persona_green.mk b/extras/Persona_green.mk
deleted file mode 100644
index 2c89f15cd640..000000000000
--- a/extras/Persona_green.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- 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,extras_persona_green,$(SRCDIR)/extras/source/gallery/personas/green))
-
-$(eval $(call gb_Package_add_files,extras_persona_green,$(LIBO_SHARE_FOLDER)/gallery/personas/green,\
- footer.png \
- header.png \
- preview.png \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Persona_pink.mk b/extras/Persona_pink.mk
deleted file mode 100644
index d60d1962b5d9..000000000000
--- a/extras/Persona_pink.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- 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,extras_persona_pink,$(SRCDIR)/extras/source/gallery/personas/pink))
-
-$(eval $(call gb_Package_add_files,extras_persona_pink,$(LIBO_SHARE_FOLDER)/gallery/personas/pink,\
- footer.png \
- header.png \
- preview.png \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Persona_sand.mk b/extras/Persona_sand.mk
deleted file mode 100644
index 113cdfbd6c4d..000000000000
--- a/extras/Persona_sand.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- 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,extras_persona_sand,$(SRCDIR)/extras/source/gallery/personas/sand))
-
-$(eval $(call gb_Package_add_files,extras_persona_sand,$(LIBO_SHARE_FOLDER)/gallery/personas/sand,\
- footer.png \
- header.png \
- preview.png \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Persona_white.mk b/extras/Persona_white.mk
deleted file mode 100644
index ff830d8ab953..000000000000
--- a/extras/Persona_white.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- 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,extras_persona_white,$(SRCDIR)/extras/source/gallery/personas/white))
-
-$(eval $(call gb_Package_add_files,extras_persona_white,$(LIBO_SHARE_FOLDER)/gallery/personas/white,\
- footer.png \
- header.png \
- preview.png \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Personas.mk b/extras/Personas.mk
index 15f599f85271..6a924c81a71a 100644
--- a/extras/Personas.mk
+++ b/extras/Personas.mk
@@ -7,8 +7,24 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
+LO_PERSONAS_LIST=dark gray green pink sand white
+
+$(foreach persona,$(LO_PERSONAS_LIST),\
+ $(eval $(call gb_Package_Package,extras_persona_$(persona),$(SRCDIR)/extras/source/gallery/personas/$(persona))) \
+ $(eval $(call gb_Package_add_files,extras_persona_$(persona),$(LIBO_SHARE_FOLDER)/gallery/personas/$(persona),\
+ footer.png \
+ header.png \
+ preview.png \
+ ))\
+ $(eval $(call gb_Package_get_target,extras_personas): $(call gb_Package_get_target,extras_persona_$(persona))) \
+)
+
$(eval $(call gb_Package_Package,extras_personas,$(SRCDIR)/extras/source/gallery/personas))
+$(call gb_Package_get_clean_target,extras_personas):
+ rm -rf $(INSTROOT)/$(LIBO_SHARE_FOLDER)/gallery/personas
+
+# TODO: generate this, and potentiallly make labels translatable
$(eval $(call gb_Package_add_files,extras_personas,$(LIBO_SHARE_FOLDER)/gallery/personas,\
personas_list.txt \
))
More information about the Libreoffice-commits
mailing list