[pkg-java] r8234 - in trunk/clojure/debian: . scripts

Peter Collingbourne pcc-guest at alioth.debian.org
Thu May 7 15:55:06 UTC 2009


Author: pcc-guest
Date: 2009-05-07 15:55:05 +0000 (Thu, 07 May 2009)
New Revision: 8234

Modified:
   trunk/clojure/debian/changelog
   trunk/clojure/debian/clojure-repl.1
   trunk/clojure/debian/clojure.1
   trunk/clojure/debian/clojurec.1
   trunk/clojure/debian/scripts/clojure
Log:
debian/clojure-repl.1, debian/clojure.1, debian/clojurec.1, debian/scripts/clojure: clojure script now uses clojure.main. Rewrote man page and deprecated clojure-repl which provides the same functionality

Modified: trunk/clojure/debian/changelog
===================================================================
--- trunk/clojure/debian/changelog	2009-05-07 15:55:03 UTC (rev 8233)
+++ trunk/clojure/debian/changelog	2009-05-07 15:55:05 UTC (rev 8234)
@@ -9,6 +9,10 @@
     debian/scripts/clojurec, debian/scripts/clojure-repl,
     debian/README.Debian: add a Class-Path attribute to clojure.jar to
     automatically bring in asm3 and asm3-commons deps
+  * debian/clojure-repl.1, debian/clojure.1, debian/clojurec.1,
+    debian/scripts/clojure: clojure script now uses clojure.main.
+    Rewrote man page and deprecated clojure-repl which provides the same
+    functionality
 
  -- Peter Collingbourne <peter at pcc.me.uk>  Thu, 07 May 2009 15:09:44 +0100
 

Modified: trunk/clojure/debian/clojure-repl.1
===================================================================
--- trunk/clojure/debian/clojure-repl.1	2009-05-07 15:55:03 UTC (rev 8233)
+++ trunk/clojure/debian/clojure-repl.1	2009-05-07 15:55:05 UTC (rev 8234)
@@ -20,6 +20,10 @@
 \fBclojure-repl\fP binds \fI*command\-line\-args*\fP to a seq
 containing the (optional) arguments provided after the two dashes
 (\-\-).
+.PP
+\fBclojure-repl\fP is \fBdeprecated\fP; please instead use
+.BR clojure (1)
+which includes a REPL mode.
 .SH OPTIONS
 A summary of options is included below.
 .TP

Modified: trunk/clojure/debian/clojure.1
===================================================================
--- trunk/clojure/debian/clojure.1	2009-05-07 15:55:03 UTC (rev 8233)
+++ trunk/clojure/debian/clojure.1	2009-05-07 15:55:05 UTC (rev 8234)
@@ -1,43 +1,62 @@
-.TH CLOJURE 1 "January 2, 2009"
+.TH CLOJURE 1 "May 7, 2009"
 .SH NAME
-clojure \- Clojure script interpreter
+clojure \- a JVM-based dynamic programming language
 .SH SYNOPSIS
 .B clojure
-[\fI-cp/-classpath classpath\fP] 
-script1.clj [script2.clj \fI...\fP] [\-\- \fIargs ...\fP]
+[\fB\-cp/\-classpath \fIclasspath\fP]
+[\fB\-i/\-\-init \fIpath\fP]
+[\fB\-e/\-\-eval \fIexpr\fP]
+{\fB\-h\fP | \fB\-r\fP | \fIpath\fP | -}
+[\fIargs ...\fP]
 .SH DESCRIPTION
 This manual page documents briefly the
 .B clojure
 command.
 .PP
 .B clojure
-provides a way to run one or more Clojure files from a command line.
-Any number of Clojure files can be provided as path arguments; these
-files are loaded in order, as if via \fIload-file\fP.  Files to be
-loaded from the classpath must be prefixed with a `@' character, and
-must be an absolute path to the classpath resource.  Note that the
-path will be treated as absolute within the classpath, whether it
-is prefixed with a slash or not.  Filesystem and classpath paths may
-be provided in any order, and be intermixed as necessary.
-.PP
-\fBclojure\fP binds \fI*command\-line\-args*\fP to a seq containing
-the (optional) arguments provided after the two dashes (\-\-); this
-provides a way to provide command-line arguments to your scripts.
-.PP
-Once the final script path has been loaded, \fBclojure\fP exits.
+is the main entry point for Clojure, a dynamic programming language
+that targets the Java Virtual Machine.   With no options or arguments,
+it runs an interactive Read-Eval-Print loop (REPL).
 .SH OPTIONS
 A summary of options is included below.
 .TP
-.B \-cp \fIclasspath\fP, \-classpath \fIclasspath\fP
-Specifies additional classpath elements.  This option overrides the $CLASSPATH environment variable.
+.B \-cp, \-classpath \fIclasspath\fP
+Specifies additional classpath elements.  Overrides the $CLASSPATH environment variable.  Must appear first if given.
+.TP
+.B \-i, \-\-init \fIpath\fP
+Load a file or resource at initialisation time.  May be specified multiple times.
+.TP
+.B \-e, \-\-eval \fIstring\fP
+Evaluate expressions in string; print non-nil values.  May be specified multiple times.
+.TP
+.B \-r, \-\-repl
+Run a repl
+.TP
+.I path
+Run a script from a file or resource
+.TP
+.B \-
+Run a script from standard input
+.TP
+.B \-h, \-?, \-\-help
+Print a help message and exit
+.SH PATH ARGUMENTS
+A Clojure file can be provided as a path argument.  Files to be
+loaded from the classpath must be prefixed with a `@' character,
+and must be an absolute path to the classpath resource.  Note that
+the path will be treated as absolute within the classpath, whether
+it is prefixed with a slash or not.
+.PP
+\fBclojure\fP binds \fI*command\-line\-args*\fP to a seq containing the
+(optional) arguments provided after the path argument; this provides
+a way to provide command-line arguments to your scripts.
 .SH ENVIRONMENT
 A listing of recognised environment variables is included below.
 .TP
 .B CLASSPATH
 Specifies additional classpath elements.
 .SH SEE ALSO
-.BR clojurec (1),
-.BR clojure-repl (1).
+.BR clojurec (1).
 .SH AUTHOR
 \fBclojure\fP is a wrapper script around a Java implementation by Rich Hickey <richhickey at gmail.com>.
 The wrapper script was written by Peter Collingbourne <peter at pcc.me.uk>.

Modified: trunk/clojure/debian/clojurec.1
===================================================================
--- trunk/clojure/debian/clojurec.1	2009-05-07 15:55:03 UTC (rev 8233)
+++ trunk/clojure/debian/clojurec.1	2009-05-07 15:55:05 UTC (rev 8234)
@@ -31,8 +31,7 @@
 .B CLASSPATH
 Specifies additional classpath elements.
 .SH SEE ALSO
-.BR clojure (1),
-.BR clojure-repl (1).
+.BR clojure (1).
 .SH AUTHOR
 \fBclojurec\fP is a wrapper script around a Java implementation by Rich Hickey <richhickey at gmail.com>.
 The wrapper script was written by Peter Collingbourne <peter at pcc.me.uk>.

Modified: trunk/clojure/debian/scripts/clojure
===================================================================
--- trunk/clojure/debian/scripts/clojure	2009-05-07 15:55:03 UTC (rev 8233)
+++ trunk/clojure/debian/scripts/clojure	2009-05-07 15:55:05 UTC (rev 8234)
@@ -1,10 +1,5 @@
 #!/bin/sh
 
-if [ $# -eq 0 ] ; then
-	echo "usage: $0 [-cp/-classpath <classpath>] file.clj [@classpathfile.clj ...] [-- args]"
-	exit 1
-fi
-
 if [ "x$CLASSPATH" = "x" ] ; then
 	extra_classpath=""
 else
@@ -24,4 +19,4 @@
 	esac
 done
 
-exec java -cp /usr/share/java/clojure.jar"$extra_classpath" clojure.lang.Script "$@"
+exec java -cp /usr/share/java/clojure.jar"$extra_classpath" clojure.main "$@"




More information about the pkg-java-commits mailing list