fdo#63197: convert wizards

Change-Id: Ic7fa577fbdb527a75643c4e2919e0527432d5536
Reviewed-on: https://gerrit.libreoffice.org/3439
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

13 files changed, 96 insertions, 66 deletions

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a15e58ce9998..bd5b571c3fb1 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -28,33 +28,38 @@
 #include "macros.inc"
 
 File gid_File_Basic_Depot
-    Dir = gid_Dir_Basic_Depot;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "basicsrvdepot.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "wizards_basicsrvdepot.filelist";
 End
 
 File gid_File_Basic_Euro
-    Dir = gid_Dir_Basic_Euro;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "basicsrveuro.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "wizards_basicsrveuro.filelist";
 End
 
 File gid_File_Basic_Gimmicks
-    Dir = gid_Dir_Basic_Gimmicks;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "basicsrvgimmicks.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "wizards_basicsrvgimmicks.filelist";
 End
 
 File gid_File_Basic_Importwiz
-    Dir = gid_Dir_Basic_Importwiz;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "basicsrvimport.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "wizards_basicsrvimport.filelist";
 End
 
 File gid_File_Basic_Formwiz
-    Dir = gid_Dir_Basic_Formwiz;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "basicsrvform.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "wizards_basicsrvform.filelist";
 End
 
 #ifndef DISABLE_SCRIPTING
@@ -68,42 +73,45 @@ End
 #endif
 
 File gid_File_Basic_Template
-    Dir = gid_Dir_Basic_Template;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "basicsrvtemplate.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "wizards_basicsrvtemplate.filelist";
 End
 
 File gid_File_Basic_Tools
-    Dir = gid_Dir_Basic_Tools;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "basicsrvtools.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "wizards_basicsrvtools.filelist";
 End
 
 File gid_File_Basic_User
+    Dir = FILELIST_DIR;
     USER_FILE_BODY;
-    Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-    Dir = gid_Dir_User_Basic;
-    Name = "basicusr.zip";
+    Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE);
+    Name = "wizards_basicusr.filelist";
 End
 
 File gid_File_Basic_Share
+    Dir = FILELIST_DIR;
     USER_FILE_BODY;
-    Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-    Dir = gid_Dir_Basic;
-    Name = "basicshare.zip";
+    Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE);
+    Name = "wizards_basicshare.filelist";
 End
 
 File gid_File_Basic_User_Standard
+    Dir = FILELIST_DIR;
     USER_FILE_BODY;
-    Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-    Dir = gid_Dir_Basic_Standard;
-    Name = "basicsrvstandard.zip";
+    Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE);
+    Name = "wizards_basicsrvstandard.filelist";
 End
 
 File gid_File_Basic_Tutorials
-    Dir = gid_Dir_Basic_Tutorials;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "basicsrvtutorials.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "wizards_basicsrvtutorials.filelist";
 End
 
 #if defined ENABLE_NPAPI_INTO_BROWSER
diff --git a/wizards/Module_wizards.mk b/wizards/Module_wizards.mk
index 098433d3734d..2d6e36f7b5e2 100644
--- a/wizards/Module_wizards.mk
+++ b/wizards/Module_wizards.mk
@@ -34,21 +34,21 @@ $(eval $(call gb_Module_add_targets,wizards,\
 	AllLangResTarget_imp \
 	AllLangResTarget_tpl \
 	AllLangResTarget_wzi \
+	Package_depot \
+	Package_euro \
+	Package_form \
+	Package_gimmicks \
+	Package_import \
+	Package_share \
+	Package_standard \
+	Package_template \
+	Package_tools \
+	Package_tutorials \
+	Package_usr \
 	Pyuno_fax \
 	Pyuno_letter \
 	Pyuno_agenda \
 	Pyuno_commonwizards \
-	Zip_depot \
-	Zip_euro \
-	Zip_form \
-	Zip_gimmicks \
-	Zip_import \
-	Zip_share \
-	Zip_standard \
-	Zip_template \
-	Zip_tools \
-	Zip_tutorials \
-	Zip_usr \
 ))
 
 ifeq ($(SOLAR_JAVA),TRUE)
diff --git a/wizards/Zip_depot.mk b/wizards/Package_depot.mk
index 8dd5fef64c33..229b17e5ee77 100644
--- a/wizards/Zip_depot.mk
+++ b/wizards/Package_depot.mk
@@ -26,9 +26,11 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Zip_Zip,basicsrvdepot,$(SRCDIR)/wizards/source/depot))
+$(eval $(call gb_Package_Package,wizards_basicsrvdepot,$(SRCDIR)/wizards/source/depot))
 
-$(eval $(call gb_Zip_add_files,basicsrvdepot,\
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvdepot,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,wizards_basicsrvdepot,share/basic/Depot,\
 	CommonLang.xba \
 	Currency.xba \
 	Depot.xba \
diff --git a/wizards/Zip_euro.mk b/wizards/Package_euro.mk
index ac71ce946978..db5cd9442fcf 100644
--- a/wizards/Zip_euro.mk
+++ b/wizards/Package_euro.mk
@@ -26,9 +26,11 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Zip_Zip,basicsrveuro,$(SRCDIR)/wizards/source/euro))
+$(eval $(call gb_Package_Package,wizards_basicsrveuro,$(SRCDIR)/wizards/source/euro))
 
-$(eval $(call gb_Zip_add_files,basicsrveuro,\
+$(eval $(call gb_Package_set_outdir,wizards_basicsrveuro,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,wizards_basicsrveuro,share/basic/Euro,\
 	AutoPilotRun.xba \
 	Common.xba \
 	ConvertRun.xba \
diff --git a/wizards/Zip_form.mk b/wizards/Package_form.mk
index 8a2d577484c9..228d0bf93374 100644
--- a/wizards/Zip_form.mk
+++ b/wizards/Package_form.mk
@@ -26,9 +26,11 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Zip_Zip,basicsrvform,$(SRCDIR)/wizards/source/formwizard))
+$(eval $(call gb_Package_Package,wizards_basicsrvform,$(SRCDIR)/wizards/source/formwizard))
 
-$(eval $(call gb_Zip_add_files,basicsrvform,\
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvform,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,wizards_basicsrvform,share/basic/FormWizard,\
 	DBMeta.xba \
 	develop.xba \
 	dialog.xlb \
diff --git a/wizards/Zip_gimmicks.mk b/wizards/Package_gimmicks.mk
index 1099756f6bee..1e1ad29af9b6 100644
--- a/wizards/Zip_gimmicks.mk
+++ b/wizards/Package_gimmicks.mk
@@ -26,9 +26,11 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Zip_Zip,basicsrvgimmicks,$(SRCDIR)/wizards/source/gimmicks))
+$(eval $(call gb_Package_Package,wizards_basicsrvgimmicks,$(SRCDIR)/wizards/source/gimmicks))
 
-$(eval $(call gb_Zip_add_files,basicsrvgimmicks,\
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvgimmicks,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,wizards_basicsrvgimmicks,share/basic/Gimmicks,\
 	AutoText.xba \
 	ChangeAllChars.xba \
 	dialog.xlb \
diff --git a/wizards/Zip_import.mk b/wizards/Package_import.mk
index 1cabc80d74d4..16d569b3fd1a 100644
--- a/wizards/Zip_import.mk
+++ b/wizards/Package_import.mk
@@ -26,9 +26,11 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Zip_Zip,basicsrvimport,$(SRCDIR)/wizards/source/importwizard))
+$(eval $(call gb_Package_Package,wizards_basicsrvimport,$(SRCDIR)/wizards/source/importwizard))
 
-$(eval $(call gb_Zip_add_files,basicsrvimport,\
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvimport,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,wizards_basicsrvimport,share/basic/ImportWizard,\
 	API.xba \
 	dialog.xlb \
 	DialogModul.xba \
diff --git a/wizards/Zip_usr.mk b/wizards/Package_share.mk
index efb2968c63ec..d7f0752967cd 100644
--- a/wizards/Zip_usr.mk
+++ b/wizards/Package_share.mk
@@ -26,9 +26,11 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Zip_Zip,basicusr,$(SRCDIR)/wizards/source/config))
+$(eval $(call gb_Package_Package,wizards_basicshare,$(SRCDIR)/wizards/source/configshare))
 
-$(eval $(call gb_Zip_add_files,basicusr,\
+$(eval $(call gb_Package_set_outdir,wizards_basicshare,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,wizards_basicshare,share/basic,\
 	dialog.xlc \
 	script.xlc \
 ))
diff --git a/wizards/Zip_standard.mk b/wizards/Package_standard.mk
index 87bbb4a43814..cd76305a2c8d 100644
--- a/wizards/Zip_standard.mk
+++ b/wizards/Package_standard.mk
@@ -26,9 +26,11 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Zip_Zip,basicsrvstandard,$(SRCDIR)/wizards/source/standard))
+$(eval $(call gb_Package_Package,wizards_basicsrvstandard,$(SRCDIR)/wizards/source/standard))
 
-$(eval $(call gb_Zip_add_files,basicsrvstandard,\
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvstandard,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,wizards_basicsrvstandard,presets/basic/Standard,\
 	dialog.xlb \
 	Module1.xba \
 	script.xlb \
diff --git a/wizards/Zip_template.mk b/wizards/Package_template.mk
index 238a3752736f..a69ebc8fe144 100644
--- a/wizards/Zip_template.mk
+++ b/wizards/Package_template.mk
@@ -26,9 +26,11 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Zip_Zip,basicsrvtemplate,$(SRCDIR)/wizards/source/template))
+$(eval $(call gb_Package_Package,wizards_basicsrvtemplate,$(SRCDIR)/wizards/source/template))
 
-$(eval $(call gb_Zip_add_files,basicsrvtemplate,\
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvtemplate,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,wizards_basicsrvtemplate,share/basic/Template,\
 	Autotext.xba \
 	Correspondence.xba \
 	dialog.xlb \
diff --git a/wizards/Zip_tools.mk b/wizards/Package_tools.mk
index f7231138109d..743b6f36c4c6 100644
--- a/wizards/Zip_tools.mk
+++ b/wizards/Package_tools.mk
@@ -26,9 +26,11 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Zip_Zip,basicsrvtools,$(SRCDIR)/wizards/source/tools))
+$(eval $(call gb_Package_Package,wizards_basicsrvtools,$(SRCDIR)/wizards/source/tools))
 
-$(eval $(call gb_Zip_add_files,basicsrvtools,\
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvtools,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,wizards_basicsrvtools,share/basic/Tools,\
 	Debug.xba \
 	dialog.xlb \
 	DlgOverwriteAll.xdl \
diff --git a/wizards/Zip_tutorials.mk b/wizards/Package_tutorials.mk
index 6c0608a6e505..410e221ba000 100644
--- a/wizards/Zip_tutorials.mk
+++ b/wizards/Package_tutorials.mk
@@ -26,9 +26,11 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Zip_Zip,basicsrvtutorials,$(SRCDIR)/wizards/source/tutorials))
+$(eval $(call gb_Package_Package,wizards_basicsrvtutorials,$(SRCDIR)/wizards/source/tutorials))
 
-$(eval $(call gb_Zip_add_files,basicsrvtutorials,\
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvtutorials,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,wizards_basicsrvtutorials,share/basic/Tutorials,\
 	dialog.xlb \
 	Functions.xba \
 	RoadMap.xba \
diff --git a/wizards/Zip_share.mk b/wizards/Package_usr.mk
index 5f90a1a3a289..d0f23646e6a1 100644
--- a/wizards/Zip_share.mk
+++ b/wizards/Package_usr.mk
@@ -26,9 +26,11 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Zip_Zip,basicshare,$(SRCDIR)/wizards/source/configshare))
+$(eval $(call gb_Package_Package,wizards_basicusr,$(SRCDIR)/wizards/source/config))
 
-$(eval $(call gb_Zip_add_files,basicshare,\
+$(eval $(call gb_Package_set_outdir,wizards_basicusr,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,wizards_basicusr,presets/basic,\
 	dialog.xlc \
 	script.xlc \
 ))