Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

build-time depedency for jsr166

Signed-off-by: Rich Hickey <richhickey@gmail.com>
  • Loading branch information...
commit ce2d1d3bf46d860780d929fa7e23ba2394ce7f51 1 parent 4876c14
@stuarthalloway stuarthalloway authored richhickey committed
Showing with 25 additions and 3 deletions.
  1. +2 −0  .gitignore
  2. +7 −0 antsetup.sh
  3. +2 −1  build.xml
  4. +11 −1 pom.xml
  5. +3 −1 readme.txt
View
2  .gitignore
@@ -3,3 +3,5 @@ target
clojure.iws
clojure.ipr
nbproject/private/
+maven-classpath
+maven-classpath.properties
View
7 antsetup.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+mvn -q dependency:build-classpath -Dmdep.outputFile=maven-classpath
+cat <<EOF >maven-classpath.properties
+maven.compile.classpath=`cat maven-classpath`
+EOF
+echo "Wrote maven-classpath.properties for standalone ant use"
View
3  build.xml
@@ -17,6 +17,7 @@
<property name="build" location="${target}/classes"/>
<property name="test-classes" location="${target}/test-classes"/>
<property name="dist" location="dist"/>
+ <property file="maven-classpath.properties"/>
<!-- Get the version string out of the POM -->
<xmlproperty file="pom.xml" prefix="pom"/>
@@ -43,7 +44,7 @@
<target name="compile-clojure"
description="Compile Clojure sources.">
<java classname="clojure.lang.Compile"
- classpath="${build}:${cljsrc}"
+ classpath="${maven.compile.classpath}:${build}:${cljsrc}"
failonerror="true"
fork="true">
<sysproperty key="clojure.compile.path" value="${build}"/>
View
12 pom.xml
@@ -38,6 +38,15 @@
<url>git@github.com:clojure/clojure.git</url>
</scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.jsr166-mirror</groupId>
+ <artifactId>jsr166y</artifactId>
+ <version>1.7.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<build>
<resources>
<resource>
@@ -72,7 +81,8 @@
</goals>
<configuration>
<target>
- <ant target="compile-clojure" />
+ <property name="maven.compile.classpath" refid="maven.compile.classpath"/>
+ <ant target="compile-clojure"/>
</target>
</configuration>
</execution>
View
4 readme.txt
@@ -13,8 +13,10 @@ Getting Started: http://dev.clojure.org/display/doc/Getting+Started
To run: java -cp clojure-${VERSION}.jar clojure.main
-To build locally with Ant: ant
+To build locally with Ant:
+ One-time setup: ./antsetup.sh
+ To build: ant
Maven 2 build instructions:
Please sign in to comment.
Something went wrong with that request. Please try again.