From 2ddd78e8259652c7c88a5bb7150d7b6ab0e089e2 Mon Sep 17 00:00:00 2001 From: Magnus Ihse Bursie Date: Wed, 28 Nov 2018 10:00:41 +0100 Subject: [PATCH] 8178317: Create man pages using pandoc from markdown sources Reviewed-by: erikj --- make/CompileToolsJdk.gmk | 27 + make/Docs.gmk | 28 +- make/Images.gmk | 121 - make/ModuleWrapper.gmk | 10 +- make/ToolsJdk.gmk | 6 + make/autoconf/jdk-options.m4 | 4 +- make/common/Modules.gmk | 8 + make/common/ProcessMarkdown.gmk | 130 +- make/conf/jib-profiles.js | 4 +- make/devkit/createPandocBundle.sh | 54 +- make/launcher/LauncherCommon.gmk | 70 + make/scripts/pandoc-manpage-filter.js | 142 + .../scripts/pandoc-manpage-filter.sh.template | 28 + src/bsd/doc/man/DO_NOT_EDIT--GENERATED_FILES | 2 - src/bsd/doc/man/apt.1 | 153 - src/bsd/doc/man/ja/apt.1 | 27 - src/bsd/doc/man/ja/jar.1 | 24 - src/bsd/doc/man/ja/jarsigner.1 | 24 - src/bsd/doc/man/ja/java.1 | 24 - src/bsd/doc/man/ja/javac.1 | 24 - src/bsd/doc/man/ja/javadoc.1 | 22 - src/bsd/doc/man/ja/javap.1 | 24 - src/bsd/doc/man/ja/javaws.1 | 24 - src/bsd/doc/man/ja/jcmd.1 | 24 - src/bsd/doc/man/ja/jconsole.1 | 24 - src/bsd/doc/man/ja/jdb.1 | 24 - src/bsd/doc/man/ja/jdeps.1 | 24 - src/bsd/doc/man/ja/jhat.1 | 24 - src/bsd/doc/man/ja/jinfo.1 | 24 - src/bsd/doc/man/ja/jjs.1 | 24 - src/bsd/doc/man/ja/jmap.1 | 24 - src/bsd/doc/man/ja/jps.1 | 24 - src/bsd/doc/man/ja/jrunscript.1 | 24 - src/bsd/doc/man/ja/jsadebugd.1 | 24 - src/bsd/doc/man/ja/jstack.1 | 24 - src/bsd/doc/man/ja/jstat.1 | 24 - src/bsd/doc/man/ja/jstatd.1 | 24 - src/bsd/doc/man/ja/keytool.1 | 24 - src/bsd/doc/man/ja/pack200.1 | 24 - src/bsd/doc/man/ja/rmic.1 | 24 - src/bsd/doc/man/ja/rmid.1 | 24 - src/bsd/doc/man/ja/rmiregistry.1 | 24 - src/bsd/doc/man/ja/serialver.1 | 24 - src/bsd/doc/man/ja/unpack200.1 | 24 - src/bsd/doc/man/javaws.1 | 222 - src/bsd/doc/man/jhat.1 | 136 - src/bsd/doc/man/jsadebugd.1 | 108 - src/{bsd/doc => java.base/share}/man/java.1 | 0 .../doc => java.base/share}/man/keytool.1 | 0 src/{bsd/doc => java.rmi/share}/man/rmid.1 | 0 .../doc => java.rmi/share}/man/rmiregistry.1 | 0 .../share}/man/jrunscript.1 | 0 .../doc => jdk.compiler/share}/man/javac.1 | 0 .../share}/man/serialver.1 | 0 src/{bsd/doc => jdk.jartool/share}/man/jar.1 | 0 .../doc => jdk.jartool/share}/man/jarsigner.1 | 0 .../doc => jdk.javadoc/share}/man/javadoc.1 | 0 src/{bsd/doc => jdk.jcmd/share}/man/jcmd.1 | 0 src/{bsd/doc => jdk.jcmd/share}/man/jinfo.1 | 0 src/{bsd/doc => jdk.jcmd/share}/man/jmap.1 | 0 src/{bsd/doc => jdk.jcmd/share}/man/jps.1 | 0 src/{bsd/doc => jdk.jcmd/share}/man/jstack.1 | 0 src/{bsd/doc => jdk.jcmd/share}/man/jstat.1 | 0 .../doc => jdk.jconsole/share}/man/jconsole.1 | 0 src/{bsd/doc => jdk.jdeps/share}/man/javap.1 | 0 src/{bsd/doc => jdk.jdeps/share}/man/jdeps.1 | 0 src/{bsd/doc => jdk.jdi/share}/man/jdb.1 | 0 .../doc => jdk.jstatd/share}/man/jstatd.1 | 0 src/{bsd/doc => jdk.pack/share}/man/pack200.1 | 0 .../doc => jdk.pack/share}/man/unpack200.1 | 0 src/{bsd/doc => jdk.rmic/share}/man/rmic.1 | 0 .../share}/man/jjs.1 | 0 .../doc/man/DO_NOT_EDIT--GENERATED_FILES | 2 - src/linux/doc/man/ja/jar.1 | 538 -- src/linux/doc/man/ja/jarsigner.1 | 1097 ---- src/linux/doc/man/ja/java.1 | 2915 ---------- src/linux/doc/man/ja/javac.1 | 1565 ------ src/linux/doc/man/ja/javadoc.1 | 4665 ----------------- src/linux/doc/man/ja/javap.1 | 356 -- src/linux/doc/man/ja/javaws.1 | 234 - src/linux/doc/man/ja/jcmd.1 | 158 - src/linux/doc/man/ja/jconsole.1 | 158 - src/linux/doc/man/ja/jdb.1 | 378 -- src/linux/doc/man/ja/jdeps.1 | 394 -- src/linux/doc/man/ja/jhat.1 | 216 - src/linux/doc/man/ja/jinfo.1 | 188 - src/linux/doc/man/ja/jjs.1 | 434 -- src/linux/doc/man/ja/jmap.1 | 211 - src/linux/doc/man/ja/jps.1 | 270 - src/linux/doc/man/ja/jrunscript.1 | 213 - src/linux/doc/man/ja/jsadebugd.1 | 174 - src/linux/doc/man/ja/jstack.1 | 213 - src/linux/doc/man/ja/jstat.1 | 644 --- src/linux/doc/man/ja/jstatd.1 | 278 - src/linux/doc/man/ja/keytool.1 | 2248 -------- src/linux/doc/man/ja/pack200.1 | 373 -- src/linux/doc/man/ja/rmic.1 | 357 -- src/linux/doc/man/ja/rmid.1 | 373 -- src/linux/doc/man/ja/rmiregistry.1 | 135 - src/linux/doc/man/ja/serialver.1 | 148 - src/linux/doc/man/ja/unpack200.1 | 205 - src/linux/doc/man/jar.1 | 484 -- src/linux/doc/man/jarsigner.1 | 808 --- src/linux/doc/man/java.1 | 3721 ------------- src/linux/doc/man/javac.1 | 1366 ----- src/linux/doc/man/javadoc.1 | 3001 ----------- src/linux/doc/man/javap.1 | 380 -- src/linux/doc/man/javaws.1 | 222 - src/linux/doc/man/jcmd.1 | 210 - src/linux/doc/man/jconsole.1 | 112 - src/linux/doc/man/jdb.1 | 267 - src/linux/doc/man/jdeps.1 | 537 -- src/linux/doc/man/jhat.1 | 136 - src/linux/doc/man/jinfo.1 | 132 - src/linux/doc/man/jjs.1 | 247 - src/linux/doc/man/jmap.1 | 143 - src/linux/doc/man/jps.1 | 204 - src/linux/doc/man/jrunscript.1 | 195 - src/linux/doc/man/jsadebugd.1 | 108 - src/linux/doc/man/jstack.1 | 137 - src/linux/doc/man/jstat.1 | 777 --- src/linux/doc/man/jstatd.1 | 209 - src/linux/doc/man/keytool.1 | 1619 ------ src/linux/doc/man/pack200.1 | 290 - src/linux/doc/man/rmic.1 | 223 - src/linux/doc/man/rmid.1 | 314 -- src/linux/doc/man/rmiregistry.1 | 98 - src/linux/doc/man/serialver.1 | 107 - src/linux/doc/man/unpack200.1 | 137 - .../sun/man/man1/DO_NOT_EDIT--GENERATED_FILES | 2 - src/solaris/doc/sun/man/man1/ja/jar.1 | 538 -- src/solaris/doc/sun/man/man1/ja/jarsigner.1 | 1097 ---- src/solaris/doc/sun/man/man1/ja/java.1 | 2915 ---------- src/solaris/doc/sun/man/man1/ja/javac.1 | 1565 ------ src/solaris/doc/sun/man/man1/ja/javadoc.1 | 4665 ----------------- src/solaris/doc/sun/man/man1/ja/javap.1 | 356 -- src/solaris/doc/sun/man/man1/ja/jcmd.1 | 158 - src/solaris/doc/sun/man/man1/ja/jconsole.1 | 158 - src/solaris/doc/sun/man/man1/ja/jdb.1 | 378 -- src/solaris/doc/sun/man/man1/ja/jdeps.1 | 394 -- src/solaris/doc/sun/man/man1/ja/jhat.1 | 216 - src/solaris/doc/sun/man/man1/ja/jinfo.1 | 188 - src/solaris/doc/sun/man/man1/ja/jjs.1 | 434 -- src/solaris/doc/sun/man/man1/ja/jmap.1 | 211 - src/solaris/doc/sun/man/man1/ja/jps.1 | 270 - src/solaris/doc/sun/man/man1/ja/jrunscript.1 | 213 - src/solaris/doc/sun/man/man1/ja/jsadebugd.1 | 174 - src/solaris/doc/sun/man/man1/ja/jstack.1 | 213 - src/solaris/doc/sun/man/man1/ja/jstat.1 | 644 --- src/solaris/doc/sun/man/man1/ja/jstatd.1 | 278 - src/solaris/doc/sun/man/man1/ja/keytool.1 | 2248 -------- src/solaris/doc/sun/man/man1/ja/pack200.1 | 373 -- src/solaris/doc/sun/man/man1/ja/rmic.1 | 357 -- src/solaris/doc/sun/man/man1/ja/rmid.1 | 373 -- src/solaris/doc/sun/man/man1/ja/rmiregistry.1 | 135 - src/solaris/doc/sun/man/man1/ja/serialver.1 | 148 - src/solaris/doc/sun/man/man1/ja/unpack200.1 | 205 - src/solaris/doc/sun/man/man1/jar.1 | 484 -- src/solaris/doc/sun/man/man1/jarsigner.1 | 808 --- src/solaris/doc/sun/man/man1/java.1 | 3721 ------------- src/solaris/doc/sun/man/man1/javac.1 | 1366 ----- src/solaris/doc/sun/man/man1/javadoc.1 | 3001 ----------- src/solaris/doc/sun/man/man1/javap.1 | 380 -- src/solaris/doc/sun/man/man1/jcmd.1 | 210 - src/solaris/doc/sun/man/man1/jconsole.1 | 112 - src/solaris/doc/sun/man/man1/jdb.1 | 267 - src/solaris/doc/sun/man/man1/jdeps.1 | 537 -- src/solaris/doc/sun/man/man1/jhat.1 | 136 - src/solaris/doc/sun/man/man1/jinfo.1 | 132 - src/solaris/doc/sun/man/man1/jjs.1 | 247 - src/solaris/doc/sun/man/man1/jmap.1 | 143 - src/solaris/doc/sun/man/man1/jps.1 | 204 - src/solaris/doc/sun/man/man1/jrunscript.1 | 195 - src/solaris/doc/sun/man/man1/jsadebugd.1 | 108 - src/solaris/doc/sun/man/man1/jstack.1 | 137 - src/solaris/doc/sun/man/man1/jstat.1 | 777 --- src/solaris/doc/sun/man/man1/jstatd.1 | 209 - src/solaris/doc/sun/man/man1/keytool.1 | 1619 ------ src/solaris/doc/sun/man/man1/pack200.1 | 290 - src/solaris/doc/sun/man/man1/rmic.1 | 223 - src/solaris/doc/sun/man/man1/rmid.1 | 314 -- src/solaris/doc/sun/man/man1/rmiregistry.1 | 98 - src/solaris/doc/sun/man/man1/serialver.1 | 107 - src/solaris/doc/sun/man/man1/unpack200.1 | 137 - 184 files changed, 441 insertions(+), 71701 deletions(-) create mode 100644 make/scripts/pandoc-manpage-filter.js create mode 100644 make/scripts/pandoc-manpage-filter.sh.template delete mode 100644 src/bsd/doc/man/DO_NOT_EDIT--GENERATED_FILES delete mode 100644 src/bsd/doc/man/apt.1 delete mode 100644 src/bsd/doc/man/ja/apt.1 delete mode 100644 src/bsd/doc/man/ja/jar.1 delete mode 100644 src/bsd/doc/man/ja/jarsigner.1 delete mode 100644 src/bsd/doc/man/ja/java.1 delete mode 100644 src/bsd/doc/man/ja/javac.1 delete mode 100644 src/bsd/doc/man/ja/javadoc.1 delete mode 100644 src/bsd/doc/man/ja/javap.1 delete mode 100644 src/bsd/doc/man/ja/javaws.1 delete mode 100644 src/bsd/doc/man/ja/jcmd.1 delete mode 100644 src/bsd/doc/man/ja/jconsole.1 delete mode 100644 src/bsd/doc/man/ja/jdb.1 delete mode 100644 src/bsd/doc/man/ja/jdeps.1 delete mode 100644 src/bsd/doc/man/ja/jhat.1 delete mode 100644 src/bsd/doc/man/ja/jinfo.1 delete mode 100644 src/bsd/doc/man/ja/jjs.1 delete mode 100644 src/bsd/doc/man/ja/jmap.1 delete mode 100644 src/bsd/doc/man/ja/jps.1 delete mode 100644 src/bsd/doc/man/ja/jrunscript.1 delete mode 100644 src/bsd/doc/man/ja/jsadebugd.1 delete mode 100644 src/bsd/doc/man/ja/jstack.1 delete mode 100644 src/bsd/doc/man/ja/jstat.1 delete mode 100644 src/bsd/doc/man/ja/jstatd.1 delete mode 100644 src/bsd/doc/man/ja/keytool.1 delete mode 100644 src/bsd/doc/man/ja/pack200.1 delete mode 100644 src/bsd/doc/man/ja/rmic.1 delete mode 100644 src/bsd/doc/man/ja/rmid.1 delete mode 100644 src/bsd/doc/man/ja/rmiregistry.1 delete mode 100644 src/bsd/doc/man/ja/serialver.1 delete mode 100644 src/bsd/doc/man/ja/unpack200.1 delete mode 100644 src/bsd/doc/man/javaws.1 delete mode 100644 src/bsd/doc/man/jhat.1 delete mode 100644 src/bsd/doc/man/jsadebugd.1 rename src/{bsd/doc => java.base/share}/man/java.1 (100%) rename src/{bsd/doc => java.base/share}/man/keytool.1 (100%) rename src/{bsd/doc => java.rmi/share}/man/rmid.1 (100%) rename src/{bsd/doc => java.rmi/share}/man/rmiregistry.1 (100%) rename src/{bsd/doc => java.scripting/share}/man/jrunscript.1 (100%) rename src/{bsd/doc => jdk.compiler/share}/man/javac.1 (100%) rename src/{bsd/doc => jdk.compiler/share}/man/serialver.1 (100%) rename src/{bsd/doc => jdk.jartool/share}/man/jar.1 (100%) rename src/{bsd/doc => jdk.jartool/share}/man/jarsigner.1 (100%) rename src/{bsd/doc => jdk.javadoc/share}/man/javadoc.1 (100%) rename src/{bsd/doc => jdk.jcmd/share}/man/jcmd.1 (100%) rename src/{bsd/doc => jdk.jcmd/share}/man/jinfo.1 (100%) rename src/{bsd/doc => jdk.jcmd/share}/man/jmap.1 (100%) rename src/{bsd/doc => jdk.jcmd/share}/man/jps.1 (100%) rename src/{bsd/doc => jdk.jcmd/share}/man/jstack.1 (100%) rename src/{bsd/doc => jdk.jcmd/share}/man/jstat.1 (100%) rename src/{bsd/doc => jdk.jconsole/share}/man/jconsole.1 (100%) rename src/{bsd/doc => jdk.jdeps/share}/man/javap.1 (100%) rename src/{bsd/doc => jdk.jdeps/share}/man/jdeps.1 (100%) rename src/{bsd/doc => jdk.jdi/share}/man/jdb.1 (100%) rename src/{bsd/doc => jdk.jstatd/share}/man/jstatd.1 (100%) rename src/{bsd/doc => jdk.pack/share}/man/pack200.1 (100%) rename src/{bsd/doc => jdk.pack/share}/man/unpack200.1 (100%) rename src/{bsd/doc => jdk.rmic/share}/man/rmic.1 (100%) rename src/{bsd/doc => jdk.scripting.nashorn.shell/share}/man/jjs.1 (100%) delete mode 100644 src/linux/doc/man/DO_NOT_EDIT--GENERATED_FILES delete mode 100644 src/linux/doc/man/ja/jar.1 delete mode 100644 src/linux/doc/man/ja/jarsigner.1 delete mode 100644 src/linux/doc/man/ja/java.1 delete mode 100644 src/linux/doc/man/ja/javac.1 delete mode 100644 src/linux/doc/man/ja/javadoc.1 delete mode 100644 src/linux/doc/man/ja/javap.1 delete mode 100644 src/linux/doc/man/ja/javaws.1 delete mode 100644 src/linux/doc/man/ja/jcmd.1 delete mode 100644 src/linux/doc/man/ja/jconsole.1 delete mode 100644 src/linux/doc/man/ja/jdb.1 delete mode 100644 src/linux/doc/man/ja/jdeps.1 delete mode 100644 src/linux/doc/man/ja/jhat.1 delete mode 100644 src/linux/doc/man/ja/jinfo.1 delete mode 100644 src/linux/doc/man/ja/jjs.1 delete mode 100644 src/linux/doc/man/ja/jmap.1 delete mode 100644 src/linux/doc/man/ja/jps.1 delete mode 100644 src/linux/doc/man/ja/jrunscript.1 delete mode 100644 src/linux/doc/man/ja/jsadebugd.1 delete mode 100644 src/linux/doc/man/ja/jstack.1 delete mode 100644 src/linux/doc/man/ja/jstat.1 delete mode 100644 src/linux/doc/man/ja/jstatd.1 delete mode 100644 src/linux/doc/man/ja/keytool.1 delete mode 100644 src/linux/doc/man/ja/pack200.1 delete mode 100644 src/linux/doc/man/ja/rmic.1 delete mode 100644 src/linux/doc/man/ja/rmid.1 delete mode 100644 src/linux/doc/man/ja/rmiregistry.1 delete mode 100644 src/linux/doc/man/ja/serialver.1 delete mode 100644 src/linux/doc/man/ja/unpack200.1 delete mode 100644 src/linux/doc/man/jar.1 delete mode 100644 src/linux/doc/man/jarsigner.1 delete mode 100644 src/linux/doc/man/java.1 delete mode 100644 src/linux/doc/man/javac.1 delete mode 100644 src/linux/doc/man/javadoc.1 delete mode 100644 src/linux/doc/man/javap.1 delete mode 100644 src/linux/doc/man/javaws.1 delete mode 100644 src/linux/doc/man/jcmd.1 delete mode 100644 src/linux/doc/man/jconsole.1 delete mode 100644 src/linux/doc/man/jdb.1 delete mode 100644 src/linux/doc/man/jdeps.1 delete mode 100644 src/linux/doc/man/jhat.1 delete mode 100644 src/linux/doc/man/jinfo.1 delete mode 100644 src/linux/doc/man/jjs.1 delete mode 100644 src/linux/doc/man/jmap.1 delete mode 100644 src/linux/doc/man/jps.1 delete mode 100644 src/linux/doc/man/jrunscript.1 delete mode 100644 src/linux/doc/man/jsadebugd.1 delete mode 100644 src/linux/doc/man/jstack.1 delete mode 100644 src/linux/doc/man/jstat.1 delete mode 100644 src/linux/doc/man/jstatd.1 delete mode 100644 src/linux/doc/man/keytool.1 delete mode 100644 src/linux/doc/man/pack200.1 delete mode 100644 src/linux/doc/man/rmic.1 delete mode 100644 src/linux/doc/man/rmid.1 delete mode 100644 src/linux/doc/man/rmiregistry.1 delete mode 100644 src/linux/doc/man/serialver.1 delete mode 100644 src/linux/doc/man/unpack200.1 delete mode 100644 src/solaris/doc/sun/man/man1/DO_NOT_EDIT--GENERATED_FILES delete mode 100644 src/solaris/doc/sun/man/man1/ja/jar.1 delete mode 100644 src/solaris/doc/sun/man/man1/ja/jarsigner.1 delete mode 100644 src/solaris/doc/sun/man/man1/ja/java.1 delete mode 100644 src/solaris/doc/sun/man/man1/ja/javac.1 delete mode 100644 src/solaris/doc/sun/man/man1/ja/javadoc.1 delete mode 100644 src/solaris/doc/sun/man/man1/ja/javap.1 delete mode 100644 src/solaris/doc/sun/man/man1/ja/jcmd.1 delete mode 100644 src/solaris/doc/sun/man/man1/ja/jconsole.1 delete mode 100644 src/solaris/doc/sun/man/man1/ja/jdb.1 delete mode 100644 src/solaris/doc/sun/man/man1/ja/jdeps.1 delete mode 100644 src/solaris/doc/sun/man/man1/ja/jhat.1 delete mode 100644 src/solaris/doc/sun/man/man1/ja/jinfo.1 delete mode 100644 src/solaris/doc/sun/man/man1/ja/jjs.1 delete mode 100644 src/solaris/doc/sun/man/man1/ja/jmap.1 delete mode 100644 src/solaris/doc/sun/man/man1/ja/jps.1 delete mode 100644 src/solaris/doc/sun/man/man1/ja/jrunscript.1 delete mode 100644 src/solaris/doc/sun/man/man1/ja/jsadebugd.1 delete mode 100644 src/solaris/doc/sun/man/man1/ja/jstack.1 delete mode 100644 src/solaris/doc/sun/man/man1/ja/jstat.1 delete mode 100644 src/solaris/doc/sun/man/man1/ja/jstatd.1 delete mode 100644 src/solaris/doc/sun/man/man1/ja/keytool.1 delete mode 100644 src/solaris/doc/sun/man/man1/ja/pack200.1 delete mode 100644 src/solaris/doc/sun/man/man1/ja/rmic.1 delete mode 100644 src/solaris/doc/sun/man/man1/ja/rmid.1 delete mode 100644 src/solaris/doc/sun/man/man1/ja/rmiregistry.1 delete mode 100644 src/solaris/doc/sun/man/man1/ja/serialver.1 delete mode 100644 src/solaris/doc/sun/man/man1/ja/unpack200.1 delete mode 100644 src/solaris/doc/sun/man/man1/jar.1 delete mode 100644 src/solaris/doc/sun/man/man1/jarsigner.1 delete mode 100644 src/solaris/doc/sun/man/man1/java.1 delete mode 100644 src/solaris/doc/sun/man/man1/javac.1 delete mode 100644 src/solaris/doc/sun/man/man1/javadoc.1 delete mode 100644 src/solaris/doc/sun/man/man1/javap.1 delete mode 100644 src/solaris/doc/sun/man/man1/jcmd.1 delete mode 100644 src/solaris/doc/sun/man/man1/jconsole.1 delete mode 100644 src/solaris/doc/sun/man/man1/jdb.1 delete mode 100644 src/solaris/doc/sun/man/man1/jdeps.1 delete mode 100644 src/solaris/doc/sun/man/man1/jhat.1 delete mode 100644 src/solaris/doc/sun/man/man1/jinfo.1 delete mode 100644 src/solaris/doc/sun/man/man1/jjs.1 delete mode 100644 src/solaris/doc/sun/man/man1/jmap.1 delete mode 100644 src/solaris/doc/sun/man/man1/jps.1 delete mode 100644 src/solaris/doc/sun/man/man1/jrunscript.1 delete mode 100644 src/solaris/doc/sun/man/man1/jsadebugd.1 delete mode 100644 src/solaris/doc/sun/man/man1/jstack.1 delete mode 100644 src/solaris/doc/sun/man/man1/jstat.1 delete mode 100644 src/solaris/doc/sun/man/man1/jstatd.1 delete mode 100644 src/solaris/doc/sun/man/man1/keytool.1 delete mode 100644 src/solaris/doc/sun/man/man1/pack200.1 delete mode 100644 src/solaris/doc/sun/man/man1/rmic.1 delete mode 100644 src/solaris/doc/sun/man/man1/rmid.1 delete mode 100644 src/solaris/doc/sun/man/man1/rmiregistry.1 delete mode 100644 src/solaris/doc/sun/man/man1/serialver.1 delete mode 100644 src/solaris/doc/sun/man/man1/unpack200.1 diff --git a/make/CompileToolsJdk.gmk b/make/CompileToolsJdk.gmk index cd4034d51f..c725e116fc 100644 --- a/make/CompileToolsJdk.gmk +++ b/make/CompileToolsJdk.gmk @@ -29,6 +29,7 @@ include $(SPEC) include MakeBase.gmk include JavaCompilation.gmk include SetupJavaCompilers.gmk +include TextFileProcessing.gmk ################################################################################ @@ -87,4 +88,30 @@ TARGETS += $(COMPILE_DEPEND) $(DEPEND_SERVICE_PROVIDER) ################################################################################ +# To be able to call the javascript filter when generating man pages using +# pandoc, we need to create this executable wrapper script. +ifneq ($(PANDOC), ) + # PANDOC_FILTER is duplicated for export in ToolsJdk.gmk. + PANDOC_FILTER := $(BUILDTOOLS_OUTPUTDIR)/manpages/pandoc-manpage-filter + PANDOC_FILTER_SETUP := $(BUILDTOOLS_OUTPUTDIR)/manpages/_pandoc_filter_setup.marker + + # Create a usable instance of the wrapper script that calls the pandoc filter + # (which is written in javascript). + $(eval $(call SetupTextFileProcessing, CREATE_PANDOC_FILTER, \ + SOURCE_FILES := $(TOPDIR)/make/scripts/pandoc-manpage-filter.sh.template, \ + OUTPUT_FILE := $(PANDOC_FILTER), \ + REPLACEMENTS := \ + @@BOOT_JDK@@ => $(BOOT_JDK) ; \ + @@TOPDIR@@ => $(TOPDIR) ; \ + @@JJS_FLAGS@@ => $(addprefix -J, $(JAVA_FLAGS_SMALL)), \ + )) + + # Created script must be made executable + $(PANDOC_FILTER_SETUP): $(CREATE_PANDOC_FILTER) + $(CHMOD) a+rx $(PANDOC_FILTER) + $(TOUCH) $@ + + TARGETS += $(PANDOC_FILTER_SETUP) +endif + all: $(TARGETS) diff --git a/make/Docs.gmk b/make/Docs.gmk index a3adae9117..6423e29e83 100644 --- a/make/Docs.gmk +++ b/make/Docs.gmk @@ -332,7 +332,7 @@ define SetupApiDocsGenerationBody $1_JAVADOC_CMD := $$(JAVA) -Djava.awt.headless=true $$($1_JAVA_ARGS) \ $$(NEW_JAVADOC) else - $1_OPTIONS += $$(addprefix -J, $$($1_JAVA_ARGS)) + $1_OPTIONS += $$(addprefix -J, $$($1_JAVA_ARGS)) endif $1_VARDEPS := $$($1_JAVA_ARGS) $$($1_OPTIONS) $$(MODULES_SOURCE_PATH) \ @@ -466,7 +466,7 @@ $(eval $(call SetupApiDocsGeneration, JAVASE_API, \ # Setup generation of the reference Java SE API documentation (javadoc + modulegraph) # The reference javadoc is just the same as javase, but using the BootJDK javadoc -# and a stable set of javadoc options. Typically it is used for generating +# and a stable set of javadoc options. Typically it is used for generating # diffs between the reference javadoc and a javadoc bundle of a specific build # generated in the same way. @@ -542,7 +542,7 @@ ifeq ($(ENABLE_FULL_DOCS), true) $(eval SPECS_$m := $(call FindModuleSpecsDirs, $m)) \ $(foreach d, $(SPECS_$m), \ $(if $(filter %.md, $(call CacheFind, $d)), \ - $(eval $m_$d_NAME := CONVERT_MARKDOWN_$m_$(strip $(call RelativePath, $d, $(TOPDIR)))) \ + $(eval $m_$d_NAME := SPECS_TO_HTML_$m_$(strip $(call RelativePath, $d, $(TOPDIR)))) \ $(eval $(call SetupProcessMarkdown, $($m_$d_NAME), \ SRC := $d, \ FILES := $(filter %.md, $(call CacheFind, $d)), \ @@ -553,6 +553,28 @@ ifeq ($(ENABLE_FULL_DOCS), true) ) \ ) \ ) + + # For all markdown files in $module/share/man directories, convert them to + # html. + $(foreach m, $(ALL_MODULES), \ + $(eval MAN_$m := $(call FindModuleManDirs, $m)) \ + $(foreach d, $(MAN_$m), \ + $(if $(filter %.md, $(call CacheFind, $d)), \ + $(eval $m_$d_NAME := MAN_TO_HTML_$m_$(strip $(call RelativePath, $d, $(TOPDIR)))) \ + $(eval $(call SetupProcessMarkdown, $($m_$d_NAME), \ + SRC := $d, \ + FILES := $(filter %.md, $(call CacheFind, $d)), \ + DEST := $(DOCS_OUTPUTDIR)/specs/man, \ + CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \ + REPLACEMENTS := @@VERSION_SHORT@@ => $(VERSION_SHORT), \ + )) \ + $(eval JDK_SPECS_TARGETS += $($($m_$d_NAME))) \ + ) \ + ) \ + ) + + # The html generated from markdown also needs the css file + JDK_SPECS_TARGETS += $(COPY_GLOBAL_RESOURCES) endif # Special treatment for generated documentation diff --git a/make/Images.gmk b/make/Images.gmk index a12970dd8e..3bf8695815 100644 --- a/make/Images.gmk +++ b/make/Images.gmk @@ -121,127 +121,6 @@ $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \ TOOL_JRE_TARGETS := $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE) TOOL_JDK_TARGETS := $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE) -################################################################################ -# /man dir -# -# All variables in this section are assigned with simple =, without :, to enable -# more selective overriding from the custom version of this file. -# -# Avoid evaluating this whole section on windows for speed and stability -ifneq ($(OPENJDK_TARGET_OS), windows) - ifeq ($(BUILD_MANPAGES), true) - JRE_MAN_PAGES += \ - java.1 \ - jjs.1 \ - keytool.1 \ - orbd.1 \ - pack200.1 \ - rmid.1 \ - rmiregistry.1 \ - servertool.1 \ - unpack200.1 - - JDK_MAN_PAGES += \ - $(JRE_MAN_PAGES) \ - idlj.1 \ - jar.1 \ - jarsigner.1 \ - javac.1 \ - javadoc.1 \ - javap.1 \ - jconsole.1 \ - jcmd.1 \ - jdb.1 \ - jdeps.1 \ - jinfo.1 \ - jmap.1 \ - jps.1 \ - jrunscript.1 \ - jstack.1 \ - jstat.1 \ - jstatd.1 \ - rmic.1 \ - serialver.1 - - # This variable is potentially overridden in the closed makefile. - MAN_SRC_BASEDIR ?= $(TOPDIR)/src - - ifeq ($(OPENJDK_TARGET_OS), linux) - MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/linux/doc - MAN1_SUBDIR = man - endif - ifeq ($(OPENJDK_TARGET_OS), solaris) - MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/solaris/doc - MAN1_SUBDIR = sun/man/man1 - endif - ifeq ($(OPENJDK_TARGET_OS), macosx) - MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/bsd/doc - MAN1_SUBDIR = man - endif - - $(JRE_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/% - $(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%,%,$@)) - $(install-file) - - $(JDK_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/% - $(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%,%,$@)) - $(install-file) - - $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/% - $(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%,%,$@)) - $(install-file) - - $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/% - $(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%,%,$@)) - $(install-file) - - ifeq ($(OPENJDK_TARGET_OS), solaris) - $(JRE_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/% - $(call LogInfo, Converting $(patsubst $(OUTPUTDIR)/%,%,$@)) - $(install-file) - - $(JDK_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/% - $(call LogInfo, Converting $(patsubst $(OUTPUTDIR)/%,%,$@)) - $(install-file) - endif - - ifneq ($(findstring $(OPENJDK_TARGET_OS), linux macosx), ) - $(JRE_IMAGE_DIR)/man/ja: - $(call LogInfo, Creating $(patsubst $(OUTPUTDIR)/%,%,$@)) - $(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja - - $(JDK_IMAGE_DIR)/man/ja: - $(call LogInfo, Creating $(patsubst $(OUTPUTDIR)/%,%,$@)) - $(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja - endif - - ifeq ($(OPENJDK_TARGET_OS), solaris) - JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \ - $(addprefix $(JRE_IMAGE_DIR)/man/ja/man1/, $(JRE_MAN_PAGES)) \ - $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \ - $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JRE_MAN_PAGES)) - - JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \ - $(addprefix $(JDK_IMAGE_DIR)/man/ja/man1/, $(JDK_MAN_PAGES)) \ - $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \ - $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JDK_MAN_PAGES)) - endif - - ifneq ($(findstring $(OPENJDK_TARGET_OS), linux macosx), ) - JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \ - $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \ - $(JRE_IMAGE_DIR)/man/ja - - JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \ - $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \ - $(JDK_IMAGE_DIR)/man/ja - endif - - JRE_TARGETS += $(JRE_MAN_PAGE_LIST) - JDK_TARGETS += $(JDK_MAN_PAGE_LIST) - endif # BUILD_MANPAGES -endif # Windows - ################################################################################ # src.zip diff --git a/make/ModuleWrapper.gmk b/make/ModuleWrapper.gmk index 5f9c5fc82e..f0291aa422 100644 --- a/make/ModuleWrapper.gmk +++ b/make/ModuleWrapper.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -93,6 +93,12 @@ $(eval $(call SetupCopyFiles, COPY_CMDS, \ FILES := $(filter $(SUPPORT_OUTPUTDIR)/modules_cmds/$(MODULE)/%, $(TARGETS)), \ )) +$(eval $(call SetupCopyFiles, COPY_MAN, \ + SRC := $(SUPPORT_OUTPUTDIR)/modules_man/$(MODULE), \ + DEST := $(JDK_OUTPUTDIR)/man, \ + FILES := $(filter $(SUPPORT_OUTPUTDIR)/modules_man/$(MODULE)/%, $(TARGETS)), \ +)) + $(eval $(call SetupCopyFiles, COPY_CONF, \ SRC := $(SUPPORT_OUTPUTDIR)/modules_conf/$(MODULE), \ DEST := $(JDK_OUTPUTDIR)/conf, \ @@ -104,5 +110,5 @@ ifeq ($(GENERATE_COMPILE_COMMANDS_ONLY), true) all: $(filter $(MAKESUPPORT_OUTPUTDIR)/compile-commands/%, $(TARGETS)) else all: $(TARGETS) $(COPY_LIBS_TO_BIN) $(COPY_LIBS_TO_LIB) \ - $(COPY_INCLUDE) $(COPY_CMDS) $(COPY_CONF) $(LINK_LIBS_TO_LIB) + $(COPY_INCLUDE) $(COPY_CMDS) $(COPY_MAN) $(COPY_CONF) $(LINK_LIBS_TO_LIB) endif diff --git a/make/ToolsJdk.gmk b/make/ToolsJdk.gmk index 993a4c26e3..2837a0231c 100644 --- a/make/ToolsJdk.gmk +++ b/make/ToolsJdk.gmk @@ -116,4 +116,10 @@ TOOL_PUBLICSUFFIXLIST = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_clas ########################################################################################## +# Executable javascript filter for man page generation using pandoc. + +PANDOC_FILTER := $(BUILDTOOLS_OUTPUTDIR)/manpages/pandoc-manpage-filter + +########################################################################################## + endif # _TOOLS_GMK diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4 index c6198e63a1..4c017ff220 100644 --- a/make/autoconf/jdk-options.m4 +++ b/make/autoconf/jdk-options.m4 @@ -587,10 +587,10 @@ AC_DEFUN([JDKOPT_EXCLUDE_TRANSLATIONS], AC_DEFUN([JDKOPT_ENABLE_DISABLE_MANPAGES], [ AC_ARG_ENABLE([manpages], [AS_HELP_STRING([--disable-manpages], - [Set to disable building of man pages @<:@enabled@:>@])]) + [Set to disable copy of static man pages @<:@enabled@:>@])]) BUILD_MANPAGES="true" - AC_MSG_CHECKING([if man pages should be built]) + AC_MSG_CHECKING([if static man pages should be copied]) if test "x$enable_manpages" = "x"; then AC_MSG_RESULT([yes]) elif test "x$enable_manpages" = "xyes"; then diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk index 2327c3b4d8..b2f67a4a50 100644 --- a/make/common/Modules.gmk +++ b/make/common/Modules.gmk @@ -247,6 +247,8 @@ SRC_SUBDIRS += share/classes SPEC_SUBDIRS += share/specs +MAN_SUBDIRS += share/man + # Find all module-info.java files for the current build target platform and # configuration. # Param 1 - Module to find for, set to * for finding all @@ -305,6 +307,12 @@ FindModuleSpecsDirs = \ $(strip $(wildcard \ $(foreach sub, $(SPEC_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS))))) +# Find all man dirs for a particular module +# $1 - Module to find man dirs for +FindModuleManDirs = \ + $(strip $(wildcard \ + $(foreach sub, $(MAN_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS))))) + # Construct the complete module source path GetModuleSrcPath = \ $(call PathList, \ diff --git a/make/common/ProcessMarkdown.gmk b/make/common/ProcessMarkdown.gmk index fe4d30e75c..684e9789ae 100644 --- a/make/common/ProcessMarkdown.gmk +++ b/make/common/ProcessMarkdown.gmk @@ -1,4 +1,4 @@ -# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -26,12 +26,36 @@ ifeq (,$(_MAKEBASE_GMK)) $(error You must include MakeBase.gmk prior to including ProcessMarkdown.gmk) endif +include TextFileProcessing.gmk + # Helper function for SetupProcessMarkdown # $1: The $1 from SetupProcessMarkdown -# $2: The name of the current source file, relative to $1_SRC +# $2: The name of the current source file, relative to the dir given in $3 +# $3: The directory of the current source file define ProcessMarkdown - $1_$2_OUTPUT_FILE := $$($1_DEST)/$$(basename $2).html + $1_$2_OUTPUT_FILE := $$($1_DEST)/$$(basename $2)$$($1_FILE_EXT) $1_$2_TARGET_DIR := $$(dir $$($1_$2_OUTPUT_FILE)) + $1_$2_INPUT_FILE := $3/$2 + $1_$2_MARKER := $$(subst /,_,$1_$2) + + ifneq ($$($1_REPLACEMENTS), ) + $1_$2_PANDOC_INPUT := $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER)_pre.tmp + + $$(eval $$(call SetupTextFileProcessing, $1_$2_PREPROCESSED, \ + SOURCE_FILES := $$($1_$2_INPUT_FILE), \ + OUTPUT_FILE := $$($1_$2_PANDOC_INPUT), \ + REPLACEMENTS := $$($1_REPLACEMENTS), \ + )) + else + $1_$2_PANDOC_INPUT := $$($1_$2_INPUT_FILE) + endif + + ifneq ($$($1_POST_PROCESS), ) + $1_$2_PANDOC_OUTPUT := $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER)_post.tmp + else + $1_$2_PANDOC_OUTPUT := $$($1_$2_OUTPUT_FILE) + endif + ifneq ($$($1_CSS), ) ifneq ($$(findstring http:/, $$($1_CSS)), ) $1_$2_CSS_OPTION := --css '$$($1_CSS)' @@ -40,28 +64,44 @@ define ProcessMarkdown $1_$2_CSS_OPTION := --css '$$($1_$2_CSS)' endif endif - $1_$2_OPTIONS = $$(shell $$(GREP) _pandoc-options_: $$($1_SRC)/$2 | $$(CUT) -d : -f 2-) - $1_$2_MARKER := $$(subst /,_,$1_$2) - $1_$2_VARDEPS := $$($1_OPTIONS) $$($1_CSS) + $1_$2_OPTIONS := $$(shell $$(GREP) _pandoc-options_: $3/$2 | $$(CUT) -d : -f 2-) + + ifneq ($$($1_FILTER), ) + $1_$2_OPTIONS += --filter $$($1_FILTER) + endif + + $1_$2_VARDEPS := $$($1_OPTIONS) $$($1_$2_OPTIONS) $$($1_CSS) \ + $$($1_REPLACEMENTS) $$($1_POST_PROCESS) $1_$2_VARDEPS_FILE := $$(call DependOnVariable, $1_$2_VARDEPS, \ $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER).vardeps) -$$($1_$2_OUTPUT_FILE): $$($1_SRC)/$2 $$($1_$2_VARDEPS_FILE) - $$(call LogInfo, Converting $2 to html) - $$(call MakeDir, $$($1_$2_TARGET_DIR) $$(SUPPORT_OUTPUTDIR)/markdown) + $$($1_$2_PANDOC_OUTPUT): $$($1_$2_PANDOC_INPUT) $$($1_$2_VARDEPS_FILE) $$($1_EXTRA_DEPS) + $$(call LogInfo, Converting $2 to $$($1_FORMAT)) + $$(call MakeDir, $$(SUPPORT_OUTPUTDIR)/markdown $$(dir $$($1_$2_PANDOC_OUTPUT))) $$(call ExecuteWithLog, $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER), \ - $$(PANDOC) $$($1_OPTIONS) -f markdown -t html5 --standalone \ - $$($1_$2_CSS_OPTION) $$($1_$2_OPTIONS) '$$<' -o '$$@') + $$(PANDOC) $$($1_OPTIONS) -f markdown -t $$($1_FORMAT) --standalone \ + $$($1_$2_CSS_OPTION) $$($1_$2_OPTIONS) '$$($1_$2_PANDOC_INPUT)' \ + -o '$$($1_$2_PANDOC_OUTPUT)') ifneq ($$(findstring $$(LOG_LEVEL), debug trace),) - TOO_LONG_LINES=`$$(GREP) -E -e '^.{80}.+$$$$' $$<` || true ; \ - if [ "x$$$$TOO_LONG_LINES" != x ]; then \ - $$(ECHO) "Warning: Unsuitable markdown in $$<:" ; \ - $$(ECHO) "The following lines are longer than 80 characters:" ; \ - $$(GREP) -E -n -e '^.{80}.+$$$$' $$< || true ; \ - fi + TOO_LONG_LINES=`$$(GREP) -E -e '^.{80}.+$$$$' $$<` || true ; \ + if [ "x$$$$TOO_LONG_LINES" != x ]; then \ + $$(ECHO) "Warning: Unsuitable markdown in $$<:" ; \ + $$(ECHO) "The following lines are longer than 80 characters:" ; \ + $$(GREP) -E -n -e '^.{80}.+$$$$' $$< || true ; \ + fi endif + # If we have no post processing, PANDOC_OUTPUT is set to OUTPUT_FILE. Otherwise + # PANDOC_OUTPUT is a temporary file, and we must now create the real OUTPUT_FILE. + ifneq ($$($1_POST_PROCESS), ) + $$($1_$2_OUTPUT_FILE): $$($1_$2_PANDOC_OUTPUT) + $$(call LogInfo, Post-processing markdown file $2) + $$(call MakeDir, $$(SUPPORT_OUTPUTDIR)/markdown $$($1_$2_TARGET_DIR)) + $$(call ExecuteWithLog, $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER)_post, \ + $$($1_POST_PROCESS) < $$($1_$2_PANDOC_OUTPUT) > $$($1_$2_OUTPUT_FILE)) + endif + $1 += $$($1_$2_OUTPUT_FILE) endef @@ -72,11 +112,17 @@ endef # and the targets generated are listed in a variable by that name. # # Remaining parameters are named arguments. These include: -# SRC : Source root dir (defaults to dir of first file) -# DEST : Dest root dir -# FILES : List of files to copy with absolute paths, or path relative to SRC. -# Must be in SRC. -# OPTIONS : Additional options to pandoc +# DEST : Destination root dir +# FILES : List of files to copy with absolute paths, or path relative to SRC. +# SRC : Source root dir; if given keep input files hierarchy relative to +# SRC in DEST, otherwise flatten structure into DEST. +# FORMAT : The target format (defaults to html5) +# FILE_EXT : The file extension to replace .md with (defaults to .html) +# OPTIONS : Additional options to pandoc +# EXTRA_DEPS : Additional dependencies to add to each pandoc call +# FILTER : Optional pandoc filter command +# POST_PROCESS : Optional command-line to post-process generated markdown +# REPLACEMENTS : Text replacements to perform on input file before processing # SetupProcessMarkdown = $(NamedParamsMacroTemplate) define SetupProcessMarkdownBody @@ -88,16 +134,40 @@ define SetupProcessMarkdownBody $$(error DEST is missing in SetupProcessMarkdown $1) endif - # Default SRC to the dir of the first file. - ifeq ($$($1_SRC), ) - $1_SRC := $$(dir $$(firstword $$($1_FILES))) + # If no target format is specified, default to html5. + ifeq ($$($1_FORMAT), ) + $1_FORMAT := html5 endif - # Remove any trailing slash from SRC and DEST - $1_SRC := $$(patsubst %/,%,$$($1_SRC)) + ifeq ($$($1_FORMAT), man) + # If no file extension is specified, default to '.1'. + ifeq ($$($1_FILE_EXT), ) + $1_FILE_EXT := .1 + endif + else ifeq ($$($1_FORMAT), html5) + ifeq ($$($1_FILE_EXT), ) + $1_FILE_EXT := .html + endif + else ifeq ($$($1_FORMAT), html) + ifeq ($$($1_FILE_EXT), ) + $1_FILE_EXT := .html + endif + endif + + # Remove any trailing slash $1_DEST := $$(patsubst %/,%,$$($1_DEST)) - $$(foreach f, $$(patsubst $$($1_SRC)/%,%,$$($1_FILES)), \ - $$(eval $$(call ProcessMarkdown,$1,$$f)) \ - ) + ifeq ($$($1_SRC), ) + # No SRC given, assume we're flattening all files into output dir. + $$(foreach f, $$($1_FILES), \ + $$(eval $$(call ProcessMarkdown,$1,$$(notdir $$f),$$(patsubst %/,%,$$(dir $$f)))) \ + ) + else + # Remove any trailing slash + $1_SRC := $$(patsubst %/,%,$$($1_SRC)) + + $$(foreach f, $$(patsubst $$($1_SRC)/%,%,$$($1_FILES)), \ + $$(eval $$(call ProcessMarkdown,$1,$$f,$$($1_SRC))) \ + ) + endif endef diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js index bfaef64a77..146b1642b8 100644 --- a/make/conf/jib-profiles.js +++ b/make/conf/jib-profiles.js @@ -401,7 +401,7 @@ var getJibProfilesProfiles = function (input, common, data) { "macosx-x64": { target_os: "macosx", target_cpu: "x64", - dependencies: ["devkit", "graalunit_lib"], + dependencies: ["devkit", "pandoc", "graalunit_lib"], configure_args: concat(common.configure_args_64bit, "--with-zlib=system", "--with-macosx-version-max=10.9.0"), }, @@ -939,7 +939,7 @@ var getJibProfilesDependencies = function (input, common) { pandoc: { organization: common.organization, ext: "tar.gz", - revision: "1.17.2+1.0", + revision: "2.3.1+1.0", module: "pandoc-" + input.target_platform, configure_args: "PANDOC=" + input.get("pandoc", "install_path") + "/pandoc/pandoc", environment_path: input.get("pandoc", "install_path") + "/pandoc" diff --git a/make/devkit/createPandocBundle.sh b/make/devkit/createPandocBundle.sh index 0badfa8ffd..f4c6ca729e 100644 --- a/make/devkit/createPandocBundle.sh +++ b/make/devkit/createPandocBundle.sh @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -31,43 +31,35 @@ trap "rm -rf \"$TMPDIR\"" EXIT ORIG_DIR=`pwd` cd "$TMPDIR" -PANDOC_VERSION=1.17.2 -FULL_PANDOC_VERSION=1.17.2-1 +PANDOC_VERSION=2.3.1 PACKAGE_VERSION=1.0 TARGET_PLATFORM=linux_x64 + +if [[ $TARGET_PLATFORM == linux_x64 ]] ; then + PANDOC_PLATFORM=linux + PANDOC_SUFFIX=tar.gz +elif [[ $TARGET_PLATFORM == macosx_x64 ]] ; then + PANDOC_PLATFORM=macOS + PANDOC_SUFFIX=zip +else + echo "Unknown platform" + exit 1 +fi BUNDLE_NAME=pandoc-$TARGET_PLATFORM-$PANDOC_VERSION+$PACKAGE_VERSION.tar.gz -wget https://github.com/jgm/pandoc/releases/download/$PANDOC_VERSION/pandoc-$FULL_PANDOC_VERSION-amd64.deb +wget https://github.com/jgm/pandoc/releases/download/$PANDOC_VERSION/pandoc-$PANDOC_VERSION-$PANDOC_PLATFORM.$PANDOC_SUFFIX -mkdir pandoc -cd pandoc -ar p ../pandoc-$FULL_PANDOC_VERSION-amd64.deb data.tar.gz | tar xz +mkdir tmp +cd tmp +if [[ $PANDOC_SUFFIX == zip ]]; then + unzip ../pandoc-$PANDOC_VERSION-$PANDOC_PLATFORM.$PANDOC_SUFFIX +else + tar xzf ../pandoc-$PANDOC_VERSION-$PANDOC_PLATFORM.$PANDOC_SUFFIX +fi cd .. -# Pandoc depends on libgmp.so.10, which in turn depends on libc. No readily -# available precompiled binaries exists which match the requirement of -# support for older linuxes (glibc 2.12), so we'll compile it ourselves. +mkdir pandoc +cp tmp/pandoc-$PANDOC_VERSION/bin/pandoc pandoc -LIBGMP_VERSION=6.1.2 - -wget https://gmplib.org/download/gmp/gmp-$LIBGMP_VERSION.tar.xz -mkdir gmp -cd gmp -tar xf ../gmp-$LIBGMP_VERSION.tar.xz -cd gmp-$LIBGMP_VERSION -./configure --prefix=$TMPDIR/pandoc/usr -make -make install -cd ../.. - -cat > pandoc/pandoc << EOF -#!/bin/bash -# Get an absolute path to this script -this_script_dir=\`dirname \$0\` -this_script_dir=\`cd \$this_script_dir > /dev/null && pwd\` -export LD_LIBRARY_PATH="\$this_script_dir/usr/lib:\$LD_LIBRARY_PATH" -exec \$this_script_dir/usr/bin/pandoc "\$@" -EOF -chmod +x pandoc/pandoc tar -cvzf ../$BUNDLE_NAME pandoc cp ../$BUNDLE_NAME "$ORIG_DIR" diff --git a/make/launcher/LauncherCommon.gmk b/make/launcher/LauncherCommon.gmk index 294dd1770d..cfaa9edb64 100644 --- a/make/launcher/LauncherCommon.gmk +++ b/make/launcher/LauncherCommon.gmk @@ -24,6 +24,9 @@ # include JdkNativeCompilation.gmk +include Modules.gmk +include ProcessMarkdown.gmk +include ToolsJdk.gmk # Tell the compiler not to export any functions unless declared so in # the source code. On Windows, this is the default and cannot be changed. @@ -189,3 +192,70 @@ define SetupBuildLauncherBody $$($1_WINDOWS_JLI_LIB) endif endef + +################################################################################ +# Create man pages for jmod to pick up. There should be a one-to-one +# relationship between executables and man pages (even if this is not always +# the case), so piggyback man page generation on the launcher compilation. + +ifeq ($(OPENJDK_TARGET_OS_TYPE), unix) + # Only build manpages on unix systems. + # We assume all our man pages should reside in section 1. + + MAN_FILES_MD := $(wildcard $(addsuffix /*.md, $(call FindModuleManDirs, $(MODULE)))) + MAN_FILES_TROFF := $(wildcard $(addsuffix /*.1, $(call FindModuleManDirs, $(MODULE)))) + + ifneq ($(MAN_FILES_MD), ) + # If we got markdown files, ignore the troff files + ifeq ($(PANDOC), ) + $(info Warning: pandoc not found. Not generating man pages) + else + # Create dynamic man pages from markdown using pandoc. We need + # PANDOC_FILTER, a wrapper around PANDOC_FILTER_JAVASCRIPT. This is + # created by buildtools-jdk. + + # We should also depend on the source javascript filter + PANDOC_FILTER_JAVASCRIPT := $(TOPDIR)/make/scripts/pandoc-manpage-filter.js + + # The norm in man pages is to display code literals as bold, but pandoc + # "correctly" converts these constructs (encoded in markdown using `...` + # or ```...```) to \f[C]. Ideally, we should use the filter to encapsulate + # the Code/CodeBlock in Strong. While this works for Code, pandoc cannot + # correctly render man page output for CodeBlock wrapped in Strong. So we + # take the easy way out, and post-process the troff output, replacing + # \f[C] with \f[CB]. This has the added benefit of working correctly on + # pandoc prior to version 2.0, which cannot properly produced nested + # formatting in man pages (see https://github.com/jgm/pandoc/issues/3568). + # + # As of pandoc 2.3, the termination of formatting is still broken + # (see https://github.com/jgm/pandoc/issues/4973). We need to replace + # \f[] with \f[R]. + MAN_POST_PROCESS := $(SED) -e 's/\\f\[C\]/\\f\[CB\]/g' \ + -e 's/\\f\[\]/\\f\[R\]/g' + + # Now generate the man pages from markdown using pandoc + $(eval $(call SetupProcessMarkdown, BUILD_MAN_PAGES, \ + DEST := $(SUPPORT_OUTPUTDIR)/modules_man/$(MODULE)/man1, \ + FILES := $(MAN_FILES_MD), \ + FORMAT := man, \ + FILTER := $(PANDOC_FILTER), \ + POST_PROCESS := $(MAN_POST_PROCESS), \ + REPLACEMENTS := @@VERSION_SHORT@@ => $(VERSION_SHORT), \ + EXTRA_DEPS := $(PANDOC_FILTER) $(PANDOC_FILTER_JAVASCRIPT), \ + )) + + TARGETS += $(BUILD_MAN_PAGES) + endif + else + # No markdown man pages present + ifeq ($(BUILD_MANPAGES), true) + # BUILD_MANPAGES is a mis-nomer. It really means "copy the pre-generated man pages". + $(eval $(call SetupCopyFiles, COPY_MAN_PAGES, \ + DEST := $(SUPPORT_OUTPUTDIR)/modules_man/$(MODULE)/man1, \ + FILES := $(MAN_FILES_TROFF), \ + )) + + TARGETS += $(COPY_MAN_PAGES) + endif + endif +endif diff --git a/make/scripts/pandoc-manpage-filter.js b/make/scripts/pandoc-manpage-filter.js new file mode 100644 index 0000000000..d1b20630a4 --- /dev/null +++ b/make/scripts/pandoc-manpage-filter.js @@ -0,0 +1,142 @@ +// +// Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. +// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +// +// This code is free software; you can redistribute it and/or modify it +// under the terms of the GNU General Public License version 2 only, as +// published by the Free Software Foundation. +// +// This code is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// version 2 for more details (a copy is included in the LICENSE file that +// accompanied this code). +// +// You should have received a copy of the GNU General Public License version +// 2 along with this work; if not, write to the Free Software Foundation, +// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +// +// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +// or visit www.oracle.com if you need additional information or have any +// questions. +// + +// +// Traverse a tree of pandoc format objects, calling callback on each +// element, and replacing it if callback returns a new object. +// +// Inspired by the walk method in +// https://github.com/jgm/pandocfilters/blob/master/pandocfilters.py +// +function traverse(obj, callback) { + if (Array.isArray(obj)) { + var processed_array = []; + obj.forEach(function(elem) { + if (elem === Object(elem) && elem.t) { + var replacement = callback(elem.t, elem.c || []); + if (!replacement) { + // no replacement object returned, use original + processed_array.push(traverse(elem, callback)); + } else if (Array.isArray(replacement)) { + // array of objects returned, splice all elements into array + replacement.forEach(function(repl_elem) { + processed_array.push(traverse(repl_elem, callback)); + }) + } else { + // replacement object given, traverse it + processed_array.push(traverse(replacement, callback)); + } + } else { + processed_array.push(traverse(elem, callback)); + } + }) + return processed_array; + } else if (obj === Object(obj)) { + var processed_obj = {}; + Object.keys(obj).forEach(function(key) { + processed_obj[key] = traverse(obj[key], callback); + }) + return processed_obj; + } else { + return obj; + } +} + +// +// Helper constructors to create pandoc format objects +// +function Space() { + return { 't': 'Space', 'c': [] }; +} + +function Str(value) { + return { 't': 'Str', 'c': value }; +} + +function Strong(value) { + return { 't': 'Strong', 'c': value }; +} + +function Header(value) { + return { 't': 'Header', 'c': value }; +} + +// +// Callback to change all Str texts to upper case +// +function uppercase(type, value) { + if (type === 'Str') { + return Str(value.toUpperCase()); + } +} + +// +// Main callback function that performs our man page AST rewrites +// +function manpage_filter(type, value) { + // If it is a header, decrease the heading level by one, and + // if it is a level 1 header, convert it to upper case. + if (type === 'Header') { + value[0] = Math.max(1, value[0] - 1); + if (value[0] == 1) { + return Header(traverse(value, uppercase)); + } + } + + // Man pages does not have superscript. We use it for footnotes, so + // enclose in [...] for best representation. + if (type === 'Superscript') { + return [ Str('['), value[0], Str(']') ]; + } + + // If it is a link, put the link name in bold. If it is an external + // link, put it in brackets. Otherwise, it is either an internal link + // (like "#next-heading"), or a relative link to another man page + // (like "java.html"), so remove it for man pages. + if (type === 'Link') { + var target = value[2][0]; + if (target.match(/^http[s]?:/)) { + return [ Strong(value[1]), Space(), Str('[' + target + ']') ]; + } else { + return Strong(value[1]); + } + } +} + +// +// Main function +// +function main() { + var input = ""; + while (line = readLine()) { + input = input.concat(line); + } + var json = JSON.parse(input); + + var transformed_json = traverse(json, manpage_filter); + + print(JSON.stringify(transformed_json)); +} + +// ... and execute it +main(); diff --git a/make/scripts/pandoc-manpage-filter.sh.template b/make/scripts/pandoc-manpage-filter.sh.template new file mode 100644 index 0000000000..5dea8d1c68 --- /dev/null +++ b/make/scripts/pandoc-manpage-filter.sh.template @@ -0,0 +1,28 @@ +#!/bin/bash +# +# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +# Simple wrapper script to call Nashorn with the javascript pandoc filter + +@@BOOT_JDK@@/bin/jjs @@JJS_FLAGS@@ -scripting \ + "@@TOPDIR@@/make/scripts/pandoc-manpage-filter.js" 2> /dev/null diff --git a/src/bsd/doc/man/DO_NOT_EDIT--GENERATED_FILES b/src/bsd/doc/man/DO_NOT_EDIT--GENERATED_FILES deleted file mode 100644 index 9b33f604d5..0000000000 --- a/src/bsd/doc/man/DO_NOT_EDIT--GENERATED_FILES +++ /dev/null @@ -1,2 +0,0 @@ -These files are generated from docs/technotes/tools pages in the -jdk/pubs subspace of the jdk workspace (adjacent to jdk/j2se). diff --git a/src/bsd/doc/man/apt.1 b/src/bsd/doc/man/apt.1 deleted file mode 100644 index bf8cd5d325..0000000000 --- a/src/bsd/doc/man/apt.1 +++ /dev/null @@ -1,153 +0,0 @@ -." Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH apt 1 "10 May 2011" - -.LP -.SH "NAME" -.LP -.LP -\f2apt\fP \- annotation processing tool -.LP -.SH "SYNOPSIS" -.LP -.LP -\f2apt [\-classpath \fP\f2classpath\fP] [\-sourcepath \f2sourcepath\fP] [\-d \f2directory\fP] [\-s \f2directory\fP] [\-factorypath \f2path\fP] [\-factory \f2class\fP] [\-print] [\-nocompile] [\-A\f2key\fP[\f2=val\fP] ...] [\f2javac option\fP] sourcefiles [@files] -.LP -.SH "PARAMETERS" -.LP -.LP -Options may be in any order. For a discussion of parameters which apply to a specific option, see OPTIONS below. -.LP -.RS 3 -.TP 3 -sourcefiles -Zero or more source files to be processed. -.TP 3 -@files -One or more files that list source files or other options -.RE - -.LP -.SH "DESCRIPTION" -.LP -.LP -\f3Note\fP: The \f2apt\fP tool and its associated API contained in the package \f2com.sun.mirror\fP have been deprecated since JDK 7 and are planned to be removed in the next major JDK release. Use the options available in the \f2javac(1)\fP tool and the APIs contained in the packages \f2javax.annotation.processing\fP and \f2javax.lang.model\fP to process annotations. -.LP -.LP -The tool \f2apt\fP, annotation processing tool, includes reflective APIs and supporting infrastructure to process program annotations. The \f2apt\fP reflective APIs provide a build\-time, source\-based, read\-only view of program structure. These reflective APIs are designed to cleanly model the Java(TM) programming language's type system after the addition of generics. First, \f2apt\fP runs annotation processors that can produce new source code and other files. Next, \f2apt\fP can cause compilation of both original and generated source files, easing development. The reflective APIs and other APIs used to interact with the tool are subpackages of \f2com.sun.mirror\fP. -.LP -.LP -A fuller discussion of how the tool operates as well as instructions for developing with \f2apt\fP are in -.na -\f4Getting Started with \fP\f4apt\fP. @ -.fi -http://download.oracle.com/javase/7/docs/technotes/guides/apt/GettingStarted.html -.LP -.SH "OPTIONS" -.LP -.SS -apt specific options -.LP -.RS 3 -.TP 3 -\-s dir -Specify the directory root under which processor\-generated source files will be placed; files are placed in subdirectories based on package namespace. -.TP 3 -\-nocompile -Do not compile source files to class files. -.TP 3 -\-print -Print out textual representation of specified types; perform no annotation processing or compilation. -.TP 3 -\-A[key[=val]] -Options to pass to annotation processors \-\- these are not interpreted by \f2apt\fP directly, but are made available for use by individual processors -.TP 3 -\-factorypath path -Specify where to find annotation processor factories; if this option is used, the classpath is \f2not\fP searched for factories. -.TP 3 -\-factory classname -Name of annotation processor factory to use; bypasses default discovery process -.TP 3 -\-version -Print version information. -.TP 3 -\-X -Display information about non\-standard options. -.RE - -.LP -.SS -Options shared with javac -.LP -.RS 3 -.TP 3 -\-d dir -Specify where to place processor and javac generated class files -.TP 3 -\-cp path or \-classpath path -Specify where to find user class files and annotation processor factories. If \f2\-factorypath\fP is given, the classpath is not searched for factories. -.RE - -.LP -.LP -Consult the javac(1) man page for information on \f2javac\fP options. -.LP -.SS -Non\-Standard Options -.LP -.RS 3 -.TP 3 -\-XListAnnotationTypes -List found annotation types. -.TP 3 -\-XListDeclarations -List specified and included declarations. -.TP 3 -\-XPrintAptRounds -Print information about initial and recursive \f2apt\fP rounds. -.TP 3 -\-XPrintFactoryInfo -Print information about which annotations a factory is asked to process. -.TP 3 -\-XclassesAsDecls -Treat both class and source files as declarations to process. -.RE - -.LP -.LP -\f3Note\fP: Because these options are non\-standard, they are subject to change without notice. -.LP -.SH "NOTES" -.LP -.LP -The \f2apt\fP tool and its associated API contained in the package \f2com.sun.mirror\fP have been deprecated since JDK 7 and are planned to be removed in the next major JDK release. Use the options available in the \f2javac(1)\fP tool and the APIs contained in the packages \f2javax.annotation.processing\fP and \f2javax.lang.model\fP to process annotations. -.LP -.SH "SEE ALSO" -.LP -.RS 3 -.TP 2 -o -javac(1), java(1) -.RE - -.LP - diff --git a/src/bsd/doc/man/ja/apt.1 b/src/bsd/doc/man/ja/apt.1 deleted file mode 100644 index dffe5b6f06..0000000000 --- a/src/bsd/doc/man/ja/apt.1 +++ /dev/null @@ -1,27 +0,0 @@ -." Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH apt 1 "07 May 2011" - -.LP -.SH "NAME" -.LP -.LP diff --git a/src/bsd/doc/man/ja/jar.1 b/src/bsd/doc/man/ja/jar.1 deleted file mode 100644 index 0da6278ef6..0000000000 --- a/src/bsd/doc/man/ja/jar.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH jar 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/ja/jarsigner.1 b/src/bsd/doc/man/ja/jarsigner.1 deleted file mode 100644 index 8c66249971..0000000000 --- a/src/bsd/doc/man/ja/jarsigner.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH jarsigner 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/ja/java.1 b/src/bsd/doc/man/ja/java.1 deleted file mode 100644 index cbc47c04f7..0000000000 --- a/src/bsd/doc/man/ja/java.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH java 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/ja/javac.1 b/src/bsd/doc/man/ja/javac.1 deleted file mode 100644 index 4269d534d2..0000000000 --- a/src/bsd/doc/man/ja/javac.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH javac 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/ja/javadoc.1 b/src/bsd/doc/man/ja/javadoc.1 deleted file mode 100644 index 536c1bcda9..0000000000 --- a/src/bsd/doc/man/ja/javadoc.1 +++ /dev/null @@ -1,22 +0,0 @@ -." Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH javadoc 1 "07 May 2011" diff --git a/src/bsd/doc/man/ja/javap.1 b/src/bsd/doc/man/ja/javap.1 deleted file mode 100644 index c3c37eff48..0000000000 --- a/src/bsd/doc/man/ja/javap.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH javap 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/ja/javaws.1 b/src/bsd/doc/man/ja/javaws.1 deleted file mode 100644 index 4b401550f7..0000000000 --- a/src/bsd/doc/man/ja/javaws.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH javaws 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/ja/jcmd.1 b/src/bsd/doc/man/ja/jcmd.1 deleted file mode 100644 index a281da552e..0000000000 --- a/src/bsd/doc/man/ja/jcmd.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH jcmd 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/ja/jconsole.1 b/src/bsd/doc/man/ja/jconsole.1 deleted file mode 100644 index a0f045389d..0000000000 --- a/src/bsd/doc/man/ja/jconsole.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH jconsole 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/ja/jdb.1 b/src/bsd/doc/man/ja/jdb.1 deleted file mode 100644 index 329541beb2..0000000000 --- a/src/bsd/doc/man/ja/jdb.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH jdb 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/ja/jdeps.1 b/src/bsd/doc/man/ja/jdeps.1 deleted file mode 100644 index 58949352aa..0000000000 --- a/src/bsd/doc/man/ja/jdeps.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH jdeps 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/ja/jhat.1 b/src/bsd/doc/man/ja/jhat.1 deleted file mode 100644 index 1f37506d9a..0000000000 --- a/src/bsd/doc/man/ja/jhat.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH jhat 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/ja/jinfo.1 b/src/bsd/doc/man/ja/jinfo.1 deleted file mode 100644 index 7ac07aa3bb..0000000000 --- a/src/bsd/doc/man/ja/jinfo.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH jinfo 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/ja/jjs.1 b/src/bsd/doc/man/ja/jjs.1 deleted file mode 100644 index c57b30ab16..0000000000 --- a/src/bsd/doc/man/ja/jjs.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH jjs 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/ja/jmap.1 b/src/bsd/doc/man/ja/jmap.1 deleted file mode 100644 index faaf19512f..0000000000 --- a/src/bsd/doc/man/ja/jmap.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH jmap 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/ja/jps.1 b/src/bsd/doc/man/ja/jps.1 deleted file mode 100644 index 78453a273a..0000000000 --- a/src/bsd/doc/man/ja/jps.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH jps 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/ja/jrunscript.1 b/src/bsd/doc/man/ja/jrunscript.1 deleted file mode 100644 index 24a9685735..0000000000 --- a/src/bsd/doc/man/ja/jrunscript.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH jrunscript 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/ja/jsadebugd.1 b/src/bsd/doc/man/ja/jsadebugd.1 deleted file mode 100644 index 9e3ee5cb85..0000000000 --- a/src/bsd/doc/man/ja/jsadebugd.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH jsadebugd 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/ja/jstack.1 b/src/bsd/doc/man/ja/jstack.1 deleted file mode 100644 index 9bcdda1300..0000000000 --- a/src/bsd/doc/man/ja/jstack.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH jstack 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/ja/jstat.1 b/src/bsd/doc/man/ja/jstat.1 deleted file mode 100644 index 6b1dfb02e3..0000000000 --- a/src/bsd/doc/man/ja/jstat.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH jstat 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/ja/jstatd.1 b/src/bsd/doc/man/ja/jstatd.1 deleted file mode 100644 index 1e4ea6426e..0000000000 --- a/src/bsd/doc/man/ja/jstatd.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH jstatd 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/ja/keytool.1 b/src/bsd/doc/man/ja/keytool.1 deleted file mode 100644 index 7dcc59fb46..0000000000 --- a/src/bsd/doc/man/ja/keytool.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH keytool 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/ja/pack200.1 b/src/bsd/doc/man/ja/pack200.1 deleted file mode 100644 index f27786275b..0000000000 --- a/src/bsd/doc/man/ja/pack200.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH pack200 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/ja/rmic.1 b/src/bsd/doc/man/ja/rmic.1 deleted file mode 100644 index 288c93310b..0000000000 --- a/src/bsd/doc/man/ja/rmic.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH rmic 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/ja/rmid.1 b/src/bsd/doc/man/ja/rmid.1 deleted file mode 100644 index 0b64e48594..0000000000 --- a/src/bsd/doc/man/ja/rmid.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH rmid 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/ja/rmiregistry.1 b/src/bsd/doc/man/ja/rmiregistry.1 deleted file mode 100644 index eec95fa455..0000000000 --- a/src/bsd/doc/man/ja/rmiregistry.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH rmiregistry 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/ja/serialver.1 b/src/bsd/doc/man/ja/serialver.1 deleted file mode 100644 index 531478342a..0000000000 --- a/src/bsd/doc/man/ja/serialver.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH serialver 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/ja/unpack200.1 b/src/bsd/doc/man/ja/unpack200.1 deleted file mode 100644 index 66a82c841b..0000000000 --- a/src/bsd/doc/man/ja/unpack200.1 +++ /dev/null @@ -1,24 +0,0 @@ -." Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH unpack200 1 "07 May 2011" - -.LP diff --git a/src/bsd/doc/man/javaws.1 b/src/bsd/doc/man/javaws.1 deleted file mode 100644 index 32c9713e8d..0000000000 --- a/src/bsd/doc/man/javaws.1 +++ /dev/null @@ -1,222 +0,0 @@ -." Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. -." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -." -." This code is free software; you can redistribute it and/or modify it -." under the terms of the GNU General Public License version 2 only, as -." published by the Free Software Foundation. -." -." This code is distributed in the hope that it will be useful, but WITHOUT -." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -." version 2 for more details (a copy is included in the LICENSE file that -." accompanied this code). -." -." You should have received a copy of the GNU General Public License version -." 2 along with this work; if not, write to the Free Software Foundation, -." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -." -." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -." or visit www.oracle.com if you need additional information or have any -." questions. -." -.TH javaws 1 "10 May 2011" - -.LP -.SH "Name" -\f2javaws\fP Command Line -.LP -.SH "NAME" -.LP -.LP -\f2javaws\fP \- Java Web Start launcher command -.LP -.SH "SYNOPSIS" -.LP -.LP -\f2javaws [run\-options] \fP -.LP -.LP -\f2javaws [control\-options]\fP -.LP -.SH "PARAMETERS" -.LP -.LP -\f2[run\-options]\fP -.LP -.LP -Command\-line run\-options. run\-options may be in any order. For a discussion of the various run\-options, see RUN\-OPTIONS below. -.LP -.LP -\f2\fP -.LP -.LP -This can be either the path of, or the Uniform Resource Locater (URL) of the JNLP (Java Network Launching Protocol) file. -.LP -.LP -\f2[control\-options]\fP -.LP -.LP -Command\-line control\-options. control\-options may be in any order. For a discussion of the various control\-options, see CONTROL\-OPTIONS below. -.LP -.SH "DESCRIPTION" -.LP -.LP -The \f2javaws\fP command launches Java Web Start, which is the reference implementation of the Java Network Launching Protocol (JNLP). Java Web Start launches Java applications/applets hosted on a network. -.LP -.LP -If a JNLP file is specified, \f2javaws\fP will launch the Java application/applet specified in the JNLP file. -.LP -.LP -The \f2javaws\fP launcher has a set of options that are supported in the current release. However, the options may be removed in a future release. -.LP -.SH "RUN\-OPTIONS" -.LP -.LP -\f2\-offline\fP -.LP -.LP -Run Java Web Start in offline mode. -.LP -.LP -\f2\-Xnosplash\fP -.LP -.LP -Do not display the initial splash screen. -.LP -.LP -\f2\-open \fP -.LP -.LP -If specified, replaces the arguments in the jnlp file with \f2\-open \fP. -.LP -.LP -\f2\-print \fP -.LP -.LP -If specified, replaces the arguments in the jnlp file with \f2\-print \fP. -.LP -.LP -\f2\-online\fP -.LP -.LP -Use online mode (default behavior). -.LP -.LP -\f2\-wait\fP -.LP -.LP -If specified, the \f2javaws\fP process will not exit until the application exits. This option does not function as described on Windows platforms. -.LP -.LP -\f2\-verbose\fP -.LP -.LP -Display additional output. -.LP -.LP -\f2\-J