summaryrefslogtreecommitdiff
path: root/src/assembly
diff options
context:
space:
mode:
authorStuart Sierra <mail@stuartsierra.com>2010-12-17 17:04:15 -0500
committerStuart Halloway <stu@thinkrelevance.com>2011-01-05 08:12:27 -0500
commit16eef0b2259d3cc0aaa95e7d7b438aeec3cdb197 (patch)
tree8a54aac1b4e7ea9b97a288c082a264fbfdeea8ca /src/assembly
parentc5673086d40f206135b99a37001c80a4016c3877 (diff)
Build and deploy with Maven 2; CLJ-681
* Real pom.xml * Simpler build.xml for local development with Ant * No Clojure plugin; uses AntRun to build Clojure * POM inheritance from Sonatype OSS deployment * Build instructions in README * Automatically builds "slim" and "sources" JARs as before * 'distribution' profile generates a ZIP * version.properties generated by the version in pom.xml * slightly different format * minor changes to clojure.core to handle version.properties * Fix tests that assumed Ant as the test driver * Tweaked run_tests.clj to work against current master
Diffstat (limited to 'src/assembly')
-rw-r--r--src/assembly/distribution.xml49
-rw-r--r--src/assembly/slim.xml32
2 files changed, 81 insertions, 0 deletions
diff --git a/src/assembly/distribution.xml b/src/assembly/distribution.xml
new file mode 100644
index 00000000..410fb0f0
--- /dev/null
+++ b/src/assembly/distribution.xml
@@ -0,0 +1,49 @@
+<assembly>
+ <id>distribution</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>src</directory>
+ <outputDirectory>src</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>doc</directory>
+ <outputDirectory>doc</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>test</directory>
+ <outputDirectory>test</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>/</outputDirectory>
+ <filtered>false</filtered>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ <files>
+ <file>
+ <source>pom.xml</source>
+ </file>
+ <file>
+ <source>build.xml</source>
+ </file>
+ <file>
+ <source>readme.txt</source>
+ <filtered>true</filtered>
+ </file>
+ <file>
+ <source>changes.txt</source>
+ </file>
+ <file>
+ <source>clojure.iml</source>
+ </file>
+ <file>
+ <source>epl-v10.html</source>
+ </file>
+ </files>
+</assembly>
diff --git a/src/assembly/slim.xml b/src/assembly/slim.xml
new file mode 100644
index 00000000..5958439a
--- /dev/null
+++ b/src/assembly/slim.xml
@@ -0,0 +1,32 @@
+<assembly>
+ <id>slim</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/clj</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>src/resources</directory>
+ <outputDirectory>/</outputDirectory>
+ <filtered>true</filtered>
+ </fileSet>
+ <fileSet>
+ <directory>target/classes/clojure/asm</directory>
+ <outputDirectory>clojure/asm</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/classes/clojure/lang</directory>
+ <outputDirectory>clojure/lang</outputDirectory>
+ </fileSet>
+ </fileSets>
+ <files>
+ <file>
+ <source>target/classes/clojure/main.class</source>
+ <outputDirectory>clojure</outputDirectory>
+ </file>
+ </files>
+</assembly>