summaryrefslogtreecommitdiff
path: root/external/rhino
AgeCommit message (Collapse)Author
2021-11-12rhino: unbreak build on Fedora 34Michael Stahl
Sometime during the Fedora 34 lifecycle, ant started to put /usr/share/java/rhino.jar on the classpath used to invoke javac, which results in: [javac] workdir/UnpackedTarball/rhino/src/org/mozilla/javascript/optimizer/Codegen.java:202: error: reference to Hashtable is ambiguous [javac] Hashtable possibleDirectCalls = null; [javac] ^ [javac] both class java.util.Hashtable in java.util and class org.mozilla.javascript.Hashtable in org.mozilla.javascript match Indeed /usr/share/java/rhino.jar contains a class org.mozilla.javascript.Hashtable, while it doesn't exist yet in the older rhino1_5R5.zip that is bundled. The problem is that the package ant-apache-bsf contains the file /etc/ant.d/apache-bsf which references the system rhino jar. It turns out that reading the /etc/ant.d/* files in the shell script /usr/bin/ant can be suppressed by setting the variable OPT_JAR_LIST to a non-empty value, which is documented as "A user should request optional jars and their dependencies via the OPT_JAR_LIST variable", but which is sadly ignored if set to an empty value. Another way to fix the problem is to patch the property build.sysclasspath to "ignore" in build.xml. http://ant.apache.org/manual/sysclasspath.html Change-Id: I6d82eb226e5d01d094ebe044dbdada85b8687814 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124934 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2020-09-11cross-build: fix Java NI linkingJan-Marek Glogowski
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-02-16GBUILD_TRACE, support for finding out where the build time is spentLuboš Luňák
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>
2018-11-29Rename Mac OS X to official name macOS in comments and documentationBartosz Kosiorek
Change-Id: I651b7f202fa52ff5f5357a11aa72c43eb7dc7f95 Reviewed-on: https://gerrit.libreoffice.org/64102 Tested-by: Jenkins Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
2017-09-12This hunk breaks jdk9 buildFridrich Štrba
Change-Id: I80b6619a95ccac43a06ffd9b1b64dc1115510d90
2017-08-30Compact content of external/rhino/rhino1_5R5-find_swing.patch to single placeStephan Bergmann
...instead of adding something into the middle of the previous external/rhino/rhino1_5R5.patch Change-Id: I94a0e022776db67f50e785c45b0982977eec17f1
2017-08-30Pass "verbose" flag into antStephan Bergmann
Change-Id: I76d7c8a41d64baae3591dd188a2d2e46f17622bb Reviewed-on: https://gerrit.libreoffice.org/41735 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2016-08-26Remove gcj support from build system.Thorsten Behrens
Change-Id: I79fe046ff8c932c5f6a9a5f70970168e42d23702 Reviewed-on: https://gerrit.libreoffice.org/28406 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2014-06-18OS X: modify rhino1_5R5 patch for JDKs >= 1.5rbuj
Change-Id: Ie07d71055d2776c0701a23db05a0cb91b8d5cb5b Reviewed-on: https://gerrit.libreoffice.org/9809 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-04fdo#70393: move rhino to a subdir of externalKhaled Hosny
Change-Id: I7d7858d84a62568d9b0c61403645da13658e78d2 Reviewed-on: https://gerrit.libreoffice.org/6552 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>