Attachment 204579 Details for Bug 223304 – Updated to remove 1.5[+] from man pages

[patch] Updated to remove 1.5[+] from man pages

javavmwrapper.patch (text/plain), 3.69 KB, created by Tommy P on 2019-05-23 22:18:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tommy P

Created: 2019-05-23 22:18:51 UTC

Size: 3.69 KB

patch

obsolete

>--- src/javavm.1.ori    2019-05-23 12:33:16.172643000 -0700
>+++ src/javavm.1        2019-05-23 15:15:58.326538000 -0700
>@@ -113,13 +113,19 @@
> equal to the given version will be used.
> .Pp
> Currently allowed versions are
>-.Ql 1.5 ,
>-.Ql 1.5+ ,
> .Ql 1.6 ,
> .Ql 1.6+ ,
>-.Ql 1.7
>+.Ql 1.7 ,
>+.Ql 1.7+ ,
>+.Ql 1.8 ,
>+.Ql 1.8+ ,
>+.Ql 9 ,
>+.Ql 9+ ,
>+.Ql 11 ,
>+.Ql 11+ ,
>+.Ql 12 ,
> and
>-.Ql 1.7+ .
>+.Ql 12+ .
> .It Ev JAVAVM_OPTS
> The contents of this environment variable will be passed to the invoked
> Java VM as options.
>@@ -179,16 +185,16 @@
> .Dq native
> Java VM registered with
> .Nm .
>-.It Ev JAVA_VERSION=1.5+ Pa %%LOCALBASE%%/bin/javac MyClass.java
>+.It Ev JAVA_VERSION=1.8+ Pa %%LOCALBASE%%/bin/javac MyClass.java
> Compile MyClass.java with a registered Java VM's javac that is at least
>-version 1.5.
>+version 1.8.
> .It Ev JAVA_OS=native Pa %%LOCALBASE%%/bin/java Fl jar Pa MyApp.jar
> Execute MyApp with the most up to date native Java VM that is registered
> with
> .Nm .
> This is necessary if MyApp uses JNI, for instance.
>-.It Ev JAVA_VERSION="1.5 1.7" Pa %%LOCALBASE%%/bin/java Fl jar Pa MyApp.jar
>-Execute MyApp with either a Java VM that is either version 1.5 or version 1.7.
>+.It Ev JAVA_VERSION="1.8 11" Pa %%LOCALBASE%%/bin/java Fl jar Pa MyApp.jar
>+Execute MyApp with either a Java VM that is either version 1.8 or version 11.
> .It Ev JAVAVM_DRYRUN=yes Pa %%LOCALBASE%%/bin/java
> Don't invoke the Java VM, but print out information about what would have
> been done.
>--- src/javavmwrapper.sh.ori    2019-05-23 12:33:16.193859000 -0700
>+++ src/javavmwrapper.sh        2019-05-23 14:16:14.177715000 -0700
>@@ -501,16 +501,22 @@
>         for version in ${JAVA_VERSION}; do
>             case "${version}" in
>                 1.6+)
>-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7 1.8 1.9"
>+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7 1.8 9 11 12"
>                     ;;
>                 1.7+)
>-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.7 1.8 1.9"
>+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.7 1.8 9 11 12"
>                     ;;
>                 1.8+)
>-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.8 1.9"
>+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.8 9 11 12"
>                     ;;
>-                1.9+)
>-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.9"
>+                9+)
>+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 9 11 12"
>+                    ;;
>+                11+)
>+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 11 12"
>+                    ;;
>+                12+)
>+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 12"
>                     ;;
>                 *)
>                     _JAVAVM_VERSION="${_JAVAVM_VERSION} ${version}"
>--- src/manvm.1.ori     2019-05-23 12:33:16.200567000 -0700
>+++ src/manvm.1 2019-05-23 15:16:17.398069000 -0700
>@@ -101,13 +101,20 @@
> greater than or equal to the given version will be used.
> .Pp
> Currently allowed versions are
>-.Ql 1.5 ,
>-.Ql 1.5+ ,
> .Ql 1.6 ,
> .Ql 1.6+ ,
>-.Ql 1.7
>+.Ql 1.7 ,
>+.Ql 1.7+ ,
>+.Ql 1.8 ,
>+.Ql 1.8+ ,
>+.Ql 9 ,
>+.Ql 9+ ,
>+.Ql 11 ,
>+.Ql 11+ ,
>+.Ql 12 ,
> and
>-.Ql 1.7+ .
>+.Ql 12+ .
>+
> .It Ev JAVAVM_OPTS
> The contents of this environment variable will be passed to the invoked
> .Nm man
>@@ -125,10 +132,10 @@
> .Dq native
> Java VM registered with
> .Nm javavm .
>-.It Ev JAVA_VERSION=1.5 Pa %%LOCALBASE%%/bin/manvm javac
>+.It Ev JAVA_VERSION=1.8 Pa %%LOCALBASE%%/bin/manvm javac
> Display the on-line manual page for the
> .Nm javac
>-programme for a Java VM which is version 1.5.
>+programme for a Java VM which is version 1.8.
> .El
> .Sh SEE ALSO
> .Xr javavm 1 ,

Actions: View | Diff

Attachments on bug 223304: 204577 | 204579 | 204710