From: Niki Roo <roo.niki@gmail.com>
Date: Tue, 29 Mar 2016 10:08:25 +0000 (+0200)
Subject: Makefile fix(1), More stdout info on --X-photo(2):
X-Git-Tag: v1.1~16
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=e3fe983485916e0f3dbae73394f9dd8271623639;p=jvcard.git

Makefile fix(1), More stdout info on --X-photo(2):
1: recompile lanterna when sources change
2: display "Loading xxx" and "Saving xxx" for each file
---

diff --git a/Makefile b/Makefile
index 93b55b9..83242cc 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,6 @@ mrpropre: clean
 	@rm -f jvcard.jar jvcard-`grep "APPLICATION_VERSION" src/be/nikiroo/jvcard/launcher/Main.java | head -n1 | cut -d'"' -f2`.jar
 
 jvcard.jar: bin/be/nikiroo/jvcard/launcher/Main.class src/be/nikiroo/jvcard/*/* src/be/nikiroo/jvcard/*
-	@mkdir -p bin/
 	@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 | head -n1 | cut -d'"' -f2`.jar...
@@ -71,7 +70,7 @@ bin/files: src/be/nikiroo/jvcard/*/* src/be/nikiroo/jvcard/*
 	@mkdir -p bin/
 	@find src/be/ -name '*.java' > bin/files
 
-bin/lanterna:
+bin/lanterna: src/com/googlecode/lanterna/* src/com/googlecode/lanterna/*/* src/com/googlecode/lanterna/*/*/*
 	@mkdir -p bin/
 	@find src/com/ -name '*.java' > bin/lanterna
 	javac -encoding UTF-8 -source 5 @bin/lanterna -d bin/ || rm bin/lanterna
diff --git a/src/be/nikiroo/jvcard/launcher/Main.java b/src/be/nikiroo/jvcard/launcher/Main.java
index 66625f7..080223d 100644
--- a/src/be/nikiroo/jvcard/launcher/Main.java
+++ b/src/be/nikiroo/jvcard/launcher/Main.java
@@ -316,6 +316,7 @@ public class Main {
 						File f = new File(dir, filename);
 
 						if (f.exists()) {
+							System.out.println("Loading " + f);
 							try {
 								String b64 = StringUtils.fromImage(ImageIO
 										.read(f));
@@ -356,6 +357,7 @@ public class Main {
 						if (photo != null) {
 							String filename = contact.toString(format, "");
 							File f = new File(dir, filename + ".png");
+							System.out.println("Saving " + f);
 							try {
 								ImageIO.write(
 										StringUtils.toImage(photo.getValue()),