From 6435013a3d3feabc7b5a4536ca766ffede0c4d5b Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Mon, 28 Mar 2016 18:02:40 +0200 Subject: [PATCH] Fix Makefile for new Main.java, uupdate version to "-dev" again --- Makefile | 8 ++++---- src/be/nikiroo/jvcard/launcher/Main.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b0ae19a..93b55b9 100644 --- a/Makefile +++ b/Makefile @@ -27,17 +27,17 @@ 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 + @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 | cut -d'"' -f2`.jar... - jar cfm jvcard-`grep "APPLICATION_VERSION" src/be/nikiroo/jvcard/launcher/Main.java | cut -d'"' -f2`.jar bin/manifest -C bin/ be -C bin/ com + @echo Creating jar file jvcard-`grep "APPLICATION_VERSION" src/be/nikiroo/jvcard/launcher/Main.java | head -n1 | cut -d'"' -f2`.jar... + jar cfm jvcard-`grep "APPLICATION_VERSION" src/be/nikiroo/jvcard/launcher/Main.java | head -n1 | cut -d'"' -f2`.jar bin/manifest -C bin/ be -C bin/ com @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 + @cp jvcard-`grep "APPLICATION_VERSION" src/be/nikiroo/jvcard/launcher/Main.java | head -n1 | cut -d'"' -f2`.jar jvcard.jar bin/5: bin/lanterna bin/files @cp -r src/* bin/ diff --git a/src/be/nikiroo/jvcard/launcher/Main.java b/src/be/nikiroo/jvcard/launcher/Main.java index 85223d8..66625f7 100644 --- a/src/be/nikiroo/jvcard/launcher/Main.java +++ b/src/be/nikiroo/jvcard/launcher/Main.java @@ -37,7 +37,7 @@ import be.nikiroo.jvcard.resources.enums.StringId; */ public class Main { static public final String APPLICATION_TITLE = "jVcard"; - static public final String APPLICATION_VERSION = "1.0"; + static public final String APPLICATION_VERSION = "1.0-dev"; static private final int ERR_NO_FILE = 1; static private final int ERR_SYNTAX = 2; -- 2.27.0