diff options
| author | Rich Hickey <richhickey@gmail.com> | 2009-04-28 14:41:12 +0000 |
|---|---|---|
| committer | Rich Hickey <richhickey@gmail.com> | 2009-04-28 14:41:12 +0000 |
| commit | 0467cd7fef326c65d3a73d5eb49fbf62497cb687 (patch) | |
| tree | bed8d243f97de3613ffed84664ecf00714de1801 | |
| parent | 3548ed6bb5a29b64ff62c5832cdbc01b8efbad93 (diff) | |
copy versioned jars to unversioned on build, patch from
laurent.petit
made :major :minor :incremental parts of *clojure-version* integers
| -rw-r--r-- | build.xml | 6 | ||||
| -rw-r--r-- | src/clj/clojure/core.clj | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -46,6 +46,9 @@ <filter token="clojure-version" value="${clojure.version.label}"/> </filterset> + <property name="clojure_noversion_jar" location="clojure.jar"/> + <property name="slim_noversion_jar" location="clojure-slim.jar"/> + <property name="src_noversion_jar" location="clojure-sources.jar"/> <property name="clojure_jar" location="clojure-${clojure.version.label}.jar"/> <property name="slim_jar" location="clojure-slim-${clojure.version.label}.jar"/> <property name="src_jar" location="clojure-sources-${clojure.version.label}.jar"/> @@ -104,6 +107,7 @@ <attribute name="Class-Path" value="."/> </manifest> </jar> + <copy file="${clojure_jar}" tofile="${clojure_noversion_jar}" /> </target> <target name="clojure-slim" depends="compile-java" @@ -121,6 +125,7 @@ <attribute name="Class-Path" value="."/> </manifest> </jar> + <copy file="${slim_jar}" tofile="${slim_noversion_jar}" /> </target> <target name="clojure-sources" depends="init" @@ -129,6 +134,7 @@ <fileset dir="${cljsrc}" includes="clojure/version.properties"/> </jar> + <copy file="${src_jar}" tofile="${src_noversion_jar}" /> </target> <target name="jar" depends="clojure"/> diff --git a/src/clj/clojure/core.clj b/src/clj/clojure/core.clj index 5e6c20f1..8fee8bcb 100644 --- a/src/clj/clojure/core.clj +++ b/src/clj/clojure/core.clj @@ -4091,9 +4091,9 @@ "clojure/version.properties") properties (doto (new java.util.Properties) (.load version-stream)) prop (fn [k] (.getProperty properties (str "clojure.version." k))) - clojure-version {:major (prop "major") - :minor (prop "minor") - :incremental (prop "incremental") + clojure-version {:major (Integer/valueOf (prop "major")) + :minor (Integer/valueOf (prop "minor")) + :incremental (Integer/valueOf (prop "incremental")) :qualifier (prop "qualifier")}] (def *clojure-version* (if (not (= (prop "interim") "false")) |