Permalink
Browse files

Removed debugging, added version number

  • Loading branch information...
1 parent e63f0b7 commit 873b980b6f51c5dfd11014dacfaab5535fc1f7dd @russolsen russolsen committed Feb 11, 2010
Showing with 21 additions and 20 deletions.
  1. +1 −6 bin/clj
  2. +20 −14 build.xml
View
@@ -74,16 +74,14 @@ CP_DELIMITER=":"
# add jruby jars for command-line execution
CLOJURE_JAR=$CLOJURE_LIB/clojure.jar
-CLOJURE_CP=$CLOJURE_JAR
+CLOJURE_CP=.:$CLOJURE_JAR
for jarfile in "$CLOJURE_LIB"/*.jar; do
if [ "$jarfile" != "$CLOJURE_JAR" ]; then
CLOJURE_CP="$CLOJURE_CP$CP_DELIMITER$jarfile"
fi
done
-echo $CLOJURE_CP
-
if $cygwin; then
CLOJURE_CP=`cygpath -p -w "$CLOJURE_CP"`
fi
@@ -170,7 +168,4 @@ do
shift
done
-echo $JAVA_ARGS
-echo $CLOJURE_ARGS
-set -x
java -classpath $CLOJURE_CP $JAVA_ARGS $CLOJURE_JLINE $CLOJURE_MAIN $CLOJURE_ARGS
View
@@ -1,16 +1,24 @@
<project name="dejure" basedir="." default="all">
+ <property name="clojure-version" value="1.1.0" />
+ <property name="clojure-contrib-version" value="1.1.0" />
+ <property name="jline-version" value="0.9.94" />
+
+ <property name="dejure-version" value="${clojure-version}" />
+
+ <property name="staging-dir" value="build/dejure-${dejure-version}"/>
+
<target name="init">
- <mkdir dir="build/dejure/lib"/>
+ <mkdir dir="${staging-dir}"/>
</target>
<target name="clojure.zip" depends="init" unless="skip.download">
- <get src="http://clojure.googlecode.com/files/clojure-1.1.0.zip"
+ <get src="http://clojure.googlecode.com/files/clojure-${clojure-version}.zip"
dest="build/clojure.zip" />
</target>
<target name="clojure.jar" depends="clojure.zip">
- <unzip src="build/clojure.zip" dest="build/dejure/lib">
+ <unzip src="build/clojure.zip" dest="${staging-dir}/lib">
<patternset>
<include name="**/clojure.jar"/>
</patternset>
@@ -19,12 +27,12 @@
</target>
<target name="clojure-contrib.zip" depends="init" unless="skip.download">
- <get src="http://clojure-contrib.googlecode.com/files/clojure-contrib-1.1.0.zip"
+ <get src="http://clojure-contrib.googlecode.com/files/clojure-contrib-${clojure-contrib-version}.zip"
dest="build/clojure-contrib.zip" />
</target>
<target name="clojure-contrib.jar" depends="clojure-contrib.zip">
- <unzip src="build/clojure-contrib.zip" dest="build/dejure/lib">
+ <unzip src="build/clojure-contrib.zip" dest="${staging-dir}/lib">
<patternset>
<include name="**/clojure-contrib.jar"/>
</patternset>
@@ -33,17 +41,15 @@
</target>
<target name="jline.jar" depends="init" unless="skip.download">
- <get src="http://mirrors.ibiblio.org/pub/mirrors/maven2/jline/jline/0.9.94/jline-0.9.94.jar"
- dest="build/dejure/lib/jline.jar" />
+ <get src="http://mirrors.ibiblio.org/pub/mirrors/maven2/jline/jline/${jline-version}/jline-${jline-version}.jar"
+ dest="${staging-dir}/lib/jline.jar" />
</target>
<target name="downloaded-jars"
depends="clojure.jar,clojure-contrib.jar,jline.jar" />
<target name="build.dejure" depends="downloaded-jars">
- <mkdir dir="build/dejure" />
- <mkdir dir="build/dejure/lib" />
- <copy todir="build/dejure" >
+ <copy todir="${staging-dir}" >
<fileset dir="${basedir}" includes="bin/**/*"/>
<fileset dir="${basedir}" includes="examples/**/*"/>
</copy>
@@ -52,13 +58,13 @@
<target name="all" depends="dejure.tar"/>
<target name="dejure.tar" depends="build.dejure">
- <tar destfile="build/dejure.tar">
+ <tar destfile="build/dejure-${dejure-version}.tar">
<tarfileset dir="build" filemode="755">
- <include name="dejure/bin/**/*"/>
+ <include name="dejure-${dejure-version}/bin/**/*"/>
</tarfileset>
<tarfileset dir="build">
- <include name="dejure/**/*"/>
- <exclude name="dejure/bin/**/*"/>
+ <include name="dejure-${dejure-version}/**/*"/>
+ <exclude name="dejure-${dejure-version}/bin/**/*"/>
</tarfileset>
</tar>
</target>

0 comments on commit 873b980

Please sign in to comment.