Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

java 1.0 portgroup: remove java.enforce option #20865

Merged
merged 1 commit into from
Oct 21, 2023
Merged

java 1.0 portgroup: remove java.enforce option #20865

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 2 additions & 6 deletions _resources/port1.0/group/java-1.0.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,13 @@
# - "+" and "*" wildcards are supported
#
# If the required Java cannot be found, an error will be thrown at pre-fetch.
#
# Sometimes a port hard code inside produces scripts and other files used JVM,
# then its true use java.enforce to enforce dependency.

options java.version java.home java.fallback java.deptypes java.enforce
options java.version java.home java.fallback java.deptypes

default java.version {}
default java.home {}
default java.fallback {[java::java_get_default_fallback]}
default java.deptypes lib
default java.enforce no

# allow PortGroup to be used inside a variant (e.g. octave)
global java_version_not_found
Expand Down Expand Up @@ -128,7 +124,7 @@ namespace eval java {
}

# Add dependency if required
if { (${java_version_not_found} || [option java.enforce]) && ${java.fallback} ne "" } {
if { ${java_version_not_found} && ${java.fallback} ne "" } {
ui_debug "Adding dependency on JDK fallback ${java.fallback}"
foreach deptype [option java.deptypes] {
depends_${deptype}-append port:${java.fallback}
Expand Down