From dcdc7bf5520b4b26090db52d8437c513a79d41ed Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 14 Apr 2013 12:59:48 +0200 Subject: install librelogo using filelists Change-Id: Iffd409c66608d4e67eee9e149f0063f09e0e4675 --- librelogo/Module_librelogo.mk | 3 +- librelogo/Package_librelogo.mk | 40 +++++++++++++++++++++ librelogo/Package_librelogo_properties.mk | 18 ++++++++++ librelogo/Zip_librelogo.mk | 49 -------------------------- scp2/source/python/file_python_librelogo.scp | 13 +++++-- scp2/source/python/module_python_librelogo.scp | 1 + 6 files changed, 71 insertions(+), 53 deletions(-) create mode 100644 librelogo/Package_librelogo.mk create mode 100644 librelogo/Package_librelogo_properties.mk delete mode 100644 librelogo/Zip_librelogo.mk diff --git a/librelogo/Module_librelogo.mk b/librelogo/Module_librelogo.mk index caa4cf96efb0..5d8996fc466f 100644 --- a/librelogo/Module_librelogo.mk +++ b/librelogo/Module_librelogo.mk @@ -14,7 +14,8 @@ ifneq ($(DISABLE_PYTHON),TRUE) $(eval $(call gb_Module_add_targets,librelogo,\ CustomTarget_librelogo \ - Zip_librelogo \ + Package_librelogo \ + Package_librelogo_properties \ )) endif diff --git a/librelogo/Package_librelogo.mk b/librelogo/Package_librelogo.mk new file mode 100644 index 000000000000..71181ce25d43 --- /dev/null +++ b/librelogo/Package_librelogo.mk @@ -0,0 +1,40 @@ +# -*- 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,librelogo,$(SRCDIR)/librelogo/source)) + +$(eval $(call gb_Package_set_outdir,librelogo,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,librelogo,share/Scripts/python/LibreLogo,\ + LibreLogo/LibreLogo.py \ + pythonpath/LibreLogo_en_US.properties \ +)) + +$(eval $(call gb_Package_add_files,librelogo,share/Scripts/python/LibreLogo/icons,\ + icons/lc_arrowshapes.circular-arrow.png \ + icons/lc_arrowshapes.circular-leftarrow.png \ + icons/lc_arrowshapes.down-arrow.png \ + icons/lc_arrowshapes.up-arrow.png \ + icons/lc_basicstop.png \ + icons/lc_editglossary.png \ + icons/lc_navigationbarleft.png \ + icons/lc_newdoc.png \ + icons/lc_runbasic.png \ + icons/sc_arrowshapes.circular-arrow.png \ + icons/sc_arrowshapes.circular-leftarrow.png \ + icons/sc_arrowshapes.down-arrow.png \ + icons/sc_arrowshapes.up-arrow.png \ + icons/sc_basicstop.png \ + icons/sc_editglossary.png \ + icons/sc_navigationbarleft.png \ + icons/sc_newdoc.png \ + icons/sc_runbasic.png \ +)) + +# vim:set noet sw=4 ts=4: diff --git a/librelogo/Package_librelogo_properties.mk b/librelogo/Package_librelogo_properties.mk new file mode 100644 index 000000000000..3377470281e2 --- /dev/null +++ b/librelogo/Package_librelogo_properties.mk @@ -0,0 +1,18 @@ +# -*- 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,librelogo_properties,$(call gb_CustomTarget_get_workdir,librelogo/locproperties))) + +$(eval $(call gb_Package_set_outdir,librelogo_properties,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,librelogo_properties,share/Scripts/python/LibreLogo,\ + $(foreach lang,$(subst -,_,$(gb_TRANS_LANGS)),LibreLogo_$(lang).properties) \ +)) + +# vim:set noet sw=4 ts=4: diff --git a/librelogo/Zip_librelogo.mk b/librelogo/Zip_librelogo.mk deleted file mode 100644 index d4ca7507a20f..000000000000 --- a/librelogo/Zip_librelogo.mk +++ /dev/null @@ -1,49 +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_Zip_Zip,LibreLogo,$(WORKDIR)/Zip/LibreLogo)) - -$(eval $(call gb_Zip_add_file,LibreLogo,python/LibreLogo/LibreLogo.py,\ - $(SRCDIR)/librelogo/source/LibreLogo/LibreLogo.py \ -)) - -$(eval $(call gb_Zip_add_file,LibreLogo,python/LibreLogo/LibreLogo_en_US.properties,\ - $(SRCDIR)/librelogo/source/pythonpath/LibreLogo_en_US.properties \ -)) - -librelogo_LANGS := $(subst -,_,$(filter-out qtz,$(filter-out en-US,$(gb_WITH_LANG)))) - -$(eval $(foreach lang,$(librelogo_LANGS),\ - $(call gb_Zip_add_file,LibreLogo,python/LibreLogo/LibreLogo_$(lang).properties,\ - $(call gb_CustomTarget_get_workdir,librelogo/locproperties)/LibreLogo_$(lang).properties))) - -$(eval $(foreach icon,\ - lc_arrowshapes.circular-arrow.png \ - lc_arrowshapes.circular-leftarrow.png \ - lc_arrowshapes.down-arrow.png \ - lc_arrowshapes.up-arrow.png \ - lc_basicstop.png \ - lc_editglossary.png \ - lc_navigationbarleft.png \ - lc_newdoc.png \ - lc_runbasic.png \ - sc_arrowshapes.circular-arrow.png \ - sc_arrowshapes.circular-leftarrow.png \ - sc_arrowshapes.down-arrow.png \ - sc_arrowshapes.up-arrow.png \ - sc_basicstop.png \ - sc_editglossary.png \ - sc_navigationbarleft.png \ - sc_newdoc.png \ - sc_runbasic.png, \ - $(call gb_Zip_add_file,LibreLogo,python/LibreLogo/icons/$(icon),\ - $(SRCDIR)/librelogo/source/icons/$(icon) \ -))) - -# vim:set noet sw=4 ts=4: diff --git a/scp2/source/python/file_python_librelogo.scp b/scp2/source/python/file_python_librelogo.scp index a089262fb999..d78bdd2f4573 100644 --- a/scp2/source/python/file_python_librelogo.scp +++ b/scp2/source/python/file_python_librelogo.scp @@ -12,9 +12,16 @@ #ifndef DISABLE_PYUNO File gid_File_LibreLogo TXT_FILE_BODY; - Styles = (ARCHIVE); - Dir = gid_Dir_Share_Scripts; - Name = "LibreLogo.zip"; + Styles = (FILELIST); + Dir = FILELIST_DIR; + Name = "librelogo.filelist"; +End + +File gid_File_LibreLogoProperties + TXT_FILE_BODY; + Styles = (FILELIST); + Dir = FILELIST_DIR; + Name = "librelogo_properties.filelist"; End File gid_File_Share_Registry_LibreLogo_Xcd diff --git a/scp2/source/python/module_python_librelogo.scp b/scp2/source/python/module_python_librelogo.scp index dac4a9c5fde6..0c35d619cc02 100644 --- a/scp2/source/python/module_python_librelogo.scp +++ b/scp2/source/python/module_python_librelogo.scp @@ -16,6 +16,7 @@ Module gid_Module_Optional_Pyuno_LibreLogo ParentID = gid_Module_Optional; Sortkey = "810"; Files = (gid_File_LibreLogo, + gid_File_LibreLogoProperties, gid_File_Share_Registry_LibreLogo_Xcd); Minimal = NO; Default = YES; -- cgit