[PATCH] fdo#63197, Convert Zip_autotextuser

[Julien Nabet (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3348

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/48/3348/1

fdo#63197, Convert Zip_autotextuser

Change-Id: I6a7764637f6e5754e68ee6e4ab417224f542592d
---
M extras/Module_extras.mk
R extras/Package_autotextuser.mk
M scp2/source/ooo/file_extra_ooo.scp
3 files changed, 8 insertions(+), 6 deletions(-)



diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index ece5397..cd07e66 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -22,7 +22,7 @@
 	Package_wordbook \
 	Package_database \
 	Package_databasebiblio \
-	Zip_autotextuser \
+	Package_autotextuser \
 	Zip_cfgsrvbitmapunx \
 	Zip_cfgsrvnolang \
 	Zip_cfgusr \
diff --git a/extras/Zip_autotextuser.mk b/extras/Package_autotextuser.mk
similarity index 61%
rename from extras/Zip_autotextuser.mk
rename to extras/Package_autotextuser.mk
index 9decaae..7df6c3a 100644
--- a/extras/Zip_autotextuser.mk
+++ b/extras/Package_autotextuser.mk
@@ -7,9 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,autotextuser,$(SRCDIR)/extras/source/autotext))
+$(eval $(call gb_Package_Package,extras_autotextuser,$(SRCDIR)/extras/source/autotext))
 
-$(eval $(call gb_Zip_add_files,autotextuser,\
+$(eval $(call gb_Package_set_outdir,extras_autotextuser,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_autotextuser,presets/autotext,\
 	mytexts.bau \
 ))
 
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index e2ac274..bb15b33 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -42,10 +42,10 @@
 End
 
 File gid_File_Extra_Autotextuser
-    Dir = gid_Dir_User_Autotext;
+    Dir = FILELIST_DIR;
     USER_FILE_BODY;
-    Styles = (ARCHIVE, WORKSTATION, DOCLANG, DONT_OVERWRITE);
-    Name = "autotextuser.zip";
+    Styles = (FILELIST, WORKSTATION, DOCLANG, DONT_OVERWRITE);
+    Name = "extras_autotextuser.filelist";
 End
 
 #ifdef UNX

-- 
To view, visit https://gerrit.libreoffice.org/3348
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a7764637f6e5754e68ee6e4ab417224f542592d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet <serval2412 at yahoo.fr>