Permalink
Browse files

Refactored script/run&repl, auto-generate script/maven-classpath, update

to 1.3 beta 3
  • Loading branch information...
1 parent fdc4135 commit bcbafd2e7775172a94313210f124b483f0bde9f3 @pmbauer pmbauer committed Sep 11, 2011
Showing with 37 additions and 19 deletions.
  1. +27 −11 pom.xml
  2. +2 −5 script/repl
  3. +2 −3 script/run
  4. +6 −0 script/script_common
View
38 pom.xml
@@ -20,24 +20,40 @@
<dependency>
<groupId>org.clojure</groupId>
<artifactId>clojure</artifactId>
- <version>1.3.0-alpha8</version>
+ <version>1.3.0-beta3</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>com.theoryinpractise</groupId>
- <artifactId>clojure-maven-plugin</artifactId>
- <version>1.3.7</version>
- <extensions>true</extensions>
- <configuration>
- <warnOnReflection>${clojure.warnOnReflection}</warnOnReflection>
- <temporaryOutputDirectory>false</temporaryOutputDirectory>
- </configuration>
- </plugin>
+ <groupId>com.theoryinpractise</groupId>
+ <artifactId>clojure-maven-plugin</artifactId>
+ <version>1.3.7</version>
+ <extensions>true</extensions>
+ <configuration>
+ <warnOnReflection>${clojure.warnOnReflection}</warnOnReflection>
+ <temporaryOutputDirectory>false</temporaryOutputDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <id>build-classpath</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>build-classpath</goal>
+ </goals>
+ <configuration>
+ <outputFile>${basedir}/script/maven-classpath</outputFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
-
</project>
View
@@ -1,6 +1,3 @@
#!/bin/sh
-CLASSPATH=src/main/clojure:`cat script/maven-classpath`
-
-java -server -XX:+AggressiveOpts -cp $CLASSPATH clojure.main
-
-
+. $(dirname $0)/script_common
+${CMD_BASE} -r
View
@@ -1,4 +1,3 @@
#!/bin/sh
-CLASSPATH='target/*':src/main/clojure:`cat script/maven-classpath`
-
-java -server -XX:+AggressiveOpts -cp $CLASSPATH clojure.main -m $@
+. $(dirname $0)/script_common
+${CMD_BASE} -m $@
View
@@ -0,0 +1,6 @@
+#!/bin/sh
+BASE_DIR=$(dirname $0)/..
+TARGET_CLASSPATH=`ls -d ${BASE_DIR}/target/*class* | tr '\n' :`
+MAVEN_CLASSPATH=`cat ${BASE_DIR}/script/maven-classpath`
+CLASSPATH=${TARGET_CLASSPATH}${BASE_DIR}/src/main/clojure:${MAVEN_CLASSPATH}
+CMD_BASE="java -server -XX:+AggressiveOpts -cp ${CLASSPATH} clojure.main"

0 comments on commit bcbafd2

Please sign in to comment.