Cleaned up release file structure moving JAR's to JAR-folder.

.gitlab-ci.yml

@@ -6,7 +6,7 @@ release:
   - "mvn -e 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/lib/kickc-release.jar target/release/kickc/jar/kickc-${CI_COMMIT_REF_NAME}.jar"
   - "mkdir ./kickc"
   - "mv target/release/kickc/* ./kickc/"
   - "cat target/site/jacoco/index.html"
@@ -14,7 +14,7 @@ release:
     name: kickc_${CI_COMMIT_REF_NAME}
     paths:
     - ./kickc/bin
-    - ./kickc/lib
+    - ./kickc/jar
     - ./kickc/include
     - ./kickc/lib
     - ./kickc/fragment

src/main/assembly/assembly.xml

@@ -6,7 +6,7 @@
     <dependencySets>
         <dependencySet>
             <useProjectArtifact>false</useProjectArtifact>
-            <outputDirectory>lib</outputDirectory>
+            <outputDirectory>jar</outputDirectory>
             <unpack>false</unpack>
         </dependencySet>
     </dependencySets>
@@ -64,7 +64,7 @@
         </fileSet>
         <fileSet>
             <directory>${project.build.directory}</directory>
-            <outputDirectory>lib</outputDirectory>
+            <outputDirectory>jar</outputDirectory>
             <includes>
                 <include>*.jar</include>
             </includes>

src/main/script/kickc.bat

@@ -6,13 +6,14 @@ echo KICKC_HOME=%KICKC_HOME%
 REM KCLIB HOME
 set KICKC_STDLIB=%KICKC_HOME%\lib
 set KICKC_STDINCLUDE=%KICKC_HOME%\include
-echo KICKCLIB_HOME=%KICKCLIB_HOME%
+echo KICKC_STDLIB=%KICKC_STDINCLUDE%
+echo KICKC_STDINCLUDE=%KICKC_STDINCLUDE%
 set KICKC_FRAGMENT_HOME=%KICKC_HOME%\fragment
 echo KICKC_FRAGMENT_HOME=%KICKC_FRAGMENT_HOME%
 REM KICKASSEMBLER HOME
 REM VICE HOME
 REM KICKC_JAR
-for %%I in ( %KICKC_HOME%\lib\kickc-*.jar ) do set KICKC_JAR=%%I
+for %%I in ( %KICKC_HOME%\jar\kickc-*.jar ) do set KICKC_JAR=%%I
 echo KICKC_JAR=%KICKC_JAR%
 
 echo java -jar %KICKC_JAR% -I %KICKC_STDINCLUDE% -L %KICKC_STDLIB% -F %KICKC_FRAGMENT_HOME% %*

src/main/script/kickc.sh

@@ -4,15 +4,15 @@
 # KICKC HOME
 export KICKC_HOME="$(dirname $0)/.."
 # STANDARD INCLUDE
-export KICKC_STD_INCLUDE="$KICKC_HOME/include"
+export KICKC_STDINCLUDE="$KICKC_HOME/include"
 # STANDARD LIBRARY
-export KICKC_STD_LIB="$KICKC_HOME/lib"
+export KICKC_STDLIB="$KICKC_HOME/lib"
 # FRAGMENTS HOME
 export KICKC_FRAGMENT_HOME="$KICKC_HOME/fragment"
 # KICKASSEMBLER HOME
 # VICE HOME
 # KICKC_JAR
-export KICKC_JAR=$KICKC_HOME/lib/kickc-*.jar
+export KICKC_JAR=$KICKC_HOME/jar/kickc-*.jar
 
 # Parse parameters (overriding defaults)
 export PARAM="";
@@ -21,5 +21,5 @@ while [[ "$#" -gt 0 ]]; do case $1 in
   *) export PARAM="$PARAM $1"; shift;;
 esac; done
 
-echo java -jar $KICKC_JAR -F $KICKC_FRAGMENT_HOME $PARAM -I $KICKC_STD_INCLUDE -L $KICKC_STD_LIB
-java -jar $KICKC_JAR -F $KICKC_FRAGMENT_HOME $PARAM -I $KICKC_STD_INCLUDE -L $KICKC_STD_LIB
+echo java -jar $KICKC_JAR -F $KICKC_FRAGMENT_HOME $PARAM -I $KICKC_STDINCLUDE -L $KICKC_STDLIB
+java -jar $KICKC_JAR -F $KICKC_FRAGMENT_HOME $PARAM -I $KICKC_STDINCLUDE -L $KICKC_STDLIB