scp2/source/ooo/file_ooo.scp | 21 ++++++++------
scp2/source/python/file_python.scp | 6 ++--
scripting/Module_scripting.mk | 8 ++---
scripting/Package_ScriptsBeanShell.mk | 48 +++++++++++++++++++++++++++++++++
scripting/Package_ScriptsJavaScript.mk | 43 +++++++++++++++++++++++++++++
scripting/Package_ScriptsPython.mk | 39 ++++++++++++++++++++++++++
scripting/Package_scriptbindinglib.mk | 39 ++++++++++++++++++++++++++
scripting/Zip_ScriptsBeanShell.mk | 46 -------------------------------
scripting/Zip_ScriptsJavaScript.mk | 41 ----------------------------
scripting/Zip_ScriptsPython.mk | 37 -------------------------
scripting/Zip_scriptbindinglib.mk | 37 -------------------------
11 files changed, 188 insertions(+), 177 deletions(-)
New commits:
commit 687a821e3b4ac872fd7eb1010ea87c3d81e71991
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Fri Apr 19 00:15:12 2013 +0200
fdo#63197: convert 3 out 4 from scripting part
Change-Id: Ie359d0ef00f62dd3c2d1f1dfd86e115409438e76
Reviewed-on: https://gerrit.libreoffice.org/3470
Reviewed-by: David Tardon <dtar...@redhat.com>
Tested-by: David Tardon <dtar...@redhat.com>
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 @@ End
#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 @@ End
#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 @@ End
//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 @@ $(eval $(call gb_Module_add_targets,scripting,\
) \
Zip_ScriptsJava \
) \
+ Package_scriptbindinglib \
Package_scriptproviderforpython \
+ Package_ScriptsBeanShell \
+ Package_ScriptsJavaScript \
+ Package_ScriptsPython \
Library_basprov \
Library_dlgprov \
Library_protocolhandler \
@@ -55,10 +59,6 @@ $(eval $(call gb_Module_add_targets,scripting,\
Library_stringresource \
Library_vbaevents \
Pyuno_mailmerge \
- Zip_scriptbindinglib \
- Zip_ScriptsBeanShell \
- Zip_ScriptsJavaScript \
- Zip_ScriptsPython \
))
endif
diff --git a/scripting/Package_ScriptsBeanShell.mk
b/scripting/Package_ScriptsBeanShell.mk
new file mode 100644
index 0000000..897683e
--- /dev/null
+++ b/scripting/Package_ScriptsBeanShell.mk
@@ -0,0 +1,48 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Matúš Kukan <matus.ku...@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call
gb_Package_Package,scripting_ScriptsBeanShell,$(SRCDIR)/scripting/examples))
+
+$(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 \
+ beanshell/HelloWorld/parcel-descriptor.xml \
+ beanshell/Highlight/ButtonPressHandler.bsh \
+ beanshell/Highlight/highlighter.bsh \
+ beanshell/Highlight/parcel-descriptor.xml \
+ beanshell/Highlight/ShowDialog.bsh \
+ beanshell/MemoryUsage/memusage.bsh \
+ beanshell/MemoryUsage/parcel-descriptor.xml \
+ beanshell/WordCount/parcel-descriptor.xml \
+ beanshell/WordCount/wordcount.bsh \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scripting/Package_ScriptsJavaScript.mk
b/scripting/Package_ScriptsJavaScript.mk
new file mode 100644
index 0000000..c7ae315
--- /dev/null
+++ b/scripting/Package_ScriptsJavaScript.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Matúš Kukan <matus.ku...@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call
gb_Package_Package,scripting_ScriptsJavaScript,$(SRCDIR)/scripting/examples))
+
+$(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 \
+ javascript/HelloWorld/parcel-descriptor.xml \
+ javascript/Highlight/ButtonPressHandler.js \
+ javascript/Highlight/parcel-descriptor.xml \
+ javascript/Highlight/ShowDialog.js \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scripting/Package_ScriptsPython.mk
b/scripting/Package_ScriptsPython.mk
new file mode 100644
index 0000000..d844496
--- /dev/null
+++ b/scripting/Package_ScriptsPython.mk
@@ -0,0 +1,39 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Matúš Kukan <matus.ku...@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call
gb_Package_Package,scripting_ScriptsPython,$(SRCDIR)/scripting/examples))
+
+$(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 \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scripting/Package_scriptbindinglib.mk
b/scripting/Package_scriptbindinglib.mk
new file mode 100644
index 0000000..f21ea1a
--- /dev/null
+++ b/scripting/Package_scriptbindinglib.mk
@@ -0,0 +1,39 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Matúš Kukan <matus.ku...@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call
gb_Package_Package,scripting_scriptbindinglib,$(SRCDIR)/scripting/workben/bindings))
+
+$(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 \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scripting/Zip_ScriptsBeanShell.mk
b/scripting/Zip_ScriptsBeanShell.mk
deleted file mode 100644
index 21c8180..0000000
--- a/scripting/Zip_ScriptsBeanShell.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# Matúš Kukan <matus.ku...@gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# 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_Zip_add_files,ScriptsBeanShell,\
- beanshell/Capitalise/capitalise.bsh \
- beanshell/Capitalise/parcel-descriptor.xml \
- beanshell/HelloWorld/helloworld.bsh \
- beanshell/HelloWorld/parcel-descriptor.xml \
- beanshell/Highlight/ButtonPressHandler.bsh \
- beanshell/Highlight/highlighter.bsh \
- beanshell/Highlight/parcel-descriptor.xml \
- beanshell/Highlight/ShowDialog.bsh \
- beanshell/MemoryUsage/memusage.bsh \
- beanshell/MemoryUsage/parcel-descriptor.xml \
- beanshell/WordCount/parcel-descriptor.xml \
- beanshell/WordCount/wordcount.bsh \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scripting/Zip_ScriptsJavaScript.mk
b/scripting/Zip_ScriptsJavaScript.mk
deleted file mode 100644
index ef51511..0000000
--- a/scripting/Zip_ScriptsJavaScript.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# Matúš Kukan <matus.ku...@gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# 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_Zip_add_files,ScriptsJavaScript,\
- javascript/ExportSheetsToHTML/exportsheetstohtml.js \
- javascript/ExportSheetsToHTML/parcel-descriptor.xml \
- javascript/HelloWorld/helloworld.js \
- javascript/HelloWorld/parcel-descriptor.xml \
- javascript/Highlight/ButtonPressHandler.js \
- javascript/Highlight/parcel-descriptor.xml \
- javascript/Highlight/ShowDialog.js \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scripting/Zip_ScriptsPython.mk b/scripting/Zip_ScriptsPython.mk
deleted file mode 100644
index e86785c..0000000
--- a/scripting/Zip_ScriptsPython.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# Matúš Kukan <matus.ku...@gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# 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_Zip_add_files,ScriptsPython,\
- python/Capitalise.py \
- python/HelloWorld.py \
- python/pythonSamples/TableSample.py \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scripting/Zip_scriptbindinglib.mk
b/scripting/Zip_scriptbindinglib.mk
deleted file mode 100644
index 213206a..0000000
--- a/scripting/Zip_scriptbindinglib.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# Matúš Kukan <matus.ku...@gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# 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_Zip_add_files,scriptbindinglib,\
- Highlight.xdl \
- dialog.xlb \
- script.xlb \
-))
-
-# vim: set noet sw=4 ts=4:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
