[PATCH] fdo#63197, Convert Zip_database

[Julien Nabet (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3302

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/02/3302/1

fdo#63197, Convert Zip_database

Change-Id: I459b27065869b50639330dcbbae8bc7a1651882f
---
M extras/Module_extras.mk
R extras/Package_database.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 977c475..3de16a4 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -20,11 +20,11 @@
 	Package_newfiles \
 	Package_palettes \
 	Package_wordbook \
+	Package_database \
 	Zip_autotextuser \
 	Zip_cfgsrvbitmapunx \
 	Zip_cfgsrvnolang \
 	Zip_cfgusr \
-	Zip_database \
 	Zip_databasebiblio \
 	Zip_gallbullets \
 	Zip_gallhtmlexpo \
diff --git a/extras/Zip_database.mk b/extras/Package_database.mk
similarity index 64%
rename from extras/Zip_database.mk
rename to extras/Package_database.mk
index b35e3aa..a5b6248 100644
--- a/extras/Zip_database.mk
+++ b/extras/Package_database.mk
@@ -7,9 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,database,$(SRCDIR)/extras/source/database))
+$(eval $(call gb_Package_Package,extras_database,$(SRCDIR)/extras/source/database))
 
-$(eval $(call gb_Zip_add_files,database,\
+$(eval $(call gb_Package_set_outdir,extras_database,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_database,presets,\
 	biblio.odb \
 	evolocal.odb \
 ))
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index 2eef8a5..67f769c 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -86,10 +86,10 @@
 End
 
 File gid_File_Extra_Database
-    Dir = gid_Dir_Database;
+    Dir = FILELIST_DIR;
     USER_FILE_BODY;
-    Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-    Name = "database.zip";
+    Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE);
+    Name = "extras_database.filelist";
 End
 
 File gid_File_Extra_Databasebiblio

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

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