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

Collapse All | Expand All

(-)src/javavm.1 2019-05-23 15:15:58.326538000 -0700 (-8 / +14 lines)
Lines 113-125 Link Here
113
equal to the given version will be used.
113
equal to the given version will be used.
114
.Pp
114
.Pp
115
Currently allowed versions are
115
Currently allowed versions are
116
.Ql 1.5 ,
117
.Ql 1.5+ ,
118
.Ql 1.6 ,
116
.Ql 1.6 ,
119
.Ql 1.6+ ,
117
.Ql 1.6+ ,
120
.Ql 1.7
118
.Ql 1.7 ,
119
.Ql 1.7+ ,
120
.Ql 1.8 ,
121
.Ql 1.8+ ,
122
.Ql 9 ,
123
.Ql 9+ ,
124
.Ql 11 ,
125
.Ql 11+ ,
126
.Ql 12 ,
121
and
127
and
122
.Ql 1.7+ .
128
.Ql 12+ .
123
.It Ev JAVAVM_OPTS
129
.It Ev JAVAVM_OPTS
124
The contents of this environment variable will be passed to the invoked
130
The contents of this environment variable will be passed to the invoked
125
Java VM as options.
131
Java VM as options.
Lines 179-194 Link Here
179
.Dq native
185
.Dq native
180
Java VM registered with
186
Java VM registered with
181
.Nm .
187
.Nm .
182
.It Ev JAVA_VERSION=1.5+ Pa %%LOCALBASE%%/bin/javac MyClass.java
188
.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
189
Compile MyClass.java with a registered Java VM's javac that is at least
184
version 1.5.
190
version 1.8.
185
.It Ev JAVA_OS=native Pa %%LOCALBASE%%/bin/java Fl jar Pa MyApp.jar
191
.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
192
Execute MyApp with the most up to date native Java VM that is registered
187
with
193
with
188
.Nm .
194
.Nm .
189
This is necessary if MyApp uses JNI, for instance.
195
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
196
.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.
197
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
198
.It Ev JAVAVM_DRYRUN=yes Pa %%LOCALBASE%%/bin/java
193
Don't invoke the Java VM, but print out information about what would have
199
Don't invoke the Java VM, but print out information about what would have
194
been done.
200
been done.
(-)src/javavmwrapper.sh 2019-05-23 14:16:14.177715000 -0700 (-5 / +11 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 9 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 9 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 9 11 12"
511
                    ;;
511
                    ;;
512
                1.9+)
512
                9+)
513
                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.9"
513
                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 9 11 12"
514
                    ;;
515
                11+)
516
                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 11 12"
517
                    ;;
518
                12+)
519
                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 12"
514
                    ;;
520
                    ;;
515
                *)
521
                *)
516
                    _JAVAVM_VERSION="${_JAVAVM_VERSION} ${version}"
522
                    _JAVAVM_VERSION="${_JAVAVM_VERSION} ${version}"
(-)src/manvm.1 2019-05-23 15:16:17.398069000 -0700 (-6 / +13 lines)
Lines 101-113 Link Here
101
greater than or equal to the given version will be used.
101
greater than or equal to the given version will be used.
102
.Pp
102
.Pp
103
Currently allowed versions are
103
Currently allowed versions are
104
.Ql 1.5 ,
105
.Ql 1.5+ ,
106
.Ql 1.6 ,
104
.Ql 1.6 ,
107
.Ql 1.6+ ,
105
.Ql 1.6+ ,
108
.Ql 1.7
106
.Ql 1.7 ,
107
.Ql 1.7+ ,
108
.Ql 1.8 ,
109
.Ql 1.8+ ,
110
.Ql 9 ,
111
.Ql 9+ ,
112
.Ql 11 ,
113
.Ql 11+ ,
114
.Ql 12 ,
109
and
115
and
110
.Ql 1.7+ .
116
.Ql 12+ .
117
111
.It Ev JAVAVM_OPTS
118
.It Ev JAVAVM_OPTS
112
The contents of this environment variable will be passed to the invoked
119
The contents of this environment variable will be passed to the invoked
113
.Nm man
120
.Nm man
Lines 125-134 Link Here
125
.Dq native
132
.Dq native
126
Java VM registered with
133
Java VM registered with
127
.Nm javavm .
134
.Nm javavm .
128
.It Ev JAVA_VERSION=1.5 Pa %%LOCALBASE%%/bin/manvm javac
135
.It Ev JAVA_VERSION=1.8 Pa %%LOCALBASE%%/bin/manvm javac
129
Display the on-line manual page for the
136
Display the on-line manual page for the
130
.Nm javac
137
.Nm javac
131
programme for a Java VM which is version 1.5.
138
programme for a Java VM which is version 1.8.
132
.El
139
.El
133
.Sh SEE ALSO
140
.Sh SEE ALSO
134
.Xr javavm 1 ,
141
.Xr javavm 1 ,

Return to bug 223304