X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=Makefile.base;h=3304c83c802f47d4d5ede0e5cb33c5a252bd0552;hb=f1fb834c62f9d9a73edeeda3fed060e0dede8cef;hp=a88eb4a2df0d9c09378831aeda1945beccbc4d2e;hpb=614574c4a697c12338766b1d7914733ddf63a7ab;p=fanfix.git

diff --git a/Makefile.base b/Makefile.base
index a88eb4a..3304c83 100644
--- a/Makefile.base
+++ b/Makefile.base
@@ -7,6 +7,7 @@
 #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/
@@ -34,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
@@ -50,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...
@@ -63,14 +64,16 @@ test:
 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
@@ -86,7 +89,18 @@ love:
 
 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
+	@cp VERSION bin/
+
+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" ; \
@@ -96,9 +110,11 @@ 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/*-sources.jar; do \
-		basename "$$lib"; \
-		jar xf "$$lib"; \
+	@[ -e bin/libs -o ! -d libs ] || (cd src && 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 xf "$$lib"; \
+		fi \
 	done )
 	@[ ! -d libs ] || touch bin/libs
 
@@ -134,7 +150,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
@@ -142,6 +158,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)"