install libexttextcat fingerprint data using filelist

Change-Id: I1576b60bc511bdac964decd5a7f8c3834281f380

4 files changed, 176 insertions, 178 deletions

diff --git a/libexttextcat/ExternalPackage_fingerprint.mk b/libexttextcat/ExternalPackage_fingerprint.mk
new file mode 100644
index 000000000000..be9ce907e634
--- /dev/null
+++ b/libexttextcat/ExternalPackage_fingerprint.mk
@@ -0,0 +1,172 @@
+# -*- 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,libexttextcat_fingerprint,exttextcat))
+
+$(eval $(call gb_ExternalPackage_set_outdir,libexttextcat_fingerprint,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_files,libexttextcat_fingerprint,share/fingerprint,\
+	langclass/fpdb.conf \
+	langclass/LM/ab.lm \
+	langclass/LM/ace.lm \
+	langclass/LM/ada.lm \
+	langclass/LM/af.lm \
+	langclass/LM/alt.lm \
+	langclass/LM/am.lm \
+	langclass/LM/ar.lm \
+	langclass/LM/arn.lm \
+	langclass/LM/ast.lm \
+	langclass/LM/ay.lm \
+	langclass/LM/az-Cyrl.lm \
+	langclass/LM/az.lm \
+	langclass/LM/ban.lm \
+	langclass/LM/be.lm \
+	langclass/LM/bem.lm \
+	langclass/LM/bg.lm \
+	langclass/LM/bho.lm \
+	langclass/LM/bi.lm \
+	langclass/LM/bik.lm \
+	langclass/LM/bm.lm \
+	langclass/LM/bn.lm \
+	langclass/LM/bo.lm \
+	langclass/LM/br.lm \
+	langclass/LM/bs.lm \
+	langclass/LM/ca.lm \
+	langclass/LM/cs.lm \
+	langclass/LM/cy.lm \
+	langclass/LM/da.lm \
+	langclass/LM/de.lm \
+	langclass/LM/dv.lm \
+	langclass/LM/ee.lm \
+	langclass/LM/el.lm \
+	langclass/LM/en.lm \
+	langclass/LM/eo.lm \
+	langclass/LM/es.lm \
+	langclass/LM/et.lm \
+	langclass/LM/eu.lm \
+	langclass/LM/fa.lm \
+	langclass/LM/fi.lm \
+	langclass/LM/fj.lm \
+	langclass/LM/fo.lm \
+	langclass/LM/fr.lm \
+	langclass/LM/fur.lm \
+	langclass/LM/fy.lm \
+	langclass/LM/ga.lm \
+	langclass/LM/gd.lm \
+	langclass/LM/gl.lm \
+	langclass/LM/grc.lm \
+	langclass/LM/gu.lm \
+	langclass/LM/gug.lm \
+	langclass/LM/gv.lm \
+	langclass/LM/ha-NG.lm \
+	langclass/LM/haw.lm \
+	langclass/LM/he.lm \
+	langclass/LM/hi.lm \
+	langclass/LM/hil.lm \
+	langclass/LM/hr.lm \
+	langclass/LM/hsb.lm \
+	langclass/LM/ht.lm \
+	langclass/LM/hu.lm \
+	langclass/LM/hy.lm \
+	langclass/LM/ia.lm \
+	langclass/LM/id.lm \
+	langclass/LM/is.lm \
+	langclass/LM/it.lm \
+	langclass/LM/ja.lm \
+	langclass/LM/ka.lm \
+	langclass/LM/kk.lm \
+	langclass/LM/kl.lm \
+	langclass/LM/km.lm \
+	langclass/LM/kn.lm \
+	langclass/LM/ko.lm \
+	langclass/LM/ktu.lm \
+	langclass/LM/ky.lm \
+	langclass/LM/la.lm \
+	langclass/LM/lb.lm \
+	langclass/LM/lg.lm \
+	langclass/LM/ln.lm \
+	langclass/LM/lo.lm \
+	langclass/LM/lt.lm \
+	langclass/LM/lv.lm \
+	langclass/LM/mai.lm \
+	langclass/LM/mi.lm \
+	langclass/LM/mk.lm \
+	langclass/LM/ml.lm \
+	langclass/LM/mn.lm \
+	langclass/LM/mos.lm \
+	langclass/LM/mr.lm \
+	langclass/LM/ms.lm \
+	langclass/LM/mt.lm \
+	langclass/LM/my.lm \
+	langclass/LM/nb.lm \
+	langclass/LM/ne.lm \
+	langclass/LM/nl.lm \
+	langclass/LM/nn.lm \
+	langclass/LM/nr.lm \
+	langclass/LM/nso.lm \
+	langclass/LM/ny.lm \
+	langclass/LM/oc.lm \
+	langclass/LM/om.lm \
+	langclass/LM/pa.lm \
+	langclass/LM/pl.lm \
+	langclass/LM/plt.lm \
+	langclass/LM/pt.lm \
+	langclass/LM/qxa.lm \
+	langclass/LM/rm.lm \
+	langclass/LM/ro.lm \
+	langclass/LM/ru.lm \
+	langclass/LM/rue.lm \
+	langclass/LM/rw.lm \
+	langclass/LM/sa.lm \
+	langclass/LM/sc.lm \
+	langclass/LM/sco.lm \
+	langclass/LM/sd.lm \
+	langclass/LM/se.lm \
+	langclass/LM/sg.lm \
+	langclass/LM/shs.lm \
+	langclass/LM/si.lm \
+	langclass/LM/sk.lm \
+	langclass/LM/sl.lm \
+	langclass/LM/so.lm \
+	langclass/LM/sq.lm \
+	langclass/LM/sr-Cyrl.lm \
+	langclass/LM/sr-Latn.lm \
+	langclass/LM/ss.lm \
+	langclass/LM/st.lm \
+	langclass/LM/sv.lm \
+	langclass/LM/sw.lm \
+	langclass/LM/ta.lm \
+	langclass/LM/tet.lm \
+	langclass/LM/tg.lm \
+	langclass/LM/th.lm \
+	langclass/LM/ti.lm \
+	langclass/LM/tk.lm \
+	langclass/LM/tl.lm \
+	langclass/LM/tn.lm \
+	langclass/LM/tpi.lm \
+	langclass/LM/tr.lm \
+	langclass/LM/ts.lm \
+	langclass/LM/tt.lm \
+	langclass/LM/ty.lm \
+	langclass/LM/ug.lm \
+	langclass/LM/uk.lm \
+	langclass/LM/ur.lm \
+	langclass/LM/uz.lm \
+	langclass/LM/ve.lm \
+	langclass/LM/vi.lm \
+	langclass/LM/wa.lm \
+	langclass/LM/xh.lm \
+	langclass/LM/yi.lm \
+	langclass/LM/yo.lm \
+	langclass/LM/zh-Hans.lm \
+	langclass/LM/zh-Hant.lm \
+	langclass/LM/zu.lm \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libexttextcat/Module_libexttextcat.mk b/libexttextcat/Module_libexttextcat.mk
index 43cc3067d735..29c48158aed6 100644
--- a/libexttextcat/Module_libexttextcat.mk
+++ b/libexttextcat/Module_libexttextcat.mk
@@ -11,8 +11,8 @@ $(eval $(call gb_Module_Module,libexttextcat))
 
 ifeq ($(SYSTEM_LIBEXTTEXTCAT),NO)
 $(eval $(call gb_Module_add_targets,libexttextcat,\
+	ExternalPackage_fingerprint \
 	UnpackedTarball_exttextcat \
-	Zip_fingerprint \
 ))
 ifeq ($(COM),MSC)
 $(eval $(call gb_Module_add_targets,libexttextcat,\
diff --git a/libexttextcat/Zip_fingerprint.mk b/libexttextcat/Zip_fingerprint.mk
deleted file mode 100644
index da1df9a69c61..000000000000
--- a/libexttextcat/Zip_fingerprint.mk
+++ /dev/null
@@ -1,174 +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,fingerprint,$(call gb_UnpackedTarball_get_dir,exttextcat)/langclass))
-
-$(eval $(call gb_Zip_use_unpacked,fingerprint,exttextcat))
-
-$(eval $(call gb_Zip_add_files,fingerprint,\
-	fpdb.conf \
-	LM/ab.lm \
-	LM/ace.lm \
-	LM/ada.lm \
-	LM/af.lm \
-	LM/alt.lm \
-	LM/am.lm \
-	LM/ar.lm \
-	LM/arn.lm \
-	LM/ast.lm \
-	LM/ay.lm \
-	LM/az-Cyrl.lm \
-	LM/az.lm \
-	LM/ban.lm \
-	LM/be.lm \
-	LM/bem.lm \
-	LM/bg.lm \
-	LM/bho.lm \
-	LM/bik.lm \
-	LM/bi.lm \
-	LM/bm.lm \
-	LM/bn.lm \
-	LM/bo.lm \
-	LM/br.lm \
-	LM/bs.lm \
-	LM/ca.lm \
-	LM/cs.lm \
-	LM/cy.lm \
-	LM/da.lm \
-	LM/de.lm \
-	LM/dv.lm \
-	LM/ee.lm \
-	LM/el.lm \
-	LM/en.lm \
-	LM/eo.lm \
-	LM/es.lm \
-	LM/et.lm \
-	LM/eu.lm \
-	LM/fa.lm \
-	LM/fi.lm \
-	LM/fj.lm \
-	LM/fo.lm \
-	LM/fr.lm \
-	LM/fur.lm \
-	LM/fy.lm \
-	LM/ga.lm \
-	LM/gd.lm \
-	LM/gl.lm \
-	LM/grc.lm \
-	LM/gug.lm \
-	LM/gu.lm \
-	LM/gv.lm \
-	LM/ha-NG.lm \
-	LM/haw.lm \
-	LM/he.lm \
-	LM/hil.lm \
-	LM/hi.lm \
-	LM/hr.lm \
-	LM/hsb.lm \
-	LM/ht.lm \
-	LM/hu.lm \
-	LM/hy.lm \
-	LM/ia.lm \
-	LM/id.lm \
-	LM/is.lm \
-	LM/it.lm \
-	LM/ja.lm \
-	LM/ka.lm \
-	LM/kk.lm \
-	LM/kl.lm \
-	LM/km.lm \
-	LM/kn.lm \
-	LM/ko.lm \
-	LM/ktu.lm \
-	LM/ky.lm \
-	LM/la.lm \
-	LM/lb.lm \
-	LM/lg.lm \
-	LM/ln.lm \
-	LM/lo.lm \
-	LM/lt.lm \
-	LM/lv.lm \
-	LM/mai.lm \
-	LM/mi.lm \
-	LM/mk.lm \
-	LM/ml.lm \
-	LM/mn.lm \
-	LM/mos.lm \
-	LM/mr.lm \
-	LM/ms.lm \
-	LM/mt.lm \
-	LM/my.lm \
-	LM/nb.lm \
-	LM/ne.lm \
-	LM/nl.lm \
-	LM/nn.lm \
-	LM/nr.lm \
-	LM/nso.lm \
-	LM/ny.lm \
-	LM/oc.lm \
-	LM/om.lm \
-	LM/pa.lm \
-	LM/pl.lm \
-	LM/plt.lm \
-	LM/pt.lm \
-	LM/qxa.lm \
-	LM/rm.lm \
-	LM/ro.lm \
-	LM/rue.lm \
-	LM/ru.lm \
-	LM/rw.lm \
-	LM/sa.lm \
-	LM/sc.lm \
-	LM/sco.lm \
-	LM/sd.lm \
-	LM/se.lm \
-	LM/sg.lm \
-	LM/shs.lm \
-	LM/si.lm \
-	LM/sk.lm \
-	LM/sl.lm \
-	LM/so.lm \
-	LM/sq.lm \
-	LM/sr-Cyrl.lm \
-	LM/sr-Latn.lm \
-	LM/ss.lm \
-	LM/st.lm \
-	LM/sv.lm \
-	LM/sw.lm \
-	LM/ta.lm \
-	LM/tet.lm \
-	LM/tg.lm \
-	LM/th.lm \
-	LM/ti.lm \
-	LM/tk.lm \
-	LM/tl.lm \
-	LM/tn.lm \
-	LM/tpi.lm \
-	LM/tr.lm \
-	LM/ts.lm \
-	LM/tt.lm \
-	LM/ty.lm \
-	LM/ug.lm \
-	LM/uk.lm \
-	LM/ur.lm \
-	LM/uz.lm \
-	LM/ve.lm \
-	LM/vi.lm \
-	LM/wa.lm \
-	LM/xh.lm \
-	LM/yi.lm \
-	LM/yo.lm \
-	LM/zh-Hans.lm \
-	LM/zh-Hant.lm \
-	LM/zu.lm \
-))
-
-$(eval $(call gb_Zip_add_commandoptions,fingerprint,-j))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 30237c7a58a1..f073b97f4307 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -483,10 +483,10 @@ End
 // fingerprint files (lm)
 
 File gid_File_Share_Fingerprint
-    Dir = gid_Dir_Share_Fingerprint;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    Name = "fingerprint.zip";
+    Styles = (FILELIST, DONT_OVERWRITE);
+    Name = "libexttextcat_fingerprint.filelist";
 End
 
 #endif