diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2013-04-19 00:15:12 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-19 04:05:13 +0000 |
| commit | 687a821e3b4ac872fd7eb1010ea87c3d81e71991 (patch) | |
| tree | b96fb49b8f2e9468f29df697bca8710c6ba26a2c /scripting | |
| parent | 4069417bc3bbe4858f4d7cd264604e76affe82fc (diff) | |
fdo#63197: convert 3 out 4 from scripting part
Change-Id: Ie359d0ef00f62dd3c2d1f1dfd86e115409438e76
Reviewed-on: https://gerrit.libreoffice.org/3470
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/Module_scripting.mk | 8 | ||||
| -rw-r--r-- | scripting/Package_ScriptsBeanShell.mk (renamed from scripting/Zip_ScriptsBeanShell.mk) | 6 | ||||
| -rw-r--r-- | scripting/Package_ScriptsJavaScript.mk (renamed from scripting/Zip_ScriptsJavaScript.mk) | 6 | ||||
| -rw-r--r-- | scripting/Package_ScriptsPython.mk (renamed from scripting/Zip_ScriptsPython.mk) | 6 | ||||
| -rw-r--r-- | scripting/Package_scriptbindinglib.mk (renamed from scripting/Zip_scriptbindinglib.mk) | 6 |
5 files changed, 20 insertions, 12 deletions
diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk index 7beadf559f2e..305d1dad17b8 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/Zip_ScriptsBeanShell.mk b/scripting/Package_ScriptsBeanShell.mk index 21c818007b74..897683efadb3 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 index ef515119de2f..c7ae315161d7 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 index e86785c4f82b..d84449686762 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 index 213206aa19e0..f21ea1a2296a 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 \ |