web2c help msgs: luatangle no longer exists

git-svn-id: svn://tug.org/texlive/trunk@26997 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 28 insertions, 31 deletions

diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index ea85f5761c6..4bebdb7446a 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* help.h (LUATANGLEHELP): Removed, luatangle no longer exists.
+	[WIN32]: Use "nul" instead of "/dev/null" as for Unix.
+
 2012-07-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* w2c/config.h: Define LONGINTEGER_{TYPE,PRId} for MSVC.
diff --git a/Build/source/texk/web2c/help.h b/Build/source/texk/web2c/help.h
index 037be8d9c04..214ecf2215b 100644
--- a/Build/source/texk/web2c/help.h
+++ b/Build/source/texk/web2c/help.h
@@ -10,7 +10,7 @@
    thing, the messages have a lot in common, so it's nice to have them
    in one place.)
 
-Copyright 1995, 1996, 2009, 2011 Karl Berry.
+Copyright 1995, 1996, 2009, 2011, 2012 Karl Berry.
 Copyright 2008 Taco Hoekwater.
 Copyright 2001, 2003, 2004 Olaf Weber.
 
@@ -33,6 +33,12 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 #ifndef HELP_H
 #define HELP_H
 
+#ifdef WIN32
+#define NULL_DEV "nul"
+#else
+#define NULL_DEV "/dev/null"
+#endif
+
 #ifdef BIBTEX
 const_string BIBTEXHELP[] = {
     "Usage: bibtex [OPTION]... AUXFILE[.aux]",
@@ -48,37 +54,37 @@ const_string BIBTEXHELP[] = {
 #endif /* BIBTEX */
 
 #ifdef CWEB
-const_string CWEAVEHELP[] = {
-    "Usage: cweave [OPTIONS] WEBFILE[.w] [{CHANGEFILE[.ch]|-} [OUTFILE[.tex]]]",
-    "  Weave WEBFILE with CHANGEFILE into a TeX document.",
-    "  Default CHANGEFILE is /dev/null;",
-    "  TeX output goes to the basename of WEBFILE extended with `.tex'",
+const_string CTANGLEHELP[] = {
+    "Usage: ctangle [OPTIONS] WEBFILE[.w] [{CHANGEFILE[.ch]|-} [OUTFILE[.c]]]",
+    "  Tangle WEBFILE with CHANGEFILE into a C/C++ program.",
+    "  Default CHANGEFILE is " NULL_DEV ";",
+    "  C output goes to the basename of WEBFILE extended with `.c'",
     "  unless otherwise specified by OUTFILE; in this case, '-' specifies",
     "  a null CHANGEFILE.",
     "",
     "-b          suppress banner line on terminal",
-    "-f          do not force a newline after every C statement in output",
     "-h          suppress success message on completion",
     "-p          suppress progress report messages",
-    "-x          omit indices and table of contents",
-    "+e          enclose C material in \\PB{...}",
     "+s          print usage statistics",
     "--help      display this help and exit",
     "--version   output version information and exit",
     NULL
 };
 
-const_string CTANGLEHELP[] = {
-    "Usage: ctangle [OPTIONS] WEBFILE[.w] [{CHANGEFILE[.ch]|-} [OUTFILE[.c]]]",
-    "  Tangle WEBFILE with CHANGEFILE into a C/C++ program.",
-    "  Default CHANGEFILE is /dev/null;",
-    "  C output goes to the basename of WEBFILE extended with `.c'",
+const_string CWEAVEHELP[] = {
+    "Usage: cweave [OPTIONS] WEBFILE[.w] [{CHANGEFILE[.ch]|-} [OUTFILE[.tex]]]",
+    "  Weave WEBFILE with CHANGEFILE into a TeX document.",
+    "  Default CHANGEFILE is " NULL_DEV ";",
+    "  TeX output goes to the basename of WEBFILE extended with `.tex'",
     "  unless otherwise specified by OUTFILE; in this case, '-' specifies",
     "  a null CHANGEFILE.",
     "",
     "-b          suppress banner line on terminal",
+    "-f          do not force a newline after every C statement in output",
     "-h          suppress success message on completion",
     "-p          suppress progress report messages",
+    "-x          omit indices and table of contents",
+    "+e          enclose C material in \\PB{...}",
     "+s          print usage statistics",
     "--help      display this help and exit",
     "--version   output version information and exit",
@@ -160,20 +166,6 @@ const_string GFTYPEHELP[] = {
 };
 #endif /* GFTYPE */
 
-#if defined (LUATANGLE) || defined (LUATANGLEBOOT)
-const_string LUATANGLEHELP[] = {
-    "Usage: luatangle [OPTION]... WEBFILE[.web] [CHANGEFILE[.ch]]",
-    "  Tangle WEBFILE with CHANGEFILE into a Pascal program.",
-    "  Default CHANGEFILE is /dev/null;",
-    "  Pascal output goes to the basename of WEBFILE extended with `.p',",
-    "  and a string pool file, if necessary, to the same extended with `.pool'.",
-    "",
-    "-help       display this help and exit",
-    "-version    output version information and exit",
-    NULL
-};
-#endif /* LUATANGLE */
-
 #ifdef MFT
 const_string MFTHELP[] = {
     "Usage: mft [OPTION]... NAME[.mf|.mp]",
@@ -257,7 +249,7 @@ const_string OPL2OFMHELP[] = {
 const_string OTANGLEHELP[] = {
     "Usage: otangle [OPTION]... WEBFILE[.web] [CHANGEFILE[.ch]]",
     "  Tangle WEBFILE with CHANGEFILE into a Pascal program.",
-    "  Default CHANGEFILE is /dev/null;",
+    "  Default CHANGEFILE is " NULL_DEV ";",
     "  Pascal output goes to the basename of WEBFILE extended with `.p',",
     "  and a string pool file, if necessary, to the same extended with `.pool'.",
     "",
@@ -444,7 +436,7 @@ const_string PTFTOPLHELP[] = {
 const_string TANGLEHELP[] = {
     "Usage: tangle [OPTION]... WEBFILE[.web] [CHANGEFILE[.ch]]",
     "  Tangle WEBFILE with CHANGEFILE into a Pascal program.",
-    "  Default CHANGEFILE is /dev/null;",
+    "  Default CHANGEFILE is " NULL_DEV ";",
     "  Pascal output goes to the basename of WEBFILE extended with `.p',",
     "  and a string pool file, if necessary, to the same extended with `.pool'.",
     "",
@@ -597,7 +589,7 @@ const_string VPTOVFHELP[] = {
 const_string WEAVEHELP[] = {
     "Usage: weave [OPTION]... WEBFILE[.web] [CHANGEFILE[.ch]]",
     "  Weave WEBFILE with CHANGEFILE into a TeX document.",
-    "  Default CHANGEFILE is /dev/null;",
+    "  Default CHANGEFILE is " NULL_DEV ";",
     "  TeX output goes to the basename of WEBFILE extended with `.tex'.",
     "",
     "-x          omit cross-reference information",