Ghidra is a software reverse engineering (SRE) framework
GP-0: Updating gradle wrapper jar and scripts
Ryan Kurtzf98b9495b187
diff --git a/Ghidra/RuntimeScripts/support/gradle/gradle-wrapper.jar b/Ghidra/RuntimeScripts/support/gradle/gradle-wrapper.jarindex e6441136f3..5097068a8d 100644Binary files a/Ghidra/RuntimeScripts/support/gradle/gradle-wrapper.jar and b/Ghidra/RuntimeScripts/support/gradle/gradle-wrapper.jar differdiff --git a/Ghidra/RuntimeScripts/support/gradle/gradle-wrapper.properties b/Ghidra/RuntimeScripts/support/gradle/gradle-wrapper.propertiesindex 299848b169..9b7cb4af38 100644--- a/Ghidra/RuntimeScripts/support/gradle/gradle-wrapper.properties+++ b/Ghidra/RuntimeScripts/support/gradle/gradle-wrapper.properties@@ -2,6 +2,8 @@ distributionBase=GRADLE_USER_HOMEdistributionPath=wrapper/distsdistributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zipnetworkTimeout=10000+retries=0+retryBackOffMs=500validateDistributionUrl=truezipStoreBase=GRADLE_USER_HOMEzipStorePath=wrapper/distsdiff --git a/gradlew b/gradlewindex 1173c4281a..1b17e778ac 100755--- a/gradlew+++ b/gradlew@@ -1,7 +1,7 @@#!/bin/sh#-# Copyright © 2015-2021 the original authors.+# Copyright © 2015 the original authors.## Licensed under the Apache License, Version 2.0 (the "License");# you may not use this file except in compliance with the License.@@ -15,10 +15,12 @@# See the License for the specific language governing permissions and# limitations under the License.#+# SPDX-License-Identifier: Apache-2.0+################################################################################-# Gradle start up script for POSIX generated by Gradle.+# gradlew start up script for POSIX generated by Gradle.## Important for running:#@@ -27,7 +29,7 @@# bash, then to run this script, type that shell name before the whole# command line, like:#-# ksh Gradle+# ksh gradlew## Busybox and similar reduced shells will NOT work, because this script# requires all of these POSIX shell features:@@ -55,7 +57,7 @@# Darwin, MinGW, and NonStop.## (3) This script is generated from the Groovy template-# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt+# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt# within the Gradle project.## You can find Gradle at https://github.com/gradle/gradle/.@@ -84,7 +86,7 @@ done# shellcheck disable=SC2034APP_BASE_NAME=${0##*/}# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit# Use the maximum available, or set MAX_FD != -1 to use that value.MAX_FD=maximum@@ -117,11 +119,11 @@ esac# Set variables based on Production vs Dev environmentif [ -f "${APP_HOME}/gradle-wrapper.jar" ]; then# Production Environment- CLASSPATH="${APP_HOME}/gradle-wrapper.jar"+ JAR_PATH="${APP_HOME}/gradle-wrapper.jar"GHIDRA_HOME="${APP_HOME}/../.."else# Development Environment (Eclipse classes or "gradle jar")- CLASSPATH="${APP_HOME}/Ghidra/RuntimeScripts/support/gradle/gradle-wrapper.jar"+ JAR_PATH="${APP_HOME}/Ghidra/RuntimeScripts/support/gradle/gradle-wrapper.jar"GHIDRA_HOME="${APP_HOME}"fi@@ -194,7 +196,6 @@ fi# For Cygwin or MSYS, switch paths to Windows format before running javaif "$cygwin" || "$msys" ; thenAPP_HOME=$( cygpath --path --mixed "$APP_HOME" )- CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )JAVACMD=$( cygpath --unix "$JAVACMD" )@@ -227,15 +228,14 @@ fiDEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'# Collect all arguments for the java command:-# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,# and any embedded shellness will be escaped.# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be# treated as '${Hostname}' itself on the command line.set -- \"-Dorg.gradle.appname=$APP_BASE_NAME" \- -classpath "$CLASSPATH" \- org.gradle.wrapper.GradleWrapperMain \+ -jar "$JAR_PATH" \"$@"# Stop when "xargs" is not available.diff --git a/gradlew.bat b/gradlew.batindex 70c2204d03..35b0281536 100644--- a/gradlew.bat+++ b/gradlew.bat@@ -16,16 +16,45 @@@rem See the License for the specific language governing permissions and@rem limitations under the License.@rem+@rem SPDX-License-Identifier: Apache-2.0+@rem@if "%DEBUG%"=="" @echo off@rem ##########################################################################@rem-@rem Gradle startup script for Windows+@rem gradlew startup script for Windows@rem@rem ##########################################################################-@rem Set local scope for the variables with windows NT shell-if "%OS%"=="Windows_NT" setlocal+@rem Set local scope for the variables, and ensure extensions are enabled+setlocal EnableExtensions++@rem Catch executions from older scripts and ensure they exit cleanly.+@rem This can be removed once we can be reasonably confident that few people+@rem will be migrating directly to this new wrapper.+goto afterSafetyNet+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::+goto exitWithErrorLevel+:afterSafetyNetset DIRNAME=%~dp0if "%DIRNAME%"=="" set DIRNAME=.@@ -46,13 +75,14 @@ set JAVA_EXE=java.exe%JAVA_EXE% -version >NUL 2>&1if %ERRORLEVEL% equ 0 goto execute-echo. 1>&2-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2-echo. 1>&2-echo Please set the JAVA_HOME variable in your environment to match the 1>&2-echo location of your Java installation. 1>&2+1>&2 echo.+1>&2 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.+1>&2 echo.+1>&2 echo Please set the JAVA_HOME variable in your environment to match the+1>&2 echo location of your Java installation.-goto fail+"%COMSPEC%" /c exit 1+goto exitWithErrorLevel:findJavaFromJavaHomeset JAVA_HOME=%JAVA_HOME:"=%@@ -60,13 +90,14 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exeif exist "%JAVA_EXE%" goto execute-echo. 1>&2-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2-echo. 1>&2-echo Please set the JAVA_HOME variable in your environment to match the 1>&2-echo location of your Java installation. 1>&2+1>&2 echo.+1>&2 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%+1>&2 echo.+1>&2 echo Please set the JAVA_HOME variable in your environment to match the+1>&2 echo location of your Java installation.-goto fail+"%COMSPEC%" /c exit 1+goto exitWithErrorLevel:execute@rem Setup the command line@@ -76,11 +107,11 @@ goto fail@rem Set variables based on Production vs Dev environmentif exist "%APP_HOME%\gradle-wrapper.jar" (@rem Production Environment- set "CLASSPATH=%APP_HOME%gradle-wrapper.jar"+ set "JAR_PATH=%APP_HOME%gradle-wrapper.jar"set "GHIDRA_HOME=%APP_HOME%..\..\") else (@rem Development Environment (Eclipse classes or "gradle jar")- set "CLASSPATH=%APP_HOME%Ghidra\RuntimeScripts\support\gradle\gradle-wrapper.jar"+ set "JAR_PATH=%APP_HOME%Ghidra\RuntimeScripts\support\gradle\gradle-wrapper.jar"set "GHIDRA_HOME=%APP_HOME%")@@ -100,26 +131,17 @@ if not "%application.release.name%" == "PUBLIC" (if %PROCEED% == 0 (echo Please install Gradle %application.gradle.min% or later and put it on your PATH.- goto fail+ "%COMSPEC%" /c exit 1+ goto exitWithErrorLevel)@rem ------------------------------------------------------------------------------------------------@rem Execute Gradle-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*--:end-@rem End local scope for the variables with windows NT shell-if %ERRORLEVEL% equ 0 goto mainEnd--:fail-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of-rem the _cmd.exe /c_ return code!-set EXIT_CODE=%ERRORLEVEL%-if %EXIT_CODE% equ 0 set EXIT_CODE=1-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%-exit /b %EXIT_CODE%--:mainEnd-if "%OS%"=="Windows_NT" endlocal+@rem Execute gradlew+@rem endlocal doesn't take effect until after the line is parsed and variables are expanded+@rem which allows us to clear the local environment before executing the java command+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%JAR_PATH%" %* & call :exitWithErrorLevel & goto exitWithErrorLevel-:omega+@rem This label must not be changed. We rely on old scripts being able to jump to this point.+:exitWithErrorLevel+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts+"%COMSPEC%" /c exit %ERRORLEVEL%