From 19a960e424b633deb080fdd91b2d08643992197e Mon Sep 17 00:00:00 2001 From: Ryan Senior Date: Fri, 3 Feb 2012 12:15:40 -0600 Subject: [PATCH 1/2] Switched data.xml to use JDK 1.6 --- ci_data.clj | 3 ++- .../main/clojure/clojure/build/ci/generator.clj | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ci_data.clj b/ci_data.clj index efb2a62..6b516db 100644 --- a/ci_data.clj +++ b/ci_data.clj @@ -70,7 +70,8 @@ {:name "data.priority-map" :owners ["markengelberg" "seancorfield"]} {:name "data.xml" - :owners []} + :owners [] + :jdk "Sun JDK 1.6"} {:name "data.zip" :owners []} {:name "java.classpath" diff --git a/generator/src/main/clojure/clojure/build/ci/generator.clj b/generator/src/main/clojure/clojure/build/ci/generator.clj index 4972645..7115e0e 100644 --- a/generator/src/main/clojure/clojure/build/ci/generator.clj +++ b/generator/src/main/clojure/clojure/build/ci/generator.clj @@ -62,12 +62,12 @@ (interleave (map :name (contrib-libs)) (map #(str (:name %) "-test-matrix") (contrib-libs)))) -(defn release-job-defaults [] - {:jdk (default-jdk)}) +(defn release-job-defaults [{:keys (jdk)}] + {:jdk (or jdk (default-jdk))}) (defn release-job-config [lib] (render-template "release_job" - (merge (release-job-defaults) lib))) + (merge (release-job-defaults lib) lib))) (defn matrix-job-defaults [] {:jdks (jdk-names) -- 1.7.1 From 8ff1ac83d6b5f9fcdc728a1cd3db557d6b696bd0 Mon Sep 17 00:00:00 2001 From: Ryan Senior Date: Fri, 3 Feb 2012 15:04:56 -0600 Subject: [PATCH 2/2] Added a version (independent of JDK vendor), defaults to version 1.5 --- ci_data.clj | 29 +++++++++++++------- .../main/clojure/clojure/build/ci/generator.clj | 10 ++++--- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/ci_data.clj b/ci_data.clj index 6b516db..796bedd 100644 --- a/ci_data.clj +++ b/ci_data.clj @@ -13,32 +13,41 @@ :jdks [{:name "Sun JDK 1.5" :enabled true - :home "/var/lib/hudson/tools/Sun_JDK_1.5.0_22"} + :home "/var/lib/hudson/tools/Sun_JDK_1.5.0_22" + :jdk-version "1.5"} {:name "Sun JDK 1.6" :enabled true - :home "/usr/java/jdk1.6.0_20"} + :home "/usr/java/jdk1.6.0_20" + :jdk-version "1.6"} {:name "Oracle JDK 1.7" :enabled true - :home "/usr/java/jdk1.7.0-b147"} + :home "/usr/java/jdk1.7.0-b147" + :jdk-version "1.7"} {:name "IBM JDK 1.5" :enabled true - :home "/usr/java/ibm-java2-x86_64-50"} + :home "/usr/java/ibm-java2-x86_64-50" + :jdk-version "1.5"} {:name "IBM JDK 1.6" :enabled true - :home "/usr/java/ibm-java-x86_64-sdk-6.0-9.2"} + :home "/usr/java/ibm-java-x86_64-sdk-6.0-9.2" + :jdk-version "1.6"} {:name "IBM JDK 1.7" :enabled false - :home "/usr/java/ibm-java-x86_64-sdk-7.0-0.0"} + :home "/usr/java/ibm-java-x86_64-sdk-7.0-0.0" + :jdk-version "1.7"} {:name "OpenJDK 1.6" :enabled true - :home "/usr/java/java-1.6.0-openjdk-1.6.0.0.x86_64"} + :home "/usr/java/java-1.6.0-openjdk-1.6.0.0.x86_64" + :jdk-version "1.6"} ;; 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"} + :home "/usr/java/jrockit-jdk1.5.0_28-R28.1.3-4.0.1" + :jdk-version "1.5"} {:name "JRockit 1.6" :enabled false - :home "/usr/java/jrockit-jdk1.6.0_24-R28.1.3-4.0.1"}] + :home "/usr/java/jrockit-jdk1.6.0_24-R28.1.3-4.0.1" + :jdk-version "1.6"}] ;; The contrib libraries. :owners are Hudson usernames of people with ;; permission to build and release each library. @@ -71,7 +80,7 @@ :owners ["markengelberg" "seancorfield"]} {:name "data.xml" :owners [] - :jdk "Sun JDK 1.6"} + :jdk-version "1.6"} {:name "data.zip" :owners []} {:name "java.classpath" diff --git a/generator/src/main/clojure/clojure/build/ci/generator.clj b/generator/src/main/clojure/clojure/build/ci/generator.clj index 7115e0e..939bcca 100644 --- a/generator/src/main/clojure/clojure/build/ci/generator.clj +++ b/generator/src/main/clojure/clojure/build/ci/generator.clj @@ -26,8 +26,10 @@ (defn jdk-names [] (map :name (active-jdks))) -(defn default-jdk [] - (first (jdk-names))) +(defn default-jdk [jdk-version] + (first (filter #(= (or jdk-version "1.5") + (:jdk-version %)) + (active-jdks)))) (defn active-clojures [] (:clojure-versions (input-data))) @@ -62,8 +64,8 @@ (interleave (map :name (contrib-libs)) (map #(str (:name %) "-test-matrix") (contrib-libs)))) -(defn release-job-defaults [{:keys (jdk)}] - {:jdk (or jdk (default-jdk))}) +(defn release-job-defaults [{:keys (jdk-version)}] + {:jdk (:name (default-jdk jdk-version))}) (defn release-job-config [lib] (render-template "release_job" -- 1.7.1