From 00e6293e207dedac320383837acad45eb1ba9c03 Mon Sep 17 00:00:00 2001
From: jespergravgaard <jesper@balmangravgaard.dk>
Date: Tue, 2 Oct 2018 01:06:36 +0200
Subject: [PATCH] JAR file version number should now follow git tag.

---
 .gitlab-ci.yml                              | 3 ++-
 pom.xml                                     | 2 +-
 src/main/java/dk/camelot64/kickc/KickC.java | 2 +-
 src/main/script/kickc.bat                   | 7 +++++--
 src/main/script/kickc.sh                    | 6 ++++--
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 97ddc30c5..efbbdbe29 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,10 +6,11 @@ release:
   - "mvn package"
   - "ls target"
   - "unzip -d target/release target/kickc-release.zip"
+  - "mv target/release/kickc/lib/kickc-release.jar target/release/kickc/lib/kickc-${CI_COMMIT_REF_NAME}.jar"
   - "mv target/release/kickc/* ."
   - "cat target/site/jacoco/index.html"
   artifacts:
-    name: kickc_${CI_BUILD_REF_NAME}
+    name: kickc_${CI_COMMIT_REF_NAME}
     paths:
     - ./bin
     - ./lib
diff --git a/pom.xml b/pom.xml
index 887fd24c1..0c9bb329e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 
     <groupId>dk.camelot64.kickc</groupId>
     <artifactId>kickc</artifactId>
-    <version>0.5-SNAPSHOT</version>
+    <version>release</version>
 
     <dependencies>
         <dependency>
diff --git a/src/main/java/dk/camelot64/kickc/KickC.java b/src/main/java/dk/camelot64/kickc/KickC.java
index 441632c6b..0eb388699 100644
--- a/src/main/java/dk/camelot64/kickc/KickC.java
+++ b/src/main/java/dk/camelot64/kickc/KickC.java
@@ -22,7 +22,7 @@ import java.util.concurrent.Callable;
       descriptionHeading = "%nDescription:%n%n",
       parameterListHeading = "%nParameters:%n",
       optionListHeading = "%nOptions:%n",
-      version = "KickC 0.5 SNAPSHOT"
+      version = "KickC 0.5"
 )
 public class KickC implements Callable<Void> {
 
diff --git a/src/main/script/kickc.bat b/src/main/script/kickc.bat
index 530de2e26..9a48f70f5 100644
--- a/src/main/script/kickc.bat
+++ b/src/main/script/kickc.bat
@@ -8,6 +8,9 @@ set KICKCLIB_HOME=%KICKC_HOME%\stdlib
 echo KICKCLIB_HOME=%KICKCLIB_HOME%
 REM KICKASSEMBLER HOME
 REM VICE HOME
+REM KICKC_JAR
+set KICKC_JAR=%KICKC_HOME%\lib\kickc-*.jar
+echo KICKC_JAR=%KICKC_JAR%
 
-echo java -jar %KICKC_HOME%\lib\kickc-0.5-SNAPSHOT.jar -I %KICKCLIB_HOME% %*
-java -jar %KICKC_HOME%\lib\kickc-0.5-SNAPSHOT.jar -I %KICKCLIB_HOME% %*
\ No newline at end of file
+echo java -jar %KICKC_JAR% -I %KICKCLIB_HOME% %*
+java -jar %KICKC_JAR% -I %KICKCLIB_HOME% %*
\ No newline at end of file
diff --git a/src/main/script/kickc.sh b/src/main/script/kickc.sh
index e7afa44ea..add2531eb 100755
--- a/src/main/script/kickc.sh
+++ b/src/main/script/kickc.sh
@@ -7,6 +7,8 @@ export KICKC_HOME="$(dirname $0)/.."
 export KICKCLIB_HOME="$KICKC_HOME/stdlib"
 # KICKASSEMBLER HOME
 # VICE HOME
+# KICKC_JAR
+export KICKC_JAR=$KICKC_HOME/lib/kickc-*.jar
 
-echo java -jar lib/kickc-0.5-SNAPSHOT.jar -I $KICKCLIB_HOME $*
-java -jar lib/kickc-0.5-SNAPSHOT.jar -I $KICKCLIB_HOME $*
\ No newline at end of file
+echo java -jar $KICKC_JAR -I $KICKCLIB_HOME $*
+java -jar $KICKC_JAR -I $KICKCLIB_HOME $*
\ No newline at end of file