[PATCH] fdo#63197: convert 3 out 4 from scripting part

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3470

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/70/3470/1

fdo#63197: convert 3 out 4 from scripting part

Change-Id: Ie359d0ef00f62dd3c2d1f1dfd86e115409438e76
---
M scp2/source/ooo/file_ooo.scp
M scp2/source/python/file_python.scp
M scripting/Module_scripting.mk
R scripting/Package_ScriptsBeanShell.mk
R scripting/Package_ScriptsJavaScript.mk
R scripting/Package_ScriptsPython.mk
R scripting/Package_scriptbindinglib.mk
7 files changed, 35 insertions(+), 24 deletions(-)



diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index b5fe2a2..1b3dd8a 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -65,9 +65,10 @@
 #ifndef DISABLE_SCRIPTING
 
 File gid_File_Basic_Scriptbindinglib
-    Dir = gid_Dir_Basic_Scriptbindinglib;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "scriptbindinglib.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "scripting_scriptbindinglib.filelist";
 End
 
 #endif
@@ -766,17 +767,19 @@
 
 #ifndef WITHOUT_SCRIPTING_BEANSHELL
 File gid_File_Scripts_Beanshell
-    Dir = gid_Dir_Share_Scripts;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "ScriptsBeanShell.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "scripting_ScriptsBeanShell.filelist";
 End
 #endif
 
 #ifndef WITHOUT_SCRIPTING_JAVASCRIPT
 File gid_File_Scripts_Javascript
-    Dir = gid_Dir_Share_Scripts;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "ScriptsJavaScript.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "scripting_ScriptsJavaScript.filelist";
 End
 #endif
 #endif
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index ce892fd..614c732 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -144,10 +144,10 @@
 //Scripting Framework Python example scripts
 
 File gid_File_Scripts_Python
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE);
-    Dir = gid_Dir_Share_Scripts;
-    Name = "ScriptsPython.zip";
+    Styles = (FILELIST);
+    Name = "scripting_ScriptsPython.filelist";
 End
 
 // Scripting Framework Python configuration settings
diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk
index 7beadf5..305d1da 100644
--- a/scripting/Module_scripting.mk
+++ b/scripting/Module_scripting.mk
@@ -47,7 +47,11 @@
                ) \
                Zip_ScriptsJava \
        ) \
+       Package_scriptbindinglib \
        Package_scriptproviderforpython \
+       Package_ScriptsBeanShell \
+       Package_ScriptsJavaScript \
+       Package_ScriptsPython \
        Library_basprov \
        Library_dlgprov \
        Library_protocolhandler \
@@ -55,10 +59,6 @@
        Library_stringresource \
        Library_vbaevents \
        Pyuno_mailmerge \
-       Zip_scriptbindinglib \
-       Zip_ScriptsBeanShell \
-       Zip_ScriptsJavaScript \
-       Zip_ScriptsPython \
 ))
 
 endif
diff --git a/scripting/Zip_ScriptsBeanShell.mk b/scripting/Package_ScriptsBeanShell.mk
similarity index 87%
rename from scripting/Zip_ScriptsBeanShell.mk
rename to scripting/Package_ScriptsBeanShell.mk
index 21c8180..897683e 100644
--- a/scripting/Zip_ScriptsBeanShell.mk
+++ b/scripting/Package_ScriptsBeanShell.mk
@@ -26,9 +26,11 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Zip_Zip,ScriptsBeanShell,$(SRCDIR)/scripting/examples))
+$(eval $(call gb_Package_Package,scripting_ScriptsBeanShell,$(SRCDIR)/scripting/examples))
 
-$(eval $(call gb_Zip_add_files,ScriptsBeanShell,\
+$(eval $(call gb_Package_set_outdir,scripting_ScriptsBeanShell,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsBeanShell,share/Scripts,\
        beanshell/Capitalise/capitalise.bsh \
        beanshell/Capitalise/parcel-descriptor.xml \
        beanshell/HelloWorld/helloworld.bsh \
diff --git a/scripting/Zip_ScriptsJavaScript.mk b/scripting/Package_ScriptsJavaScript.mk
similarity index 86%
rename from scripting/Zip_ScriptsJavaScript.mk
rename to scripting/Package_ScriptsJavaScript.mk
index ef51511..c7ae315 100644
--- a/scripting/Zip_ScriptsJavaScript.mk
+++ b/scripting/Package_ScriptsJavaScript.mk
@@ -26,9 +26,11 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Zip_Zip,ScriptsJavaScript,$(SRCDIR)/scripting/examples))
+$(eval $(call gb_Package_Package,scripting_ScriptsJavaScript,$(SRCDIR)/scripting/examples))
 
-$(eval $(call gb_Zip_add_files,ScriptsJavaScript,\
+$(eval $(call gb_Package_set_outdir,scripting_ScriptsJavaScript,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsJavaScript,share/Scripts,\
        javascript/ExportSheetsToHTML/exportsheetstohtml.js \
        javascript/ExportSheetsToHTML/parcel-descriptor.xml \
        javascript/HelloWorld/helloworld.js \
diff --git a/scripting/Zip_ScriptsPython.mk b/scripting/Package_ScriptsPython.mk
similarity index 84%
rename from scripting/Zip_ScriptsPython.mk
rename to scripting/Package_ScriptsPython.mk
index e86785c..d844496 100644
--- a/scripting/Zip_ScriptsPython.mk
+++ b/scripting/Package_ScriptsPython.mk
@@ -26,9 +26,11 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Zip_Zip,ScriptsPython,$(SRCDIR)/scripting/examples))
+$(eval $(call gb_Package_Package,scripting_ScriptsPython,$(SRCDIR)/scripting/examples))
 
-$(eval $(call gb_Zip_add_files,ScriptsPython,\
+$(eval $(call gb_Package_set_outdir,scripting_ScriptsPython,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files_with_dir,Scripting_ScriptsPython,share/Scripts,\
        python/Capitalise.py \
        python/HelloWorld.py \
        python/pythonSamples/TableSample.py \
diff --git a/scripting/Zip_scriptbindinglib.mk b/scripting/Package_scriptbindinglib.mk
similarity index 82%
rename from scripting/Zip_scriptbindinglib.mk
rename to scripting/Package_scriptbindinglib.mk
index 213206a..f21ea1a 100644
--- a/scripting/Zip_scriptbindinglib.mk
+++ b/scripting/Package_scriptbindinglib.mk
@@ -26,9 +26,11 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Zip_Zip,scriptbindinglib,$(SRCDIR)/scripting/workben/bindings))
+$(eval $(call gb_Package_Package,scripting_scriptbindinglib,$(SRCDIR)/scripting/workben/bindings))
 
-$(eval $(call gb_Zip_add_files,scriptbindinglib,\
+$(eval $(call gb_Package_set_outdir,scripting_scriptbindinglib,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,scripting_scriptbindinglib,share/basic/ScriptBindingLibrary,\
        Highlight.xdl \
        dialog.xlb \
        script.xlb \

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

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