Skip to content
This repository was archived by the owner on Jan 25, 2019. It is now read-only.

Commit e9abce7

Browse files
committed
Revert "change build to use plain java tools (faster) (#10)"
This reverts commit c5760f9.
1 parent 2606934 commit e9abce7

File tree

4 files changed

+22
-29
lines changed

4 files changed

+22
-29
lines changed

README.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,14 @@ Boot executable—downloads and runs [Boot](http://boot-clj.com).
1515
System requirements:
1616

1717
* Java 7
18+
* Boot
1819
* Bash shell
1920
* [launch4j](http://launch4j.sourceforge.net/)
2021

2122
```
22-
./build.sh # builds target/boot.sh (Unix) and target/boot.exe (Windows)
23+
./build.sh # builds bin/boot.sh (Unix) and bin/boot.exe (Windows)
2324
```
2425

25-
Running various artifacts:
26-
27-
- `target/Boot.class`: `java -cp target Boot`
28-
- `target/loader.jar`: `java -jar target/loader.jar`
29-
- `target/boot.sh`: `./target/boot.sh`
30-
3126
## License
3227

3328
Copyright © 2015 Alan Dipert and Micha Niskin

boot.properties

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#https://github.com/boot-clj/boot
2+
#Sun Nov 15 17:35:18 EST 2015
3+
BOOT_VERSION=2.7.2
4+
BOOT_CLOJURE_VERSION=1.7.0
5+
BOOT_CLOJURE_NAME=org.clojure/clojure
6+
BOOT_EMIT_TARGET=no

build.sh

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,33 @@ export PATH=${PATH}:launch4j
66
VERSION=$(git describe)
77
JAVA_VERSION=$(java -version 2>&1 \
88
| awk -F '"' '/version/ {print $2}' \
9-
| awk -F. '{print $1 "." $2}')
9+
|awk -F. '{print $1 "." $2}')
1010

1111
if [ "$JAVA_VERSION" != "1.7" ]; then
1212
echo "You must build with JDK version 1.7 only." 1>&2
1313
exit 1
1414
fi
1515

16-
rm -rf target
17-
mkdir target
16+
mkdir -p bin build
1817

19-
echo -e "\033[0;33m<< Version: $VERSION >>\033[0m"; \
20-
21-
22-
# Build target/loader.jar which serves as foundation for boot.sh/exe
23-
24-
javac -d target src/Boot.java src/boot/bin/ParentClassLoader.java
25-
cp -r resources/* target/
26-
jar cef Boot target/loader.jar -C target/ .
27-
28-
29-
# Build boot.sh
30-
31-
cat src/head.sh target/loader.jar > target/boot.sh
32-
chmod 755 target/boot.sh
33-
echo -e "\033[0;32m<< Success: bin/boot.sh >>\033[0m"
18+
if [ ! -e build/boot ]; then
19+
wget -O build/boot https://github.com/boot-clj/boot-bin/releases/download/2.4.2/boot.sh
20+
chmod 755 build/boot
21+
fi
3422

23+
echo -e "\033[0;33m<< Version: $VERSION >>\033[0m"; \
3524

36-
# Build boot.exe
25+
./build/boot -s src -r resources javac jar -m Boot -f loader.jar target
3726

3827
sed -e "s@__VERSION__@$(git describe)@" src/launch4j-config.in.xml > launch4j-config.xml
3928

4029
if which launch4j; then
4130
launch4j launch4j-config.xml
42-
echo -e "\033[0;32m<< Success: target/boot.exe >>\033[0m"; \
31+
echo -e "\033[0;32m<< Success: bin/boot.exe >>\033[0m"; \
4332
else
44-
echo -e "\033[0;31m<< Skipped: target/boot.exe (launch4j not found) >>\033[0m"; \
33+
echo -e "\033[0;31m<< Skipped: bin/boot.exe (launch4j not found) >>\033[0m"; \
4534
fi
4635

36+
cat src/head.sh target/loader.jar > bin/boot.sh
37+
chmod 755 bin/boot.sh
38+
echo -e "\033[0;32m<< Success: bin/boot.sh >>\033[0m"

src/launch4j-config.in.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<launch4jConfig>
22
<headerType>console</headerType>
3-
<outfile>target/boot.exe</outfile>
3+
<outfile>bin/boot.exe</outfile>
44
<jar>target/loader.jar</jar>
55
<classPath>
66
<mainClass>Boot</mainClass>

0 commit comments

Comments
 (0)