Skip to content
Browse files

Set project version 1.3.0

- fixes for lein2
- fixes for action on failure
  • Loading branch information...
1 parent 5b66f72 commit a8ce265f5a3b2ee643b9093950bad68cb1e7fe1a @mlimotte mlimotte committed Feb 19, 2013
View
2 bin/lemur
@@ -41,7 +41,7 @@ fi
if [ -f $BASE/lemur-*.jar ]; then
LEMUR_CP=`echo $BASE/lemur-*.jar`
else
- LEMUR_CP=$BASE/src/main/clj:$BASE/classes:$BASE/resources
+ LEMUR_CP=$BASE/src/main/clj:$BASE/target/classes:$BASE/resources
fi
DEPS_CP=$BASE/lib/*
View
17 build.xml
@@ -3,23 +3,27 @@
<macrodef name="lein">
<element name="lein-params" implicit="true"/>
<sequential>
- <exec executable="lein" failonerror="yes"
+ <exec executable="lein2" failonerror="yes"
dir="${basedir}">
<env key="JVM_OPTS" value="-Droot.logger=error,file,stdout"/>
<lein-params/>
</exec>
</sequential>
</macrodef>
+ <target name="libdir">
+ <lein><arg value="libdir"/></lein>
+ </target>
+
<target name="jar">
<lein><arg value="jar"/></lein>
</target>
- <target name="package" depends="jar">
+ <target name="package" depends="libdir,jar">
<exec logError="true" executable="bash" outputproperty="jar-name">
<arg value="-c"/>
- <arg value="ls lemur-*.jar"/>
+ <arg value="ls target/lemur-*.jar"/>
</exec>
<fail message="Could not find lemur jar">
@@ -29,7 +33,7 @@
<exec logError="true" executable="sed" failonerror="true" inputstring="${jar-name}" outputproperty="jar-version">
<arg value="-e"/>
- <arg value="s/lemur-\(.*\).jar/\1/"/>
+ <arg value="s/.*lemur-\(.*\).jar/\1/"/>
</exec>
<echo message="jar ${jar-version}"/>
@@ -39,11 +43,14 @@
prefix="/lemur-${jar-version}">
<include name="README.md"/>
<include name="project.clj"/>
- <include name="lemur-*.jar"/>
<include name="lib/*.jar"/>
<include name="src/"/>
<include name="examples/"/>
</tarfileset>
+ <tarfileset dir="${basedir}/target"
+ prefix="/lemur-${jar-version}">
+ <include name="lemur-*.jar"/>
+ </tarfileset>
<tarfileset dir="${basedir}"
filemode="755"
prefix="/lemur-${jar-version}">
View
18 project.clj
@@ -32,26 +32,24 @@
; Other
[log4j/log4j "1.2.16"]]
- :dev-dependencies [[robert/hooke "1.1.2"] ;for leiningen test-selectors
- [org.clojure/tools.trace "0.7.1"]
- [com.offbytwo.iclojure/iclojure "1.1.0"]
- [clojure-source "1.3.0"]
- [org.clojure/tools.trace "0.7.3"]]
+ :plugins [[lein-libdir "0.1.0"]]
+ :libdir-path "lib"
:profiles {:dev {:plugins [[lein-midje "2.0.4"]]
- :dependencies [[midje "1.4.0"]]}}
+ :dependencies [[midje "1.4.0"]
+ [org.clojure/tools.trace "0.7.3"]
+ [clojure-source "1.3.0"]]}}
+
:repl-init lemur.repl
:main ^:skip-aot lemur.repl
:min-lein-version "2.0.0"
:run-aliases {:lemur lemur.core}
- ; Launch irepl:
- ;java -cp lib/*:lib/dev/* com.offbytwo.iclojure.Main
-
:test-selectors {:default (fn [v] (not (or (:integration v) (:manual v))))
:integration :integration
:manual :manual
:all (fn [v] (not (:manual v)))}
- :aot [lemur.core])
+ :aot [lemur.core]
+ )
View
1 src/main/clj/com/climate/services/aws/common.clj
@@ -5,7 +5,6 @@
[com.climate.shell :as sh]
[clojure.data.json :as json]
[clojure.tools.logging :as log]
- [clojure.tools.trace :as trace]
[clojure.java.io :as io])
(:import
java.io.IOException
View
3 src/main/clj/com/climate/services/aws/emr.clj
@@ -247,7 +247,8 @@
(.setProperties (kv-props properties))))]
(.setActionOnFailure sc (str (or action-on-failure
(and alive? ActionOnFailure/CANCEL_AND_WAIT)
- ActionOnFailure/TERMINATE_JOB_FLOW)))))
+ ActionOnFailure/TERMINATE_JOB_FLOW)))
+ sc))
(defn add-steps
"Add a step to a running jobflow. Steps is a seq of StepConfig objects.
View
1 src/main/clj/lemur/core.clj
@@ -959,4 +959,3 @@ calls launch - take action (upload files, start cluster, etc)
(quit :msg (slurp (io/resource "help.txt"))))
(quit :msg "Unrecognized lemur command" :cmdspec (context-get :command-spec) :exit-code 1))))
(quit))
-

0 comments on commit a8ce265

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