Revert "change build to use plain java tools (faster) (#10)"

This reverts commit c5760f9.

README.md

@@ -15,19 +15,14 @@ Boot executable—downloads and runs [Boot](http://boot-clj.com).
 System requirements:
 
 * Java 7
+* Boot
 * Bash shell
 * [launch4j](http://launch4j.sourceforge.net/)
 
 ```
-./build.sh # builds target/boot.sh (Unix) and target/boot.exe (Windows)
+./build.sh # builds bin/boot.sh (Unix) and bin/boot.exe (Windows)
 ```
 
-Running various artifacts:
-
-- `target/Boot.class`: `java -cp target Boot`
-- `target/loader.jar`: `java -jar target/loader.jar`
-- `target/boot.sh`: `./target/boot.sh`
-
 ## License
 
 Copyright © 2015 Alan Dipert and Micha Niskin

boot.properties

@@ -0,0 +1,6 @@
+#https://github.com/boot-clj/boot
+#Sun Nov 15 17:35:18 EST 2015
+BOOT_VERSION=2.7.2
+BOOT_CLOJURE_VERSION=1.7.0
+BOOT_CLOJURE_NAME=org.clojure/clojure
+BOOT_EMIT_TARGET=no

build.sh

@@ -6,41 +6,33 @@ export PATH=${PATH}:launch4j
 VERSION=$(git describe)
 JAVA_VERSION=$(java -version 2>&1 \
   | awk -F '"' '/version/ {print $2}' \
-  | awk -F. '{print $1 "." $2}')
+  |awk -F. '{print $1 "." $2}')
 
 if [ "$JAVA_VERSION" != "1.7" ]; then
   echo "You must build with JDK version 1.7 only." 1>&2
   exit 1
 fi
 
-rm -rf target
-mkdir target
+mkdir -p bin build
 
-echo -e "\033[0;33m<< Version: $VERSION >>\033[0m"; \
-
-
-# Build target/loader.jar which serves as foundation for boot.sh/exe
-
-javac -d target src/Boot.java src/boot/bin/ParentClassLoader.java
-cp -r resources/* target/
-jar cef Boot target/loader.jar -C target/ .
-
-
-# Build boot.sh
-
-cat src/head.sh target/loader.jar > target/boot.sh
-chmod 755 target/boot.sh
-echo -e "\033[0;32m<< Success: bin/boot.sh >>\033[0m"
+if [ ! -e build/boot ]; then
+  wget -O build/boot https://github.com/boot-clj/boot-bin/releases/download/2.4.2/boot.sh
+  chmod 755 build/boot
+fi
 
+echo -e "\033[0;33m<< Version: $VERSION >>\033[0m"; \
 
-# Build boot.exe
+./build/boot -s src -r resources javac jar -m Boot -f loader.jar target
 
 sed -e "s@__VERSION__@$(git describe)@" src/launch4j-config.in.xml > launch4j-config.xml
 
 if which launch4j; then
   launch4j launch4j-config.xml
-  echo -e "\033[0;32m<< Success: target/boot.exe >>\033[0m"; \
+  echo -e "\033[0;32m<< Success: bin/boot.exe >>\033[0m"; \
 else
-  echo -e "\033[0;31m<< Skipped: target/boot.exe (launch4j not found) >>\033[0m"; \
+  echo -e "\033[0;31m<< Skipped: bin/boot.exe (launch4j not found) >>\033[0m"; \
 fi
 
+cat src/head.sh target/loader.jar > bin/boot.sh
+chmod 755 bin/boot.sh
+echo -e "\033[0;32m<< Success: bin/boot.sh >>\033[0m"

src/launch4j-config.in.xml

@@ -1,6 +1,6 @@
 <launch4jConfig>
   <headerType>console</headerType>
-  <outfile>target/boot.exe</outfile>
+  <outfile>bin/boot.exe</outfile>
   <jar>target/loader.jar</jar>
   <classPath>
     <mainClass>Boot</mainClass>