aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Sierra <mail@stuartsierra.com>2010-02-03 11:59:31 -0500
committerStuart Sierra <mail@stuartsierra.com>2010-02-03 11:59:31 -0500
commit9b194dfd5a54d461c4cd5f8e3307f0949fcd04f1 (patch)
tree64ed640d967accdaab0dfac783c73d103bb6b614
parentac67da72203c129173f3741d21f9b9285599d648 (diff)
Re-enable local build with -Dclojure.jar in POM
-rw-r--r--README.txt5
-rw-r--r--pom.xml20
2 files changed, 21 insertions, 4 deletions
diff --git a/README.txt b/README.txt
index 176c871c..010f8bc7 100644
--- a/README.txt
+++ b/README.txt
@@ -68,10 +68,9 @@ to the mvn command line.
If you want to compile/build with a customized clojure.jar file, use
the following command:
- mvn -Denv=local -Dclojure.jar=/path/to/clojure.jar package
+ mvn package -o -Dclojure.jar=/path/to/clojure.jar
-The /path/to/clojure.jar MUST be an absolute path. It defaults to
-${current-dir}/../clojure/clojure.jar if you do not specify it.
+The /path/to/clojure.jar MUST be an absolute path.
diff --git a/pom.xml b/pom.xml
index bb064dd1..ad9dfaa2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,6 @@
http://maven.apache.org/maven-v4_0_0.xsd">
<properties>
<clojure.version>1.2.0-master-SNAPSHOT</clojure.version>
- <clojure.jar>${basedir}/../clojure/clojure.jar</clojure.jar>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<modelVersion>4.0.0</modelVersion>
@@ -51,6 +50,25 @@
</snapshots>
</repository>
</repositories>
+ <profiles>
+ <profile>
+ <id>local</id>
+ <activation>
+ <property>
+ <name>clojure.jar</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.clojure</groupId>
+ <artifactId>clojure</artifactId>
+ <version>${clojure.version}</version>
+ <scope>system</scope>
+ <systemPath>${clojure.jar}</systemPath>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
<build>
<resources>
<resource>