View | Details | Raw Unified | Return to bug 223304 | Differences between
and this patch

Collapse All | Expand All

(-)src/javavm.1 (-12 / +14 lines)
Lines 100-110 Link Here
100
The selected Java VM must have been released by one of the vendors in the list.
100
The selected Java VM must have been released by one of the vendors in the list.
101
.Pp
101
.Pp
102
Currently allowed vendors are
102
Currently allowed vendors are
103
.Ql bsdjava ,
103
.Ql oracle
104
.Ql freebsd ,
105
.Ql openjdk
106
and
104
and
107
.Ql sun .
105
.Ql openjdk.
108
.It Ev JAVA_VERSION
106
.It Ev JAVA_VERSION
109
A space delimited list of versions of the Java VM that may be used.
107
A space delimited list of versions of the Java VM that may be used.
110
By appending a
108
By appending a
Lines 113-125 Link Here
113
equal to the given version will be used.
111
equal to the given version will be used.
114
.Pp
112
.Pp
115
Currently allowed versions are
113
Currently allowed versions are
116
.Ql 1.5 ,
117
.Ql 1.5+ ,
118
.Ql 1.6 ,
114
.Ql 1.6 ,
119
.Ql 1.6+ ,
115
.Ql 1.6+ ,
120
.Ql 1.7
116
.Ql 1.7 ,
117
.Ql 1.7+ ,
118
.Ql 1.8 ,
119
.Ql 1.8+ ,
120
.Ql 11 ,
121
.Ql 11+ ,
122
.Ql 12+ ,
121
and
123
and
122
.Ql 1.7+ .
124
.Ql 12+ .
123
.It Ev JAVAVM_OPTS
125
.It Ev JAVAVM_OPTS
124
The contents of this environment variable will be passed to the invoked
126
The contents of this environment variable will be passed to the invoked
125
Java VM as options.
127
Java VM as options.
Lines 179-194 Link Here
179
.Dq native
181
.Dq native
180
Java VM registered with
182
Java VM registered with
181
.Nm .
183
.Nm .
182
.It Ev JAVA_VERSION=1.5+ Pa %%LOCALBASE%%/bin/javac MyClass.java
184
.It Ev JAVA_VERSION=1.8+ Pa %%LOCALBASE%%/bin/javac MyClass.java
183
Compile MyClass.java with a registered Java VM's javac that is at least
185
Compile MyClass.java with a registered Java VM's javac that is at least
184
version 1.5.
186
version 1.8.
185
.It Ev JAVA_OS=native Pa %%LOCALBASE%%/bin/java Fl jar Pa MyApp.jar
187
.It Ev JAVA_OS=native Pa %%LOCALBASE%%/bin/java Fl jar Pa MyApp.jar
186
Execute MyApp with the most up to date native Java VM that is registered
188
Execute MyApp with the most up to date native Java VM that is registered
187
with
189
with
188
.Nm .
190
.Nm .
189
This is necessary if MyApp uses JNI, for instance.
191
This is necessary if MyApp uses JNI, for instance.
190
.It Ev JAVA_VERSION="1.5 1.7" Pa %%LOCALBASE%%/bin/java Fl jar Pa MyApp.jar
192
.It Ev JAVA_VERSION="1.8 11" Pa %%LOCALBASE%%/bin/java Fl jar Pa MyApp.jar
191
Execute MyApp with either a Java VM that is either version 1.5 or version 1.7.
193
Execute MyApp with either a Java VM that is either version 1.8 or version 11.
192
.It Ev JAVAVM_DRYRUN=yes Pa %%LOCALBASE%%/bin/java
194
.It Ev JAVAVM_DRYRUN=yes Pa %%LOCALBASE%%/bin/java
193
Don't invoke the Java VM, but print out information about what would have
195
Don't invoke the Java VM, but print out information about what would have
194
been done.
196
been done.
(-)src/javavmwrapper.sh (-10 / +12 lines)
Lines 501-516 Link Here
501
        for version in ${JAVA_VERSION}; do
501
        for version in ${JAVA_VERSION}; do
502
            case "${version}" in
502
            case "${version}" in
503
                1.6+)
503
                1.6+)
504
                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7 1.8 1.9"
504
                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7 1.8 11 12"
505
                    ;;
505
                    ;;
506
                1.7+)
506
                1.7+)
507
                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.7 1.8 1.9"
507
                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.7 1.8 11 12"
508
                    ;;
508
                    ;;
509
                1.8+)
509
                1.8+)
510
                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.8 1.9"
510
                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.8 11 12"
511
                    ;;
511
                    ;;
512
                1.9+)
512
                11+)
513
                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.9"
513
                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 11 12"
514
                    ;;
515
                12+)
516
                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 12"
514
                    ;;
517
                    ;;
515
                *)
518
                *)
516
                    _JAVAVM_VERSION="${_JAVAVM_VERSION} ${version}"
519
                    _JAVAVM_VERSION="${_JAVAVM_VERSION} ${version}"
Lines 528-535 Link Here
528
        # Respect JAVA_VERSION
531
        # Respect JAVA_VERSION
529
        if [ -n "${JAVA_VERSION}" ]; then
532
        if [ -n "${JAVA_VERSION}" ]; then
530
            _JAVAVM_VERSION=`echo ${_JAVAVM_VM} | \
533
            _JAVAVM_VERSION=`echo ${_JAVAVM_VM} | \
531
                sed -e 's|^[^0-9]*\([0-9]\)\.\([0-9]\)\.[0-9]$|\1.\2|' \
534
                sed -e 's|^[^0-9]*\([0-9]*\)$|\1|'`
532
                    -e 's|^[^0-9]*\([0-9]\)$|1.\1|'`
535
            if [ ${_JAVAVM_VERSION} -le 8 ]; then
536
                _JAVAVM_VERSION="1.${_JAVAVM_VERSION}"
537
            fi
533
            for _JAVAVM_REQUESTED_VERSION in ${JAVA_VERSION}; do
538
            for _JAVAVM_REQUESTED_VERSION in ${JAVA_VERSION}; do
534
                if [ "${_JAVAVM_VERSION}" = "${_JAVAVM_REQUESTED_VERSION}" ]; then
539
                if [ "${_JAVAVM_VERSION}" = "${_JAVAVM_REQUESTED_VERSION}" ]; then
535
                    _JAVAVM_VERSION=
540
                    _JAVAVM_VERSION=
Lines 568-576 Link Here
568
                openjdk*)
573
                openjdk*)
569
                    _JAVAVM_VENDOR=openjdk
574
                    _JAVAVM_VENDOR=openjdk
570
                    ;;
575
                    ;;
571
                linux-sun*)
572
                    _JAVAVM_VENDOR=sun
573
                    ;;
574
                linux-oracle*)
576
                linux-oracle*)
575
                    _JAVAVM_VENDOR=oracle
577
                    _JAVAVM_VENDOR=oracle
576
                    ;;
578
                    ;;
(-)src/manvm.1 (-7 / +9 lines)
Lines 87-97 Link Here
87
been released by one of the vendors in the list.
87
been released by one of the vendors in the list.
88
.Pp
88
.Pp
89
Currently allowed vendors are
89
Currently allowed vendors are
90
.Ql bsdjava ,
91
.Ql freebsd ,
92
.Ql openjdk
90
.Ql openjdk
93
and
91
and
94
.Ql sun .
92
.Ql oracle .
95
.It Ev JAVA_VERSION
93
.It Ev JAVA_VERSION
96
A space delimited list of versions of the Java VM from which the on-line
94
A space delimited list of versions of the Java VM from which the on-line
97
manual pages may come.
95
manual pages may come.
Lines 101-113 Link Here
101
greater than or equal to the given version will be used.
99
greater than or equal to the given version will be used.
102
.Pp
100
.Pp
103
Currently allowed versions are
101
Currently allowed versions are
104
.Ql 1.5 ,
105
.Ql 1.5+ ,
106
.Ql 1.6 ,
102
.Ql 1.6 ,
107
.Ql 1.6+ ,
103
.Ql 1.6+ ,
108
.Ql 1.7
104
.Ql 1.7 ,
105
.Ql 1.7+ ,
106
.Ql 1.8 ,
107
.Ql 1.8+ ,
108
.Ql 11 ,
109
.Ql 11+ ,
110
.Ql 12 ,
109
and
111
and
110
.Ql 1.7+ .
112
.Ql 12+ .
111
.It Ev JAVAVM_OPTS
113
.It Ev JAVAVM_OPTS
112
The contents of this environment variable will be passed to the invoked
114
The contents of this environment variable will be passed to the invoked
113
.Nm man
115
.Nm man

Return to bug 223304