X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=Makefile.base;h=559b89d9020a53df2b6212600233c68cd88841a2;hb=2206ef66ee00ad42d806f04a7b7ad6f8cb2d8828;hp=300db504c67c2f31c9fa6ffef42117d8a3617baa;hpb=08fe2e33007063e30fe22dc1d290f8afaa18eb1d;p=fanfix.git

diff --git a/Makefile.base b/Makefile.base
index 300db50..559b89d 100644
--- a/Makefile.base
+++ b/Makefile.base
@@ -6,9 +6,10 @@
 #PREFIX = usually /usr/local (where to install the program)
 #TEST = path to main test source to compile
 #JAR_FLAGS += a list of things to pack, each usually prefixed with "-C bin/"
+#SJAR_FLAGS += a list of things to pack, each usually prefixed with "-C src/", for *-sources.jar files
 
 JAVAC = javac
-JAVAC_FLAGS += -encoding UTF-8 -d ./bin/ -cp ./src/ -Xdiags:verbose
+JAVAC_FLAGS += -encoding UTF-8 -d ./bin/ -cp ./src/
 JAVA = java
 JAVA_FLAGS += -cp ./bin/
 JAR = jar
@@ -62,7 +63,7 @@ test:
 clean:
 	rm -rf bin/
 	@echo Removing sources taken from libs...
-	@for lib in libs/*.jar; do \
+	@for lib in libs/*-sources.jar; do \
 		basename "$$lib"; \
 		jar tf "$$lib" | while read -r ln; do \
 			[ -f "src/$$ln" ] && rm "src/$$ln"; \
@@ -76,6 +77,9 @@ mrproper: mrpropre
 
 mrpropre: clean
 	rm -f $(NAME).jar
+	rm -f $(NAME)-sources.jar
+	[ ! -e VERSION ] || rm -f "$(NAME)-`cat VERSION`.jar"
+	[ ! -e VERSION ] || rm -f "$(NAME)-`cat VERSION`-sources.jar"
 
 love:
 	@echo "	...not war."
@@ -92,7 +96,7 @@ resources: libs
 
 libs: bin
 	@[ -e bin/libs -o ! -d libs ] || echo Extracting sources from libs...
-	@[ -e bin/libs -o ! -d libs ] || (cd src&& for lib in ../libs/*.jar;do \
+	@[ -e bin/libs -o ! -d libs ] || (cd src && for lib in ../libs/*-sources.jar; do \
 		basename "$$lib"; \
 		jar xf "$$lib"; \
 	done )
@@ -102,9 +106,16 @@ $(NAME).jar: resources
 	@[ -e bin/$(MAIN).class ] || echo You need to build the sources
 	@[ -e bin/$(MAIN).class ]
 	@echo Making JAR file...
+	@echo > bin/manifest
+	@[ "$(SJAR_FLAGS)" = "" ] || echo Creating $(NAME)-sources.jar...
+	@[ "$(SJAR_FLAGS)" = "" ] || $(JAR) cfm $(NAME)-sources.jar bin/manifest $(SJAR_FLAGS)
+	@[ "$(SJAR_FLAGS)" = "" ] || [ ! -e VERSION ] || echo Copying to "$(NAME)-`cat VERSION`-sources.jar"...
+	@[ "$(SJAR_FLAGS)" = "" ] || [ ! -e VERSION ] || cp $(NAME)-sources.jar "$(NAME)-`cat VERSION`-sources.jar"
 	@echo "Main-Class: `echo "$(MAIN)" | sed 's:/:.:g'`" > bin/manifest
 	@echo >> bin/manifest
 	$(JAR) cfm $(NAME).jar bin/manifest $(JAR_FLAGS)
+	@[ ! -e VERSION ] || echo Copying to "$(NAME)-`cat VERSION`.jar"...
+	@[ ! -e VERSION ] || cp $(NAME).jar "$(NAME)-`cat VERSION`.jar"
 
 run: 
 	@[ -e bin/$(MAIN).class ] || echo You need to build the sources
@@ -131,6 +142,6 @@ install:
 	mkdir -p "$(PREFIX)/lib" "$(PREFIX)/bin"
 	cp $(NAME).jar "$(PREFIX)/lib/"
 	echo "#!/bin/sh" > "$(PREFIX)/bin/$(NAME)"
-	echo "$(RJAR) $(RJAR_FLAGS) \"$(PREFIX)/lib/$(NAME).jar\" \"$$@\"" >> "$(PREFIX)/bin/$(NAME)"
+	echo "$(RJAR) $(RJAR_FLAGS) \"$(PREFIX)/lib/$(NAME).jar\" \"\$$@\"" >> "$(PREFIX)/bin/$(NAME)"
 	chmod a+rx "$(PREFIX)/bin/$(NAME)"