From owner-svn-ports-all@freebsd.org Fri Jul 26 18:35:06 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AC41BA69A4; Fri, 26 Jul 2019 18:35:06 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8F37B754B0; Fri, 26 Jul 2019 18:35:06 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6565A1B3CD; Fri, 26 Jul 2019 18:35:06 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x6QIZ6LS077896; Fri, 26 Jul 2019 18:35:06 GMT (envelope-from glewis@FreeBSD.org) Received: (from glewis@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6QIZ5eX077894; Fri, 26 Jul 2019 18:35:05 GMT (envelope-from glewis@FreeBSD.org) Message-Id: <201907261835.x6QIZ5eX077894@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glewis set sender to glewis@FreeBSD.org using -f From: Greg Lewis Date: Fri, 26 Jul 2019 18:35:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r507366 - in head/java/javavmwrapper: . src X-SVN-Group: ports-head X-SVN-Commit-Author: glewis X-SVN-Commit-Paths: in head/java/javavmwrapper: . src X-SVN-Commit-Revision: 507366 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8F37B754B0 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.969,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jul 2019 18:35:06 -0000 Author: glewis Date: Fri Jul 26 18:35:05 2019 New Revision: 507366 URL: https://svnweb.freebsd.org/changeset/ports/507366 Log: Support for newer Java versions * Switch the internal fallback logic (which is only run when the ports system is absent) to use modern Java versioning (e.g. 9 rather than 1.9) * Add in support for specifying 10+, 11+ and 12+ as requested versions. * Bump version to 2.7 Notes: * The fallback logic doesn't support the idea of a default version the way bsd.java.mk does. This was already the case. * The sorting of VMs in the configuration file doesn't numerically sort versions 10 and higher correctly yet. This will be addressed shortly. * Manual pages need updating. * The fallback logic is only used if bsd.java.mk is absent. This should be a no-op if it is present. PR: 223304 Modified: head/java/javavmwrapper/Makefile head/java/javavmwrapper/src/javavmwrapper.sh Modified: head/java/javavmwrapper/Makefile ============================================================================== --- head/java/javavmwrapper/Makefile Fri Jul 26 18:09:44 2019 (r507365) +++ head/java/javavmwrapper/Makefile Fri Jul 26 18:35:05 2019 (r507366) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= javavmwrapper -PORTVERSION= 2.6 +PORTVERSION= 2.7 CATEGORIES= java MASTER_SITES= # none DISTFILES= # none Modified: head/java/javavmwrapper/src/javavmwrapper.sh ============================================================================== --- head/java/javavmwrapper/src/javavmwrapper.sh Fri Jul 26 18:09:44 2019 (r507365) +++ head/java/javavmwrapper/src/javavmwrapper.sh Fri Jul 26 18:35:05 2019 (r507366) @@ -500,24 +500,45 @@ setJavaHome() { _JAVAVM_VERSION= for version in ${JAVA_VERSION}; do case "${version}" in - 1.6+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7 1.8 1.9" + *6+) + _JAVAVM_VERSION="${_JAVAVM_VERSION} 6 7 8 9 10 11 12" ;; - 1.7+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.7 1.8 1.9" + *7+) + _JAVAVM_VERSION="${_JAVAVM_VERSION} 7 8 9 10 11 12" ;; - 1.8+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.8 1.9" + *8+) + _JAVAVM_VERSION="${_JAVAVM_VERSION} 8 9 10 11 12" ;; - 1.9+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.9" + *9+) + _JAVAVM_VERSION="${_JAVAVM_VERSION} 9 10 11 12" ;; + 10+) + _JAVAVM_VERSION="${_JAVAVM_VERSION} 10 11 12" + ;; + 11+) + _JAVAVM_VERSION="${_JAVAVM_VERSION} 11 12" + ;; + 12+) + _JAVAVM_VERSION="${_JAVAVM_VERSION} 12" + ;; + 1.6) + _JAVAVM_VERSION="${_JAVAVM_VERSION} 6" + ;; + 1.7) + _JAVAVM_VERSION="${_JAVAVM_VERSION} 7" + ;; + 1.8) + _JAVAVM_VERSION="${_JAVAVM_VERSION} 8" + ;; + 1.9) + _JAVAVM_VERSION="${_JAVAVM_VERSION} 9" + ;; *) _JAVAVM_VERSION="${_JAVAVM_VERSION} ${version}" ;; esac done - JAVA_VERSION=`echo "${_JAVAVM_VERSION}" | sort | uniq` + JAVA_VERSION=`echo "${_JAVAVM_VERSION}" | sort -n | uniq` fi # Finally try to run one of the ${_JAVAVM_VMS} @@ -528,8 +549,8 @@ setJavaHome() { # Respect JAVA_VERSION if [ -n "${JAVA_VERSION}" ]; then _JAVAVM_VERSION=`echo ${_JAVAVM_VM} | \ - sed -e 's|^[^0-9]*\([0-9]\)\.\([0-9]\)\.[0-9]$|\1.\2|' \ - -e 's|^[^0-9]*\([0-9]\)$|1.\1|'` + sed -e 's|^[^0-9]*\([0-9]\)\.\([0-9]\)\.[0-9]$|\2|' \ + -e 's|^[^0-9]*\([0-9][0-9]*\)$|\1|'` for _JAVAVM_REQUESTED_VERSION in ${JAVA_VERSION}; do if [ "${_JAVAVM_VERSION}" = "${_JAVAVM_REQUESTED_VERSION}" ]; then _JAVAVM_VERSION=