Skip to content

Commit

Permalink
Makefile: allow source jar
Browse files Browse the repository at this point in the history
  • Loading branch information
nikiroo committed Jul 4, 2017
1 parent 52321e0 commit bcada5c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
18 changes: 10 additions & 8 deletions Makefile.base
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,16 @@ test: test-resources
clean:
rm -rf bin/
@echo Removing sources taken from libs...
@for lib in libs/*-sources.jar; do \
basename "$$lib"; \
jar tf "$$lib" | while read -r ln; do \
[ -f "src/$$ln" ] && rm "src/$$ln"; \
done; \
jar tf "$$lib" | tac | while read -r ln; do \
[ -d "src/$$ln" ] && rmdir "src/$$ln" 2>/dev/null || true; \
done; \
@for lib in libs/*-sources.jar libs/*-sources.patch.jar; do \
if [ "$$lib" != 'libs/*-sources.jar' -a "$$lib" != 'libs/*-sources.patch.jar' ]; then \
basename "$$lib"; \
jar tf "$$lib" | while read -r ln; do \
[ -f "src/$$ln" ] && rm "src/$$ln"; \
done; \
jar tf "$$lib" | tac | while read -r ln; do \
[ -d "src/$$ln" ] && rmdir "src/$$ln" 2>/dev/null || true; \
done; \
fi \
done

mrproper: mrpropre
Expand Down
2 changes: 1 addition & 1 deletion configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ echo "TEST_PARAMS = $cols $ok $ko" >> Makefile
echo "NAME = jexer" >> Makefile
echo "PREFIX = $PREFIX" >> Makefile
echo "JAR_FLAGS += -C bin/ jexer -C bin/ VERSION" >> Makefile
#echo "SJAR_FLAGS += -C src/ jexer -C ./ LICENSE -C ./ README.md -C ./ VERSION" >> Makefile
echo "SJAR_FLAGS += -C src/ jexer -C ./ LICENSE -C ./ README.md -C ./ VERSION" >> Makefile

cat Makefile.base >> Makefile

0 comments on commit bcada5c

Please sign in to comment.