21 Commits
Author SHA1 Message Date
Christian Lohmaier 23a4062410 use SOURCE_DATE_EPOCH for ant based projects
unfortunately ant as deployed on the baseline has a bug and expects
SOURCE_DATE_EPOCH to be in milliseconds, and if set in an environment
variable would also override the ant.tstamp.now property even when
explicitly provided at the commandline, so to avoid bogus timestamps
unset it if it was exported in the environment (default build doesn't
export it, but the user may export it to override or provide a value
e.g. when not building from source.

for ant.tstamp.now to work for setting the tstamp value, ant 1.10.2 or
later is required

Change-Id: I2dd53cb99281f46d58a8db35baf71627ed5422f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/207246
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2026-07-14 15:14:56 +02:00
Stephan Bergmann 537057a44d external/beanshell: Adapt to java.applet gone from Java 26
...with a minimally invasive attempt of no longer building any affected
functionality (and which was hopefully completely optional and not used by us)

Change-Id: I32aef78f7257ffb558704a60e69878baee777537
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198678
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@collabora.com>
2026-02-04 18:17:01 +01:00
Xisco Fauli 3709789a58 gbuild: set default patchlevel to 1
Change-Id: I195dbafff63e21a22edf438f5b9ed5beee4dac03
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183784
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2025-04-08 09:24:08 +02:00
Xisco Fauli 9f025bdad9 beanshell: upgrade to 2.1.1
* Adapt external/beanshell/java9.patch.0 to fix

[javac] error: Source option 6 is no longer supported. Use 7 or later.
[javac] error: Target option 6 is no longer supported. Use 7 or later.

Downloaded from https://github.com/beanshell/beanshell/releases/download/2.1.1/bsh-2.1.1-src.zip

Change-Id: I969813fd2bb2a910004b6c28f5ed9ba95c39895f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167764
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2024-05-17 11:50:35 +02:00
Christian Lohmaier 3c54cb2a9d add MSYS_NO_PATHCONV=1 to prevent MSYS auto-magic
git-bash/MSYS tries to resolve anything that looks like a path (i.e.
anything starting with a /) - if the "target" doesn't exists, it just
prepends the MSYS installation dir and breaks all kind of stuff.
You could escape those with double-slash at the beginning, but that
would mean lots of noise/unnecessary changes in pretty much every
makefile, so just getting rid of that behavior is much better.

ant and some externals however rely on MSYS path-conversion, so unset
MSYS_NO_PATHCONV for those. Ant does its own checks whether it
runs under cygwin or msys, and easier to please externals using the
autoconversion than to add patches to force them into compliance…

Change-Id: Ie80964e40c53ace80adb4707aae0db63ebc4ee4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166330
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2024-04-26 14:00:35 +02:00
Jan-Marek Glogowski 42aeb9f906 cross-build: fix Java NI linking
LibreOffice has a JNI component on Windows and Linux, the
officebean. Therefore we need a host JDK for linkage to the
jawt, and a build JDK to compile the Java code.

Change-Id: I4138628ab3ea2ef5900a5b4e9281050ae84e4eb5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102483
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2020-09-11 20:29:11 +02:00
Luboš Luňák 0adc9b615f GBUILD_TRACE, support for finding out where the build time is spent
See instructions in solenv/gbuild/Trace.mk . This generates a file than
can be viewed e.g. in the Chromium tracing view.

Change-Id: I5f90647c58ca729375525b6daed2d4918adc8188
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88754
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-02-16 14:49:45 +01:00
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