Commit Graph
14 Commits
Author SHA1 Message Date
Fridrich Štrba 53fc42e4be beanshell: don't remove the getPeer call, access it by reflection
Change-Id: I031580c6edd0d80727d940b4fd300308a905a383
2017-09-20 10:49:32 +02:00
Stephan Bergmann f20810a131 Adapt external/beanshell to Java 9
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
2017-08-31 11:52:50 +02:00
Stephan Bergmann c4f0977ccc Pass "verbose" flag into ant
Change-Id: I76d7c8a41d64baae3591dd188a2d2e46f17622bb
Reviewed-on: https://gerrit.libreoffice.org/41735
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-08-30 17:03:24 +02:00
Thorsten Behrens 7fe8c0b852 Remove gcj support from build system.
Change-Id: I79fe046ff8c932c5f6a9a5f70970168e42d23702
Reviewed-on: https://gerrit.libreoffice.org/28406
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2016-08-26 21:44:46 +00:00
Douglas Mencken 841a58da93 beanshell: improve compatibility for script engine
javax.script.Invocable may contain either
• two `invoke' methods
or
• `invokeMethod' and `invokeFunction'
so let's support any variant

Change-Id: I47196af79cc2de75725ded29992ab1f6f4cd623e
Reviewed-on: https://gerrit.libreoffice.org/23163
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-03-15 09:37:00 +00:00
Caolán McNamara b769648a5f upgrade beanshell to 2.0b5
Change-Id: I2081af13b9d77d58d5086db9e167c37b78b199db
2016-02-23 15:00:42 +00:00
Caolán McNamara b7d1c05e68 bsh-2.0b1->bsh-2.0b5
Change-Id: I250a683faf7d201b9fea8eb0fffd9cd49da7f79f
2015-01-12 11:19:47 +00:00
rbuj 3c891408ea beanshell: encode(String) in URLEncoder has been deprecated
http://docs.oracle.com/javase/1.5.0/docs/api/java/net/URLEncoder.html

Change-Id: Ie21fdd12206c7954e99761826f98686c4567aa64
Reviewed-on: https://gerrit.libreoffice.org/10482
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2014-07-23 07:57:09 +00:00
rbuj 37594357cb beanshell: [deprecation] show() in Window has been deprecated
http://docs.oracle.com/javase/1.5.0/docs/api/java/awt/Window.html#show()

Change-Id: Id02e622f3335315747e7c66724f5a3f37992e85d
Reviewed-on: https://gerrit.libreoffice.org/10481
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-23 07:56:53 +00:00
rbuj 5d1c5d558a beanshell: [deprecation] toURL() in File has been deprecated
http://docs.oracle.com/javase/6/docs/api/java/io/File.html#toURL()

Change-Id: I7f5ee6ad89ce73fa3b217396669fa42ea6e75c8a
Reviewed-on: https://gerrit.libreoffice.org/10473
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-23 07:56:35 +00:00
Michael Stahl 8df17a3409 gbuild: set Package default target to INSTDIR
Change-Id: I2bc45e4ba63f5faaee7389bcd9d7b3f563503186
2013-10-28 20:17:26 +01:00
Michael Stahl 7b1da9a478 gbuild: remove gb_ExternalPackage_add_jar_for_install
Deliver all external jar files to INSTDIR directly.

Change-Id: Ibfaabf713da01e752517dc400200a6918d82db6d
2013-10-25 23:31:31 +02:00
Khaled Hosny cc4aca0c9f Fix building from inside modules moved to external
Change-Id: Id6023dc3751fe70984f489682be17d1ab1855f71
2013-10-18 21:52:01 +02:00
Khaled Hosny 4641fd9aec fdo#70393: move beanshell to a subdir of external
Change-Id: I7e8324fd366a25db59becedfb3f00a10723f45be
Reviewed-on: https://gerrit.libreoffice.org/6283
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-10-17 10:42:45 +00:00