Merge pull request #1 from OMGeeky/package-improvements

Package improvements

.github/workflows/release.yml

@@ -0,0 +1,61 @@
+name: Release Build
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up JDK
+      uses: actions/setup-java@v2
+      with:
+        java-version: '11'
+        distribution: 'adopt'
+
+    - name: Install NSIS
+      uses: joncloud/makensis-action@v4
+
+    - name: Build JAR
+      shell: bash
+      run: |
+        cd ATCS/packaging
+        chmod +x package.sh
+        ./package.sh -windows
+
+    - name: Create Installer
+      shell: bash
+      run: |
+        cd ATCS/packaging/Windows
+        makensis ATCS_Installer.nsi
+
+    - name: Get Version
+      id: get_version
+      shell: bash
+      run: |
+        VERSION=$(cat ATCS/packaging/ATCS_latest | sed 's/^v//')
+        echo "VERSION=$VERSION" >> $GITHUB_ENV
+
+    - name: Upload ZIP to Release
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: ./ATCS/packaging/ATCS_${{ env.VERSION }}.zip
+        asset_name: ATCS_${{ env.VERSION }}.zip
+        asset_content_type: application/zip
+
+    - name: Upload Installer to Release
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: ./ATCS/packaging/Windows/ATCS_v${{ env.VERSION }}_Setup.exe
+        asset_name: ATCS_v${{ env.VERSION }}_Setup.exe
+        asset_content_type: application/octet-stream

packaging/Windows/ATCS_Installer.nsi

@@ -1,9 +1,10 @@
 !include MUI2.nsh
 
-!define VERSION "0.6.21"
+!system 'for /f "delims=" %%a in ('type ..\ATCS_latest') do set "VERSION=%%a" && exit'
+!define VERSION "$%VERSION:~1%"
 !define TRAINER_VERSION "0.1.5"
 !define JAVA_BIN "java"
-!define ATCS_SOURCE_DIR "C:\ATCS"
+!define ATCS_SOURCE_DIR "..\..\"
 
 Name "Andor's Trail Content Studio v${VERSION}"
 OutFile "ATCS_v${VERSION}_Setup.exe"

packaging/package.sh

@@ -21,7 +21,6 @@ MANIFEST_LOCATION="${PACKAGING_DIR}/Manifest.txt"
 VERSION_FILE="${PACKAGING_DIR}/ATCS_latest"
 SOURCE_BASE_DIR="${ATCS_SOURCE_DIR}/src" # Base directory for standard source code
 LIB_BASE_DIR="${ATCS_SOURCE_DIR}/lib"     # Base directory for libraries
-OUTPUT_JAR_DIR="${PACKAGING_DIR}"  # Directory where the final JAR will be placed - as per script
 
 # --- **ADDITIONAL SOURCE CODE FOLDERS** ---
 EXTRA_SOURCE_DIRS=(
@@ -103,17 +102,19 @@ cd "${PACKAGING_DIR}" || exit # Go back to packaging dir
 
 echo ''
 echo "Done creating jar at ${JAR_LOCATION}"
-cp -f "${JAR_LOCATION}" "${OUTPUT_JAR_DIR}/common/ATCS.jar" # Copy JAR to versioned name
+cp -f "${JAR_LOCATION}" "${PACKAGING_DIR}/common/ATCS.jar" # Copy JAR to versioned name
 
 # --- Create archive ---
-if [ "$PLATFORM" = "LINUX" ]; then
+cd "${PACKAGING_DIR}" || exit
-    cd "${OUTPUT_JAR_DIR}" || exit
+echo "Creating archive"
-    echo "Creating archive"
+if [ "$PLATFORM" = "WINDOWS" ]; then
-    tar caf "ATCS_${VERSION}.tar.gz" common/* # archive the 'common' folder which now contains the JAR and libs
+    # Use PowerShell's Compress-Archive which is available by default on Windows
-    echo "Created archive at ${OUTPUT_JAR_DIR}/ATCS_${VERSION}.tar.gz"
+    powershell.exe -Command "Compress-Archive -Path './common/*' -DestinationPath './ATCS_${VERSION}.zip' -Force"
-    cd "${PACKAGING_DIR}" || exit
 else
-  echo "Can't create zip files on windows yet. Please pack the content of the '${OUTPUT_JAR_DIR}/common/' folder yourself"
+    # Use zip command on Linux
+    zip -r "ATCS_${VERSION}.zip" common/* # archive the 'common' folder which now contains the JAR and libs
 fi
+echo "Created archive at ${PACKAGING_DIR}/ATCS_${VERSION}.zip"
+cd "${PACKAGING_DIR}" || exit
 
 echo "Script finished."

src/com/gpl/rpg/atcontentstudio/ATContentStudio.java

@@ -153,7 +153,8 @@ public class ATContentStudio {
 			while ((inputLine = in.readLine()) != null) {
 				lastLine = inputLine;
 			}
-			if (lastLine != null && compareVersions(lastLine) < 0) {
+			if (lastLine != null && !lastLine.equals(APP_VERSION)) {
+
 				// for copying style
 				JLabel label = new JLabel();
 				Font font = label.getFont();
@@ -230,19 +231,4 @@ public class ATContentStudio {
 			}
 		}
 	}
-
-    /// returns The difference between the the latest version and the current one (CURRENT - LATEST)
-    private static int compareVersions(String latest) {
-        String[] levels1 = ATContentStudio.APP_VERSION.substring(1).split("\\.");
-        String[] levels2 = latest.substring(1).split("\\.");
-        int length = Math.max(levels1.length, levels2.length);
-        for (int i = 0; i < length; i++) {
-            int v1 = i < levels1.length ? Integer.parseInt(levels1[i]) : 0;
-            int v2 = i < levels2.length ? Integer.parseInt(levels2[i]) : 0;
-            if (v1 != v2) {
-                return v1 - v2;
-            }
-        }
-        return 0;
-    }
 }