Projects
openEuler:20.03:LTS:SP3
groovy
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 10
View file
_service:tar_scm_kernel_repo:groovy.spec
Changed
@@ -1,6 +1,6 @@ Name: groovy Version: 2.4.8 -Release: 11 +Release: 12 Summary: Dynamic language for the Java Platform License: ASL 2.0 and BSD and EPL-1.0 and Public Domain and ANTLR-PD and MIT URL: http://groovy-lang.org @@ -18,6 +18,7 @@ Patch5: 0006-Disable-artifactory-publish.patch Patch6: 0007-Fix-missing-extension-definitions.patch Patch7: CVE-2020-17521.patch +Patch8: 0008-compatible-for-version-1.8.patch BuildRequires: gradle-local >= 2.1-0.9 javapackages-local java-devel >= 1.8 ant antlr-tool ant-antlr BuildRequires: aqute-bnd gpars multiverse apache-parent testng jline apache-commons-cli apache-commons-beanutils @@ -190,6 +191,9 @@ %doc LICENSE NOTICE README.adoc %changelog +* Mon Feb 05 2024 Ge Wang <wang__ge@126.com> - 2.4.8-12 +- Compatible adapter for version 1.8 + * Fri May 20 2022 loong_C <loong_c@yeah.net> - 2.4.8-11 - fix spec changelog date
View file
_service:tar_scm_kernel_repo:0008-compatible-for-version-1.8.patch
Added
@@ -0,0 +1,89 @@ +From bfe732cf53ad19c9a8e6db3af595e728cf2bacfa Mon Sep 17 00:00:00 2001 +From: wang--ge <wang__ge@126.com> +Date: Mon, 5 Feb 2024 09:56:34 +0800 +Subject: [PATCH] compatible for version 1.8 + +--- + src/bin/startGroovy | 45 +++++++++++++++++++++++++++++++-------------- + 1 file changed, 31 insertions(+), 14 deletions(-) + +diff --git a/src/bin/startGroovy b/src/bin/startGroovy +index 36d6edd..9fcccc4 100644 +--- a/src/bin/startGroovy ++++ b/src/bin/startGroovy +@@ -28,7 +28,6 @@ + ## $Revision$ + ## $Date$ + ## +- + PROGNAME=`basename "$0"` + + #DIRNAME=`dirname "$0"` +@@ -150,7 +149,6 @@ fi + if [ -z "$GROOVY_CONF" ] ; then + GROOVY_CONF="$GROOVY_HOME/conf/groovy-starter.conf" + fi +-STARTER_CLASSPATH="$GROOVY_HOME/lib/@GROOVYJAR@" + + # Create the final classpath. Setting a classpath using the -cp or -classpath option means not to use the + # global classpath. Groovy behaves then the same as the java interpreter +@@ -162,6 +160,11 @@ else + CP=. + fi + ++STARTER_CLASSPATH="$GROOVY_HOME/lib/@GROOVYJAR@" ++if [ ${GROOVY_VERSION} == "1.8" ];then ++ STARTER_CLASSPATH="/usr/share/java/groovy-1.8.jar:$CP" ++fi ++ + # Determine the Java command to use to start the JVM. + if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then +@@ -283,18 +286,32 @@ startGroovy ( ) { + if $useprofiler ; then + runProfiler + else +- eval exec "\"\$JAVACMD\"" $JAVA_OPTS \ +- -classpath "\"\$STARTER_CLASSPATH\"" \ +- -Dscript.name="\"\$SCRIPT_PATH\"" \ +- -Dprogram.name="\"\$PROGNAME\"" \ +- -Dgroovy.starter.conf="\"\$GROOVY_CONF\"" \ +- -Dgroovy.home="\"\$GROOVY_HOME\"" \ +- -Dtools.jar="\"\$TOOLS_JAR\"" \ +- $STARTER_MAIN_CLASS \ +- --main $CLASS \ +- --conf "\"\$GROOVY_CONF\"" \ +- --classpath "\"\$CP\"" \ +- "\"\$@\"" ++ if [ ${GROOVY_VERSION} == "1.8" ];then ++ eval exec "\"\$JAVACMD\"" $JAVA_OPTS \ ++ -classpath "\"\$STARTER_CLASSPATH\"" \ ++ -Dscript.name="\"\$SCRIPT_PATH\"" \ ++ -Dprogram.name="\"\$PROGNAME\"" \ ++ -Dgroovy.starter.conf="\"\$GROOVY_CONF\"" \ ++ -Dgroovy.home="\"\$GROOVY_HOME\"" \ ++ -Dtools.jar="\"\$TOOLS_JAR\"" \ ++ $STARTER_MAIN_CLASS \ ++ --main $CLASS \ ++ --conf "\"\$GROOVY_CONF\"" \ ++ "\"\$@\"" ++ else ++ eval exec "\"\$JAVACMD\"" $JAVA_OPTS \ ++ -classpath "\"\$STARTER_CLASSPATH\"" \ ++ -Dscript.name="\"\$SCRIPT_PATH\"" \ ++ -Dprogram.name="\"\$PROGNAME\"" \ ++ -Dgroovy.starter.conf="\"\$GROOVY_CONF\"" \ ++ -Dgroovy.home="\"\$GROOVY_HOME\"" \ ++ -Dtools.jar="\"\$TOOLS_JAR\"" \ ++ $STARTER_MAIN_CLASS \ ++ --main $CLASS \ ++ --conf "\"\$GROOVY_CONF\"" \ ++ --classpath "\"\$CP\"" \ ++ "\"\$@\"" ++ fi + fi + } + +-- +2.33.0 +
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.