Skip to content

Commit

Permalink
Revert "Revert loader--build executables from boot.jar"
Browse files Browse the repository at this point in the history
This reverts commit dd4facb.
  • Loading branch information
micha committed Oct 27, 2015
1 parent dd4facb commit 6450c27
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ $(corejar): $(verfile) boot/core/project.clj $(shell find boot/core/src)
$(baseuber): boot/base/pom.xml $(shell find boot/base/src/main)
(cd boot/base && mvn -q assembly:assembly -DdescriptorId=jar-with-dependencies)

$(bootbin): head.sh $(baseuber)
$(bootbin): head.sh $(loaderjar)
mkdir -p bin
cat $^ > $@
chmod 755 $@
Expand All @@ -84,7 +84,7 @@ $(bootbin): head.sh $(baseuber)
launch4j-config.xml: launch4j-config.in.xml $(verfile)
sed -e "s@__VERSION__@`cat $(verfile) |sed 's/.*=//'`@" launch4j-config.in.xml > launch4j-config.xml;

$(bootexe): $(baseuber) launch4j-config.xml
$(bootexe): $(loaderjar) launch4j-config.xml
@if [ -z $$RUNNING_IN_CI ] && which launch4j; then \
launch4j launch4j-config.xml; \
echo -e "\033[0;32m<< Created boot executable: $(bootexe) >>\033[0m"; \
Expand Down
4 changes: 2 additions & 2 deletions launch4j-config.in.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<launch4jConfig>
<headerType>console</headerType>
<outfile>bin/boot.exe</outfile>
<jar>boot/base/target/base-__VERSION__-jar-with-dependencies.jar</jar>
<jar>boot/loader/target/loader.jar</jar>
<classPath>
<mainClass>boot.App</mainClass>
<mainClass>boot.Loader</mainClass>
</classPath>
<jre>
<path></path>
Expand Down

0 comments on commit 6450c27

Please sign in to comment.