diff --git a/.gitignore b/.gitignore index ab2874f..96c93a0 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ pom.xml.asc /boot .nrepl-port /build.boot +*.iml diff --git a/Makefile b/Makefile index 7b0bd82..3f20364 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,7 @@ help: @echo @echo 'Targets:' @echo ' boot Create executable boot jar file.' + @echo ' cyg-boot Create executable boot jar file for use under cygwin.' @echo clean: @@ -26,3 +27,11 @@ boot: build cat target/boot*-standalone.jar >> boot chmod 0755 boot @echo "*** Done. Created boot executable: ./boot ***" + +cyg-boot: build + echo '#!/usr/bin/env bash' > boot + echo 'java $$JVM_OPTS -jar $$(cygpath -w $$0) "$$@"' >> boot + echo 'exit' >> boot + cat target/boot*-standalone.jar >> boot + chmod 0755 boot + @echo "*** Done. Created boot executable: ./boot ***" \ No newline at end of file diff --git a/boot-classloader/src/tailrecursion/boot_classloader.clj b/boot-classloader/src/tailrecursion/boot_classloader.clj index 5f92980..ca12931 100644 --- a/boot-classloader/src/tailrecursion/boot_classloader.clj +++ b/boot-classloader/src/tailrecursion/boot_classloader.clj @@ -63,15 +63,15 @@ (let [deps (mapv exclude-clj deps)] (aether/resolve-dependencies :coordinates deps - :repositories (zipmap repos repos) + :repositories repos :transfer-listener transfer-listener :proxy (get-proxy-settings)))) (defn resolve-dependencies! [deps repos] (->> (resolve-dependencies!* deps repos) - kahn/topo-sort - (map (fn [x] {:dep x :jar (.getPath (:file (meta x)))})))) + kahn/topo-sort + (map (fn [x] {:dep x :jar (.getPath (:file (meta x)))})))) (defn glob-match? [pattern path] (.match (AntPathMatcher.) pattern path)) diff --git a/boot.bat b/boot.bat new file mode 100644 index 0000000..b9760cd --- /dev/null +++ b/boot.bat @@ -0,0 +1,3 @@ +@echo off + +java %JVM_OPTS% -jar D:\git-repos\github\bergm\boot\target\boot-1.0.3-standalone.jar "%*" \ No newline at end of file diff --git a/src/tailrecursion/boot/loader.clj b/src/tailrecursion/boot/loader.clj index d3f8e26..b860d19 100644 --- a/src/tailrecursion/boot/loader.clj +++ b/src/tailrecursion/boot/loader.clj @@ -58,7 +58,8 @@ ;; loader ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (def min-core-version "2.0.0") -(def dfl-repos #{"http://clojars.org/repo/" "http://repo1.maven.org/maven2/"}) +(def dfl-repos {"clojars" "http://clojars.org/repo/" + "central" "http://repo1.maven.org/maven2/"}) (def ^:private core-dep (atom nil)) (def ^:private cl2 (atom nil))