Feature/native decorations

.ci_scripts/build_upload.ps1

@@ -12,40 +12,82 @@ if ("$env:GITHUB_REF" -match "^refs/tags/v") {
     $repo = "release"
 } elseif ("$env:GITHUB_REF" -eq "refs/heads/master") {
     $repo = "development"
-} elseif ("$env:GITHUB_REF" -match "^refs/heads/feature/(.*)") {
-    $feature = $matches[1];
-    $version = "$version-$feature"
+} elseif ("$env:GITHUB_REF" -eq "refs/heads/release") {
+    $repo = "experimental"
 } elseif ("$env:GITHUB_REF" -match "^refs/pull/(.*)/merge") {
     $pr_id = $matches[1];
     $version = "pr-$pr_id-$version"
 } else {
-    echo "Unknown branch type: ${env:GITHUB_REF} - skipping deploy"
-    exit
+    echo "Unknown branch type: ${env:GITHUB_REF}"
 }
 
 # Create deploy file
 mkdir deploy
 if ("${env:COMPILER}" -eq "msvc") {
-    $suffix = "windows-msvc"
-    CopyFile build/Release/julius.exe .
+    $suffix = "windows-msvc-x64"
+    CopyFile build/RelWithDebInfo/augustus.exe .
+    CopyFile build/RelWithDebInfo/augustus.pdb .
     CopyFile ext\SDL2\SDL2-${env:SDL_VERSION}\lib\x64\SDL2.dll .
     CopyFile ext\SDL2\SDL2_mixer-${env:SDL_MIXER_VERSION}\lib\x64\SDL2_mixer.dll .
+} elseif ("${env:COMPILER}" -eq "msvc-arm64") {
+    $suffix = "windows-arm64"
+    CopyFile build/RelWithDebInfo/augustus.exe .
+    CopyFile build/RelWithDebInfo/augustus.pdb .
+    CopyFile ext\SDL2\SDL2\SDL2.dll .
+    CopyFile ext\SDL2\SDL2_mixer\SDL2_mixer.dll .
 } elseif ("${env:COMPILER}" -eq "mingw-32") {
     $suffix = "windows"
-    CopyFile build/julius.exe .
+    build/cv2pdb.exe build/augustus.exe
+    CopyFile build/augustus.exe .
+    CopyFile build/augustus.pdb .
     CopyFile ext\SDL2\SDL2-${env:SDL_VERSION}\i686-w64-mingw32\bin\SDL2.dll .
     CopyFile ext\SDL2\SDL2_mixer-${env:SDL_MIXER_VERSION}\i686-w64-mingw32\bin\SDL2_mixer.dll .
 } elseif ("${env:COMPILER}" -eq "mingw-64") {
     $suffix = "windows-64bit"
-    CopyFile build/julius.exe .
+    build/cv2pdb.exe build/augustus.exe
+    CopyFile build/augustus.exe .
+    CopyFile build/augustus.pdb .
     CopyFile ext\SDL2\SDL2-${env:SDL_VERSION}\x86_64-w64-mingw32\bin\SDL2.dll .
     CopyFile ext\SDL2\SDL2_mixer-${env:SDL_MIXER_VERSION}\x86_64-w64-mingw32\bin\SDL2_mixer.dll .
 } else {
     throw "Unknown compiler: ${env:COMPILER}"
 }
 
-$deploy_file = "julius-$version-$suffix.zip"
-7z a "deploy\$deploy_file" julius.exe SDL2.dll SDL2_mixer.dll
+$deploy_file = "augustus-$version-$suffix.zip"
+
+$packed_assets = $false
+
+if ($repo -eq "release") {
+    echo "Packing the assets"
+
+    cd .\res\asset_packer
+    mkdir build
+    cd build
+
+    cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release -D CMAKE_C_COMPILER=x86_64-w64-mingw32-gcc.exe -D CMAKE_MAKE_PROGRAM=mingw32-make.exe ..
+    cmake --build . -j 4 --config Release
+    if ($?) {
+        .\asset_packer.exe ..\..\
+        if ($?) {
+            Move-Item -Path ..\..\packed_assets -Destination ..\..\..\assets
+            $packed_assets = $true
+        }
+    }
+    if (!$packed_assets) {
+        echo "Unable to pack the assets. Using the original folder"
+        Move-Item -Path ..\..\assets -Destination ..\..\..\
+        $packed_assets = $true
+    }
+
+    cd ..\..\..
+
+    xcopy /ei res\maps .\maps
+    xcopy /ei res\manual .\manual
+    7z a "deploy\$deploy_file" augustus.exe augustus.pdb SDL2.dll SDL2_mixer.dll assets maps manual
+} else {
+    7z a "deploy\$deploy_file" augustus.exe augustus.pdb SDL2.dll SDL2_mixer.dll
+}
+
 if (!$?) {
     throw "Unable to create $deploy_file"
 }
@@ -56,7 +98,7 @@ if ($env:SKIP_UPLOAD) {
 }
 
 if (!$repo) {
-    echo "No repo found - skipping deploy"
+    echo "No repo found - skipping upload"
     exit
 }
 
@@ -65,9 +107,47 @@ if (!$env:UPLOAD_TOKEN) {
     exit
 }
 
-echo "Uploading $deploy_file to $repo/windows/$version"
-curl -u "$env:UPLOAD_TOKEN" -T "deploy/$deploy_file" "https://julius.biancavanschaik.nl/upload/$repo/windows/$version/${deploy_file}"
+echo "Uploading $deploy_file to $repo/$suffix/$version"
+curl -u "$env:UPLOAD_TOKEN" -T "deploy/$deploy_file" "https://augustus.josecadete.net/upload/$repo/$suffix/$version/${deploy_file}"
 if (!$?) {
     throw "Unable to upload"
 }
-echo "Uploaded. URL: https://julius.biancavanschaik.nl/"
+echo "Uploaded. URL: https://augustus.josecadete.net/$repo.html"
+
+if ($suffix -ne "windows") {
+    exit
+}
+
+if (!$packed_assets) {
+    echo "Packing the assets"
+
+    cd .\res\asset_packer
+    mkdir build
+    cd build
+
+    cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release -D CMAKE_C_COMPILER=x86_64-w64-mingw32-gcc.exe -D CMAKE_MAKE_PROGRAM=mingw32-make.exe ..
+    cmake --build . -j 4 --config Release
+    if ($?) {
+        .\asset_packer.exe ..\..\
+        if ($?) {
+            Move-Item -Path ..\..\packed_assets -Destination ..\..\..\assets
+            $packed_assets = $true
+        }
+    }
+    if (!$packed_assets) {
+        echo "Unable to pack the assets. Using the original folder"
+        Move-Item -Path ..\..\assets -Destination ..\..\..\
+    }
+
+    cd ..\..\..
+}
+
+$assets_file = "assets-$version-$repo.zip"
+7z a "$assets_file" assets
+
+echo "Uploading $assets_file to $repo/windows/$version"
+curl -u "$env:UPLOAD_TOKEN" -T "$assets_file" "https://augustus.josecadete.net/upload/$repo/assets/$version/${assets_file}"
+if (!$?) {
+    throw "Unable to upload assets"
+}
+echo "Assets uploaded"

.ci_scripts/build_upload.sh

@@ -12,68 +12,63 @@ then
 elif [[ "$GITHUB_REF" == "refs/heads/master" ]]
 then
   REPO=development
-elif [[ "$GITHUB_REF" =~ ^refs/heads/feature/ ]]
-then
-  FEATURE=${GITHUB_REF##refs/heads/feature/}
-  VERSION=$VERSION-$FEATURE
 elif [[ "$GITHUB_REF" =~ ^refs/pull/ ]]
 then
   PR_ID=${GITHUB_REF##refs/pull/}
   PR_ID=${PR_ID%%/merge}
   VERSION=pr-$PR_ID-$VERSION
 else
   echo "Unknown branch type $GITHUB_REF - skipping upload"
-  exit
 fi
 
 DEPLOY_FILE=
 case "$DEPLOY" in
 "linux")
   PACKAGE=linux
-  DEPLOY_FILE=julius-$VERSION-linux-x86_64.zip
-  cp "${build_dir}/julius.zip" "deploy/$DEPLOY_FILE"
+  DEPLOY_FILE=augustus-$VERSION-linux-x86_64.zip
+  cp "${build_dir}/augustus.zip" "deploy/$DEPLOY_FILE"
   ;;
 "flatpak")
   PACKAGE=linux-flatpak
-  DEPLOY_FILE=julius-$VERSION-linux.flatpak
+  DEPLOY_FILE=augustus-$VERSION-linux.flatpak
   flatpak build-export export repo
-  flatpak build-bundle export julius.flatpak com.github.bvschaik.julius --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo
-  cp julius.flatpak "deploy/$DEPLOY_FILE"
-  ;;
-"appimage")
-  PACKAGE=linux-appimage
-  DEPLOY_FILE=julius-$VERSION-linux.AppImage
-  cp "${build_dir}/julius.AppImage" "deploy/$DEPLOY_FILE"
-  ;;
-"mac")
-  PACKAGE=mac
-  DEPLOY_FILE=julius-$VERSION-mac.dmg
-  cp "${build_dir}/julius.dmg" "deploy/$DEPLOY_FILE"
+  flatpak build-bundle export augustus.flatpak com.github.keriew.augustus --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo
+  cp augustus.flatpak "deploy/$DEPLOY_FILE"
   ;;
 "vita")
   PACKAGE=vita
-  DEPLOY_FILE=julius-$VERSION-vita.vpk
-  cp "${build_dir}/julius.vpk" "deploy/$DEPLOY_FILE"
+  DEPLOY_FILE=augustus-$VERSION-vita.vpk
+  cp "${build_dir}/augustus.vpk" "deploy/$DEPLOY_FILE"
   ;;
 "switch")
   PACKAGE=switch
-  DEPLOY_FILE=julius-$VERSION-switch.zip
-  cp "release/julius_switch.zip" "deploy/$DEPLOY_FILE"
+  DEPLOY_FILE=augustus-$VERSION-switch.nro
+  cp "${build_dir}/augustus.nro" "deploy/$DEPLOY_FILE"
+  ;;
+"appimage")
+  PACKAGE=linux-appimage
+  DEPLOY_FILE=augustus-$VERSION-linux.AppImage
+  cp "${build_dir}/augustus.AppImage" "deploy/$DEPLOY_FILE"
+  ;;
+"mac")
+  PACKAGE=mac
+  DEPLOY_FILE=augustus-$VERSION-mac.dmg
+  cp "${build_dir}/augustus.dmg" "deploy/$DEPLOY_FILE"
   ;;
 "android")
   PACKAGE=android
-  if [ -f "${build_dir}/julius.apk" ]
+  if [ -f "${build_dir}/augustus.apk" ]
   then
-    DEPLOY_FILE=julius-$VERSION-android.apk
-    cp "${build_dir}/julius.apk" "deploy/$DEPLOY_FILE"
+    DEPLOY_FILE=augustus-$VERSION-android.apk
+    cp "${build_dir}/augustus.apk" "deploy/$DEPLOY_FILE"
   fi
   ;;
 "emscripten")
   PACKAGE=emscripten
-  if [ -f "${build_dir}/julius.zip" ]
+  if [ -f "${build_dir}/augustus.html" ]
   then
-    DEPLOY_FILE=julius-$VERSION-emscripten.zip
-    cp "${build_dir}/julius.zip" "deploy/$DEPLOY_FILE"
+    DEPLOY_FILE=augustus-$VERSION-emscripten.html
+    cp "${build_dir}/augustus.html" "deploy/$DEPLOY_FILE"
   fi
   ;;
 *)
@@ -100,5 +95,5 @@ then
   exit
 fi
 
-curl -u "$UPLOAD_TOKEN" -T deploy/$DEPLOY_FILE https://julius.biancavanschaik.nl/upload/$REPO/$PACKAGE/$VERSION/$DEPLOY_FILE
-echo "Uploaded. URL: https://julius.biancavanschaik.nl/"
+curl -u "$UPLOAD_TOKEN" -T deploy/$DEPLOY_FILE https://augustus.josecadete.net/upload/$REPO/$PACKAGE/$VERSION/$DEPLOY_FILE
+echo "Uploaded. URL: https://augustus.josecadete.net/$REPO.html" 

.ci_scripts/install_dependencies.bat

@@ -0,0 +1,8 @@
+cd ..
+mkdir tmp
+cd tmp
+curl -o SDL2-devel-2.0.16-VC.zip https://www.libsdl.org/release/SDL2-devel-2.0.16-VC.zip
+curl -o SDL2_mixer-devel-2.0.4-VC.zip https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-devel-2.0.4-VC.zip
+tar -xf SDL2-devel-2.0.16-VC.zip -C ../ext/SDL2
+tar -xf SDL2_mixer-devel-2.0.4-VC.zip -C ../ext/SDL2
+cd ../.ci_scripts

.ci_scripts/install_dependencies.sh

@@ -75,14 +75,11 @@ function install_sdl_macos {
 function install_sdl_android {
   local MODULE=$1
   local VERSION=$2
-  local DIRNAME=deps/$MODULE-$VERSION
-  local FILENAME=$DIRNAME.tar.gz
-  if [ ! -f "$FILENAME" ]
-  then
-    get_sdl_lib_url $MODULE $VERSION "tar.gz"
-    curl -o "$FILENAME" "$SDL_LIB_URL"
-  fi
+  local FILENAME=ext/SDL2/$MODULE-$VERSION.tar.gz
+  get_sdl_lib_url $MODULE $VERSION "tar.gz"
+  curl -o "$FILENAME" "$SDL_LIB_URL"
   tar -zxf $FILENAME -C ext/SDL2
+  rm $FILENAME
 }
 
 function install_sdl_ios {
@@ -101,12 +98,12 @@ function install_sdl_ios {
 mkdir -p deps
 if [ "$BUILD_TARGET" == "appimage" ] || [ "$BUILD_TARGET" == "codeql-cpp" ]
 then
-  sudo apt-get update && sudo apt-get -y install libgl1-mesa-dev libsdl2-dev libsdl2-mixer-dev
+  sudo add-apt-repository universe && sudo add-apt-repository ppa:savoury1/multimedia && sudo apt-get update && sudo apt-get -y install libgl1-mesa-dev libsdl2-dev libsdl2-mixer-dev libfuse2
 elif [ "$BUILD_TARGET" == "flatpak" ]
 then
   sudo apt-get update && sudo apt-get -y install flatpak-builder
   sudo flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
-  sudo flatpak-builder repo com.github.bvschaik.julius.json --install-deps-from=flathub --install-deps-only --delete-build-dirs
+  sudo flatpak-builder repo res/com.github.keriew.augustus.json --install-deps-from=flathub --install-deps-only --delete-build-dirs
   sudo rm -R .flatpak-builder
 elif [ ! -z "$SDL_VERSION" ] && [ ! -z "$SDL_MIXER_VERSION" ]
 then
@@ -116,8 +113,20 @@ then
     install_sdl_macos "SDL2_mixer" $SDL_MIXER_VERSION
   elif [ "$BUILD_TARGET" == "android" ]
   then
-    install_sdl_android "SDL2" $SDL_VERSION
-    install_sdl_android "SDL2_mixer" $SDL_MIXER_VERSION
+  	if [ ! -f "android/augustus.keystore" ]
+    then
+      BUILDTYPE=debug
+    else
+      BUILDTYPE=release
+    fi
+    if [ ! -f "deps/SDL2-$BUILDTYPE.aar" ]
+    then
+      install_sdl_android "SDL2" $SDL_VERSION
+      install_sdl_android "SDL2_mixer" $SDL_MIXER_VERSION
+    else
+      mkdir android/augustus/libs
+      cp deps/SDL2-$BUILDTYPE.aar android/augustus/libs/SDL2-$BUILDTYPE.aar
+    fi
   elif [ "$BUILD_TARGET" == "ios" ]
   then
     install_sdl_ios "SDL2" $SDL_VERSION

.ci_scripts/install_sdl.ps1

@@ -3,6 +3,7 @@ function CheckSuccess($message) {
 }
 
 mkdir -Force deps
+
 if ("${env:COMPILER}" -eq "msvc") {
     if ((Test-Path deps/SDL.zip) -and (Test-Path deps/SDL_mixer.zip)) {
         echo "Using cached SDL libraries"
@@ -18,6 +19,55 @@ if ("${env:COMPILER}" -eq "msvc") {
     CheckSuccess("Unpack SDL")
     7z x deps\SDL_mixer.zip -oext\SDL2
     CheckSuccess("Unpack SDL mixer")
+} elseif ("${env:COMPILER}" -eq "msvc-arm64") {
+    $Env:SDL2_DIR = $PWD.Path + "\deps\SDL2"
+    mkdir -Force $Env:SDL2_DIR
+    $Env:SDL2_MIXER_DIR = $PWD.Path + "\deps\SDL2_mixer"
+    mkdir -Force $Env:SDL2_MIXER_DIR
+    if ((Test-Path "${Env:SDL2_DIR}\SDL2.dll") -and (Test-Path "${Env:SDL2_MIXER_DIR}\SDL2_mixer.dll")) {
+        echo "Using cached SDL libraries"
+    } else {
+        echo "Downloading SDL and SDL_mixer Sources"
+        curl "https://libsdl.org/release/SDL2-${env:SDL_VERSION}.zip" -o SDL.zip
+        CheckSuccess("Download SDL")
+        curl "https://libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${env:SDL_MIXER_VERSION}.zip" -o SDL_mixer.zip
+        CheckSuccess("Download SDL mixer")
+
+        7z x SDL.zip
+        7z x SDL_mixer.zip
+
+        CheckSuccess("Unpack SDL and SDL mixer")
+
+        cd "SDL2-${env:SDL_VERSION}"
+        mkdir build
+        cd build
+
+        cmake -G "Visual Studio 17 2022" -A ARM64 -DCMAKE_BUILD_TYPE=Release ..
+        cmake --build . -j 4 --config Release
+        mv include-config-release\SDL2\*.h include\SDL2
+        mv include\SDL2 $Env:SDL2_DIR
+        mv Release\SDL2* $Env:SDL2_DIR
+
+        CheckSuccess("Build SDL")
+
+        cd ..\..
+        cd "SDL2_mixer-${env:SDL_MIXER_VERSION}"
+        mkdir build
+        cd build
+
+        cmake -G "Visual Studio 17 2022" -A ARM64 -DCMAKE_BUILD_TYPE=Release -DSDL2MIXER_MP3=ON -DSDL2MIXER_MP3_MINIMP3=ON -DSDL2MIXER_VENDORED=OFF -DSDL2MIXER_SAMPLES=OFF -DSDL2MIXER_FLAC=OFF -DSDL2MIXER_CMD=OFF -DSDL2MIXER_MOD=OFF -DSDL2MIXER_MIDI=OFF -DSDL2MIXER_MIDI_TIMIDITY=OFF -DSDL2MIXER_OPUS=OFF -DSDL2MIXER_VORBIS=STB -DSDL2MIXER_WAVPACK=OFF ..
+        cmake --build . -j 4 --config Release
+
+        mv ..\include $Env:SDL2_MIXER_DIR
+        mv Release\SDL2_mixer* $Env:SDL2_MIXER_DIR
+
+        CheckSuccess("Build SDL mixer")
+
+        cd ..\..
+    }
+
+    cp -r $Env:SDL2_DIR ext\SDL2
+    cp -r $Env:SDL2_MIXER_DIR ext\SDL2
 } else {
     if ((Test-Path deps/SDL.tar.gz) -and (Test-Path deps/SDL_mixer.tar.gz)) {
         echo "Using cached SDL libraries"

.ci_scripts/pack_assets.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+mkdir res/asset_packer/build && cd res/asset_packer/build
+cmake -DCMAKE_BUILD_TYPE=Release ..
+make -j4
+./asset_packer ../../
+if [ $? -ne 0 ]
+then
+    rm -rf ../../packed_assets
+fi