ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Update to latest Rhino 1.7.14

Browse Source 
...at the expense of losing, at least for now, the script editor for it (which
had been hacked into the old upstream sources in a hard-to-maintain way).

rhino-1.7.14.zip is taken from
<https://github.com/mozilla/rhino/releases/download/Rhino1_7_14_Release/rhino-1.7.14.zip>.
Building it would now use Gradle, but instead just hack together an invocation
of javac and jar in external/rhino/ExternalProject_rhino.mk that effectively
generates the same jar as the upstream-built jar available at
<https://github.com/mozilla/rhino/releases/download/Rhino1_7_14_Release/rhino-1.7.14.jar>.

All the various patches are no longer necessary:
* external/rhino/rhino1_5R5.patch and external/rhino/OfficeScriptInfo.java were
  mostly for the hacked-in script editor, which has been abandoned at least for
  now (see above).
* external/rhino/rhino1_5R5-find_swing.patch (originally from
  0a7f934650 "ause109: #i106296# make build.xml
  aware of TARFILE_LOCATION") appears to be obsolete.
* external/rhino/rhino1_5R5-updateToolTip.patch is covered by
  <https://github.com/mozilla/rhino/commit/ab20a73b16f68daf715c7ac4808c119bb15d698c>
  "Fix bug 414869: Rhino debugger fails to launch due to updates in mac os x
  leopard".
* external/rhino/rhino-classpath.patch.1 from
  bb58293296 "rhino: unbreak build on Fedora 34"
  was only relevant when building with Ant.

Change-Id: I5fca5915d785716f7aaf313ff2469a20f55f707a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165190
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
This commit is contained in:
Stephan Bergmann
2024-04-02 18:56:13 +02:00
parent a0c53ab438
commit 58c4457a90
14 changed files with 363 additions and 1695 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripting/Jar_ScriptProviderForJavaScript.mk
-6
View File
@@ -25,13 +25,7 @@ $(eval $(call gb_Jar_set_componentfile,ScriptProviderForJavaScript,scripting/jav
$(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: