1 |
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp |
2 |
index d052261..0eb090c 100644 |
3 |
--- a/scp2/source/ooo/file_ooo.scp |
4 |
+++ b/scp2/source/ooo/file_ooo.scp |
5 |
@@ -453,10 +453,6 @@ UNO_JAR_FILE( gid_File_Jar_Lucenehelpwrapper, LuceneHelpWrapper ) |
6 |
#endif |
7 |
|
8 |
#ifdef SOLAR_JAVA |
9 |
-STD_JAR_FILE( gid_File_Jar_Js, js ) |
10 |
-#endif |
11 |
- |
12 |
-#ifdef SOLAR_JAVA |
13 |
|
14 |
#ifndef MACOSX |
15 |
|
16 |
@@ -501,9 +497,7 @@ End |
17 |
|
18 |
#ifdef SOLAR_JAVA |
19 |
UNO_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework ) |
20 |
-UNO_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell ) |
21 |
UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava ) |
22 |
-UNO_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScript ) |
23 |
#endif |
24 |
|
25 |
#ifdef SOLAR_JAVA |
26 |
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp |
27 |
index 5ffe87a..4a4b2ff 100644 |
28 |
--- a/scp2/source/ooo/module_hidden_ooo.scp |
29 |
+++ b/scp2/source/ooo/module_hidden_ooo.scp |
30 |
@@ -91,7 +91,6 @@ Module gid_Module_Root_Files_3 |
31 |
gid_File_Jar_Hsqldb, |
32 |
gid_File_Jar_Hsqldb_Sdbc, |
33 |
gid_File_Jar_Accessbridge, |
34 |
- gid_File_Jar_Js, |
35 |
gid_File_Jar_Officebean, |
36 |
gid_File_Jar_Report, |
37 |
gid_File_Jar_Table, |
38 |
@@ -104,9 +103,7 @@ Module gid_Module_Root_Files_3 |
39 |
gid_File_Jar_Commonwizards, |
40 |
gid_File_Jar_Sandbox, |
41 |
gid_File_Jar_Scriptframework, |
42 |
- gid_File_Jar_Scriptproviderforbeanshell, |
43 |
gid_File_Jar_Scriptproviderforjava, |
44 |
- gid_File_Jar_Scriptproviderforjavascript, |
45 |
gid_File_Jar_Xml_Apis, |
46 |
gid_File_Jar_Bsh, |
47 |
gid_File_Jar_Classes, |
48 |
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp |
49 |
index e586876..0876b53 100644 |
50 |
--- a/scp2/source/python/file_python.scp |
51 |
+++ b/scp2/source/python/file_python.scp |
52 |
@@ -104,18 +104,6 @@ |
53 |
#endif |
54 |
#endif |
55 |
|
56 |
-// Scripting Framework Python script proxy |
57 |
- |
58 |
-#ifndef AIX |
59 |
-File gid_File_Py_Pythonscript |
60 |
- TXT_FILE_BODY; |
61 |
- Dir = gid_Dir_Program; |
62 |
- Name = "pythonscript.py"; |
63 |
- RegistryID = gid_Starregistry_Services_Rdb; |
64 |
- Styles = (PACKED,UNO_COMPONENT); |
65 |
-End |
66 |
-#endif |
67 |
- |
68 |
//Scripting Framework Python example scripts |
69 |
|
70 |
File gid_File_Scripts_Python |
71 |
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp |
72 |
index 3abeec2..d32f6f6 100644 |
73 |
--- a/scp2/source/python/module_python.scp |
74 |
+++ b/scp2/source/python/module_python.scp |
75 |
@@ -32,7 +32,7 @@ |
76 |
MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON ); |
77 |
ParentID = gid_Module_Optional; |
78 |
Sortkey = "750"; |
79 |
- Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So,gid_Shortcut_Lib_Python_So,gid_File_Lib_Python_So_Brand, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd); |
80 |
+ Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So,gid_Shortcut_Lib_Python_So,gid_File_Lib_Python_So_Brand,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd); |
81 |
Minimal = NO; |
82 |
Default = YES; |
83 |
Styles = ( ); |
84 |
diff --git a/scripting/prj/build.lst b/scripting/prj/build.lst |
85 |
index 7d51621..81a8512 100755 |
86 |
--- a/scripting/prj/build.lst |
87 |
+++ b/scripting/prj/build.lst |
88 |
@@ -12,3 +12,5 @@ tc scripting\java nmake - all tc1_scriptingjava tc1_scriptingprovider tc1_s |
89 |
tc scripting\examples\java nmake - all tc1_scriptingexamplesjava tc1_scriptingjava NULL |
90 |
tc scripting\examples nmake - all tc1_scriptingexamples tc1_scriptingexamplesjava tc1_inc NULL |
91 |
tc scripting\util nmake - all tc1_scriptingutil tc1_scriptingprovider tc1_scriptingprotocolhandler tc1_scriptingbasprov tc1_scriptingstringresource tc1_scriptingvbaevents tc1_scriptingpyprov tc1_scriptingjava tc1_scriptingexamplesjava tc1_scriptingexamples NULL |
92 |
+tc scripting\util\provider\javascript nmake - all tc1_scriptingjsprov tc1_scriptingjava NULL |
93 |
+tc scripting\util\provider\beanshell nmake - all tc1_scriptingbshprov tc1_scriptingjava NULL |
94 |
diff --git a/scripting/prj/d.lst b/scripting/prj/d.lst |
95 |
index ef216fe..30d5e1c 100644 |
96 |
--- a/scripting/prj/d.lst |
97 |
+++ b/scripting/prj/d.lst |
98 |
@@ -15,3 +15,6 @@ mkdir: %_DEST%\bin%_EXT%\pyuno |
99 |
..\source\storage\storage.xml %_DEST%\xml%_EXT%\storage.xml |
100 |
|
101 |
..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib |
102 |
+ |
103 |
+# Extensions |
104 |
+..\%__SRC%\bin\*.oxt %_DEST%\bin%_EXT%\*.oxt |
105 |
diff --git a/scripting/source/pyprov/description.xml b/scripting/source/pyprov/description.xml |
106 |
new file mode 100644 |
107 |
index 0000000..1fe0a3d |
108 |
--- /dev/null |
109 |
+++ b/scripting/source/pyprov/description.xml |
110 |
@@ -0,0 +1,24 @@ |
111 |
+<?xml version="1.0"?> |
112 |
+<description |
113 |
+ xmlns="http://openoffice.org/extensions/description/2006" |
114 |
+ xmlns:xlink="http://www.w3.org/1999/xlink" |
115 |
+ xmlns:dep="http://openoffice.org/extensions/description/2006"> |
116 |
+ |
117 |
+ <identifier value="com.sun.star.script.provider.ScriptProviderForPython"/> |
118 |
+ |
119 |
+ <dependencies> |
120 |
+ <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/> |
121 |
+ </dependencies> |
122 |
+ |
123 |
+ <version value="3.3.0"/> |
124 |
+ |
125 |
+ <publisher> |
126 |
+ <name xlink:href="http://www.documentfoundation.org" lang="en">The |
127 |
+ Document Foundation</name> |
128 |
+ </publisher> |
129 |
+ |
130 |
+ <display-name> |
131 |
+ <name lang="en">Script provider for Python</name> |
132 |
+ </display-name> |
133 |
+ |
134 |
+</description> |
135 |
diff --git a/scripting/source/pyprov/makefile.mk b/scripting/source/pyprov/makefile.mk |
136 |
index 3c02785..2a63d9f 100644 |
137 |
--- a/scripting/source/pyprov/makefile.mk |
138 |
+++ b/scripting/source/pyprov/makefile.mk |
139 |
@@ -39,11 +39,26 @@ TARGET=pyprov |
140 |
|
141 |
# --- Targets ------------------------------------------------------ |
142 |
ALL : ALLTAR \ |
143 |
- $(DLLDEST)$/pythonscript.py \ |
144 |
$(DLLDEST)$/officehelper.py \ |
145 |
$(DLLDEST)$/mailmerge.py |
146 |
|
147 |
$(DLLDEST)$/%.py: %.py |
148 |
cp $? $@ |
149 |
|
150 |
-.INCLUDE : target.mk |
151 |
+# scripting provider extension |
152 |
+.IF "$(L10N_framework)"=="" |
153 |
+ |
154 |
+EXTENSIONNAME:=ScriptProviderForPython |
155 |
+EXTENSION_ZIPNAME:=script-provider-for-python |
156 |
+ |
157 |
+COMPONENT_FILES=$(EXTENSIONDIR)$/pythonscript.py |
158 |
+ |
159 |
+.INCLUDE : extension_pre.mk |
160 |
+.INCLUDE : target.mk |
161 |
+.INCLUDE : extension_post.mk |
162 |
+ |
163 |
+.ELSE |
164 |
+ |
165 |
+.INCLUDE : target.mk |
166 |
+ |
167 |
+.ENDIF |
168 |
diff --git a/scripting/source/pyprov/manifest.xml b/scripting/source/pyprov/manifest.xml |
169 |
new file mode 100644 |
170 |
index 0000000..7e4e045 |
171 |
--- /dev/null |
172 |
+++ b/scripting/source/pyprov/manifest.xml |
173 |
@@ -0,0 +1,7 @@ |
174 |
+<?xml version="1.0" encoding="UTF-8"?> |
175 |
+<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd"> |
176 |
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest"> |
177 |
+ <manifest:file-entry |
178 |
+ manifest:media-type="application/vnd.sun.star.uno-component;type=python" |
179 |
+ manifest:full-path="pythonscript.py"/> |
180 |
+</manifest:manifest> |
181 |
diff --git a/scripting/util/provider/beanshell/description.xml b/scripting/util/provider/beanshell/description.xml |
182 |
new file mode 100644 |
183 |
index 0000000..6b05318 |
184 |
--- /dev/null |
185 |
+++ b/scripting/util/provider/beanshell/description.xml |
186 |
@@ -0,0 +1,24 @@ |
187 |
+<?xml version="1.0"?> |
188 |
+<description |
189 |
+ xmlns="http://openoffice.org/extensions/description/2006" |
190 |
+ xmlns:xlink="http://www.w3.org/1999/xlink" |
191 |
+ xmlns:dep="http://openoffice.org/extensions/description/2006"> |
192 |
+ |
193 |
+ <identifier value="com.sun.star.script.provider.ScriptProviderForBeanShell"/> |
194 |
+ |
195 |
+ <dependencies> |
196 |
+ <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/> |
197 |
+ </dependencies> |
198 |
+ |
199 |
+ <version value="3.3.0"/> |
200 |
+ |
201 |
+ <publisher> |
202 |
+ <name xlink:href="http://www.documentfoundation.org" lang="en">The |
203 |
+ Document Foundation</name> |
204 |
+ </publisher> |
205 |
+ |
206 |
+ <display-name> |
207 |
+ <name lang="en">Script provider for BeanShell</name> |
208 |
+ </display-name> |
209 |
+ |
210 |
+</description> |
211 |
diff --git a/scripting/util/provider/beanshell/makefile.mk b/scripting/util/provider/beanshell/makefile.mk |
212 |
new file mode 100644 |
213 |
index 0000000..7e16329 |
214 |
--- /dev/null |
215 |
+++ b/scripting/util/provider/beanshell/makefile.mk |
216 |
@@ -0,0 +1,48 @@ |
217 |
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+ |
218 |
+# |
219 |
+# The contents of this file are subject to the Mozilla Public License Version |
220 |
+# 1.1 (the "License"); you may not use this file except in compliance with |
221 |
+# the License. You may obtain a copy of the License at |
222 |
+# http://www.mozilla.org/MPL/ |
223 |
+# |
224 |
+# Software distributed under the License is distributed on an "AS IS" basis, |
225 |
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License |
226 |
+# for the specific language governing rights and limitations under the |
227 |
+# License. |
228 |
+# |
229 |
+# The Initial Developer of the Original Code is |
230 |
+# Red Hat, Inc. |
231 |
+# Portions created by the Initial Developer are Copyright (C) 2010 the |
232 |
+# Initial Developer. All Rights Reserved. |
233 |
+# |
234 |
+# Contributor(s): David Tardon <dtardon@redhat.com> |
235 |
+# |
236 |
+# Alternatively, the contents of this file may be used under the terms of |
237 |
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or |
238 |
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), |
239 |
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable |
240 |
+# instead of those above. |
241 |
+ |
242 |
+PRJ=..$/..$/.. |
243 |
+ |
244 |
+PRJNAME=scripting |
245 |
+TARGET=bshprov |
246 |
+ |
247 |
+.INCLUDE : settings.mk |
248 |
+ |
249 |
+.IF "$(L10N_framework)"=="" && "$(SOLAR_JAVA)"!="" |
250 |
+ |
251 |
+EXTENSIONNAME:=ScriptProviderForBeanShell |
252 |
+EXTENSION_ZIPNAME:=script-provider-for-beanshell |
253 |
+ |
254 |
+COMPONENT_JARFILES=$(EXTENSIONDIR)$/$(EXTENSIONNAME).jar |
255 |
+ |
256 |
+.INCLUDE : extension_pre.mk |
257 |
+.INCLUDE : target.mk |
258 |
+.INCLUDE : extension_post.mk |
259 |
+ |
260 |
+.ELSE |
261 |
+ |
262 |
+.INCLUDE : target.mk |
263 |
+ |
264 |
+.ENDIF |
265 |
diff --git a/scripting/util/provider/beanshell/manifest.xml b/scripting/util/provider/beanshell/manifest.xml |
266 |
new file mode 100644 |
267 |
index 0000000..da8e620 |
268 |
--- /dev/null |
269 |
+++ b/scripting/util/provider/beanshell/manifest.xml |
270 |
@@ -0,0 +1,7 @@ |
271 |
+<?xml version="1.0" encoding="UTF-8"?> |
272 |
+<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd"> |
273 |
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest"> |
274 |
+ <manifest:file-entry |
275 |
+ manifest:media-type="application/vnd.sun.star.uno-component;type=java" |
276 |
+ manifest:full-path="ScriptProviderForBeanShell.jar"/> |
277 |
+</manifest:manifest> |
278 |
diff --git a/scripting/util/provider/javascript/description.xml b/scripting/util/provider/javascript/description.xml |
279 |
new file mode 100644 |
280 |
index 0000000..58f0478 |
281 |
--- /dev/null |
282 |
+++ b/scripting/util/provider/javascript/description.xml |
283 |
@@ -0,0 +1,24 @@ |
284 |
+<?xml version="1.0"?> |
285 |
+<description |
286 |
+ xmlns="http://openoffice.org/extensions/description/2006" |
287 |
+ xmlns:xlink="http://www.w3.org/1999/xlink" |
288 |
+ xmlns:dep="http://openoffice.org/extensions/description/2006"> |
289 |
+ |
290 |
+ <identifier value="com.sun.star.script.provider.ScriptProviderForJavaScript"/> |
291 |
+ |
292 |
+ <dependencies> |
293 |
+ <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/> |
294 |
+ </dependencies> |
295 |
+ |
296 |
+ <version value="3.3.0"/> |
297 |
+ |
298 |
+ <publisher> |
299 |
+ <name xlink:href="http://www.documentfoundation.org" lang="en">The |
300 |
+ Document Foundation</name> |
301 |
+ </publisher> |
302 |
+ |
303 |
+ <display-name> |
304 |
+ <name lang="en">Script provider for JavaScript</name> |
305 |
+ </display-name> |
306 |
+ |
307 |
+</description> |
308 |
diff --git a/scripting/util/provider/javascript/makefile.mk b/scripting/util/provider/javascript/makefile.mk |
309 |
new file mode 100644 |
310 |
index 0000000..a99096a |
311 |
--- /dev/null |
312 |
+++ b/scripting/util/provider/javascript/makefile.mk |
313 |
@@ -0,0 +1,55 @@ |
314 |
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+ |
315 |
+# |
316 |
+# The contents of this file are subject to the Mozilla Public License Version |
317 |
+# 1.1 (the "License"); you may not use this file except in compliance with |
318 |
+# the License. You may obtain a copy of the License at |
319 |
+# http://www.mozilla.org/MPL/ |
320 |
+# |
321 |
+# Software distributed under the License is distributed on an "AS IS" basis, |
322 |
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License |
323 |
+# for the specific language governing rights and limitations under the |
324 |
+# License. |
325 |
+# |
326 |
+# The Initial Developer of the Original Code is |
327 |
+# Red Hat, Inc. |
328 |
+# Portions created by the Initial Developer are Copyright (C) 2010 the |
329 |
+# Initial Developer. All Rights Reserved. |
330 |
+# |
331 |
+# Contributor(s): David Tardon <dtardon@redhat.com> |
332 |
+# |
333 |
+# Alternatively, the contents of this file may be used under the terms of |
334 |
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or |
335 |
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), |
336 |
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable |
337 |
+# instead of those above. |
338 |
+ |
339 |
+PRJ=..$/..$/.. |
340 |
+ |
341 |
+PRJNAME=scripting |
342 |
+TARGET=jsprov |
343 |
+ |
344 |
+.INCLUDE : settings.mk |
345 |
+ |
346 |
+.IF "$(L10N_framework)"=="" && "$(SOLAR_JAVA)"!="" |
347 |
+ |
348 |
+EXTENSIONNAME:=ScriptProviderForJavaScript |
349 |
+EXTENSION_ZIPNAME:=script-provider-for-javascript |
350 |
+ |
351 |
+COMPONENT_JARFILES=$(EXTENSIONDIR)$/$(EXTENSIONNAME).jar |
352 |
+EXTENSION_PACKDEPS=$(SOLARBINDIR)$/js.jar |
353 |
+ |
354 |
+.INCLUDE : extension_pre.mk |
355 |
+.INCLUDE : target.mk |
356 |
+.INCLUDE : extension_post.mk |
357 |
+ |
358 |
+ALLTAR : $(EXTENSIONDIR)$/js.jar |
359 |
+ |
360 |
+$(EXTENSIONDIR)$/js.jar : $(SOLARBINDIR)$/js.jar |
361 |
+ @@-$(MKDIRHIER) $(@:d) |
362 |
+ $(COMMAND_ECHO)$(COPY) $< $@ |
363 |
+ |
364 |
+.ELSE |
365 |
+ |
366 |
+.INCLUDE : target.mk |
367 |
+ |
368 |
+.ENDIF |
369 |
diff --git a/scripting/util/provider/javascript/manifest.xml b/scripting/util/provider/javascript/manifest.xml |
370 |
new file mode 100644 |
371 |
index 0000000..4c61747 |
372 |
--- /dev/null |
373 |
+++ b/scripting/util/provider/javascript/manifest.xml |
374 |
@@ -0,0 +1,10 @@ |
375 |
+<?xml version="1.0" encoding="UTF-8"?> |
376 |
+<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd"> |
377 |
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest"> |
378 |
+ <manifest:file-entry |
379 |
+ manifest:media-type="application/vnd.sun.star.uno-component;type=java" |
380 |
+ manifest:full-path="js.jar"/> |
381 |
+ <manifest:file-entry |
382 |
+ manifest:media-type="application/vnd.sun.star.uno-component;type=java" |
383 |
+ manifest:full-path="ScriptProviderForJavaScript.jar"/> |
384 |
+</manifest:manifest> |
385 |
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk |
386 |
--- a/instsetoo_native/util/makefile.mk |
387 |
+++ b/instsetoo_native/util/makefile.mk |
388 |
@@ -72,7 +72,6 @@ LOCALPYFILES= \ |
389 |
$(BIN)$/uno.py \ |
390 |
$(BIN)$/unohelper.py \ |
391 |
$(BIN)$/pythonloader.py \ |
392 |
- $(BIN)$/pythonscript.py \ |
393 |
$(BIN)$/officehelper.py \ |
394 |
$(BIN)$/mailmerge.py |
395 |
|