Hi, I have submitted a patch for review:
https://gerrit.libreoffice.org/3650 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/50/3650/1 fdo#63197: convert liblangtag_data Change-Id: I0727b800c715962a88e256b30046c9e13d6bd2a9 --- A liblangtag/ExternalPackage_liblangtag_data.mk M liblangtag/Module_liblangtag.mk D liblangtag/Zip_liblangtag_data.mk M scp2/source/ooo/file_extra_ooo.scp 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/liblangtag/ExternalPackage_liblangtag_data.mk b/liblangtag/ExternalPackage_liblangtag_data.mk new file mode 100644 index 0000000..a56211f --- /dev/null +++ b/liblangtag/ExternalPackage_liblangtag_data.mk @@ -0,0 +1,30 @@ +# -*- 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_ExternalPackage_ExternalPackage,liblangtag_data,langtag)) + +$(eval $(call gb_ExternalPackage_set_outdir,liblangtag_data,$(INSTDIR))) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,share/liblangtag,\ + data/language-subtag-registry.xml \ + data/common/bcp47/calendar.xml \ + data/common/bcp47/collation.xml \ + data/common/bcp47/currency.xml \ + data/common/bcp47/number.xml \ + data/common/bcp47/timezone.xml \ + data/common/bcp47/transform.xml \ + data/common/bcp47/transform_ime.xml \ + data/common/bcp47/transform_keyboard.xml \ + data/common/bcp47/transform_mt.xml \ + data/common/bcp47/transform_private_use.xml \ + data/common/bcp47/variant.xml \ + data/common/supplemental/likelySubtags.xml \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/liblangtag/Module_liblangtag.mk b/liblangtag/Module_liblangtag.mk index b5e9cc3..36201f8 100644 --- a/liblangtag/Module_liblangtag.mk +++ b/liblangtag/Module_liblangtag.mk @@ -17,7 +17,7 @@ ExternalPackage_langtag_data \ ExternalPackage_langtag \ ExternalProject_langtag \ - Zip_liblangtag_data \ + ExternalPackage_liblangtag_data \ )) endif endif diff --git a/liblangtag/Zip_liblangtag_data.mk b/liblangtag/Zip_liblangtag_data.mk deleted file mode 100644 index 54b3080..0000000 --- a/liblangtag/Zip_liblangtag_data.mk +++ /dev/null @@ -1,30 +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,liblangtag_data,$(call gb_UnpackedTarball_get_dir,langtag/data))) - -$(eval $(call gb_Zip_use_unpacked,liblangtag_data,langtag)) - -$(eval $(call gb_Zip_add_files,liblangtag_data,\ - language-subtag-registry.xml \ - common/bcp47/calendar.xml \ - common/bcp47/collation.xml \ - common/bcp47/currency.xml \ - common/bcp47/number.xml \ - common/bcp47/timezone.xml \ - common/bcp47/transform.xml \ - common/bcp47/transform_ime.xml \ - common/bcp47/transform_keyboard.xml \ - common/bcp47/transform_mt.xml \ - common/bcp47/transform_private_use.xml \ - common/bcp47/variant.xml \ - common/supplemental/likelySubtags.xml \ -)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index 93ebc12..92855f7 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -147,10 +147,10 @@ #if defined( ENABLE_LIBLANGTAG ) && !defined( SYSTEM_LIBLANGTAG ) File gid_File_Extra_Liblangtag - Dir = gid_Dir_Share_Liblangtag; + Dir = FILELIST_DIR; USER_FILE_BODY; - Styles = (ARCHIVE); - Name = "liblangtag_data.zip"; + Styles = (FILELIST); + Name = "liblangtag_data.filelist"; End #endif -- To view, visit https://gerrit.libreoffice.org/3650 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0727b800c715962a88e256b30046c9e13d6bd2a9 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Julien Nabet <serval2...@yahoo.fr> _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice