Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -733,10 +733,11 @@ tasks.register('deploy') {}
// Gradle process with --no-parallel.
generateLicenseReport.enabled = false
checkLicense.enabled = false
def gradlewCommand = System.getProperty('os.name').toLowerCase().contains('windows') ? 'gradlew.bat' : './gradlew'
tasks.register('licenseCheck', Exec) {
def output = new ByteArrayOutputStream()
workingDir rootDir
commandLine './gradlew', 'generateLicenseReport', 'checkLicense', '--no-parallel', '-PenableLicenseReport=true'
commandLine gradlewCommand, 'generateLicenseReport', 'checkLicense', '--no-parallel', '-PenableLicenseReport=true'
Comment thread
cursor[bot] marked this conversation as resolved.
Outdated
standardOutput = output
errorOutput = output
ignoreExitValue = true
Expand Down Expand Up @@ -932,8 +933,20 @@ startScripts {

unixStartScriptGenerator.template = resources.text.fromFile("${projectDir}/teku/src/main/scripts/unixStartScript.txt")

def shortenWindowsClasspath = { line ->
line = line.replaceAll(/^set CLASSPATH=.*$/, "set CLASSPATH=%APP_HOME%/lib/*")
}

doLast {
unixScript.text = unixScript.text.replace('TEKU_HOME', '\$APP_HOME')
windowsScript.text = windowsScript.text.replace('TEKU_HOME', '%~dp0..')

// Prevent the error originating from the 8191 chars limit on Windows
windowsScript.text =
windowsScript
.readLines()
.collect(shortenWindowsClasspath)
.join('\r\n')
}
}

Expand Down Expand Up @@ -968,7 +981,7 @@ def dockerJdkVariants = ["jdk25", "jdk26"]
def dockerBuildDir = "build/docker-teku/"
def localDockerImage = "local/teku"

def executableAndArg = ["sh", "-c"]
def executableAndArg = System.getProperty('os.name').toLowerCase().contains('windows') ? ["cmd", "/c"] : ["sh", "-c"]

tasks.register('localDocker') {
dependsOn dockerDistUntar
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
distributionSha256Sum=acd53f1edaf02f1a8ff99879f8a34b302661a057d9b063ae9e35b552f804d20a
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
6 changes: 3 additions & 3 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

82 changes: 82 additions & 0 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading