From 21a8ba7a3bed01008388f842c47054539f83e76a Mon Sep 17 00:00:00 2001
From: Andreas Brenk <mail@andreasbrenk.com>
Date: Tue, 5 Oct 2010 00:53:46 +0200
Subject: Simplify building against a custom Clojure JAR.

Signed-off-by: Andreas Brenk <mail@andreasbrenk.com>
---
 README.txt             | 15 ++-------------
 modules/parent/pom.xml | 39 ++++++++++++++++++++++++++++++++-------
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/README.txt b/README.txt
index b1affe8a..b060706e 100644
--- a/README.txt
+++ b/README.txt
@@ -77,19 +77,8 @@ You can specify -Dclojure.version=VERSION on the command line to select a differ
 
 = Building Against a Custom Clojure JAR =
 
-To build against a customized Clojure JAR, build *Clojure* like this:
-
-1. Modify the Clojure sources with your custom changes
-
-2. Set a custom version number in src/clj/clojure/version.properties
-
-3. Download maven-ant-tasks.jar from http://maven.apache.org/ant-tasks/download.html
-
-4. In the Clojure source directory, run:
-
-    ant -lib /path/to/maven-ant-tasks.jar ci-build
-
-THEN, build clojure-contrib with -Dclojure.version=YOUR_CUSTOM_VERSION
+To build against a customized Clojure JAR, you can specify
+-Dclojure.jar=/absolute/path/to/clojure.jar on the command line.
 
 
 
diff --git a/modules/parent/pom.xml b/modules/parent/pom.xml
index 6c9c6f66..38488a40 100644
--- a/modules/parent/pom.xml
+++ b/modules/parent/pom.xml
@@ -11,13 +11,6 @@
   <version>1.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Clojure Contrib parent module</name>
-  <dependencies>
-    <dependency>
-      <groupId>org.clojure</groupId>
-      <artifactId>clojure</artifactId>
-      <version>${clojure.version}</version>
-    </dependency>
-  </dependencies>
   <build>
     <resources>
       <resource>
@@ -64,6 +57,38 @@
       </plugin>
     </plugins>
   </build>
+  <profiles>
+    <profile>
+      <id>default</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.clojure</groupId>
+          <artifactId>clojure</artifactId>
+          <version>${clojure.version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
+    <profile>
+      <id>custom-clojure</id>
+      <activation>
+        <property>
+          <name>clojure.jar</name>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.clojure</groupId>
+          <artifactId>clojure</artifactId>
+          <version>CUSTOM</version>
+          <scope>system</scope>
+          <systemPath>${clojure.jar}</systemPath>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
   <repositories>
     <repository>
       <id>clojure-snapshots</id>
-- 
cgit v1.2.3-18-g5258