mirror of
https://github.com/angryip/ipscan.git
synced 2025-10-26 11:18:17 +00:00
use a better message when rt.jar is not found
This commit is contained in:
parent
08ac6bc9db
commit
899e134a62
2
.github/workflows/main.yml
vendored
2
.github/workflows/main.yml
vendored
@ -12,5 +12,7 @@ jobs:
|
||||
with:
|
||||
java-version: '8'
|
||||
architecture: x64
|
||||
- name: Find rt.jar in Zulu
|
||||
run: find $JAVA_HOME
|
||||
- name: Build
|
||||
run: ./gradlew linux64
|
||||
|
||||
@ -97,16 +97,16 @@ def packageTask(def platform, def moreJars, def moreLibs, Closure doMore) {
|
||||
with jar
|
||||
|
||||
def rtJar = new File(System.getProperty('java.home') + "/jre/lib/rt.jar")
|
||||
if (!rtJar.exists()) rtJar = new File('/usr/lib/jvm/java-10-openjdk-amd64/jmods/java.base.jmod') // try Ubuntu version of Java 10
|
||||
if (!rtJar.exists()) rtJar = new File('/usr/lib/jvm/java-8-oracle/jre/lib/rt.jar') // try Ubuntu version of Java 8 if current Java doesn't have rt.jar
|
||||
if (!rtJar.exists()) rtJar = new File('/usr/lib/jvm/java-1.8.0-openjdk-amd64/jre/lib/rt.jar') // try Ubuntu version of OpenJDK 8
|
||||
if (!rtJar.exists()) rtJar = new File('/usr/lib/jvm/java-11-openjdk-amd64/jmods/java.base.jmod') // try Debian/Ubuntu version of Java 11
|
||||
if (!rtJar.exists()) rtJar = new File('/usr/lib/jvm/java-8-oracle/jre/lib/rt.jar') // try Debian/Ubuntu version of Java 8 if current Java doesn't have rt.jar
|
||||
if (!rtJar.exists()) rtJar = new File('/usr/lib/jvm/java-1.8.0-openjdk-amd64/jre/lib/rt.jar') // try Debian/Ubuntu version of OpenJDK 8
|
||||
|
||||
if (rtJar.exists()) {
|
||||
print "Using $rtJar for proguard minimization"
|
||||
finalizedBy minimizeTask(rtJar, platform, doMore)
|
||||
}
|
||||
else {
|
||||
println "WARNING: not minimizing, Java 8 is currently required for that"
|
||||
println "WARNING: not minimizing, Java8 rt.jar not found on the system"
|
||||
doLast(doMore)
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user