Miscellaneous release improvements (#324)

MihailRis · Oct 22, 2024 · 8aab119 · 8aab119
1 parent 22b2e80
commit 8aab119
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 15 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -33,14 +33,13 @@ jobs:
           mkdir build
           cd build
           cmake -DCMAKE_BUILD_TYPE=Release -DVOXELENGINE_BUILD_WINDOWS_VCPKG=ON -DVOXELENGINE_BUILD_TESTS=ON ..
-          Remove-Item -Path CMakeFiles -Recurse -Force
-          cmake -DCMAKE_BUILD_TYPE=Release -DVOXELENGINE_BUILD_WINDOWS_VCPKG=ON -DVOXELENGINE_BUILD_TESTS=ON ..
           cmake --build . --config Release
       - name: Package for Windows
         run: |
           mkdir packaged
           cp -r build/* packaged/
           cp C:/Windows/System32/msvcp140.dll packaged/Release/msvcp140.dll
+          mv packaged/Release/VoxelEngine.exe packaged/Release/VoxelCore.exe
         working-directory: ${{ github.workspace }}
       - name: Run tests
         run: ctest --output-on-failure --test-dir build

diff --git a/dev/AppImageBuilder.yml b/dev/AppImageBuilder.yml
@@ -2,12 +2,12 @@ version: 1
 AppDir:
   path: AppDir
   app_info:
-    id: VoxelEngine
-    name: VoxelEngine
-    icon: VoxelEngine
+    id: VoxelCore
+    name: VoxelCore
+    icon: VoxelCore
     version: latest
     exec: usr/bin/VoxelEngine
-    exec_args: --dir $HOME/.voxeng --res $APPDIR/usr/share/VoxelEngine/res $@
+    exec_args: --dir $HOME/.voxeng --res $APPDIR/usr/share/VoxelCore/res $@
   apt:
     arch: amd64
     sources:

diff --git a/dev/VoxelEngine.desktop → dev/VoxelCore.desktop b/dev/VoxelEngine.desktop → dev/VoxelCore.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Version=1.0
 Type=Application
-Name=VoxelEngine
+Name=VoxelCore
 Comment=Minecraft-like game engine in C++ with OpenGL
 TryExec=VoxelEngine
 Exec=VoxelEngine
-Icon=VoxelEngine
+Icon=VoxelCore
 MimeType=image/x-foo;
 Categories=Game;
diff --git a/dev/VoxelEngine.png → dev/VoxelCore.png b/dev/VoxelEngine.png → dev/VoxelCore.png
diff --git a/dev/cmake/BuildAppdir.cmake b/dev/cmake/BuildAppdir.cmake
@@ -2,13 +2,13 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/usr/bin)
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/usr/lib)
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/usr/share/icons/hicolor/256x256)
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/usr/share/applications)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/usr/share/VoxelEngine)
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/res DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/usr/share/VoxelEngine)
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/dev/VoxelEngine.png DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/usr/share/icons/hicolor/256x256)
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/dev/VoxelEngine.png DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/AppDir)
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/dev/VoxelEngine.png DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/.dirIcon)
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/dev/VoxelEngine.desktop DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/usr/share/applications)
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/dev/VoxelEngine.desktop DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/)
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/usr/share/VoxelCore)
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/res DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/usr/share/VoxelCore)
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/dev/VoxelCore.png DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/usr/share/icons/hicolor/256x256)
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/dev/VoxelCore.png DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/AppDir)
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/dev/VoxelCore.png DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/.dirIcon)
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/dev/VoxelCore.desktop DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/usr/share/applications)
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/dev/VoxelCore.desktop DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/usr/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/usr/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/AppDir/usr/bin)