X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=Makefile.base;h=9901644035cee9e0610447751befe4b1e28cb7cc;hp=86050e6d3e9e7db7da1bcc2015895c0da8364a75;hb=2284842831ea46e89b97dd22b6e294caad361f30;hpb=d3c15421430e85e3afeefef211b4f791753e17ba

diff --git a/Makefile.base b/Makefile.base
index 86050e6..9901644 100644
--- a/Makefile.base
+++ b/Makefile.base
@@ -6,9 +6,11 @@
 #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
+#TEST_PARAMS = any parameter to pass to the test runnable when "test-run"
 
 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
@@ -33,7 +35,7 @@ RJAR_FLAGS += -jar
 
 all: build jar
 
-.PHONY: all clean mrproper mrpropre build run jrun jar resources install libs love 
+.PHONY: all clean mrproper mrpropre build run jrun jar resources test-resources install libs love 
 
 bin:
 	@mkdir -p bin
@@ -49,7 +51,7 @@ build: resources
 		$(JAVAC) $(JAVAC_FLAGS) "src/$$sup.java" ; \
 	done
 
-test: 
+test: test-resources
 	@[ -e bin/$(MAIN).class ] || echo You need to build the sources
 	@[ -e bin/$(MAIN).class ]
 	@echo Compiling test program...
@@ -76,13 +78,26 @@ 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."
 
 resources: libs
 	@echo Copying resources into bin/...
-	@cd src && find . | grep -v '\.java$$' | while read -r ln; do \
+	@cd src && find . | grep -v '\.java$$' | grep -v '/test/' | while read -r ln; do \
+		if [ -f "$$ln" ]; then \
+			dir="`dirname "$$ln"`"; \
+			mkdir -p "../bin/$$dir" ; \
+			cp "$$ln" "../bin/$$ln" ; \
+		fi ; \
+	done
+
+test-resources: resources
+	@echo Copying test resources into bin/...
+	@cd src && find . | grep -v '\.java$$' | grep '/test/' | while read -r ln; do \
 		if [ -f "$$ln" ]; then \
 			dir="`dirname "$$ln"`"; \
 			mkdir -p "../bin/$$dir" ; \
@@ -102,10 +117,15 @@ $(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 ] || echo Copying to "$(NAME)-`cat VERSION`.jar"...
 	@[ ! -e VERSION ] || cp $(NAME).jar "$(NAME)-`cat VERSION`.jar"
 
 run: 
@@ -125,7 +145,7 @@ run-test:
 	@[ "$(TEST)" = "" -o -e "bin/$(TEST).class" ]
 	@echo Running tests for "$(NAME)"...
 	@[ "$(TEST)" != "" ] || echo No test sources defined.
-	[ "$(TEST)"  = "" ] || $(JAVA) $(JAVA_FLAGS) $(TEST)
+	[ "$(TEST)"  = "" ] || ( clear ; $(JAVA) $(JAVA_FLAGS) $(TEST) $(TEST_PARAMS) )
 
 install:
 	@[ -e $(NAME).jar ] || echo You need to build the jar
@@ -133,6 +153,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)"