diff --git a/desktop/project.clj b/desktop/project.clj index 98ce50f5..fc588bd4 100644 --- a/desktop/project.clj +++ b/desktop/project.clj @@ -9,7 +9,7 @@ [com.badlogicgames.gdx/gdx-backend-lwjgl "1.5.3"] [com.badlogicgames.gdx/gdx-platform "1.5.3" :classifier "natives-desktop"] [org.clojure/clojure "1.6.0"] - [org.clojure/tools.nrepl "0.2.7"] + [play-clj "0.4.5-BRYCE"] [org.clojure/data.priority-map "0.0.5"] [org.clojure/core.async "0.1.338.0-5c5012-alpha"]] @@ -21,7 +21,9 @@ :profiles { :dev { :source-paths ["src" "src-common" "src-dev"] + :jvm-opts ["-Duse-repl=true"] :dependencies [[com.badlogicgames.gdx/gdx-tools "1.5.3"] + [org.clojure/tools.nrepl "0.2.7"] [slamhound "1.5.5"] [org.clojure/data.csv "0.1.3"]] diff --git a/desktop/src/advent/core/desktop_launcher.clj b/desktop/src/advent/core/desktop_launcher.clj index 02ef2609..f2709318 100644 --- a/desktop/src/advent/core/desktop_launcher.clj +++ b/desktop/src/advent/core/desktop_launcher.clj @@ -1,7 +1,7 @@ (ns advent.core.desktop-launcher (:require [advent.core :refer :all] [advent.utils :as utils] - #_[clojure.tools.nrepl.server]) + ) (:import [com.badlogic.gdx.backends.lwjgl LwjglApplication LwjglApplicationConfiguration] [org.lwjgl.input Keyboard] [com.badlogic.gdx Gdx]) @@ -9,18 +9,22 @@ + + (defn -main [& [port]] - #_(try - - (when port (let [{port :port} (clojure.tools.nrepl.server/start-server :port (Integer/parseInt port))] - (doseq [port-file ["target/repl-port" ".nrepl-port"]] - (-> port-file - java.io.File. - (doto .deleteOnExit) - (spit port))) - (println "Started nREPL server on port" port))) - (catch Exception e)) + (when (System/getProperty "use-repl") + (eval `(require 'clojure.tools.nrepl.server)) + (eval `(try + + (when ~port (let [{port# :port} (clojure.tools.nrepl.server/start-server :port (Integer/parseInt ~port))] + (doseq [port-file# ["target/repl-port" ".nrepl-port"]] + (-> port-file# + java.io.File. + (doto .deleteOnExit) + (spit port#))) + (println "Started nREPL server on port" port#))) + (catch Exception e#)))) (let [cfg (LwjglApplicationConfiguration.)] (if false