[Libreoffice-commits] .: 6 commits - Module_tail_build.mk postprocess/packcomponents postprocess/prj Repository.mk scp2/source scripting/examples scripting/Extension_ScriptProviderForBeanShell.mk scripting/Extension_ScriptProviderForJavaScript.mk scripting/Extension_ScriptProviderForPython.mk scripting/inc scripting/Jar_HelloWorld.mk scripting/Jar_Highlight.mk scripting/Jar_MemoryUsage.mk scripting/Jar_ScriptFramework.mk scripting/Jar_ScriptProviderForBeanShell.mk scripting/Jar_ScriptProviderForJava.mk scripting/Jar_ScriptProviderForJavaScript.mk scripting/java scripting/Library_basprov.mk scripting/Library_dlgprov.mk scripting/Library_protocolhandler.mk scripting/Library_scriptframe.mk scripting/Library_stringresource.mk scripting/Library_vbaevents.mk scripting/Makefile scripting/Module_scripting.mk scripting/prj scripting/Pyuno_mailmerge.mk scripting/source scripting/util scripting/Zip_scriptbindinglib.mk scripting/Zip_ScriptsBeanShell.mk scripting/Zip_ScriptsJava.mk scripting/Zip_Scrip tsJavaScript.mk scripting/Zip_ScriptsPython.mk solenv/gbuild tail_build/prj
Matus Kukan
mkukan at kemper.freedesktop.org
Sat Oct 1 08:31:13 PDT 2011
Module_tail_build.mk | 1
Repository.mk | 6
postprocess/packcomponents/makefile.mk | 18 -
postprocess/prj/build.lst | 2
scp2/source/ooo/file_library_ooo.scp | 16 -
scripting/Extension_ScriptProviderForBeanShell.mk | 34 ++
scripting/Extension_ScriptProviderForJavaScript.mk | 34 ++
scripting/Extension_ScriptProviderForPython.mk | 34 ++
scripting/Jar_HelloWorld.mk | 42 +++
scripting/Jar_Highlight.mk | 42 +++
scripting/Jar_MemoryUsage.mk | 42 +++
scripting/Jar_ScriptFramework.mk | 75 +++++
scripting/Jar_ScriptProviderForBeanShell.mk | 55 ++++
scripting/Jar_ScriptProviderForJava.mk | 51 +++
scripting/Jar_ScriptProviderForJavaScript.mk | 52 +++
scripting/Library_basprov.mk | 68 +++++
scripting/Library_dlgprov.mk | 68 +++++
scripting/Library_protocolhandler.mk | 60 ++++
scripting/Library_scriptframe.mk | 65 ++++
scripting/Library_stringresource.mk | 58 ++++
scripting/Library_vbaevents.mk | 64 ++++
scripting/Makefile | 39 ++
scripting/Module_scripting.mk | 61 ++++
scripting/Pyuno_mailmerge.mk | 39 ++
scripting/Zip_ScriptsBeanShell.mk | 46 +++
scripting/Zip_ScriptsJava.mk | 69 +++++
scripting/Zip_ScriptsJavaScript.mk | 41 +++
scripting/Zip_ScriptsPython.mk | 37 ++
scripting/Zip_scriptbindinglib.mk | 37 ++
scripting/examples/delzip | 1
scripting/examples/java/build.xml | 139 ----------
scripting/examples/java/makefile.mk | 38 --
scripting/examples/makefile.mk | 58 ----
scripting/inc/makefile.mk | 47 ---
scripting/java/build.env | 3
scripting/java/build.xml | 284 ---------------------
scripting/java/makefile.mk | 54 ---
scripting/prj/build.lst | 16 -
scripting/prj/d.lst | 29 --
scripting/prj/makefile.mk | 40 ++
scripting/source/basprov/makefile.mk | 82 ------
scripting/source/dlgprov/makefile.mk | 92 ------
scripting/source/protocolhandler/exports.dxp | 1
scripting/source/protocolhandler/makefile.mk | 72 -----
scripting/source/provider/exports.dxp | 1
scripting/source/provider/makefile.mk | 53 ---
scripting/source/pyprov/makefile.mk | 72 -----
scripting/source/runtimemgr/exports.dxp | 1
scripting/source/stringresource/makefile.mk | 70 -----
scripting/source/vbaevents/makefile.mk | 91 ------
scripting/util/exports.dxp | 1
scripting/util/makefile.mk | 75 -----
scripting/util/provider/beanshell/makefile.mk | 66 ----
scripting/util/provider/javascript/makefile.mk | 60 ----
solenv/gbuild/Extension.mk | 85 ++++++
solenv/gbuild/Jar.mk | 24 +
solenv/gbuild/TargetLocations.mk | 4
solenv/gbuild/Zip.mk | 7
solenv/gbuild/gbuild.mk | 1
tail_build/prj/build.lst | 2
60 files changed, 1396 insertions(+), 1429 deletions(-)
New commits:
commit 6764aef1052f9e55957431d5831041931b3295e4
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Oct 1 17:15:43 2011 +0200
add scripting to tail_build
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index c08919b..763c911 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
reportdesign \
sc \
sccomp \
+ scripting \
sd \
slideshow \
starmath \
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 30248b5..c933444 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras filter fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg package psprint_config remotebridges scaddins scp2 scripting DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
+po postprocess :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras filter fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg package psprint_config remotebridges scaddins scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 6126059..1ee66e0 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds OPENSSL:openssl REDLAND:redland TRANSLATIONS:translations avmedia basegfx basic canvas comphelper connectivity cppcanvas cppu cppuhelper filter fpicker javaunohelper jurt offapi officecfg oovbaapi package qadevOOo DESKTOP:rdbmaker ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vbahelper vcl xmlhelp xmloff xmlscript NULL
+tb tail_build : BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds OPENSSL:openssl REDLAND:redland TRANSLATIONS:translations avmedia basegfx basic bridges canvas comphelper connectivity cppcanvas cppu cppuhelper filter fpicker javaunohelper jurt offapi officecfg oovbaapi package qadevOOo DESKTOP:rdbmaker rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vbahelper vcl xmlhelp xmloff xmlscript NULL
tb tail_build\prj nmake - all tb_prj NULL
commit a116d39db624719337b0a8bf3603f8a11eb2cc42
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Sep 29 22:00:24 2011 +0200
finished converting scripting to gbuild
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 9a3eef9..f3fe6a1 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -249,11 +249,11 @@ my_components += component/framework/util/lomenubar
.IF "$(SOLAR_JAVA)" == "TRUE"
my_components += \
LuceneHelpWrapper \
- ScriptFramework \
- ScriptProviderForJava \
XMergeBridge \
component/filter/source/xsltfilter/XSLTFilter.jar \
component/filter/source/xsltvalidate/XSLTValidate \
+ component/scripting/java/ScriptFramework \
+ component/scripting/java/ScriptProviderForJava \
component/wizards/com/sun/star/wizards/agenda/agenda \
component/wizards/com/sun/star/wizards/fax/fax \
component/wizards/com/sun/star/wizards/form/form \
@@ -367,7 +367,7 @@ my_components += evoab
my_components += component/avmedia/source/gstreamer/avmediagstreamer
.END
-my_ooo_components = mailmerge
+my_ooo_components = component/scripting/source/pyprov/mailmerge
.INCLUDE: target.mk
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index ec58f59..22a19a3 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -46,9 +46,9 @@ File gid_File_Lib_Basprov
Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
- Name = STRING(CONCAT4(basprov,DLLPOSTFIX,.uno,UNXSUFFIX));
+ Name = STRING(CONCAT3(basprov,.uno,UNXSUFFIX));
#else
- Name = STRING(CONCAT4(basprov,DLLPOSTFIX,.uno,.dll));
+ Name = STRING(CONCAT3(basprov,.uno,.dll));
#endif
End
@@ -57,9 +57,9 @@ File gid_File_Lib_Vbaevent
Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
- Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,UNXSUFFIX));
+ Name = STRING(CONCAT3(vbaevents,.uno,UNXSUFFIX));
#else
- Name = STRING(CONCAT4(vbaevents,DLLPOSTFIX,.uno,.dll));
+ Name = STRING(CONCAT3(vbaevents,.uno,.dll));
#endif
End
@@ -320,9 +320,9 @@ File gid_File_Lib_Dlgprov
Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
- Name = STRING(CONCAT4(dlgprov,DLLPOSTFIX,.uno,UNXSUFFIX));
+ Name = STRING(CONCAT3(dlgprov,.uno,UNXSUFFIX));
#else
- Name = STRING(CONCAT4(dlgprov,DLLPOSTFIX,.uno,.dll));
+ Name = STRING(CONCAT3(dlgprov,.uno,.dll));
#endif
End
@@ -331,9 +331,9 @@ File gid_File_Lib_Stringresource
Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
- Name = STRING(CONCAT4(stringresource,DLLPOSTFIX,.uno,UNXSUFFIX));
+ Name = STRING(CONCAT3(stringresource,.uno,UNXSUFFIX));
#else
- Name = STRING(CONCAT4(stringresource,DLLPOSTFIX,.uno,.dll));
+ Name = STRING(CONCAT3(stringresource,.uno,.dll));
#endif
End
diff --git a/scripting/Extension_ScriptProviderForBeanShell.mk b/scripting/Extension_ScriptProviderForBeanShell.mk
new file mode 100644
index 0000000..a703229
--- /dev/null
+++ b/scripting/Extension_ScriptProviderForBeanShell.mk
@@ -0,0 +1,34 @@
+# -*- 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.kukan at 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_Extension_Extension,script-provider-for-beanshell,scripting/util/provider/beanshell))
+
+$(eval $(call gb_Extension_add_file,script-provider-for-beanshell,ScriptProviderForBeanShell.jar,\
+ $(call gb_Jar_get_target,ScriptProviderForBeanShell)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scripting/Extension_ScriptProviderForJavaScript.mk b/scripting/Extension_ScriptProviderForJavaScript.mk
new file mode 100644
index 0000000..daebae9
--- /dev/null
+++ b/scripting/Extension_ScriptProviderForJavaScript.mk
@@ -0,0 +1,34 @@
+# -*- 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.kukan at 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_Extension_Extension,script-provider-for-javascript,scripting/util/provider/javascript))
+
+$(eval $(call gb_Extension_add_file,script-provider-for-javascript,ScriptProviderForJavaScript.jar,\
+ $(call gb_Jar_get_target,ScriptProviderForJavaScript)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scripting/Extension_ScriptProviderForPython.mk b/scripting/Extension_ScriptProviderForPython.mk
new file mode 100644
index 0000000..08d3cc7
--- /dev/null
+++ b/scripting/Extension_ScriptProviderForPython.mk
@@ -0,0 +1,34 @@
+# -*- 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.kukan at 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_Extension_Extension,script-provider-for-python,scripting/source/pyprov))
+
+$(eval $(call gb_Extension_add_file,script-provider-for-python,pythonscript.py,\
+ $(SRCDIR)/scripting/source/pyprov/pythonscript.py))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scripting/Jar_HelloWorld.mk b/scripting/Jar_HelloWorld.mk
new file mode 100644
index 0000000..bbd71a0
--- /dev/null
+++ b/scripting/Jar_HelloWorld.mk
@@ -0,0 +1,42 @@
+# -*- 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.kukan at 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_Jar_Jar,HelloWorld,SRCDIR))
+
+$(eval $(call gb_Jar_add_jars,HelloWorld,\
+ $(OUTDIR)/bin/juh.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,HelloWorld,\
+ scripting/examples/java/HelloWorld/HelloWorld \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scripting/Jar_Highlight.mk b/scripting/Jar_Highlight.mk
new file mode 100644
index 0000000..018b6f8
--- /dev/null
+++ b/scripting/Jar_Highlight.mk
@@ -0,0 +1,42 @@
+# -*- 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.kukan at 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_Jar_Jar,Highlight,SRCDIR))
+
+$(eval $(call gb_Jar_add_jars,Highlight,\
+ $(OUTDIR)/bin/juh.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,Highlight,\
+ scripting/examples/java/Highlight/HighlightText \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scripting/Jar_MemoryUsage.mk b/scripting/Jar_MemoryUsage.mk
new file mode 100644
index 0000000..eb1a476
--- /dev/null
+++ b/scripting/Jar_MemoryUsage.mk
@@ -0,0 +1,42 @@
+# -*- 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.kukan at 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_Jar_Jar,MemoryUsage,SRCDIR))
+
+$(eval $(call gb_Jar_add_jars,MemoryUsage,\
+ $(OUTDIR)/bin/juh.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,MemoryUsage,\
+ scripting/examples/java/MemoryUsage/MemoryUsage \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scripting/Jar_ScriptFramework.mk b/scripting/Jar_ScriptFramework.mk
new file mode 100644
index 0000000..b95606e
--- /dev/null
+++ b/scripting/Jar_ScriptFramework.mk
@@ -0,0 +1,75 @@
+# -*- 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.kukan at 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_Jar_Jar,ScriptFramework,SRCDIR))
+
+$(eval $(call gb_Jar_add_jars,ScriptFramework,\
+ $(OUTDIR)/bin/juh.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+))
+
+$(eval $(call gb_Jar_set_componentfile,ScriptFramework,scripting/java/ScriptFramework,OOO))
+
+$(eval $(call gb_Jar_set_packageroot,ScriptFramework,com))
+
+$(eval $(call gb_Jar_add_sourcefiles,ScriptFramework,\
+ scripting/java/com/sun/star/script/framework/browse/DialogFactory \
+ scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode \
+ scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode \
+ scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode \
+ scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode \
+ scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB \
+ scripting/java/com/sun/star/script/framework/container/ParcelContainer \
+ scripting/java/com/sun/star/script/framework/container/ParcelDescriptor \
+ scripting/java/com/sun/star/script/framework/container/Parcel \
+ scripting/java/com/sun/star/script/framework/container/ParsedScriptUri \
+ scripting/java/com/sun/star/script/framework/container/ScriptEntry \
+ scripting/java/com/sun/star/script/framework/container/ScriptMetaData \
+ scripting/java/com/sun/star/script/framework/container/UnoPkgContainer \
+ scripting/java/com/sun/star/script/framework/container/XMLParserFactory \
+ scripting/java/com/sun/star/script/framework/container/XMLParser \
+ scripting/java/com/sun/star/script/framework/io/UCBStreamHandler \
+ scripting/java/com/sun/star/script/framework/io/XInputStreamImpl \
+ scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper \
+ scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper \
+ scripting/java/com/sun/star/script/framework/io/XStorageHelper \
+ scripting/java/com/sun/star/script/framework/log/LogUtils \
+ scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory \
+ scripting/java/com/sun/star/script/framework/provider/EditorScriptContext \
+ scripting/java/com/sun/star/script/framework/provider/NoSuitableClassLoaderException \
+ scripting/java/com/sun/star/script/framework/provider/PathUtils \
+ scripting/java/com/sun/star/script/framework/provider/ScriptContext \
+ scripting/java/com/sun/star/script/framework/provider/ScriptEditor \
+ scripting/java/com/sun/star/script/framework/provider/ScriptProvider \
+ scripting/java/com/sun/star/script/framework/provider/SwingInvocation \
+ scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk
new file mode 100644
index 0000000..87e2cb9
--- /dev/null
+++ b/scripting/Jar_ScriptProviderForBeanShell.mk
@@ -0,0 +1,55 @@
+# -*- 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.kukan at 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_Jar_Jar,ScriptProviderForBeanShell,SRCDIR))
+
+$(eval $(call gb_Jar_add_jars,ScriptProviderForBeanShell,\
+ $(OUTDIR)/bin/juh.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/ScriptFramework.jar \
+ $(OUTDIR)/bin/bsh.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,ScriptProviderForBeanShell,com))
+
+$(eval $(call gb_Jar_add_sourcefiles,ScriptProviderForBeanShell,\
+ scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView \
+ scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell \
+ scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell \
+ scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel \
+ scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceView \
+))
+
+$(eval $(call gb_Jar_add_packagefile,ScriptProviderForBeanShell,\
+ com/sun/star/script/framework/provider/beanshell/template.bsh,\
+ $(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/beanshell/template.bsh \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scripting/Jar_ScriptProviderForJava.mk b/scripting/Jar_ScriptProviderForJava.mk
new file mode 100644
index 0000000..8e7d2bf
--- /dev/null
+++ b/scripting/Jar_ScriptProviderForJava.mk
@@ -0,0 +1,51 @@
+# -*- 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.kukan at 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_Jar_Jar,ScriptProviderForJava,SRCDIR))
+
+$(eval $(call gb_Jar_add_jars,ScriptProviderForJava,\
+ $(OUTDIR)/bin/juh.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/ScriptFramework.jar \
+))
+
+$(eval $(call gb_Jar_set_componentfile,ScriptProviderForJava,scripting/java/ScriptProviderForJava,OOO))
+
+$(eval $(call gb_Jar_set_packageroot,ScriptProviderForJava,com))
+
+$(eval $(call gb_Jar_add_sourcefiles,ScriptProviderForJava,\
+ scripting/java/com/sun/star/script/framework/provider/java/Resolver \
+ scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor \
+ scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava \
+ scripting/java/com/sun/star/script/framework/provider/java/ScriptProxy \
+ scripting/java/com/sun/star/script/framework/provider/java/StrictResolver \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scripting/Jar_ScriptProviderForJavaScript.mk b/scripting/Jar_ScriptProviderForJavaScript.mk
new file mode 100644
index 0000000..91d97fb
--- /dev/null
+++ b/scripting/Jar_ScriptProviderForJavaScript.mk
@@ -0,0 +1,52 @@
+# -*- 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.kukan at 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_Jar_Jar,ScriptProviderForJavaScript,SRCDIR))
+
+$(eval $(call gb_Jar_add_jars,ScriptProviderForJavaScript,\
+ $(OUTDIR)/bin/juh.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/ScriptFramework.jar \
+ $(OUTDIR)/bin/js.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,ScriptProviderForJavaScript,com))
+
+$(eval $(call gb_Jar_add_sourcefiles,ScriptProviderForJavaScript,\
+ scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript \
+ scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript \
+))
+
+$(eval $(call gb_Jar_add_packagefile,ScriptProviderForJavaScript,\
+ com/sun/star/script/framework/provider/javascript/template.js,\
+ $(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/javascript/template.js \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk
index bbaa485..b926b07 100644
--- a/scripting/Module_scripting.mk
+++ b/scripting/Module_scripting.mk
@@ -29,6 +29,22 @@
$(eval $(call gb_Module_Module,scripting))
$(eval $(call gb_Module_add_targets,scripting,\
+ $(if $(SOLAR_JAVA),\
+ $(if $(filter $(ENABLE_SCRIPTING_JAVASCRIPT),YES),\
+ Extension_ScriptProviderForJavaScript) \
+ $(if $(filter $(ENABLE_SCRIPTING_BEANSHELL),YES),\
+ Extension_ScriptProviderForBeanShell) \
+ Jar_HelloWorld \
+ Jar_Highlight \
+ Jar_MemoryUsage \
+ Jar_ScriptFramework \
+ Jar_ScriptProviderForBeanShell \
+ Jar_ScriptProviderForJava \
+ Jar_ScriptProviderForJavaScript \
+ Zip_ScriptsJava \
+ ) \
+ $(if $(filter $(ENABLE_SCRIPTING_PYTHON),YES),\
+ Extension_ScriptProviderForPython) \
Library_basprov \
Library_dlgprov \
Library_protocolhandler \
@@ -41,7 +57,5 @@ $(eval $(call gb_Module_add_targets,scripting,\
Zip_ScriptsJavaScript \
Zip_ScriptsPython \
))
-# TODO:
-# $(if $(SOLAR_JAVA),Zip_ScriptsJava) \
# vim: set noet sw=4 ts=4:
diff --git a/scripting/Zip_ScriptsJava.mk b/scripting/Zip_ScriptsJava.mk
index c3cb31b..247ad15 100644
--- a/scripting/Zip_ScriptsJava.mk
+++ b/scripting/Zip_ScriptsJava.mk
@@ -26,19 +26,44 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-# first we need to convert examples/java/makefile.mk
-#$(eval $(call gb_Zip_Zip,ScriptsJava,$(WORKDIR)/...))
-
-#$(eval $(call gb_Zip_add_files,ScriptsJava,\
- java/Highlight/Highlight.jar \
- java/Highlight/HighlightText.java \
- java/Highlight/parcel-descriptor.xml \
- java/MemoryUsage/MemoryUsage.java \
- java/MemoryUsage/parcel-descriptor.xml \
- java/MemoryUsage/MemoryUsage.jar \
- java/HelloWorld/HelloWorld.java \
- java/HelloWorld/HelloWorld.jar \
- java/HelloWorld/parcel-descriptor.xml \
+$(eval $(call gb_Zip_Zip,ScriptsJava,$(WORKDIR)/Zip/ScriptsJava))
+
+$(eval $(call gb_Zip_add_file,ScriptsJava,java/HelloWorld/HelloWorld.jar,\
+ $(OUTDIR)/bin/HelloWorld.jar \
+))
+
+$(eval $(call gb_Zip_add_file,ScriptsJava,java/HelloWorld/HelloWorld.java,\
+ $(SRCDIR)/scripting/examples/java/HelloWorld/HelloWorld.java \
+))
+
+$(eval $(call gb_Zip_add_file,ScriptsJava,java/HelloWorld/parcel-descriptor.xml,\
+ $(SRCDIR)/scripting/examples/java/HelloWorld/parcel-descriptor.xml \
+))
+
+
+$(eval $(call gb_Zip_add_file,ScriptsJava,java/Highlight/Highlight.jar,\
+ $(OUTDIR)/bin/Highlight.jar \
+))
+
+$(eval $(call gb_Zip_add_file,ScriptsJava,java/Highlight/HighlightText.java,\
+ $(SRCDIR)/scripting/examples/java/Highlight/HighlightText.java \
+))
+
+$(eval $(call gb_Zip_add_file,ScriptsJava,java/Highlight/parcel-descriptor.xml,\
+ $(SRCDIR)/scripting/examples/java/Highlight/parcel-descriptor.xml \
+))
+
+
+$(eval $(call gb_Zip_add_file,ScriptsJava,java/MemoryUsage/MemoryUsage.jar,\
+ $(OUTDIR)/bin/MemoryUsage.jar \
+))
+
+$(eval $(call gb_Zip_add_file,ScriptsJava,java/MemoryUsage/MemoryUsage.java,\
+ $(SRCDIR)/scripting/examples/java/MemoryUsage/MemoryUsage.java \
+))
+
+$(eval $(call gb_Zip_add_file,ScriptsJava,java/MemoryUsage/parcel-descriptor.xml,\
+ $(SRCDIR)/scripting/examples/java/MemoryUsage/parcel-descriptor.xml \
))
# vim: set noet sw=4 ts=4:
diff --git a/scripting/Zip_pythonscript.mk b/scripting/Zip_pythonscript.mk
deleted file mode 100644
index 68ce866..0000000
--- a/scripting/Zip_pythonscript.mk
+++ /dev/null
@@ -1,36 +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.kukan at 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,pythonscript,$(SRCDIR)/scripting/source/pyprov))
-
-$(eval $(call gb_Zip_add_files,pythonscript,\
- description.xml \
- pythonscript.py \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scripting/examples/delzip b/scripting/examples/delzip
deleted file mode 100755
index 636fda9..0000000
--- a/scripting/examples/delzip
+++ /dev/null
@@ -1 +0,0 @@
-ECHO is OFF
diff --git a/scripting/examples/java/build.xml b/scripting/examples/java/build.xml
deleted file mode 100755
index cb399d6..0000000
--- a/scripting/examples/java/build.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<!--
-
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- Copyright 2000, 2010 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.
-
--->
-<project name="Scripting Framework Java Examples" default="all" basedir=".">
- <!-- =================== Environmental Properties ======================= -->
-
- <property name="prj" value="../.."/>
- <property environment="env"/>
- <property name="outdir" value="${out}/class/examples/java"/>
-
- <!-- ==================== classpath setting ============================ -->
- <path id="idlclasspath">
- <pathelement location="${solar.jar}/unoil.jar"/>
- <pathelement location="${solar.jar}/jurt.jar"/>
- <pathelement location="${solar.jar}/juh.jar"/>
- <pathelement location="${solar.jar}/ridl.jar"/>
- <pathelement location="${out}/class/ScriptFramework.jar"/>
- </path>
-
- <!-- ===================== HelloWorld example =========================== -->
- <target name="HelloWorld">
-
- <mkdir dir="${outdir}/HelloWorld"/>
-
- <javac srcdir="HelloWorld" destdir="${outdir}/HelloWorld"
- includes="**/*.java" classpathref="idlclasspath"
- debug="${debug}" optimize="${optimize}" deprecation="on" includeantruntime="false"/>
-
- <copy file="HelloWorld/HelloWorld.java" todir="${outdir}/HelloWorld"/>
- <copy file="HelloWorld/parcel-descriptor.xml" todir="${outdir}/HelloWorld"/>
-
- <jar jarfile="${outdir}/HelloWorld/HelloWorld.jar"
- basedir="${outdir}/HelloWorld"
- includes="**/*.class"
- excludes="${outdir}/HelloWorld/HelloWorld.jar">
- </jar>
-
- <delete file="${outdir}/HelloWorld/HelloWorld.class"/>
-
- </target>
-
- <!-- ===================== Highlight example ========================== -->
- <target name="Highlight">
-
- <mkdir dir="${outdir}/Highlight"/>
-
- <javac srcdir="Highlight" destdir="${outdir}/Highlight"
- includes="**/*.java" classpathref="idlclasspath"
- debug="${debug}" optimize="${optimize}" deprecation="on" includeantruntime="false"/>
-
- <copy file="Highlight/HighlightText.java" todir="${outdir}/Highlight"/>
- <copy file="Highlight/parcel-descriptor.xml" todir="${outdir}/Highlight"/>
-
- <jar jarfile="${outdir}/Highlight/Highlight.jar"
- basedir="${outdir}/Highlight"
- includes="**/*.class"
- excludes="${outdir}/Highlight/Highlight.jar">
- </jar>
-
- <delete file="${outdir}/Highlight/HighlightText.class"/>
-
- </target>
-
- <!-- ===================== MemoryUsage example ========================== -->
- <target name="MemoryUsage">
-
- <mkdir dir="${outdir}/MemoryUsage"/>
-
- <javac srcdir="MemoryUsage" destdir="${outdir}/MemoryUsage"
- includes="**/*.java" classpathref="idlclasspath"
- debug="${debug}" optimize="${optimize}" deprecation="on" includeantruntime="false"/>
-
- <copy file="MemoryUsage/MemoryUsage.java" todir="${outdir}/MemoryUsage"/>
- <copy file="MemoryUsage/parcel-descriptor.xml" todir="${outdir}/MemoryUsage"/>
-
- <jar jarfile="${outdir}/MemoryUsage/MemoryUsage.jar"
- basedir="${outdir}/MemoryUsage"
- includes="**/*.class"
- excludes="${outdir}/MemoryUsage/MemoryUsage.jar">
- </jar>
-
- <delete file="${outdir}/MemoryUsage/MemoryUsage.class"/>
-
- </target>
-
- <!-- ===================== selector example ========================== -->
- <target name="selector">
-
- <mkdir dir="${outdir}/selector"/>
-
- <javac srcdir="selector" destdir="${outdir}/selector"
- includes="**/*.java" classpathref="idlclasspath"
- debug="${debug}" optimize="${optimize}" deprecation="on"/>
-
- <copy todir="${outdir}/selector">
- <fileset dir="selector">
- <include name="**/*.java"/>
- <include name="*.xml"/>
- <include name="*.gif"/>
- </fileset>
- </copy>
-
- <jar jarfile="${outdir}/selector/selector.jar"
- basedir="${outdir}/selector" includes="*.class,*.gif">
- </jar>
-
- <delete>
- <fileset dir="${outdir}/selector" includes="*.class,*.gif"/>
- </delete>
-
- </target>
-
- <!-- ========================= All In One Build ======================= -->
- <target name="all" depends="HelloWorld,Highlight,MemoryUsage"/>
-
-</project>
diff --git a/scripting/examples/java/makefile.mk b/scripting/examples/java/makefile.mk
deleted file mode 100755
index 06ba888..0000000
--- a/scripting/examples/java/makefile.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=scripting
-TARGET=javaexamples
-
-.INCLUDE : ant.mk
-
-.IF "$(SOLAR_JAVA)"!=""
-.IF "$(L10N_framework)"==""
-ALLTAR : ANTBUILD
-.ENDIF
-.ENDIF
diff --git a/scripting/examples/makefile.mk b/scripting/examples/makefile.mk
deleted file mode 100755
index 577547c..0000000
--- a/scripting/examples/makefile.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 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.
-#
-#*************************************************************************
-PRJ=..
-PRJNAME=scriptinginstaller
-TARGET=scriptinginstaller
-no_common_build_zip=true
-
-.INCLUDE : settings.mk
-.IF "$(L10N_framework)"==""
-.IF "$(SOLAR_JAVA)"!=""
-ZIP1FLAGS=-r
-ZIP1TARGET=ScriptsJava
-ZIP1DIR=$(OUT)$/class$/examples
-ZIP1LIST=java
-.ENDIF
-
-ZIP2FLAGS=-r
-ZIP2TARGET=ScriptsBeanShell
-ZIP2LIST=beanshell/HelloWorld beanshell/Highlight beanshell/WordCount beanshell/Capitalise beanshell/MemoryUsage
-
-ZIP3FLAGS=-r
-ZIP3TARGET=ScriptsJavaScript
-ZIP3LIST=javascript
-
-ZIP4FLAGS=-r
-ZIP4TARGET=ScriptsPython
-ZIP4LIST=python/HelloWorld.py python/Capitalise.py python/pythonSamples
-
-ZIP5FLAGS=-r
-ZIP5TARGET=scriptbindinglib
-ZIP5DIR=$(PRJ)$/workben$/bindings
-ZIP5LIST=*.xlb Highlight.xdl
-.ENDIF
-.INCLUDE : target.mk
diff --git a/scripting/inc/makefile.mk b/scripting/inc/makefile.mk
deleted file mode 100755
index 1d23c96..0000000
--- a/scripting/inc/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 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.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=scripting
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/scripting/java/build.env b/scripting/java/build.env
deleted file mode 100755
index 5b055e0..0000000
--- a/scripting/java/build.env
+++ /dev/null
@@ -1,3 +0,0 @@
-jedit.install.dir=/scde/soperm/projects/scripting/build-dependencies
-install.dir=/scde/soperm/projects/scripting/build-dependencies
-netbeans.home=/scde/soperm/projects/scripting/build-dependencies
diff --git a/scripting/java/build.xml b/scripting/java/build.xml
deleted file mode 100755
index 2abb784..0000000
--- a/scripting/java/build.xml
+++ /dev/null
@@ -1,284 +0,0 @@
-<!--
-
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- Copyright 2000, 2010 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.
-
--->
-<project name="Scipting Framework" default="all" basedir=".">
-
- <!-- =================== Environmental Properties ======================= -->
-
- <property name="prj" value=".."/>
- <property name="optimize" value="off"/>
- <property name="debug" value="on"/>
- <property name="jardir" value="${out}/class"/>
- <property name="bindir" value="${out}/bin"/>
- <property name="idesupport.dir" value="org/openoffice/idesupport"/>
- <property name="netbeans.dir" value="org/openoffice/netbeans/modules/office"/>
- <property name="framework.dir" value="Framework/com/sun/star/script/framework/security"/>
-
- <!-- Change this property if you are building NetBeans editor support jar.
- Not needed in default build -->
- <property name="netbeans.install.path" value="/export/home/netbeans"/>
-
- <property environment="env"/>
- <property name="env.BSH_JAR" value="${solar.jar}/bsh.jar"/>
-
- <!-- ==================== classpath setting ============================ -->
- <path id="idlclasspath">
- <pathelement location="${solar.jar}/jurt.jar"/>
- <pathelement location="${solar.jar}/unoil.jar"/>
- <pathelement location="${solar.jar}/juh.jar"/>
- <pathelement location="${solar.jar}/java_uno.jar"/>
- <pathelement location="${solar.jar}/ridl.jar"/>
- <pathelement location="${env.BSH_JAR}"/>
- <pathelement location="${solar.jar}/js.jar"/>
- <pathelement location="${jardir}"/>
- </path>
-
- <path id="idesupport.class.path">
- <pathelement path="${jardir}"/>
- </path>
-
- <path id="openide.class.path">
- <pathelement path="${jardir}"/>
- <pathelement path="${solar.jar}/openide.jar"/>
- </path>
-
- <path id="netbeans.editor.support.classpath">
- <pathelement path="${jardir}"/>
- <pathelement path="${netbeans.install.path}/modules/ext/nb-editor.jar"/>
- </path>
-
- <condition property="boot_refID" value="macPath" else="nonMacPath">
- <and>
- <os family="mac"/>
- <os family="unix"/>
- </and>
- </condition>
- <path id="macPath" location="${java.home}/../Classes/classes.jar"/>
- <!-- rhino.jar from OpenJDK breaks build -->
- <path id="nonMacPath">
- <fileset dir="${java.home}/">
- <include name="jre/lib/*.jar"/>
- <include name="lib/*.jar"/>
- <exclude name="jre/lib/rhino.jar"/>
- <exclude name="lib/rhino.jar"/>
- </fileset>
- </path>
- <path id="my.bootstrap.classpath" refID="${boot_refID}"/>
-
- <!-- ===================== Prepare Directories ========================= -->
- <target name="prepare">
- <mkdir dir="${jardir}"/>
- </target>
-
- <!-- ======================== Compile Classes ========================== -->
- <target name="compile" depends="prepare">
- <javac srcdir="com" destdir="${jardir}"
- includes="**/*.java" classpathref="idlclasspath"
- debug="${debug}" optimize="${optimize}" deprecation="off" includeantruntime="false">
- <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
- </javac>
- <javac srcdir="Framework/" destdir="${jardir}"
- includes="**/*.java" classpathref="idlclasspath" debug="${debug}"
- optimize="${optimize}" deprecation="off" includeantruntime="false">
- <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
- </javac>
- </target>
-
- <target name="idesupport.compile" depends="compile, prepare">
- <javac srcdir="." destdir="${jardir}"
- debug="${debug}" deprecation="on">
- <classpath refid="idesupport.class.path"/>
- <exclude name="${idesupport.dir}/**/.*/*"/>
- <exclude name="${idesupport.dir}/localoffice/**/*"/>
- <exclude name="${idesupport.dir}/LocalOffice.java"/>
- <include name="${idesupport.dir}/*.java"/>
- <include name="${idesupport.dir}/*/*.java"/>
- </javac>
- </target>
-
- <target name="localoffice.compile" depends="prepare">
- <javac srcdir="." destdir="${jardir}"
- debug="${debug}" deprecation="on">
- <classpath refid="idlclasspath"/>
- <exclude name="${idesupport.dir}/localoffice/.*/*"/>
- <include name="${idesupport.dir}/localoffice/*.java"/>
- </javac>
- </target>
-
- <target name="netbeans.compile" depends="idesupport.compile, prepare">
- <javac srcdir="." destdir="${jardir}"
- debug="${debug}" deprecation="on">
- <classpath refid="openide.class.path"/>
- <exclude name="${netbeans.dir}/**/.*/*"/>
- <include name="${netbeans.dir}/**/*.java"/>
- </javac>
- </target>
-
- <target name="netbeans.editor.support" depends="prepare">
- <javac srcdir="." destdir="${jardir}"
- debug="${debug}" deprecation="on">
- <classpath refid="netbeans.editor.support.classpath"/>
- <include name="org/openoffice/netbeans/editor/*.java"/>
- </javac>
- <jar jarfile="${jardir}/nb-editorsupport.jar">
- <fileset dir="${jardir}">
- <include name="org/openoffice/netbeans/editor/*.class"/>
- </fileset>
- <fileset dir=".">
- <include name="org/openoffice/netbeans/editor/OOo.jcs"/>
- <include name="org/openoffice/netbeans/editor/OOo.jcb"/>
- </fileset>
- </jar>
- </target>
-
- <!-- ===================== jar ========================= -->
- <target name="jar" depends="compile">
- <jar jarfile="${jardir}/ScriptProviderForJava.jar"
- basedir="${jardir}">
- <manifest>
- <attribute name="Built-By" value="Sun Microsystems"/>
- <attribute name="RegistrationClassName"
- value="com.sun.star.script.framework.provider.java.ScriptProviderForJava"/>
- <attribute name="Class-Path" value="ScriptFramework.jar"/>
- <attribute name="UNO-Type-Path" value=""/>
- </manifest>
- <include name="**/provider/java/*.class"/>
- </jar>
-
- <jar jarfile="${jardir}/ScriptProviderForBeanShell.jar"
- basedir="${jardir}">
- <manifest>
- <attribute name="Built-By" value="Sun Microsystems"/>
- <attribute name="RegistrationClassName"
- value="com.sun.star.script.framework.provider.beanshell.ScriptProviderForBeanShell"/>
- <attribute name="Class-Path" value="ScriptFramework.jar bsh.jar"/>
- <attribute name="UNO-Type-Path" value=""/>
- </manifest>
- <include name="**/provider/beanshell/*.class"/>
- <fileset dir=".">
- <include name="**/provider/beanshell/*.bsh"/>
- </fileset>
- </jar>
-
- <jar jarfile="${jardir}/ScriptProviderForJavaScript.jar"
- basedir="${jardir}">
- <manifest>
- <attribute name="Built-By" value="Sun Microsystems"/>
- <attribute name="RegistrationClassName"
- value="com.sun.star.script.framework.provider.javascript.ScriptProviderForJavaScript"/>
- <attribute name="Class-Path" value="ScriptFramework.jar js.jar"/>
- <attribute name="UNO-Type-Path" value=""/>
- </manifest>
- <include name="**/provider/javascript/*.class"/>
- <fileset dir=".">
- <include name="**/provider/javascript/*.js"/>
- </fileset>
- </jar>
-
- <jar jarfile="${jardir}/ScriptFramework.jar"
- basedir="${jardir}">
- <manifest>
- <attribute name="Built-By" value="Sun Microsystems"/>
- <attribute name="RegistrationClassName"
- value="com.sun.star.script.framework.security.SecurityDialog"/>
- <attribute name="UNO-Type-Path" value=""/>
- </manifest>
- <include name="**/security/*"/>
- <include name="**/log/*.class"/>
- <include name="**/provider/*.class"/>
- <include name="**/browse/*.class"/>
- <include name="**/container/*.class"/>
- <include name="**/io/*.class"/>
- </jar>
-
- </target>
-
- <target name="idesupport.jar" depends="idesupport.compile">
- <jar jarfile="${jardir}/idesupport.jar">
- <fileset dir="${jardir}">
- <include name="${idesupport.dir}/**/*.class"/>
- <include name="CommandLineTools*"/>
- <exclude name="${idesupport.dir}/localoffice/*.class"/>
- </fileset>
- <fileset dir=".">
- <include name="${idesupport.dir}/ui/add.gif"/>
- </fileset>
- </jar>
- </target>
-
- <target name="localoffice.jar" depends="localoffice.compile">
- <unjar
- src="${solar.jar}/unoil.jar"
- dest="${jardir}"/>
- <jar jarfile="${jardir}/localoffice.jar">
- <fileset dir="${jardir}">
- <include name="${idesupport.dir}/localoffice/*.class"/>
- <include name="drafts/com/sun/star/script/framework/storage/*.class"/>
- </fileset>
- </jar>
- </target>
-
- <target name="netbeans.jar" depends="netbeans.compile">
- <jar jarfile="${jardir}/office.jar" manifest="manifest.mf">
- <fileset dir="${jardir}">
- <include name="${netbeans.dir}/**/*.class"/>
- <exclude name="${netbeans.dir}/**/ParcelDescriptorChildren.class"/>
- <exclude name="${netbeans.dir}/**/ScriptNode.class"/>
- <include name="${idesupport.dir}/**/*.class"/>
- <include name="CommandLineTools*"/>
- </fileset>
- <fileset dir=".">
- <include name="${idesupport.dir}/ui/add.gif"/>
- <include name="${netbeans.dir}/resources/*"/>
- <include name="${netbeans.dir}/resources/templates/*"/>
- <include name="${netbeans.dir}/**/Bundle*"/>
- </fileset>
- </jar>
- </target>
-
- <!-- Uncomment this target when building within NetBeans to reinstall the
- module.
- <target name="netbeans.install" depends="netbeans.package">
- <copy file="${jardir}/localoffice.jar"
- tofile="${netbeans.home}/modules/ext/localoffice.jar"/>
- <nbinstaller action="reinstall" module="${jardir}/office.jar"/>
- </target>
- -->
-
- <!-- ====================== Clean Generated Files ===================== -->
- <target name="clean">
- <delete file="${jardir}/ScriptProviderForJava.jar"/>
- <delete file="${jardir}/ScriptProviderForJavaScript.jar"/>
- <delete file="${jardir}/ScriptProviderForBeanShell.jar"/>
- <delete file="${jardir}/ScriptFramework.jar"/>
- <delete file="${jardir}/office.jar"/>
- <delete file="${jardir}/localoffice.jar"/>
- <delete file="${jardir}/idesupport.jar"/>
- </target>
-
- <!-- ========================= All In One Build ======================= -->
- <target name="all" depends="jar"/>
-</project>
diff --git a/scripting/java/makefile.mk b/scripting/java/makefile.mk
deleted file mode 100755
index 8109c91..0000000
--- a/scripting/java/makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 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.
-#
-#*************************************************************************
-
-PRJ=..
-PRJNAME=scripting
-TARGET=scriptruntimeforjava
-
-.INCLUDE : ant.mk
-
-.IF "$(L10N_framework)"==""
-.IF "$(SOLAR_JAVA)"!=""
-ALLTAR : ANTBUILD
-.ENDIF
-.ENDIF
-
-ALLTAR : \
- $(MISC)/ScriptFramework.component \
- $(MISC)/ScriptProviderForJava.component \
-
-$(MISC)/ScriptFramework.component .ERRREMOVE : \
- $(SOLARENV)/bin/createcomponent.xslt ScriptFramework.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_JAVA)ScriptFramework.jar' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt ScriptFramework.component
-
-$(MISC)/ScriptProviderForJava.component .ERRREMOVE : \
- $(SOLARENV)/bin/createcomponent.xslt ScriptProviderForJava.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_JAVA)ScriptProviderForJava.jar' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt ScriptProviderForJava.component
diff --git a/scripting/prj/build.lst b/scripting/prj/build.lst
index aa1cda8..2bd4c61 100644
--- a/scripting/prj/build.lst
+++ b/scripting/prj/build.lst
@@ -1,7 +1,2 @@
tc scripting : filter oovbaapi vbahelper bridges DESKTOP:rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper LIBXSLT:libxslt NULL
-tc scripting\source\pyprov nmake - all tc1_scriptingpyprov NULL
-tc scripting\java nmake - all tc1_scriptingjava NULL
-tc scripting\examples\java nmake - all tc1_scriptingexamplesjava tc1_scriptingjava NULL
-tc scripting\examples nmake - all tc1_scriptingexamples tc1_scriptingexamplesjava NULL
-tc scripting\util\provider\javascript nmake - all tc1_scriptingjsprov tc1_scriptingjava NULL
-tc scripting\util\provider\beanshell nmake - all tc1_scriptingbshprov tc1_scriptingjava NULL
+tc scripting\prj nmake - all tc1_prj NULL
diff --git a/scripting/prj/d.lst b/scripting/prj/d.lst
index f8efa29..e69de29 100644
--- a/scripting/prj/d.lst
+++ b/scripting/prj/d.lst
@@ -1,21 +0,0 @@
-mkdir: %_DEST%\inc\scripting
-mkdir: %_DEST%\lib\pyuno
-mkdir: %_DEST%\bin\pyuno
-
-..\%__SRC%\bin\*.dll %_DEST%\bin\*
-..\%__SRC%\bin\*.zip %COMMON_DEST%\pck\*
-..\%__SRC%\class\*.jar %_DEST%\bin\*
-..\%__SRC%\lib\*.so %_DEST%\lib\*
-..\%__SRC%\bin\*.py %_DEST%\bin\pyuno\*
-..\%__SRC%\lib\*.py %_DEST%\lib\pyuno\*
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-
-..\%__SRC%\bin\*.rdb %_DEST%\rdb\*
-
-..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib\lib*static*.dylib
-..\%__SRC%\misc\mailmerge.component %_DEST%\xml\mailmerge.component
-..\%__SRC%\misc\ScriptFramework.component %_DEST%\xml\ScriptFramework.component
-..\%__SRC%\misc\ScriptProviderForJava.component %_DEST%\xml\ScriptProviderForJava.component
-
-# Extensions
-..\%__SRC%\bin\*.oxt %_DEST%\bin\*.oxt
diff --git a/scripting/source/basprov/makefile.mk b/scripting/source/basprov/makefile.mk
deleted file mode 100755
index bde15f9..0000000
--- a/scripting/source/basprov/makefile.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=scripting
-TARGET=basprov
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-COMP1TYPELIST=$(TARGET)
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-DLLPRE =
-
-# ------------------------------------------------------------------
-
-SLOFILES= \
- $(SLO)$/basprov.obj \
- $(SLO)$/basscript.obj \
- $(SLO)$/baslibnode.obj \
- $(SLO)$/basmodnode.obj \
- $(SLO)$/basmethnode.obj
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX).uno
-SHL1IMPLIB= i$(TARGET)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-SHL1STDLIBS= \
- $(SFX2LIB) \
- $(BASICLIB) \
- $(VCLLIB) \
- $(SVLLIB) \
- $(TOOLSLIB) \
- $(UCBHELPERLIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB)
-
-SHL1DEPN=
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/basprov.component
-
-$(MISC)/basprov.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- basprov.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt basprov.component
diff --git a/scripting/source/dlgprov/makefile.mk b/scripting/source/dlgprov/makefile.mk
deleted file mode 100755
index 51f8341..0000000
--- a/scripting/source/dlgprov/makefile.mk
+++ /dev/null
@@ -1,92 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=scripting
-TARGET=dlgprov
-ENABLE_EXCEPTIONS=TRUE
-COMP1TYPELIST=$(TARGET)
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-DLLPRE =
-
-# ------------------------------------------------------------------
-
-SLOFILES= \
- $(SLO)$/dlgprov.obj \
- $(SLO)$/DialogModelProvider.obj \
- $(SLO)$/dlgevtatt.obj
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX).uno
-SHL1IMPLIB= i$(TARGET)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-SHL1STDLIBS= \
- $(SFX2LIB) \
- $(VCLLIB) \
- $(TOOLSLIB) \
- $(XMLSCRIPTLIB) \
- $(CPPUHELPERLIB) \
- $(COMPHELPERLIB) \
- $(UCBHELPERLIB) \
- $(VBAHELPERLIB) \
- $(CPPULIB) \
- $(BASICLIB) \
- $(SALLIB)
-
-SHL1DEPN=
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-# ------------------------------------------------------------------
-
-ALLTAR : \
- $(MISC)$/$(TARGET).don \
-
-$(SLOFILES) : $(MISC)$/$(TARGET).don
-
-$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
- +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
- echo $@
-
-
-ALLTAR : $(MISC)/dlgprov.component
-
-$(MISC)/dlgprov.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- dlgprov.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt dlgprov.component
diff --git a/scripting/source/protocolhandler/exports.dxp b/scripting/source/protocolhandler/exports.dxp
deleted file mode 100755
index 7003307..0000000
--- a/scripting/source/protocolhandler/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/scripting/source/protocolhandler/makefile.mk b/scripting/source/protocolhandler/makefile.mk
deleted file mode 100755
index 5a2e92b..0000000
--- a/scripting/source/protocolhandler/makefile.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME= scripting
-TARGET= protocolhandler
-USE_DEFFILE= TRUE
-ENABLE_EXCEPTIONS=TRUE
-COMP1TYPELIST=$(TARGET)
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# ------------------------------------------------------------------
-
-SLOFILES=\
- $(SLO)$/scripthandler.obj\
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-
-SHL1STDLIBS= \
- $(SFXLIB) \
- $(FWELIB) \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(VCLLIB) \
- $(SALLIB)
-
-SHL1DEPN=
-SHL1IMPLIB= i$(TARGET)
-SHL1LIBS= $(SLB)$/$(TARGET).lib
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME= $(SHL1TARGET)
-DEF1EXPORTFILE= exports.dxp
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/protocolhandler.component
-
-$(MISC)/protocolhandler.component .ERRREMOVE : \
- $(SOLARENV)/bin/createcomponent.xslt protocolhandler.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt protocolhandler.component
diff --git a/scripting/source/provider/exports.dxp b/scripting/source/provider/exports.dxp
deleted file mode 100755
index 7003307..0000000
--- a/scripting/source/provider/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/scripting/source/provider/makefile.mk b/scripting/source/provider/makefile.mk
deleted file mode 100755
index a63ae07..0000000
--- a/scripting/source/provider/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME= scripting
-TARGET= provider
-USE_DEFFILE= TRUE
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-COMP1TYPELIST=$(TARGET)
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# ------------------------------------------------------------------
-
-SLOFILES=\
- $(SLO)$/MasterScriptProvider.obj\
- $(SLO)$/URIHelper.obj\
- $(SLO)$/ActiveMSPList.obj\
- $(SLO)$/ProviderCache.obj\
- $(SLO)$/MasterScriptProviderFactory.obj\
- $(SLO)$/BrowseNodeFactoryImpl.obj\
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/scripting/source/pyprov/delzip b/scripting/source/pyprov/delzip
deleted file mode 100755
index e69de29..0000000
diff --git a/scripting/source/pyprov/makefile.mk b/scripting/source/pyprov/makefile.mk
deleted file mode 100755
index a304d97..0000000
--- a/scripting/source/pyprov/makefile.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=scripting
-TARGET=pyprov
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Targets ------------------------------------------------------
-# mailmerge is put in an extra services.rdb
-# simply do not fiddle with that. cws sb123, sb129
-ALL : ALLTAR \
- $(DLLDEST)$/officehelper.py \
- $(DLLDEST)$/msgbox.py \
- $(DLLDEST)$/mailmerge.py
-
-$(DLLDEST)$/%.py: %.py
- cp $? $@
-
-ALLTAR : $(MISC)/mailmerge.component
-
-$(MISC)/mailmerge.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- mailmerge.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_PYTHON)mailmerge' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt mailmerge.component
-
-# scripting provider extension
-.IF "$(L10N_framework)"=="" && "$(ENABLE_SCRIPTING_PYTHON)" == "YES"
-
-EXTENSIONNAME:=ScriptProviderForPython
-EXTENSION_ZIPNAME:=script-provider-for-python
-
-COMPONENT_FILES=$(EXTENSIONDIR)$/pythonscript.py
-
-.INCLUDE : extension_pre.mk
-.INCLUDE : target.mk
-.INCLUDE : extension_post.mk
-
-.ELSE
-
-.INCLUDE : target.mk
-
-.ENDIF
diff --git a/scripting/source/runtimemgr/exports.dxp b/scripting/source/runtimemgr/exports.dxp
deleted file mode 100755
index 7003307..0000000
--- a/scripting/source/runtimemgr/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/scripting/source/stringresource/makefile.mk b/scripting/source/stringresource/makefile.mk
deleted file mode 100755
index 71f8ee3..0000000
--- a/scripting/source/stringresource/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=scripting
-TARGET=stringresource
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-DLLPRE =
-
-# ------------------------------------------------------------------
-
-SLOFILES= \
- $(SLO)$/stringresource.obj \
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX).uno
-SHL1IMPLIB= i$(TARGET)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-SHL1STDLIBS= \
- $(TOOLSLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB)
-
-SHL1DEPN=
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/stringresource.component
-
-$(MISC)/stringresource.component .ERRREMOVE : \
- $(SOLARENV)/bin/createcomponent.xslt stringresource.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt stringresource.component
diff --git a/scripting/source/vbaevents/makefile.mk b/scripting/source/vbaevents/makefile.mk
deleted file mode 100755
index d7bca56..0000000
--- a/scripting/source/vbaevents/makefile.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=scripting
-TARGET=vbaevents
-VISIBILITY_HIDDEN=TRUE
-NO_BSYMBOLIC= TRUE
-ENABLE_EXCEPTIONS=TRUE
-COMP1TYPELIST=$(TARGET)
-COMPRDB=$(SOLARBINDIR)$/types.rdb
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-DLLPRE =
-
-# ------------------------------------------------------------------
-
-SLOFILES= \
- $(SLO)$/service.obj \
- $(SLO)$/eventhelper.obj
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX).uno
-SHL1IMPLIB= i$(TARGET)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-SHL1STDLIBS= \
- $(CPPUHELPERLIB) \
- $(BASICLIB) \
- $(COMPHELPERLIB) \
- $(SFXLIB) \
- $(MSFILTERLIB) \
- $(CPPULIB) \
- $(TOOLSLIB) \
- $(SALLIB)
-
-SHL1DEPN=
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-# ------------------------------------------------------------------
-
-ALLTAR : \
- $(MISC)$/$(TARGET).don \
-
-$(SLOFILES) : $(MISC)$/$(TARGET).don
-
-$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
- +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
- echo $@
-
-
-ALLTAR : $(MISC)/vbaevents.component
-
-$(MISC)/vbaevents.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- vbaevents.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt vbaevents.component
diff --git a/scripting/util/exports.dxp b/scripting/util/exports.dxp
deleted file mode 100755
index 7003307..0000000
--- a/scripting/util/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/scripting/util/makefile.mk b/scripting/util/makefile.mk
deleted file mode 100755
index 04435ca..0000000
--- a/scripting/util/makefile.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 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.
-#
-#*************************************************************************
-
-PRJ=..
-
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-PRJNAME=scripting
-TARGET=scriptframe
-USE_DEFFILE= TRUE
-NO_BSYMBOLIC= TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Allgemein ----------------------------------------------------
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-LIB1FILES= $(SLB)/provider.lib
-
-
-SHL1TARGET= $(TARGET)
-SHL1IMPLIB= $(TARGET)
-
-SHL1STDLIBS+=\
- $(TOOLSLIB) \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(COMPHELPERLIB) \
- $(UCBHELPERLIB) \
- $(SALLIB)
-
-
-SHL1LIBS= $(SLB)$/$(TARGET).lib
-
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME =$(SHL1TARGET)
-DEF1EXPORTFILE= exports.dxp
-# --- Targets ------------------------------------------------------
-
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/scriptframe.component
-
-$(MISC)/scriptframe.component .ERRREMOVE : \
- $(SOLARENV)/bin/createcomponent.xslt scriptframe.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt scriptframe.component
diff --git a/scripting/util/provider/beanshell/delzip b/scripting/util/provider/beanshell/delzip
deleted file mode 100755
index e69de29..0000000
diff --git a/scripting/util/provider/beanshell/makefile.mk b/scripting/util/provider/beanshell/makefile.mk
deleted file mode 100755
index a7c74f5..0000000
--- a/scripting/util/provider/beanshell/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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. 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
-# Red Hat, Inc.
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): David Tardon <dtardon at redhat.com>
-#
-# 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.
-
-PRJ=..$/..$/..
-
-PRJNAME=scripting
-TARGET=bshprov
-
-.INCLUDE : settings.mk
-
-.IF "$(L10N_framework)"=="" && "$(SOLAR_JAVA)"!=""
-
-EXTENSIONNAME:=ScriptProviderForBeanShell
-EXTENSION_ZIPNAME:=script-provider-for-beanshell
-
-COMPONENT_JARFILES=$(EXTENSIONDIR)$/$(EXTENSIONNAME).jar
-.IF "$(SYSTEM_BSH)" != "YES"
-EXTENSION_PACKDEPS=$(SOLARBINDIR)$/bsh.jar
-.ENDIF
-
-.IF "$(ENABLE_SCRIPTING_BEANSHELL)" != "YES"
- at all:
- @echo "Script Provider for BeanShell build disabled."
-.ENDIF
-
-.INCLUDE : extension_pre.mk
-.INCLUDE : target.mk
-.INCLUDE : extension_post.mk
-
-.IF "$(SYSTEM_BSH)" != "YES"
-
-ALLTAR : $(EXTENSIONDIR)$/bsh.jar
-
-$(EXTENSIONDIR)$/bsh.jar : $(SOLARBINDIR)$/bsh.jar
- @@-$(MKDIRHIER) $(@:d)
- $(COMMAND_ECHO)$(COPY) $< $@
-
-.ENDIF
-
-.ELSE
-
-.INCLUDE : target.mk
-
-.ENDIF
diff --git a/scripting/util/provider/javascript/delzip b/scripting/util/provider/javascript/delzip
deleted file mode 100755
index e69de29..0000000
diff --git a/scripting/util/provider/javascript/makefile.mk b/scripting/util/provider/javascript/makefile.mk
deleted file mode 100755
index f6443ad..0000000
--- a/scripting/util/provider/javascript/makefile.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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. 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
-# Red Hat, Inc.
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): David Tardon <dtardon at redhat.com>
-#
-# 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.
-
-PRJ=..$/..$/..
-
-PRJNAME=scripting
-TARGET=jsprov
-
-.INCLUDE : settings.mk
-
-.IF "$(L10N_framework)"=="" && "$(SOLAR_JAVA)"!=""
-
-EXTENSIONNAME:=ScriptProviderForJavaScript
-EXTENSION_ZIPNAME:=script-provider-for-javascript
-
-COMPONENT_JARFILES=$(EXTENSIONDIR)$/$(EXTENSIONNAME).jar
-EXTENSION_PACKDEPS=$(SOLARBINDIR)$/js.jar
-
-.IF "$(ENABLE_SCRIPTING_JAVASCRIPT)" != "YES"
- at all:
- @echo "Script Provider for JavaScript build disabled."
-.ENDIF
-
-.INCLUDE : extension_pre.mk
-.INCLUDE : target.mk
-.INCLUDE : extension_post.mk
-
-ALLTAR : $(EXTENSIONDIR)$/js.jar
-
-$(EXTENSIONDIR)$/js.jar : $(SOLARBINDIR)$/js.jar
- @@-$(MKDIRHIER) $(@:d)
- $(COMMAND_ECHO)$(COPY) $< $@
-
-.ELSE
-
-.INCLUDE : target.mk
-
-.ENDIF
commit a79a93722c80f6e055593a79b9e0b0aec9a49a0e
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Oct 1 03:14:15 2011 +0200
adjust Jar.mk so we could add arbitrary files to the .jar file
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index b30bd3a..659c9ae 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -33,9 +33,14 @@
gb_Jar_JAVACOMMAND := $(JAVAINTERPRETER)
gb_Jar_JARCOMMAND := jar
+# location of files going to be packed into .jar file
+define gb_Jar_get_workdir
+$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,$(1)))
+endef
+
# location of manifest file in workdir
define gb_Jar_get_manifest_target
-$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,$(1)))/META-INF/MANIFEST.MF
+$(call gb_Jar_get_workdir,$(1))/META-INF/MANIFEST.MF
endef
# creates classset and META-INF folders if they don't exist
@@ -46,15 +51,14 @@ endef
define gb_Jar__command
$(call gb_Output_announce,$*,$(true),JAR,3)
$(call gb_Helper_abbreviate_dirs_native,\
- mkdir -p $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,$(1)))/META-INF && \
+ mkdir -p $(call gb_Jar_get_workdir,$(1))/META-INF && \
echo Manifest-Version: 1.0 > $(call gb_Jar_get_manifest_target,$(1)) && \
echo "Class-Path: $(JARCLASSPATH)" >> $(call gb_Jar_get_manifest_target,$(1)) && \
echo "Solar-Version: $(RSCREVISION)" >> $(call gb_Jar_get_manifest_target,$(1)) && \
cat $(if $(MANIFEST),$(MANIFEST),$(gb_Helper_MISCDUMMY)) >> $(call gb_Jar_get_manifest_target,$(1)) && \
- mkdir -p $(dir $(2)) && \
- cd $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,$(1))) && \
+ mkdir -p $(dir $(2)) && cd $(call gb_Jar_get_workdir,$(1)) && \
$(gb_Jar_JARCOMMAND) cfm $(2) $(call gb_Jar_get_manifest_target,$(1)) \
- META-INF $(PACKAGEROOTS) \
+ META-INF $(PACKAGEROOTS) $(PACKAGEFILES) \
|| (rm $(2); false) )
endef
@@ -80,6 +84,7 @@ define gb_Jar_Jar
$(call gb_Jar_get_target,$(1)) : MANIFEST :=
$(call gb_Jar_get_target,$(1)) : JARCLASSPATH :=
$(call gb_Jar_get_target,$(1)) : PACKAGEROOTS :=
+$(call gb_Jar_get_target,$(1)) : PACKAGEFILES :=
$(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1)),$(2))
$(call gb_JavaClassSet_set_classpath,$(call gb_Jar_get_classsetname,$(1)),$(value XCLASSPATH))
$(eval $(call gb_Module_register_target,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_clean_target,$(1))))
@@ -98,6 +103,15 @@ define gb_Jar_set_packageroot
$(call gb_Jar_get_target,$(1)) : PACKAGEROOTS := $(2)
endef
+# PACKAGEFILES is the list of all root files to pack into the jar
+define gb_Jar_add_packagefile
+$(call gb_Jar_get_target,$(1)) : PACKAGEFILES += $(2)
+$(call gb_Jar_get_target,$(1)) : $(call gb_Jar_get_workdir,$(1))/$(strip $(2))
+$(call gb_Jar_get_workdir,$(1))/$(strip $(2)) : $(3) $(call gb_JavaClassSet_get_target,$(call gb_Jar_get_classsetname,$(1)))
+ cp -f $(3) $$@
+
+endef
+
define gb_Jar_add_sourcefiles
$(foreach sourcefile,$(2),$(call gb_Jar_add_sourcefile,$(1),$(sourcefile)))
endef
commit 84a558756f751d975da860844f64b24d4a8a037f
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Oct 1 02:54:37 2011 +0200
adjust Zip.mk so we can copy files from other places to workdir and pack them
diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk
index a96ff6b..f6d492e 100644
--- a/solenv/gbuild/Zip.mk
+++ b/solenv/gbuild/Zip.mk
@@ -81,10 +81,17 @@ endef
# adding a file creates a dependency to it
# the full path name of the file needs access to the package location
# as scoped variables only exist in rules, we use a postfixed name to refer to the location
+# if package location is in $(WORKDIR) we can specify third parameter and copy file from different place
define gb_Zip_add_file
$(call gb_Zip_get_target,$(1)) : FILES += $(2)
$(call gb_Zip_get_target,$(1)) : $(gb_Package_Location_$(1))/$(2)
$(gb_Package_Location_$(1))/$(2) :| $(call gb_Zip__get_preparation_target,$(1))
+ifneq ($(3),)
+$(gb_Package_Location_$(1))/$(2) : $(3)
+ mkdir -p $$(dir $$@)
+ cp -f $$< $$@
+
+endif
endef
commit c11d61eec93b6bae3f4e106f4a8e4c8f895a99bc
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Oct 1 03:01:23 2011 +0200
add extension support to gbuild for creating .oxt files
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
new file mode 100644
index 0000000..63627ec
--- /dev/null
+++ b/solenv/gbuild/Extension.mk
@@ -0,0 +1,85 @@
+# -*- Mode: makefile-gmake; 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Matúš Kukan <matus.kukan at gmail.com>
+#
+# All Rights Reserved.
+#
+# 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.
+
+# Extension class
+
+gb_Extension_ZIPCOMMAND := zip $(if $(findstring s,$(MAKEFLAGS)),-q)
+ifeq ($(GUI),WNT)
+gb_Extension_LICENSEFILE := license.txt
+else
+gb_Extension_LICENSEFILE := LICENSE
+endif
+
+# remove extension directory in workdir and oxt file in workdir and outdir
+$(call gb_Extension_get_clean_target,%) :
+ $(call gb_Output_announce,$*,$(false),OXT,3)
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f -r $(call gb_Extension_get_workdir,$*) && \
+ rm -f $(call gb_Extension_get_target,$*) && \
+ rm -f $(call gb_Extension_get_outdir_target,$*))
+
+# rule to create oxt package in workdir
+# --filesync makes sure that all files in the oxt package will be removed that no longer are in $(FILES)
+$(call gb_Extension_get_target,%) :
+ $(call gb_Output_announce,$*,$(true),OXT,3)
+ $(call gb_Helper_abbreviate_dirs_native,\
+ mkdir -p $(call gb_Extension_get_workdir,$*)/META-INF && \
+ mkdir -p $(call gb_Extension_get_workdir,$*)/registration && \
+ cp -f $(LOCATION)/description.xml $(call gb_Extension_get_workdir,$*) && \
+ cp -f $(LOCATION)/manifest.xml $(call gb_Extension_get_workdir,$*)/META-INF && \
+ cp -f $(OUTDIR)/bin/osl/$(gb_Extension_LICENSEFILE) $(call gb_Extension_get_workdir,$*)/registration && \
+ cd $(call gb_Extension_get_workdir,$*) && \
+ $(gb_Extension_ZIPCOMMAND) -rX --filesync $(call gb_Extension_get_target,$*) $(FILES) )
+
+# TODO: needs dependency on $(OUTDIR)/bin/osl/$(gb_Extension_LICENSEFILE) once readlicense_oo will be gbuildized
+# or just another simpler solution
+
+# set file list and location of manifest and description files
+# register target and clean target
+# add deliverable
+# add dependency for outdir target to workdir target (pattern rule for delivery is in Package.mk)
+define gb_Extension_Extension
+$(call gb_Extension_get_target,$(1)) : FILES := META-INF description.xml registration
+$(call gb_Extension_get_target,$(1)) : LOCATION := $(SRCDIR)/$(2)
+$(eval $(call gb_Module_register_target,$(call gb_Extension_get_outdir_target,$(1)),$(call gb_Extension_get_clean_target,$(1))))
+$(call gb_Deliver_add_deliverable,$(call gb_Extension_get_outdir_target,$(1)),$(call gb_Extension_get_target,$(1)),$(1))
+$(call gb_Extension_get_outdir_target,$(1)) : $(call gb_Extension_get_target,$(1))
+
+endef
+
+# adding a file creates a dependency to it
+# file is copied to $(WORKDIR)
+define gb_Extension_add_file
+$(call gb_Extension_get_target,$(1)) : FILES += $(2)
+$(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_workdir,$(1))/$(2)
+$(call gb_Extension_get_workdir,$(1))/$(2) : $(3)
+ mkdir -p $$(dir $$@)
+ cp -f $$< $$@
+
+endef
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 7f067d2..cdd43cc 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -32,6 +32,7 @@ gb_ComponentTarget_get_outdir_target = $(OUTDIR)/xml/component/$(1).component
gb_ComponentTarget_get_outdir_inbuild_target = $(OUTDIR)/xml/component/$(1).inbuild.component
gb_Executable_get_target = $(OUTDIR)/bin/$(1)$(gb_Executable_EXT)
gb_Executable_get_target_for_build = $(OUTDIR_FOR_BUILD)/bin/$(1)$(gb_Executable_EXT_for_build)
+gb_Extension_get_outdir_target = $(OUTDIR)/bin/$(1).oxt
gb_PackagePart_get_destinations = \
$(OUTDIR)/xml \
$(OUTDIR)/pck \
@@ -79,6 +80,8 @@ gb_CxxObject_get_target = $(WORKDIR)/CxxObject/$(1).o
gb_GenCxxObject_get_target = $(WORKDIR)/GenCxxObject/$(1).o
gb_Executable_get_external_headers_target = $(WORKDIR)/ExternalHeaders/Executable/$(1)
gb_Executable_get_headers_target = $(WORKDIR)/Headers/Executable/$(1)
+gb_Extension_get_target = $(WORKDIR)/Extension/$(1).oxt
+gb_Extension_get_workdir = $(WORKDIR)/Extension/$(1)
gb_ExternalLib_get_workdir = $(WORKDIR)/ExternalLib/$(1)
gb_ExternalLib_get_builddir = $(WORKDIR)/ExternalLib/$(1)/build
gb_ExternalLib_get_target = $(WORKDIR)/ExternalLib/$(1).done
@@ -153,6 +156,7 @@ endef
$(eval $(call gb_Helper_make_clean_targets,\
AllLangResTarget \
ComponentTarget \
+ Extension \
JavaClassSet \
Jar \
JunitTest \
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 6c387c2..4116b6c 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -311,6 +311,7 @@ include $(foreach class, \
UnoApiTarget \
Zip \
Configuration \
+ Extension \
,$(GBUILDDIR)/$(class).mk)
# optional extensions that should never be essential
commit 3250c79071dedbfd1bef1a6417d62fab76328a42
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Mon Sep 19 11:01:15 2011 +0200
convert scripting to gbuild - first step
There are java and extensions missing.
diff --git a/Repository.mk b/Repository.mk
index 21cee99..01a93d9 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -186,6 +186,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
offacc \
pdffilter \
placeware \
+ protocolhandler \
qstart_gtk \
resourcemodel \
rpt \
@@ -279,6 +280,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
neon \
package2 \
reg \
+ scriptframe \
sofficeapp \
store \
test \
@@ -323,12 +325,14 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
))
$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
+ basprov \
bootstrap \
cairocanvas \
canvasfactory \
configmgr \
directx5canvas \
directx9canvas \
+ dlgprov \
expwrap \
fastsax \
fsstorage \
@@ -348,6 +352,8 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
simplecanvas \
slideshow \
stocservices \
+ stringresource \
+ vbaevents \
vbaobj \
vbaswobj \
vclcanvas \
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index a96049a..9a3eef9 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -39,7 +39,6 @@ GTK_TWO_FOUR=$(shell @+-$(PKG_CONFIG) --exists 'gtk+-2.0 >= 2.4.0' && echo YES)
.END
my_components = \
- basprov \
cached1 \
calc \
component/animations/source/animcore/animcore \
@@ -101,6 +100,12 @@ my_components = \
component/scaddins/source/analysis/analysis \
component/scaddins/source/datefunc/date \
component/sccomp/source/solver/solver \
+ component/scripting/source/basprov/basprov \
+ component/scripting/source/dlgprov/dlgprov \
+ component/scripting/source/protocolhandler/protocolhandler \
+ component/scripting/source/stringresource/stringresource \
+ component/scripting/source/vbaevents/vbaevents \
+ component/scripting/util/scriptframe \
component/sd/util/sd \
component/sd/util/sdd \
component/sd/util/sdfilt \
@@ -141,7 +146,6 @@ my_components = \
dbase \
dbpool2 \
dbtools \
- dlgprov \
embobj \
flat \
fpicker \
@@ -152,12 +156,9 @@ my_components = \
localebe1 \
mysql \
odbc \
- protocolhandler \
- scriptframe \
sdbc2 \
spell \
srtrs1 \
- stringresource \
syssh \
ucb1 \
ucpcmis \
@@ -168,7 +169,6 @@ my_components = \
ucphier1 \
ucppkg1 \
ucptdoc1 \
- vbaevents \
.IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DESKTOP//)"
my_components += \
diff --git a/scripting/Library_basprov.mk b/scripting/Library_basprov.mk
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list