Skip to content

added cyg-boot option in makefile and small change to allow repositories with username/pwd #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

added cyg-boot option in makefile and small change to allow repositories with username/pwd #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23746f5
added cyg-boot option to use boot with cygwin
bergm May 12, 2014
77636ad
Merge branch 'master' of https://github.com/tailrecursion/boot
bergm May 12, 2014
f9f4eab
little generalization to make repositories with username/pwd work, e.…
bergm May 13, 2014
481578e
ignore Intellij Idea project files
bergm Jul 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ pom.xml.asc
/boot
.nrepl-port
/build.boot
*.iml
9 changes: 9 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 ***"
6 changes: 3 additions & 3 deletions boot-classloader/src/tailrecursion/boot_classloader.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
3 changes: 3 additions & 0 deletions boot.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@echo off

java %JVM_OPTS% -jar D:\git-repos\github\bergm\boot\target\boot-1.0.3-standalone.jar "%*"
3 changes: 2 additions & 1 deletion src/tailrecursion/boot/loader.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down