From 71ac69a01a1051b24386ac67124c0aee657f3225 Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Sat, 7 May 2016 21:49:30 +0200 Subject: [PATCH] Fix makefile (default target Java version removed) + update TODO list --- Makefile | 19 ++++++++++++++----- README.md | 8 ++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 642e127..cc5c222 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ ### ### 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: will create the JAR file (must be compiled before) ### - 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 @@ -11,8 +11,13 @@ ALL: jvcard.jar -# Default: Java 1.5 -bin/be/nikiroo/jvcard/launcher/Main.class: bin/5 +bin/bin: bin/be/nikiroo/jvcard/launcher/Main.class src/be/nikiroo/jvcard/*/* src/be/nikiroo/jvcard/* + @echo You need to compile the code first: + @echo " make bin/5: will compile in Java 1.5 target mode" + @echo " make bin/6: will compile in Java 1.6 target mode" + @echo " make bin/7: will compile in Java 1.7 target mode" + @echo " make bin/8: will compile in Java 1.8 target mode" + @false .PHONY: ALL clean mrproper mrpropre love @@ -21,7 +26,7 @@ love: clean: @echo Cleaning files... - @rm -f bin/[0-9] bin/files bin/lanterna + @rm -f bin/[0-9] bin/bin bin/files bin/lanterna mrproper: mrpropre @@ -29,7 +34,7 @@ mrpropre: clean @echo Removing jar files... @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/* +jvcard.jar: bin/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... @@ -44,6 +49,7 @@ bin/5: bin/lanterna bin/files javac -cp bin/ -encoding UTF-8 -Xlint -Xlint:-options -source 5 -target 5 @bin/files -d bin/ @rm -f bin/[0-9] @touch bin/5 + @touch bin/bin bin/6: bin/lanterna bin/files @cp -r src/* bin/ @@ -51,6 +57,7 @@ bin/6: bin/lanterna bin/files javac -cp bin/ -encoding UTF-8 -Xlint -Xlint:-options -source 6 -target 6 @bin/files -d bin/ @rm -f bin/[0-9] @touch bin/6 + @touch bin/bin bin/7: bin/lanterna bin/files @cp -r src/* bin/ @@ -58,6 +65,7 @@ bin/7: bin/lanterna bin/files javac -cp bin/ -encoding UTF-8 -Xlint -Xlint:-options -source 7 -target 7 @bin/files -d bin/ @rm -f bin/[0-9] @touch bin/7 + @touch bin/bin bin/8: bin/lanterna bin/files @cp -r src/* bin/ @@ -65,6 +73,7 @@ bin/8: bin/lanterna bin/files javac -cp bin/ -encoding UTF-8 -Xlint -Xlint:-options -source 8 -target 8 @bin/files -d bin/ @rm -f bin/[0-9] @touch bin/8 + @touch bin/bin bin/files: src/be/nikiroo/jvcard/*/* src/be/nikiroo/jvcard/* @mkdir -p bin/ diff --git a/README.md b/README.md index 3c6b79c..c0e210c 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,14 @@ Small TUI (text mode) VCard manager (also supports abook files) - lot of other things - correct UI for new contact/new data/edit data-types - update the screenshots +- support escape as cancel in new X, new Y.. +- allow adding a new addressbook (and ask where to save it, offer current dir OR last input dir as default) +- make sure it works OK for "jvcard.jar /dir/to/directory-full-of-vcf-files" +- → maybe a mode with 1 contact/file ? and take the name from the contact to show in the list of "files" ? +- → add action "open as addressbook" ? +- find out why "R" is not displayed as a possible action (edit RAW) when viewing a contact) +- add: modal dialogue -> "sub menu" (change the action keys) ? (maybe a "second action mode" and a copy of the MainContent) +- change --save-dir so that it saves ALL the translation files (open + scan dir?) ## Screenshots -- 2.27.0