Commit 9c5e8103 authored by Emmanuel Bourg's avatar Emmanuel Bourg

New upstream version 1.7.2

parent cc575d16
......@@ -4,6 +4,7 @@ Please keep this list in alphabetical order.
Lillian Angel <langel@redhat.com>
Andrew Azores <aazores@redhat.com>
Deepak Bhole <dbhole@redhat.com>
Laurent Bourgès <bourges.laurent@gmail.com>
Adam Buchta <adbuch7@gmail.com>
Ricardo Martín Camarero <rickyepoderi@yahoo.es>
Marcin Cieslak <marcin.cieslak@gmail.com>
......@@ -11,9 +12,11 @@ Danesh Dadachanji <ddadacha@redhat.com>
Adam Domurad <adomurad@redhat.com>
Lukasz Dracz <ldracz@redhat.com>
Thomas Fitzsimmons <fitzsim@redhat.com>
Olesya Gerasimenko <gammaray@basealt.ru>
Michał Górny <mgorny@gentoo.org>
Mark Greenwood <mark@dcs.shef.ac.uk>
Tereza Hlavackova <hlavackova.tereza@gmail.com>
Lars Herschke <lhersch@dssgmbh.de>
Peter Hatina <phatina@redhat.com>
Andrew John Hughes <ahughes@redhat.com>
Jie Kang <jkang@redhat.com>
......@@ -35,6 +38,7 @@ Ville Skyttä <ville.skytta@iki.fi>
Fridrich Strba <fridrich.strba@suse.com>
Andrew Su <asu@redhat.com>
Joshua Sumali <jsumali@redhat.com>
Joel Tesdall <jtesdall@mapcon.com>
Michal Vala <mvala@redhat.com>
Jiri Vanek <jvanek@redhat.com>
Tomáš Votava <tomcacolca@gmail.com>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -8,6 +8,17 @@ GX - http://bugs.gentoo.org/show_bug.cgi?id=X
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
New in release 1.7.2 (2019-03-11):
* added support for javafx-desc and so allwong run of pure-javafx only applications
* --nosecurity enhanced for possibility to skip invalid signatures
* enhanced to allow resources to be read also from j2se/java element (OmegaT)
* PR3644 - java.lang.NoClassDefFoundError: Could not initialize class net.sourceforge.jnlp.runtime.JNLPRuntime$DeploymentConfigurationHolder
* deployment.config now support generic url instead just file
* Added support for windows desktop shortcuts via https://github.com/DmitriiShamrikov/mslinks
* cache can now be operated by groups, list by -Xcacheids (details via -verbose, can filter by regex), Xclearcache now can clear only selected id. There is also gui to operate cache via id in itweb-settings now.
* desktop shortcut name get shortened to title or file if title is missing.
* scripted launchers rework: Windows bat launchers rewritten to be feature complete, Linux shell launchers made portable, build enhanced to produce platform independent image
New in release 1.7.1 (2017-12-15):
* better work with authors file
* better work with jdk9
......
......@@ -48,7 +48,7 @@ The Browser Plugin
IcedTea-Web contains a Free Software browser plugin based on NPRuntime
called NPPlugin. By default, this will be built, and it can be turned
off using the -disable-plugin option.
off using the --disable-native-plugin option.
Building IcedTea-Web
====================
......@@ -73,7 +73,7 @@ Additionally, the plugin requires:
Some distributions do not provide correct NPAPI headers so you can use those:
https://bitbucket.org/mgorny/npapi-sdk/downloads.
The plugin can be disabled by passing --disable-plugin.
The plugin can be disabled by passing --disable-native-plugin.
The following optional dependencies enable additional features
......@@ -120,7 +120,7 @@ to point to same location.
Other options may be supplied which enable or disable new features.
These are documented fully in the relevant section below.
* --disable-plugin: Don't build the browser plugin.
* --disable-native-plugin: Don't build the browser plugin.
* --with-rhino: Specify the location of rhino jar
* --with-tagsoup: Specify the location of the tagsoup jar
* --with-jacoco: Specify the location of the jacoco jar
......
......@@ -47,6 +47,14 @@ AC_DEFUN_ONCE([IT_CHECK_FOR_JDK],
SYSTEM_JDK_DIR=
])
if test -z "${SYSTEM_JDK_DIR}"; then
AM_COND_IF([WINDOWS], [
# does not work, use which instead
# AC_CHECK_PROGS([SYSTEM_JAVA_IN_PATH], [java.exe])
SYSTEM_JAVA_IN_PATH=$(which javac 2>&AS_MESSAGE_LOG_FD)
if test x"${SYSTEM_JAVA_IN_PATH}" != x ; then
SYSTEM_JDK_DIR=$(dirname $(dirname ${SYSTEM_JAVA_IN_PATH}))
fi
] , [
for dir in /etc/alternatives/java_sdk \
/usr/lib/jvm/java-1.9.0-openjdk \
/usr/lib/jvm/icedtea9 \
......@@ -64,15 +72,8 @@ AC_DEFUN_ONCE([IT_CHECK_FOR_JDK],
break
fi
done
fi
AM_COND_IF([WINDOWS], [
# does not work, use which instead
# AC_CHECK_PROGS([SYSTEM_JAVA_IN_PATH], [java.exe])
SYSTEM_JAVA_IN_PATH=$(which java 2>&AS_MESSAGE_LOG_FD)
if test x"${SYSTEM_JAVA_IN_PATH}" != x ; then
SYSTEM_JDK_DIR=$(dirname $(dirname ${SYSTEM_JAVA_IN_PATH}))
fi
])
fi
if ! test -d "${SYSTEM_JDK_DIR}"; then
AC_MSG_ERROR("A JDK home directory could not be found. ${SYSTEM_JDK_DIR}")
else
......@@ -418,6 +419,8 @@ dnl Check for plugin support headers and libraries.
dnl FIXME: use unstable
AC_REQUIRE([IT_CHECK_NATIVE_PLUGIN])
if test "x${enable_native_plugin}" = "xyes" ; then
AC_PROG_CC
AC_PROG_CXX
PKG_CHECK_MODULES(GLIB, glib-2.0)
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
......@@ -490,6 +493,43 @@ AC_DEFUN_ONCE([IT_CHECK_FOR_TAGSOUP],
AM_CONDITIONAL([HAVE_TAGSOUP], [test x$TAGSOUP_JAR != xno -a x$TAGSOUP_JAR != x ])
])
AC_DEFUN_ONCE([IT_CHECK_FOR_MSLINKS],
[
AC_MSG_CHECKING([for mslinks])
AC_ARG_WITH([mslinks],
[AS_HELP_STRING([--with-mslinks],
[mslinks.jar])],
[
MSLINKS_JAR=${withval}
],
[
MSLINKS_JAR=
])
if test -z "${MSLINKS_JAR}"; then
for dir in /usr/share/java /usr/local/share/java ; do
if test -f $dir/mslinks.jar; then
MSLINKS_JAR=$dir/mslinks.jar
break
fi
done
fi
AM_COND_IF([WINDOWS], [
MSLINKS_JAR=$(cygpath -m ${MSLINKS_JAR})
])
AC_MSG_RESULT(${MSLINKS_JAR})
AM_COND_IF([WINDOWS], [
if test -z "${MSLINKS_JAR}"; then
AC_MSG_RESULT(**********************************************)
AC_MSG_RESULT(* Warning you are building without mslinks *)
AC_MSG_RESULT(* Your windows desktop integration will fail *)
AC_MSG_RESULT(**********************************************)
fi
])
AC_SUBST(MSLINKS_JAR)
AM_CONDITIONAL([HAVE_MSLINKS], [test x$MSLINKS_JAR != xno -a x$MSLINKS_JAR != x ])
])
dnl Generic macro to check for a Java class
dnl Takes the name of the class as an argument. The macro name
dnl is usually the name of the class with '.'
......@@ -795,10 +835,16 @@ AC_DEFUN_ONCE([IT_CHECK_JAVA_VERSION],
[
AC_REQUIRE([IT_FIND_JAVA])
AC_MSG_CHECKING([JDK version])
JAVA_VERSION=`$JAVA -version 2>&1`
JAVA_VERSION=`$JAVA -version 2>&1 | head -n 1 | cut -d'-' -f1 | cut -d'"' -f2 | cut -d'.' -f1`
if test "${JAVA_VERSION}" -eq "1"; then
JAVA_VERSION=`$JAVA -version 2>&1 | head -n 1 | cut -d'-' -f1 | cut -d'"' -f2 | cut -d'.' -f2`
fi
AC_MSG_RESULT($JAVA_VERSION)
HAVE_JAVA8=`if echo $JAVA_VERSION | grep -q -e 1.8.0 ; then echo yes ; fi`
HAVE_JAVA9=`if echo $JAVA_VERSION | grep -q -e 1.9.0 -e \"9 -e "build 9" ; then echo yes ; fi `
if test "${JAVA_VERSION}" -eq "8"; then
HAVE_JAVA8="yes"
elif test "$JAVA_VERSION" -ge "9"; then
HAVE_JAVA9="yes"
fi
if test -z "$HAVE_JAVA8" -a -z "$HAVE_JAVA9"; then
AC_MSG_ERROR([JDK8 or newer is required, detected was: $JAVA_VERSION])
fi
......@@ -1118,3 +1164,18 @@ AC_DEFUN_ONCE([IT_CHECK_FOR_WIX],
AC_SUBST(WIX_TOOLSET_DIR)
fi
])
AC_DEFUN([IT_CHECK_MODULARJDK_ARGS],
[
AC_MSG_CHECKING([where to place file with modular switches])
AC_ARG_WITH([modularjdk-file],
[AS_HELP_STRING(--with-modularjdk-file,directory where file with arguments for modualr jdk willbe installed)],
[
MODULARJDK_ARGS_DIR="${withval}"
],
[
MODULARJDK_ARGS_DIR="${bindir}"
])
AC_MSG_RESULT([${MODULARJDK_ARGS_DIR}])
AC_SUBST([MODULARJDK_ARGS_DIR])
])
This diff is collapsed.
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
scriptversion=2012-10-14.11; # UTC
scriptversion=2018-03-07.03; # UTC
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
......@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
......@@ -255,7 +255,8 @@ EOF
echo "compile $scriptversion"
exit $?
;;
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
......@@ -339,9 +340,9 @@ exit $ret
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
AC_INIT([icedtea-web],[1.7.1],[distro-pkg-dev@openjdk.java.net], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web])
AC_INIT([icedtea-web],[1.7.2],[distro-pkg-dev@openjdk.java.net], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile netx.manifest])
AM_MAINTAINER_MODE([enable])
......@@ -13,8 +13,6 @@ cd $abs_top_builddir
AC_SUBST(abs_top_srcdir)
AC_CANONICAL_HOST
AC_PROG_CC
AC_PROG_CXX
IT_SET_ARCH_SETTINGS
IT_CP_SUPPORTS_REFLINK
......@@ -41,6 +39,13 @@ if test x"$BIN_BASH" = x ; then
AC_MSG_ERROR([/bin/bash is used in runtime and for about generation. Dying sooner rather then later])
fi
IT_CHECK_MODULARJDK_ARGS
#shell launchers are only opinion for 1.7
AM_CONDITIONAL([ENABLE_SHELL_LAUNCHERS], [true])
#native launchers do not exists in 1.7
AM_CONDITIONAL([ENABLE_NATIVE_LAUNCHERS], [false])
build_linux=no
build_windows=no
case "${host_os}" in
......@@ -57,6 +62,15 @@ esac
AM_CONDITIONAL([LINUX], [test "$build_linux" = "yes"])
AM_CONDITIONAL([WINDOWS], [test "$build_windows" = "yes"])
# the images built with this switch on linux, are not exactly windows friendly (see removed jars in make log, which are made in favor of clean linux build)
AC_MSG_CHECKING([whether to include also bat lunchers during linux build])
AC_ARG_ENABLE([bats-on-linux],
[AS_HELP_STRING([--enable-bats-on-linux],
[enable generation of windows legacy bat launchers during linux build with legacy shell launchers. This is for subjects, who wish to do an custom build for windows and linuxes/mac users together. Preparation of rest of the ITW then require a bit of love. This switch is not exactly supported option.])],
[WINDOWS_OR_INCLUDE_BATS="${enableval}"], [WINDOWS_OR_INCLUDE_BATS='no'])
AM_CONDITIONAL([WINDOWS_OR_INCLUDE_BATS], [test "x$WINDOWS_OR_INCLUDE_BATS" = "xyes" -o "$build_windows" = "yes" ])
AC_MSG_RESULT(${WINDOWS_OR_INCLUDE_BATS})
IT_CHECK_WITH_GCJ
FIND_TOOL([ZIP], [zip])
FIND_JAVAC
......@@ -155,6 +169,7 @@ IT_FIND_OPTIONAL_JAR([asm], ASM,
[/usr/share/java/objectweb-asm4/asm-all.jar /usr/share/java/objectweb-asm4/asm-all-4.0.jar /usr/share/java/objectweb-asm/asm-all.jar])
IT_CHECK_FOR_TAGSOUP
IT_CHECK_FOR_MSLINKS
if test "x$build_windows" = xyes ; then
IT_CHECK_FOR_WIX
......@@ -184,4 +199,18 @@ AC_SUBST(bashcompdir)
AC_CONFIG_FILES([jrunscript], [chmod u+x jrunscript])
AC_CONFIG_FILES([build.properties])
# this is nasty hack to make GCC trully optional
echo -n "destroying gcc config? ... "
if test "x${enable_native_plugin}" = "xno" ; then
am__fastdepCC_TRUE="#"
am__fastdepCC_FALSE="#"
am__fastdepCC="#"
am__fastdepCXX_TRUE="#"
am__fastdepCXX_FALSE="#"
am__fastdepCXX="#"
echo "destroyed!"
else
echo "no"
fi
AC_OUTPUT
This diff is collapsed.
# -------------------------------------
# IcedTea-Web jigsaw run args (jdk9+)
# -------------------------------------
--add-reads=java.base=ALL-UNNAMED,java.desktop
--add-reads=java.desktop=ALL-UNNAMED,java.naming
--add-reads=java.naming=ALL-UNNAMED,java.desktop
--add-exports=java.desktop/sun.awt=ALL-UNNAMED,java.desktop
--add-exports=java.desktop/javax.jnlp=ALL-UNNAMED,java.desktop
--add-exports=java.base/com.sun.net.ssl.internal.ssl=ALL-UNNAMED,java.desktop
--add-exports=java.base/sun.net.www.protocol.jar=ALL-UNNAMED,java.desktop
--add-exports=java.base/sun.security.action=ALL-UNNAMED,java.desktop
--add-exports=java.base/sun.security.provider=ALL-UNNAMED,java.desktop
--add-exports=java.base/sun.security.util=ALL-UNNAMED,java.desktop
--add-exports=java.base/sun.security.validator=ALL-UNNAMED,java.desktop
--add-exports=java.base/sun.security.x509=ALL-UNNAMED,java.desktop
--add-exports=java.base/jdk.internal.util.jar=ALL-UNNAMED,java.desktop
--add-exports=java.base/sun.net.www.protocol.http=ALL-UNNAMED,java.desktop
--add-exports=java.desktop/sun.awt.X11=ALL-UNNAMED,java.desktop
--add-exports=java.desktop/sun.applet=ALL-UNNAMED,java.desktop
--add-exports=java.desktop/sun.applet=ALL-UNNAMED,jdk.jsobject
--add-exports=java.naming/com.sun.jndi.toolkit.url=ALL-UNNAMED,java.desktop
This diff is collapsed.
This diff is collapsed.
......@@ -52,6 +52,6 @@ public interface DownloadService2 {
public DownloadService2.ResourceSpec[] getCachedResources(
javax.jnlp.DownloadService2.ResourceSpec resourceSpec);
public DownloadService2.ResourceSpec[] getUpdateAvaiableReosurces(
public DownloadService2.ResourceSpec[] getUpdateAvailableResources(
javax.jnlp.DownloadService2.ResourceSpec resourceSpec);
}
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment