f20810a131
For one, drop a spurious target="1.5" so that ant instead uses the passed-in JAVA_TARGET_VER (which needs to be 1.6 for Java 9). For another, the deprecated java.awt.Component.getPeer method finally got removed, so bsh.util.AWTConsole would no longer compile. But it looks like that class is not used by us anyway, so just remove the problematic code. (workdir/UnpackedTarball/beanshell/docs/manual/bshmanual.html: "Web Browser Access: After starting the server you can connect your web browser to the port you specified. BeanShell will respond by sending an HTML page offering you a choice of the Swing based JConsole or the older AWTConsole. You may choose whichever is appropriate for your web browser. [...] The bsh.util.AWTConsole is a legacy implementation of the GUI Console using AWT instead of Swing. This console does work, but it is not as slick or pretty as the JConsole. The primary reason it is still here is to support remote access from generic web browsers using only Java 1.1.") Change-Id: I9f1112caebae9a55e4eec7f9baa0114b2254ccda
24 lines
781 B
Makefile
24 lines
781 B
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
# This file is part of the LibreOffice project.
|
|
#
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
#
|
|
|
|
$(eval $(call gb_UnpackedTarball_UnpackedTarball,beanshell))
|
|
|
|
$(eval $(call gb_UnpackedTarball_set_tarball,beanshell,$(BSH_TARBALL),,beanshell))
|
|
|
|
$(eval $(call gb_UnpackedTarball_fix_end_of_line,beanshell,\
|
|
engine/src/TestBshScriptEngine.java \
|
|
))
|
|
|
|
$(eval $(call gb_UnpackedTarball_add_patches,beanshell,\
|
|
external/beanshell/bsh-2.0b1-src.patch \
|
|
external/beanshell/beanshell-invoke.patch \
|
|
external/beanshell/java9.patch.0 \
|
|
))
|
|
|
|
# vim: set noet sw=4 ts=4:
|