From: Niki Roo <roo.niki@gmail.com>
Date: Thu, 24 Mar 2016 18:28:15 +0000 (+0100)
Subject: Makefile: now working, including JAR file
X-Git-Tag: v1.0-beta3~4
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=dc2075d687a80952270646e87076bbe692f5dffb;p=jvcard.git

Makefile: now working, including JAR file
---

diff --git a/Makefile b/Makefile
index 6781581..961520a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,69 @@
-# default target: create the jar file
+###
+### You can use this Makefile to generate an executable JAR file
+### The available options are:
+### -	make: will create the default (or currently compiled) JAR
+### -	make bin/5 && make: will create a Java 1.5 JAR
+### -	make bin/6 && make: will create a Java 1.6 JAR
+### -	make bin/7 && make: will create a Java 1.7 JAR
+### -	make bin/8 && make: will create a Java 1.8 JAR
+### -	make clean: will clean temporary files
+### -	make mrpropre: will clean temporary files and remove the JAR file
+
 ALL: bin/5 jvcard.jar
 
+.PHONY: ALL clean mrproper mrpropre love
+
+love:
+	@echo ...not war?
+
+clean:
+	@echo Cleaning files...
+	@rm -f bin/[0-9] bin/files bin/lanterna
+
+mrproper: mrpropre
+
+mrpropre: clean
+	@echo Removing jar files...
+	@rm -f jvcard.jar jvcard-`grep "APPLICATION_VERSION" src/be/nikiroo/jvcard/launcher/Main.java | cut -d'"' -f2`.jar
+
 jvcard.jar: bin/be/nikiroo/jvcard/*/* bin/be/nikiroo/jvcard/*
-	echo TODO: jvcard-`grep "APPLICATION_VERSION" src/be/nikiroo/jvcard/launcher/Main.java | cut -d'"' -f2`.jar
-	cp jvcard-`grep "APPLICATION_VERSION" src/be/nikiroo/jvcard/launcher/Main.java | cut -d'"' -f2`.jar jvcard.jar
+	@echo 'Main-Class: be.nikiroo.jvcard.launcher.Main' > bin/manifest
+	@echo >> bin/manifest
+	@echo Creating jar file jvcard-`grep "APPLICATION_VERSION" src/be/nikiroo/jvcard/launcher/Main.java | cut -d'"' -f2`.jar...
+	@cd bin && find . | grep -v './[0-9]' | grep -v './manifest' | grep -v './lanterna' | jar -m manifest -cf ../jvcard-`grep "APPLICATION_VERSION" ../src/be/nikiroo/jvcard/launcher/Main.java | cut -d'"' -f2`.jar -@
+	@rm bin/manifest
+	@echo Copying to jvcard.jar...
+	@cp jvcard-`grep "APPLICATION_VERSION" src/be/nikiroo/jvcard/launcher/Main.java | cut -d'"' -f2`.jar jvcard.jar
 
 bin/5: lanterna files
+	@echo Compiling in Java 1.5 mode "('make bin/5')"...
 	javac -cp bin/ -encoding UTF-8 -Xlint -source 5 @files -d bin/
-	touch bin/5
+	@rm -f bin/[0-9]
+	@touch bin/5
 
 bin/6: lanterna files
+	@echo Compiling in Java 1.6 mode "('make bin/6')"...
 	javac -cp bin/ -encoding UTF-8 -Xlint -source 6 @files -d bin/
-	touch bin/6
+	@rm -f bin/[0-9]
+	@touch bin/6
 
 bin/7: lanterna files
+	@echo Compiling in Java 1.7 mode "('make bin/7')"...
 	javac -cp bin/ -encoding UTF-8 -Xlint -source 7 @files -d bin/
-	touch bin/7
+	@rm -f bin/[0-9]
+	@touch bin/7
+
+bin/8: lanterna files
+	@echo Compiling in Java 1.8 mode "('make bin/8')"...
+	javac -cp bin/ -encoding UTF-8 -Xlint -source 8 @files -d bin/
+	@rm -f bin/[0-9]
+	@touch bin/8
 
 files: src/be/nikiroo/jvcard/*/* src/be/nikiroo/jvcard/*
-	find src/be/ -name '*.java' > files
+	@find src/be/ -name '*.java' > files
 
-lanterna:
-	find src/com/ -name '*.java' > lanterna
-	javac -encoding UTF-8 -source 5 @lanterna -d bin/ || rm lanterna
-	test -e lanterna
+bin/lanterna:
+	@find src/com/ -name '*.java' > bin/lanterna
+	javac -encoding UTF-8 -source 5 @lanterna -d bin/ || rm bin/lanterna
+	@test -e bin/lanterna