Permalink
Browse files

Added many more contribs to 1.3 complete version.

Cleaned up the way that version numbers are managed.
  • Loading branch information...
1 parent c6d1648 commit 42a9042394ed80b52574aae3c7ed4e9148390841 @russolsen committed Oct 14, 2011
Showing with 90 additions and 60 deletions.
  1. +19 −40 build.xml
  2. +71 −20 ivy.xml
View
59 build.xml
@@ -3,10 +3,7 @@
<property environment="env"/>
- <property name="clojure-version" value="1.1.0" />
- <property name="clojure-contrib-version" value="1.1.0" />
- <property name="jline-version" value="0.9.94" />
-
+ <property name="dejour-version" value="d"/>
<target name="install-ivy" description="install ivy">
<path id="ivy.lib.path">
@@ -17,25 +14,6 @@
classpathref="ivy.lib.path" />
</target>
-<!--
- <conf name="jline"
- description="Just just jline"/>
-
- <conf name="minimal-1.2.1c"
- description="Just clojure 1.2, no contrib libraries"/>
-
- <conf name="complete-1.2.1c"
- extends="minimal-1.2.1c"
- description="Clojure 1.2, plus contrib libraries"/>
-
- <conf name="minimal-1.3.0c"
- description="Just clojure, no contrib libraries"/>
-
- <conf name="complete-1.3.0c"
- extends="minimal-1.3.0c"
- description="Clojure plus all the contribs"/>
--->
-
<property name="pattern-with-rev"
value="${basedir}/downloads/[conf]/[artifact]-[revision].[ext]"/>
@@ -52,60 +30,61 @@
</target>
<macrodef name="create-dejour-release">
- <attribute name="ivy-conf-name"/>
- <attribute name="name" default="dejour-@{ivy-conf-name}"/>
+ <attribute name="name"/>
+ <attribute name="rel-name"
+ default="dejour-@{name}${dejour-version}"/>
<sequential>
- <mkdir dir="build/@{name}/lib"/>
- <copy todir="build/@{name}">
+ <mkdir dir="build/@{rel-name}/lib"/>
+ <copy todir="build/@{rel-name}">
<fileset dir="${basedir}">
<include name="bin/**/*"/>
<include name="examples/**/*"/>
</fileset>
</copy>
- <copy tofile="build/@{name}/syslib/jline.jar" flatten="true">
+ <copy tofile="build/@{rel-name}/syslib/jline.jar" flatten="true">
<fileset dir="${basedir}">
<include name="downloads/jline/jline*.jar"/>
</fileset>
</copy>
- <copy todir="build/@{name}/lib" flatten="true">
+ <copy todir="build/@{rel-name}/lib" flatten="true">
<fileset dir="${basedir}">
- <include name="downloads/@{ivy-conf-name}/**/*"/>
+ <include name="downloads/@{name}/**/*"/>
</fileset>
</copy>
<chmod perm="ugo+x">
- <fileset dir="build/@{name}"/>
+ <fileset dir="build/@{rel-name}"/>
</chmod>
- <zip destfile="build/@{name}.zip"
+ <zip destfile="build/@{rel-name}.zip"
basedir="build/"
includes="@{name}/**/*"/>
- <tar destfile="build/@{name}.tar">
+ <tar destfile="build/@{rel-name}.tar">
<tarfileset dir="build" filemode="755">
<include name="@{name}/bin/**/*"/>
</tarfileset>
<tarfileset dir="build">
- <include name="@{name}/**/*"/>
- <exclude name="@{name}/bin/**/*"/>
+ <include name="@{rel-name}/**/*"/>
+ <exclude name="@{rel-name}/bin/**/*"/>
</tarfileset>
</tar> </sequential>
</macrodef>
<target name="all" depends="init" >
- <create-dejour-release ivy-conf-name="minimal-1.2.1c"/>
+ <create-dejour-release name="minimal-1.2.1"/>
- <create-dejour-release ivy-conf-name="complete-1.2.1c"/>
+ <create-dejour-release name="complete-1.2.1"/>
- <create-dejour-release ivy-conf-name="minimal-1.3.0c"/>
+ <create-dejour-release name="minimal-1.3.0"/>
- <create-dejour-release ivy-conf-name="complete-1.3.0c"/>
+ <create-dejour-release name="complete-1.3.0"/>
</target>
<target name="everything" depends="clj.exe, all"/>
@@ -129,7 +108,7 @@
<target name="test">
- <test-dejour-release ivy-conf-name="complete-1.2.1c"/>
+ <test-dejour-release ivy-conf-name="complete-1.2.1${dejour-version}"/>
</target>
<target name="clean">
View
91 ivy.xml
@@ -5,58 +5,109 @@
<conf name="jline"
description="Just just jline"/>
- <conf name="minimal-1.2.1c"
+ <conf name="minimal-1.2.1"
description="Just clojure 1.2, no contrib libraries"/>
- <conf name="complete-1.2.1c"
- extends="minimal-1.2.1c"
+ <conf name="complete-1.2.1"
+ extends="minimal-1.2.1"
description="Clojure 1.2, plus contrib libraries"/>
- <conf name="minimal-1.3.0c"
+ <conf name="minimal-1.3.0"
description="Just clojure, no contrib libraries"/>
- <conf name="complete-1.3.0c"
- extends="minimal-1.3.0c"
+ <conf name="complete-1.3.0"
+ extends="minimal-1.3.0"
description="Clojure plus all the contribs"/>
</configurations>
<dependencies>
+
+ <!-- 1.2.1 and contribs -->
+
<dependency org="jline" name="jline" rev="0.9.92"
conf="jline->default"/>
<dependency org="org.clojure" name="clojure" rev="1.2.1"
- conf="minimal-1.2.1c->default"/>
+ conf="minimal-1.2.1->default"/>
<dependency org="org.clojure" name="clojure-contrib" rev="1.2.0"
- conf="complete-1.2.1c->default"/>
+ conf="complete-1.2.1->default"/>
- <dependency org="org.clojure" name="clojure" rev="1.3.0"
- conf="minimal-1.3.0c->default"/>
- <dependency org="org.clojure" name="tools.nrepl" rev="0.0.5"
- conf="complete-1.3.0c->default"/>
+ <!-- 1.3 and contribs -->
+
+ <dependency org="org.clojure" name="clojure" rev="1.3.0"
+ conf="minimal-1.3.0->default"/>
<dependency org="org.clojure" name="algo.monads" rev="0.1.0"
- conf="complete-1.3.0c->default"/>
+ conf="complete-1.3.0->default"/>
<dependency org="org.clojure" name="core.incubator" rev="0.1.0"
- conf="complete-1.3.0c->default"/>
+ conf="complete-1.3.0->default"/>
<dependency org="org.clojure" name="core.logic" rev="0.6.3"
- conf="complete-1.3.0c->default"/>
+ conf="complete-1.3.0->default"/>
+
+ <dependency org="org.clojure" name="core.match" rev="0.2.0-alpha5"
+ conf="complete-1.3.0->default"/>
+
+ <dependency org="org.clojure" name="core.unify" rev="0.5.1"
+ conf="complete-1.3.0->default"/>
+
+ <dependency org="org.clojure" name="data.csv" rev="0.1.0"
+ conf="complete-1.3.0->default"/>
<dependency org="org.clojure" name="data.finger-tree" rev="0.0.1"
- conf="complete-1.3.0c->default"/>
+ conf="complete-1.3.0->default"/>
<dependency org="org.clojure" name="data.json" rev="0.1.1"
- conf="complete-1.3.0c->default"/>
+ conf="complete-1.3.0->default"/>
+
+ <dependency org="org.clojure" name="data.priority-map" rev="0.0.1"
+ conf="complete-1.3.0->default"/>
+
+ <dependency org="org.clojure" name="data.zip" rev="0.1.0"
+ conf="complete-1.3.0->default"/>
+
+ <dependency org="org.clojure" name="java.classpath" rev="0.2.0"
+ conf="complete-1.3.0->default"/>
+
+ <dependency org="org.clojure" name="tools.nrepl" rev="0.0.5"
+ conf="complete-1.3.0->default"/>
<dependency org="org.clojure" name="java.classpath" rev="0.1.0"
- conf="complete-1.3.0c->default"/>
+ conf="complete-1.3.0->default"/>
<dependency org="org.clojure" name="java.jdbc" rev="0.0.6"
- conf="complete-1.3.0c->default"/>
+ conf="complete-1.3.0->default"/>
+
+ <dependency org="org.clojure" name="java.jmx" rev="0.1"
+ conf="complete-1.3.0->default"/>
+
+ <dependency org="org.clojure" name="math.combinatorics" rev="0.0.1"
+ conf="complete-1.3.0->default"/>
+
+ <dependency org="org.clojure" name="test.generative" rev="0.1.3"
+ conf="complete-1.3.0->default"/>
+
+ <dependency org="org.clojure" name="tools.cli" rev="0.1.0"
+ conf="complete-1.3.0->default"/>
+
+ <dependency org="org.clojure" name="tools.logging" rev="0.2.3"
+ conf="complete-1.3.0->default"/>
+
+ <dependency org="org.clojure" name="tools.macro" rev="0.1.1"
+ conf="complete-1.3.0->default"/>
+
+ <dependency org="org.clojure" name="tools.namespace" rev="0.1.1"
+ conf="complete-1.3.0->default"/>
+
+ <dependency org="org.clojure" name="tools.nrepl" rev="0.0.5"
+ conf="complete-1.3.0->default"/>
+
+ <dependency org="org.clojure" name="tools.trace" rev="0.7.1"
+ conf="complete-1.3.0->default"/>
- </dependencies>
+ </dependencies>
</ivy-module>

0 comments on commit 42a9042

Please sign in to comment.