[PATCH] fdo#63197: convert wizards

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3439

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/39/3439/1

fdo#63197: convert wizards

Change-Id: Ic7fa577fbdb527a75643c4e2919e0527432d5536
---
M scp2/source/ooo/file_ooo.scp
M wizards/Module_wizards.mk
R wizards/Package_depot.mk
R wizards/Package_euro.mk
R wizards/Package_form.mk
R wizards/Package_gimmicks.mk
R wizards/Package_import.mk
C wizards/Package_share.mk
R wizards/Package_standard.mk
R wizards/Package_template.mk
R wizards/Package_tools.mk
R wizards/Package_tutorials.mk
R wizards/Package_usr.mk
D wizards/Zip_share.mk
14 files changed, 94 insertions(+), 102 deletions(-)



diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a15e58c..bd5b571 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 @@
 #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 098433d..2d6e36f 100644
--- a/wizards/Module_wizards.mk
+++ b/wizards/Module_wizards.mk
@@ -34,21 +34,21 @@
        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
similarity index 86%
rename from wizards/Zip_depot.mk
rename to wizards/Package_depot.mk
index 8dd5fef..229b17e 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
similarity index 85%
rename from wizards/Zip_euro.mk
rename to wizards/Package_euro.mk
index ac71ce9..db5cd94 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
similarity index 84%
rename from wizards/Zip_form.mk
rename to wizards/Package_form.mk
index 8a2d577..228d0bf 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
similarity index 88%
rename from wizards/Zip_gimmicks.mk
rename to wizards/Package_gimmicks.mk
index 1099756..8d9e061 100644
--- a/wizards/Zip_gimmicks.mk
+++ b/wizards/Package_gimmicks.mk
@@ -26,9 +26,9 @@
 #
 #*************************************************************************
 
-$(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_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
similarity index 84%
rename from wizards/Zip_import.mk
rename to wizards/Package_import.mk
index 1cabc80..16d569b 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
similarity index 84%
copy from wizards/Zip_usr.mk
copy to wizards/Package_share.mk
index efb2968..d7f0752 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
similarity index 83%
rename from wizards/Zip_standard.mk
rename to wizards/Package_standard.mk
index 87bbb4a..cd76305 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
similarity index 84%
rename from wizards/Zip_template.mk
rename to wizards/Package_template.mk
index 238a375..a69ebc8 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
similarity index 85%
rename from wizards/Zip_tools.mk
rename to wizards/Package_tools.mk
index f723113..743b6f3 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
similarity index 84%
rename from wizards/Zip_tutorials.mk
rename to wizards/Package_tutorials.mk
index 6c0608a..410e221 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_usr.mk b/wizards/Package_usr.mk
similarity index 84%
rename from wizards/Zip_usr.mk
rename to wizards/Package_usr.mk
index efb2968..d0f2364 100644
--- a/wizards/Zip_usr.mk
+++ b/wizards/Package_usr.mk
@@ -26,9 +26,11 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Zip_Zip,basicusr,$(SRCDIR)/wizards/source/config))
+$(eval $(call gb_Package_Package,wizards_basicusr,$(SRCDIR)/wizards/source/config))
 
-$(eval $(call gb_Zip_add_files,basicusr,\
+$(eval $(call gb_Package_set_outdir,wizards_basicusr,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,wizards_basicusr,presets/basic,\
        dialog.xlc \
        script.xlc \
 ))
diff --git a/wizards/Zip_share.mk b/wizards/Zip_share.mk
deleted file mode 100644
index 5f90a1a3..0000000
--- a/wizards/Zip_share.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_Zip_Zip,basicshare,$(SRCDIR)/wizards/source/configshare))
-
-$(eval $(call gb_Zip_add_files,basicshare,\
-       dialog.xlc \
-       script.xlc \
-))
-
-# vim: set noet sw=4 ts=4:

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

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