aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Sierra <mail@stuartsierra.com>2010-01-30 15:11:54 -0500
committerStuart Sierra <mail@stuartsierra.com>2010-01-30 15:11:54 -0500
commit75eaf576f17db49b621aa013ac3edf56cb24d5b8 (patch)
tree3acd1e97277f0e7a5af9c4455c8f241a934842d2
parent0294e7994550569d8d82b936a01e2535924ff024 (diff)
Revert "Reenable builds with local clojure.jar"
This reverts commit 4e8696e773b7b1b121bab2e56d1fa233a2a28957. Attempted fix doesn't work.
-rw-r--r--README.txt5
-rw-r--r--pom.xml20
2 files changed, 4 insertions, 21 deletions
diff --git a/README.txt b/README.txt
index 88aedd72..176c871c 100644
--- a/README.txt
+++ b/README.txt
@@ -68,9 +68,10 @@ to the mvn command line.
If you want to compile/build with a customized clojure.jar file, use
the following command:
- mvn package -Dclojure.jar=/path/to/clojure.jar
+ mvn -Denv=local -Dclojure.jar=/path/to/clojure.jar package
-The /path/to/clojure.jar MUST be an absolute path.
+The /path/to/clojure.jar MUST be an absolute path. It defaults to
+${current-dir}/../clojure/clojure.jar if you do not specify it.
diff --git a/pom.xml b/pom.xml
index 51cd2b43..f85e6fc7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,6 +5,7 @@
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>
@@ -50,25 +51,6 @@
</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>