Permalink
Browse files

Replace .../resources/libs.clj with ci_data.clj

  • Loading branch information...
stuartsierra committed Sep 30, 2011
1 parent 43ebdaf commit 2a875b717ff4dafe83d9bed3929a564569387388
Showing with 103 additions and 79 deletions.
  1. +93 −0 ci_data.clj
  2. +10 −31 generator/src/main/clojure/clojure/build/ci/generator.clj
  3. +0 −48 generator/src/main/resources/libs.clj
View
@@ -0,0 +1,93 @@
+;;; ci_data.clj
+
+;; This is the configuration file for clojure.build.ci.generator.
+
+{
+ ;; The versions of Clojure against which we will test
+ ;; contrib libraries
+ :clojure-versions
+ ["1.2.0" "1.2.1" "1.3.0" "LATEST"]
+
+ ;; Installed Java versions. If :enabled is true we will build Clojure
+ ;; and contrib libraries with that Java.
+ :jdks
+ [{:name "Sun JDK 1.5"
+ :enabled true
+ :home "/var/lib/hudson/tools/Sun_JDK_1.5.0_22"}
+ {:name "Sun JDK 1.6"
+ :enabled true
+ :home "/usr/java/jdk1.6.0_20"}
+ {:name "Oracle JDK 1.7"
+ :enabled true
+ :home "/usr/java/jdk1.7.0-b147"}
+ {:name "IBM JDK 1.5"
+ :enabled true
+ :home "/usr/java/ibm-java2-x86_64-50"}
+ {:name "IBM JDK 1.6"
+ :enabled true
+ :home "/usr/java/ibm-java-x86_64-sdk-6.0-9.2"}
+ {:name "IBM JDK 1.7"
+ :enabled true
+ :home "/usr/java/ibm-java-x86_64-sdk-7.0-0.0"}
+ {:name "OpenJDK 1.6"
+ :enabled true
+ :home "/usr/java/java-1.6.0-openjdk-1.6.0.0.x86_64"}
+ ;; Some Clojure language tests fail on JRockit
+ {:name "JRockit 1.5"
+ :enabled false
+ :home "/usr/java/jrockit-jdk1.5.0_28-R28.1.3-4.0.1"}
+ {:name "JRockit 1.6"
+ :enabled false
+ :home "/usr/java/jrockit-jdk1.6.0_24-R28.1.3-4.0.1"}]
+
+ ;; The contrib libraries. :owners are Hudson usernames of people with
+ ;; permission to build and release each library.
+ :contribs
+ [{:name "algo.monads"
+ :owners []}
+ {:name "core.incubator"
+ :owners []}
+ {:name "core.logic"
+ :owners ["davidnolen"]}
+ {:name "core.match"
+ :owners ["davidnolen"]}
+ {:name "core.unify"
+ :owners []}
+ {:name "data.csv"
+ :owners []}
+ {:name "data.finger-tree"
+ :owners ["Chouser"]}
+ {:name "data.json"
+ :owners ["stuartsierra"]}
+ {:name "data.priority-map"
+ :owners ["markengelberg" "seancorfield"]}
+ {:name "data.xml"
+ :owners []}
+ {:name "data.zip"
+ :owners []}
+ {:name "java.classpath"
+ :owners []}
+ {:name "java.data"
+ :owners ["cosminstejerean"]}
+ {:name "java.jdbc"
+ :owners ["seancorfield"]}
+ {:name "java.jmx"
+ :owners []}
+ {:name "math.combinatorics"
+ :owners ["markengelberg" "seancorfield"]}
+ {:name "math.numeric-tower"
+ :owners ["markengelberg" "seancorfield"]}
+ {:name "test.generative"
+ :owners []}
+ {:name "tools.cli"
+ :owners ["garethjones"]}
+ {:name "tools.logging"
+ :owners []}
+ {:name "tools.macro"
+ :owners []}
+ {:name "tools.namespace"
+ :owners []}
+ {:name "tools.nrepl"
+ :owners []}
+ {:name "tools.trace"
+ :owners ["lucprefontaine"]}]}
@@ -2,6 +2,12 @@
(:require [clojure.java.io :as io])
(:import (org.stringtemplate.v4 ST)))
+(defn input-data-url [] (io/resource "ci_data.clj"))
+
+(defn input-data []
+ (with-open [r (java.io.PushbackReader. (io/reader (input-data-url)))]
+ (read r)))
+
(defn ci-root [] (io/file "hudson"))
(defn jobs-root [] (io/file (ci-root) "jobs"))
@@ -12,49 +18,22 @@
(defn ci-config-file [] (io/file (ci-root) "config.xml"))
-(defn jdks []
- [{:name "Sun JDK 1.5"
- :enabled true
- :home "/var/lib/hudson/tools/Sun_JDK_1.5.0_22"}
- {:name "Sun JDK 1.6"
- :enabled true
- :home "/usr/java/jdk1.6.0_20"}
- {:name "Oracle JDK 1.7"
- :enabled true
- :home "/usr/java/jdk1.7.0-b147"}
- {:name "IBM JDK 1.5"
- :enabled true
- :home "/usr/java/ibm-java2-x86_64-50"}
- {:name "IBM JDK 1.7"
- :enabled false
- :home "/usr/java/ibm-java-x86_64-sdk-7.0-0.0"}
- {:name "OpenJDK 1.6"
- :enabled true
- :home "/usr/java/java-1.6.0-openjdk-1.6.0.0.x86_64"}
- {:name "JRockit 1.5"
- :enabled false
- :home "/usr/java/jrockit-jdk1.5.0_28-R28.1.3-4.0.1"}
- {:name "JRockit 1.6"
- :enabled false
- :home "/usr/java/jrockit-jdk1.6.0_24-R28.1.3-4.0.1"}])
+(defn jdks [] (:jdks (input-data)))
(defn active-jdks []
(filter :enabled (jdks)))
(defn jdk-names []
(map :name (active-jdks)))
-(defn default-jdk [] (first (jdk-names)))
+(defn default-jdk []
+ (first (jdk-names)))
(defn active-clojures []
["1.2.0" "1.2.1" "1.3.0"])
-(defn contrib-libs-url []
- (io/resource "libs.clj"))
-
(defn contrib-libs []
- (with-open [r (java.io.PushbackReader. (io/reader (contrib-libs-url)))]
- (read r)))
+ (:contribs (input-data)))
(defn template [name]
(ST. (slurp (io/resource (str "templates/" name ".st")))
@@ -1,48 +0,0 @@
-[{:name "algo.monads"
- :owners []}
- {:name "core.incubator"
- :owners []}
- {:name "core.logic"
- :owners ["davidnolen"]}
- {:name "core.match"
- :owners ["davidnolen"]}
- {:name "core.unify"
- :owners []}
- {:name "data.csv"
- :owners []}
- {:name "data.finger-tree"
- :owners ["Chouser"]}
- {:name "data.json"
- :owners ["stuartsierra"]}
- {:name "data.priority-map"
- :owners ["markengelberg" "seancorfield"]}
- {:name "data.xml"
- :owners []}
- {:name "data.zip"
- :owners []}
- {:name "java.classpath"
- :owners []}
- {:name "java.data"
- :owners ["cosminstejerean"]}
- {:name "java.jdbc"
- :owners ["seancorfield"]}
- {:name "java.jmx"
- :owners []}
- {:name "math.combinatorics"
- :owners ["markengelberg" "seancorfield"]}
- {:name "math.numeric-tower"
- :owners ["markengelberg" "seancorfield"]}
- {:name "test.generative"
- :owners []}
- {:name "tools.cli"
- :owners ["garethjones"]}
- {:name "tools.logging"
- :owners []}
- {:name "tools.macro"
- :owners []}
- {:name "tools.namespace"
- :owners []}
- {:name "tools.nrepl"
- :owners []}
- {:name "tools.trace"
- :owners ["lucprefontaine"]}]

0 comments on commit 2a875b7

Please sign in to comment.