Skip to content
Browse files

Add several more versions of Clojure 1.5 including 1.5-beta12 and 1.5…

…-beta13, and 1.5-RC14 and 1.5-RC15.
  • Loading branch information...
1 parent 5e2fb58 commit 0a5d514b86a8357dc723aca852f5662a319986fa @jafingerhut committed
Showing with 17 additions and 8 deletions.
  1. +15 −6 env.sh
  2. +2 −2 lein-init.sh
View
21 env.sh
@@ -38,13 +38,13 @@ fi
# See also below the definition of ALL_BENCHMARK_CLOJURE_VERSIONS,
# which is a subset of ALL_CLOJURE_VERSIONS
-ALL_CLOJURE_VERSIONS="clj-1.2 clj-1.2.1 clj-1.3-alpha5 clj-1.3-alpha6 clj-1.3-alpha7 clj-1.3-alpha8 clj-1.3-beta1 clj-1.3-beta2 clj-1.3-beta3 clj-1.3 clj-1.4-alpha1 clj-1.4-alpha2 clj-1.4-alpha3 clj-1.4-alpha4 clj-1.4-beta1 clj-1.4-beta2 clj-1.4-beta3 clj-1.4-beta4 clj-1.4-beta5 clj-1.4-beta6 clj-1.4-beta7 clj-1.4 clj-1.5-alpha1 clj-1.5-alpha2 clj-1.5-alpha3 clj-1.5-alpha4 clj-1.5-alpha5 clj-1.5-alpha6 clj-1.5-alpha7 clj-1.5-beta1 clj-1.5-beta2 clj-1.5-RC1 clj-1.5-RC2 clj-1.5-RC3 clj-1.5-RC4 clj-1.5-RC5 clj-1.5-RC6 clj-1.5-beta7 clj-1.5-beta8 clj-1.5-beta9 clj-1.5-beta10 clj-1.5-beta11"
+ALL_CLOJURE_VERSIONS="clj-1.2 clj-1.2.1 clj-1.3-alpha5 clj-1.3-alpha6 clj-1.3-alpha7 clj-1.3-alpha8 clj-1.3-beta1 clj-1.3-beta2 clj-1.3-beta3 clj-1.3 clj-1.4-alpha1 clj-1.4-alpha2 clj-1.4-alpha3 clj-1.4-alpha4 clj-1.4-beta1 clj-1.4-beta2 clj-1.4-beta3 clj-1.4-beta4 clj-1.4-beta5 clj-1.4-beta6 clj-1.4-beta7 clj-1.4 clj-1.5-alpha1 clj-1.5-alpha2 clj-1.5-alpha3 clj-1.5-alpha4 clj-1.5-alpha5 clj-1.5-alpha6 clj-1.5-alpha7 clj-1.5-beta1 clj-1.5-beta2 clj-1.5-RC1 clj-1.5-RC2 clj-1.5-RC3 clj-1.5-RC4 clj-1.5-RC5 clj-1.5-RC6 clj-1.5-beta7 clj-1.5-beta8 clj-1.5-beta9 clj-1.5-beta10 clj-1.5-beta11 clj-1.5-beta12 clj-1.5-beta13 clj-1.5-RC14 clj-1.5-RC15"
-ALL_MAJOR_CLOJURE_VERSIONS="clj-1.2.1 clj-1.3 clj-1.4 clj-1.5-beta11"
+ALL_MAJOR_CLOJURE_VERSIONS="clj-1.2.1 clj-1.3 clj-1.4 clj-1.5-RC15"
show_known_clojure_versions()
{
- 1>&2 echo -n "1.2 1.2.1 1.3-alpha[5-8] 1.3-beta[1-3] 1.3 1.4-alpha[1-5] 1.4-beta[1-7] 1.4.0 1.5-alpha[1-7] clj-1.5-beta[1-2] clj-1.5-RC[1-6] clj-1.5-beta[7-11]"
+ 1>&2 echo -n "1.2 1.2.1 1.3-alpha[5-8] 1.3-beta[1-3] 1.3 1.4-alpha[1-5] 1.4-beta[1-7] 1.4.0 1.5-alpha[1-7] clj-1.5-beta[1-2] clj-1.5-RC[1-6] clj-1.5-beta[7-13] clj-1.5-RC[14-15]"
}
internal_check_clojure_version_spec()
@@ -102,13 +102,13 @@ internal_check_clojure_version_spec()
1.5-beta[1-27-9])
CLJ_VERSION_STR="1.5.0${spec/1.5/}"
;;
- 1.5-beta1[0-1])
+ 1.5-beta1[0-3])
CLJ_VERSION_STR="1.5.0${spec/1.5/}"
;;
1.5.0-beta[1-27-9])
CLJ_VERSION_STR="${spec}"
;;
- 1.5.0-beta1[0-1])
+ 1.5.0-beta1[0-3])
CLJ_VERSION_STR="${spec}"
;;
@@ -118,6 +118,12 @@ internal_check_clojure_version_spec()
1.5.0-RC[1-6])
CLJ_VERSION_STR="${spec}"
;;
+ 1.5-RC1[4-5])
+ CLJ_VERSION_STR="1.5.0${spec/1.5/}"
+ ;;
+ 1.5.0-RC1[4-5])
+ CLJ_VERSION_STR="${spec}"
+ ;;
*)
# Unknown Clojure version
@@ -220,6 +226,9 @@ all_clojure_versions_except()
# except the following versions have been removed so that benchmarking
# runs go faster:
+# Skip 1.5-beta12, 1.5-beta13, and 1.5-RC14 as being too similar to
+# 1.5-RC15.
+
# At least for now, don't use 1.5-RC4 in benchmarks, because my
# cljexprs graph genration stuff would sort it after all of the
# beta's, and the time order of releases has betas after RCs due to
@@ -247,7 +256,7 @@ all_clojure_versions_except()
# 1.4-beta3 is only 1 commit newer than 1.4-beta2, and it is the
# option to remove metadata during compilation.
-ALL_BENCHMARK_CLOJURE_VERSIONS="`all_clojure_versions_except 1.4-beta3 1.4-beta5 1.4-beta7 1.5-alpha6 1.5-alpha7 1.5-RC1 1.5-RC2 1.5-RC3 1.5-RC4 1.5-RC5 1.5-RC6 1.5-beta7 1.5-beta8 1.5-beta9`"
+ALL_BENCHMARK_CLOJURE_VERSIONS="`all_clojure_versions_except 1.4-beta3 1.4-beta5 1.4-beta7 1.5-alpha6 1.5-alpha7 1.5-RC1 1.5-RC2 1.5-RC3 1.5-RC4 1.5-RC5 1.5-RC6 1.5-beta7 1.5-beta8 1.5-beta9 1.5-beta12 1.5-beta13 1.5-RC14`"
all_benchmark_clojure_versions_except()
{
View
4 lein-init.sh
@@ -105,7 +105,7 @@ do
cd ..
done
-for beta in 1 2 7 8 9 10 11
+for beta in 1 2 7 8 9 10 11 12 13
do
v="1.5.0-beta${beta}"
lein1 new clojure-${v}
@@ -115,7 +115,7 @@ do
cd ..
done
-for RC in 1 2 3 4 5 6
+for RC in 1 2 3 4 5 6 14 15
do
lc_v="1.5.0-rc${RC}"
v="1.5.0-RC${RC}"

0 comments on commit 0a5d514

Please sign in to comment.
Something went wrong with that request. Please try again.