From bb3b4f2550d7bcc007b270e18964b45db3096204 Mon Sep 17 00:00:00 2001 From: Martin Gerhardy Date: Wed, 1 May 2024 18:01:18 +0200 Subject: [PATCH 1/8] CMAKE: changed order of tools included here this works around a problem in cpack not installing the last component - I'm not yet sure whether this is a problem in my cmake scripts or a cmake bug... --- src/tools/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index 10c5b3fc7a..32654b2217 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -6,18 +6,18 @@ if (VOXEDIT) else() message(STATUS "Don't build voxedit") endif() -if (VOXBROWSER) - add_subdirectory(voxbrowser) +if (VOXCONVERT) + add_subdirectory(voxconvert) else() - message(STATUS "Don't build voxbrowser") + message(STATUS "Don't build voxconvert") endif() if (THUMBNAILER) add_subdirectory(thumbnailer) else() message(STATUS "Don't build thumbnailer") endif() -if (VOXCONVERT) - add_subdirectory(voxconvert) +if (VOXBROWSER) + add_subdirectory(voxbrowser) else() - message(STATUS "Don't build voxconvert") + message(STATUS "Don't build voxbrowser") endif() From 49005cacfcd7eeac1301d2e81cccb6cf954330a5 Mon Sep 17 00:00:00 2001 From: Martin Gerhardy Date: Wed, 1 May 2024 18:07:00 +0200 Subject: [PATCH 2/8] CMAKE: install components into subdirs on windows this fixes installer issues for wix for components like voxedit and voxconvert that share the same files --- cmake/macros.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/macros.cmake b/cmake/macros.cmake index 1046425c84..795cbacfe0 100644 --- a/cmake/macros.cmake +++ b/cmake/macros.cmake @@ -1,6 +1,6 @@ function(engine_install TARGET FILE DESTINATION INSTALL_DATA) if (WIN32) - set(INSTALL_DATA_DIR ".") + set(INSTALL_DATA_DIR "${TARGET}") else() set(INSTALL_DATA_DIR "${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}-${TARGET}") endif() @@ -176,11 +176,11 @@ function(engine_add_executable) endif() if (WIN32) - set(INSTALL_DATA_DIR ".") - set(INSTALL_ICON_DIR ".") + set(INSTALL_DATA_DIR "${_EXE_TARGET}") + set(INSTALL_ICON_DIR "${_EXE_TARGET}") set(INSTALL_APPLICATION_DIR "unused") set(INSTALL_METAINFO_DIR "unused") - set(INSTALL_BIN_DIR ".") + set(INSTALL_BIN_DIR "${_EXE_TARGET}") elseif(APPLE) set(INSTALL_DATA_DIR ".") set(INSTALL_ICON_DIR "unused") @@ -452,7 +452,7 @@ function(engine_install_deps TARGET) set(DEPS ${ARGN}) list(APPEND DEPS ${TARGET}) if (WIN32) - set(INSTALL_DATA_DIR ".") + set(INSTALL_DATA_DIR "${TARGET}") else() set(INSTALL_DATA_DIR "${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}-${TARGET}") endif() From 4f3623c8bda56ca22cba3c46d6f5b47df3500c39 Mon Sep 17 00:00:00 2001 From: Martin Gerhardy Date: Sun, 5 May 2024 20:03:07 +0200 Subject: [PATCH 3/8] FORMATPRINTER: adopt to new subdirs for each component - see previous commit --- cmake/pack.cmake | 3 ++- contrib/installer/windows/wixpatch.xml | Bin 34053 -> 4482 bytes src/tools/formatprinter/FormatPrinter.cpp | 22 ++++++++++++---------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/cmake/pack.cmake b/cmake/pack.cmake index 0e58648660..757a6c6874 100644 --- a/cmake/pack.cmake +++ b/cmake/pack.cmake @@ -47,7 +47,8 @@ elseif (WIN32) set(CPACK_WIX_PRODUCT_ICON "${ROOT_DIR}/contrib/installer/vengi-icon.ico") set(CPACK_WIX_UI_BANNER "${ROOT_DIR}/contrib/installer/vengi-banner-493x58.png") set(CPACK_WIX_UI_DIALOG "${ROOT_DIR}/contrib/installer/vengi-banner-493x312.png") - set(CPACK_WIX_PROPERTY_ARPURLINFOABOUT "https://vengi-voxel.github.io/vengi") + set(CPACK_WIX_PROPERTY_ARPURLINFOABOUT "https://vengi-voxel.github.io/vengi") + set(CPACK_WIX_PATCH_FILE "${ROOT_DIR}/contrib/installer/windows/wixpatch.xml") set(CPACK_WIX_CULTURES "en-US;de-DE") # guids were generated by cmake set(CPACK_WIX_UPGRADE_GUID "9F20CEE6-8CF0-4618-922F-47942B336330") diff --git a/contrib/installer/windows/wixpatch.xml b/contrib/installer/windows/wixpatch.xml index d44374cdbab614f3c6d5081c653b1de2f4e37cb3..7ef2087d953e9c96e1cd049a068be4e1aea772c0 100644 GIT binary patch literal 4482 zcmd5=?@t;*5S_0!>Hl!GX}>9L(lkv=YY1vIS|woB#4`ltholrJ94h~O+xKQTcez73 zT8zyF*t?ybeKYfBc8=e_^0Fbf@~o6Wrt0DRI_7V6S7I}3h&5@?EW~y7M^U~`FjV2o9<((ST?F0fd)nK=?rGVE zu3WvtKonb$zE(>a8{b>DcS#C}#*W7703M|TBj`Ur#`6w5XESH;z=2e-sv!Hgs#2Ci zTt{-QT1t=`Ku-<(S!}3pjPY53q-`Gr(LAm!aH|Jw&stDEF{ttSAcD zp%1^bfx8AtLq3#H^I=|$0{CmJ7-^9quneIu{78^DZMCJ2-Nx_}_l+ee?Qm1qvC7ge z&KR4RrCSqD^`LJR4E{en5yJK>AnxD_f!3lH!l%q%V^Li_|B%0?J#Z#35ijP{Hh7%Q zlf`rD9R7PPKam6E#3y-$3g_QDf2Nse@d_sO> zX%VA7J{RB=D;=vG>-gg`nEiy+&$Yz)N9N8(-@5NhQ5l|&gzerX|wO^5T~hiAbba5Estwr8`h+)$R0t*SK70feKCez z%^ZGHNA|sE*8}P}o?_>&c3t)cx7_|IS)I31InVdEq+Rq<5p3f7oxMr;oZvZ-?!R-; z%xrR5=XWKnyR>Bm8+Y-0%5;x8U5RN+ z4jo^zdOCYK?{nwx`v618cckT4=4Agm>%5qK5-*aEjO}y|raNcHnq)nGsPD*HsThrU Q{|Q)xW=UFa>HZD*15lRdkN^Mx literal 34053 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\n"); Log::printf("\n"); Log::printf(" \n"); - Log::printf(" \n"); + Log::printf(" \n"); Log::printf(" \n"); Log::printf("\n"); Log::printf(" \n"); Log::printf(" \n"); - Log::printf(" \n"); + Log::printf(" \n"); Log::printf("\n"); Log::printf(" \n"); Log::printf(" \n"); - Log::printf(" \n"); - Log::printf(" \n"); + Log::printf(" \n"); + Log::printf(" \n"); Log::printf(" \n"); Log::printf("\n"); Log::printf(" \n"); - Log::printf(" \n"); + Log::printf(" \n"); Log::printf(" \n"); Log::printf(" \n"); Log::printf(" \n"); @@ -279,12 +280,13 @@ void FormatPrinter::printApplicationWix() { if (!uniqueExtensions.insert(e)) { continue; } - Log::printf(" \n", e.c_str(), e.c_str()); + const core::String &m = uniqueMimetype(*desc); + Log::printf(" \n", e.c_str(), e.c_str()); Log::printf(" \n", e.c_str()); Log::printf(" \n", e.c_str(), e.c_str()); - Log::printf(" \n", e.c_str(), desc->name.c_str()); - Log::printf(" \n", e.c_str()); - Log::printf(" \n"); + Log::printf(" \n", e.c_str(), desc->name.c_str()); + Log::printf(" \n", e.c_str(), m.c_str()); + Log::printf(" \n"); Log::printf(" \n"); Log::printf(" \n"); Log::printf("\n"); @@ -292,7 +294,7 @@ void FormatPrinter::printApplicationWix() { } Log::printf("\n"); Log::printf(" \n"); - Log::printf(" \n"); + Log::printf(" \n"); Log::printf(" \n"); Log::printf("\n"); } From 1799555fc5927ca8d6f40e6805c36e3061b6b3fa Mon Sep 17 00:00:00 2001 From: Martin Gerhardy Date: Sun, 5 May 2024 22:47:28 +0200 Subject: [PATCH 4/8] INSTALLER: removed bom from wix patch --- contrib/installer/windows/wixpatch.xml | Bin 4482 -> 36671 bytes src/tools/formatprinter/FormatPrinter.cpp | 6 +++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/installer/windows/wixpatch.xml b/contrib/installer/windows/wixpatch.xml index 7ef2087d953e9c96e1cd049a068be4e1aea772c0..74162b2f57ea79c6dc8a11753f07ec440e683aed 100644 GIT binary patch literal 36671 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 Xe>_X*oG%D-vS0u2nr809$^L%<-|e(_ literal 4482 zcmd5=?@t;*5S_0!>Hl!GX}>9L(lkv=YY1vIS|woB#4`ltholrJ94h~O+xKQTcez73 zT8zyF*t?ybeKYfBc8=e_^0Fbf@~o6Wrt0DRI_7V6S7I}3h&5@?EW~y7M^U~`FjV2o9<((ST?F0fd)nK=?rGVE zu3WvtKonb$zE(>a8{b>DcS#C}#*W7703M|TBj`Ur#`6w5XESH;z=2e-sv!Hgs#2Ci zTt{-QT1t=`Ku-<(S!}3pjPY53q-`Gr(LAm!aH|Jw&stDEF{ttSAcD zp%1^bfx8AtLq3#H^I=|$0{CmJ7-^9quneIu{78^DZMCJ2-Nx_}_l+ee?Qm1qvC7ge z&KR4RrCSqD^`LJR4E{en5yJK>AnxD_f!3lH!l%q%V^Li_|B%0?J#Z#35ijP{Hh7%Q zlf`rD9R7PPKam6E#3y-$3g_QDf2Nse@d_sO> zX%VA7J{RB=D;=vG>-gg`nEiy+&$Yz)N9N8(-@5NhQ5l|&gzerX|wO^5T~hiAbba5Estwr8`h+)$R0t*SK70feKCez z%^ZGHNA|sE*8}P}o?_>&c3t)cx7_|IS)I31InVdEq+Rq<5p3f7oxMr;oZvZ-?!R-; z%xrR5=XWKnyR>Bm8+Y-0%5;x8U5RN+ z4jo^zdOCYK?{nwx`v618cckT4=4Agm>%5qK5-*aEjO}y|raNcHnq)nGsPD*HsThrU Q{|Q)xW=UFa>HZD*15lRdkN^Mx diff --git a/src/tools/formatprinter/FormatPrinter.cpp b/src/tools/formatprinter/FormatPrinter.cpp index 95d72495eb..5bf6cc3d8f 100644 --- a/src/tools/formatprinter/FormatPrinter.cpp +++ b/src/tools/formatprinter/FormatPrinter.cpp @@ -252,6 +252,10 @@ void FormatPrinter::printMarkdownTables() { void FormatPrinter::printApplicationWix() { Log::printf("\n"); + Log::printf("\n"); Log::printf("\n"); Log::printf(" \n"); Log::printf(" \n"); @@ -264,7 +268,7 @@ void FormatPrinter::printApplicationWix() { Log::printf(" \n"); Log::printf(" \n"); Log::printf(" \n"); - Log::printf(" \n"); + Log::printf(" \n"); Log::printf(" \n"); Log::printf("\n"); Log::printf(" \n"); From b31951774bdf30bc32e0d74e209c6b1ec7eab6c4 Mon Sep 17 00:00:00 2001 From: Martin Gerhardy Date: Sun, 5 May 2024 22:56:54 +0200 Subject: [PATCH 5/8] CI: upload the vengi.msi installer --- .github/workflows/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6a2544b40a..813c8fcb16 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -242,6 +242,12 @@ jobs: cmake --install . --component voxbrowser --prefix voxbrowser-install cpack + - name: Upload the vengi msi + uses: actions/upload-artifact@v4 + with: + name: win-vengi-msi + path: build/vengi.msi + - name: Upload the voxedit artifacts uses: actions/upload-artifact@v4 with: From 5fc9de81a73d01a8341e238ce428344bd22d2f08 Mon Sep 17 00:00:00 2001 From: Martin Gerhardy Date: Sun, 5 May 2024 22:58:31 +0200 Subject: [PATCH 6/8] CI: also upload the thumbnailer artifacts --- .github/workflows/main.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 813c8fcb16..bbd89bd431 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -238,6 +238,7 @@ jobs: run: | cd build cmake --install . --component voxedit --prefix voxedit-install + cmake --install . --component thumbnailer --prefix thumbnailer-install cmake --install . --component voxconvert --prefix voxconvert-install cmake --install . --component voxbrowser --prefix voxbrowser-install cpack @@ -273,6 +274,12 @@ jobs: name: win-voxbrowser path: build/voxbrowser-install/ + - name: Upload the thumbnailer artifacts + uses: actions/upload-artifact@v4 + with: + name: win-thumbnailer + path: build/thumbnailer-install/ + - name: Upload the nsis installer artifacts uses: actions/upload-artifact@v4 with: From 27db81ddf02ad8a4f802116a6903b4475681d20e Mon Sep 17 00:00:00 2001 From: Martin Gerhardy Date: Sun, 5 May 2024 23:09:11 +0200 Subject: [PATCH 7/8] JANITORIAL: updated formats --- contrib/installer/linux/thumbnailer.thumbnailer.in | 2 +- contrib/installer/linux/voxedit.desktop.in | 2 +- contrib/installer/linux/x-voxel.xml | 2 +- contrib/installer/windows/wixpatch.xml | 4 ++-- tools/html/data.js | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/installer/linux/thumbnailer.thumbnailer.in b/contrib/installer/linux/thumbnailer.thumbnailer.in index 787332bb75..2aaa2cc561 100644 --- a/contrib/installer/linux/thumbnailer.thumbnailer.in +++ b/contrib/installer/linux/thumbnailer.thumbnailer.in @@ -1,4 +1,4 @@ [Thumbnailer Entry] TryExec=@CMAKE_PROJECT_NAME@-@NAME@ Exec=@CMAKE_PROJECT_NAME@-@NAME@ --use-scene-camera -s %s --input %i --output %o -MimeType=application/x-aceofspades;application/x-aceofspades-vxl;application/x-animatoon;application/x-binvox;application/x-build-engine;application/x-chronovox;application/x-cubeworld;application/x-cubzh;application/x-cubzh-world;application/x-fbx;application/x-gl-transmission-format;application/x-goxel;application/x-magicavoxel;application/x-magicavoxel-xraw;application/x-minecraft-level-dat;application/x-minecraft-region;application/x-minecraft-schematic;application/x-minetest;application/x-nicks-voxel-model;application/x-particubes;application/x-polygon-file-format;application/x-quake-1;application/x-quake-2-model;application/x-qubicle-binary;application/x-qubicle-binary-tree;application/x-qubicle-exchange;application/x-qubicle-project;application/x-rooms.xyz-thing;application/x-sandbox-voxedit-collection;application/x-sandbox-voxedit-hierarchy;application/x-sandbox-voxedit-model;application/x-sandbox-voxedit-tilemap;application/x-slab6-vox;application/x-sproxel-csv;application/x-standard-triangle-language;application/x-starmade-blueprint;application/x-starmade-template;application/x-tiberian-sun;application/x-ufo-alien-invasion;application/x-vengi;application/x-voxel3d;application/x-voxelbuilder;application/x-voxelmax;application/x-wavefront-object +MimeType=application/x-aceofspades;application/x-aceofspades-vxl;application/x-animatoon;application/x-binvox;application/x-build-engine;application/x-chronovox;application/x-cubeworld;application/x-cubzh;application/x-cubzh-world;application/x-fbx;application/x-gl-transmission-format;application/x-goxel;application/x-magicavoxel;application/x-magicavoxel-xraw;application/x-minecraft-level-dat;application/x-minecraft-region;application/x-minecraft-schematic;application/x-minetest;application/x-nicks-voxel-model;application/x-particubes;application/x-polygon-file-format;application/x-quake-1;application/x-quake-2-model;application/x-qubicle-binary;application/x-qubicle-binary-tree;application/x-qubicle-exchange;application/x-qubicle-project;application/x-rooms-xyz-thing;application/x-sandbox-voxedit-collection;application/x-sandbox-voxedit-hierarchy;application/x-sandbox-voxedit-model;application/x-sandbox-voxedit-tilemap;application/x-slab6-vox;application/x-sproxel-csv;application/x-standard-triangle-language;application/x-starmade-blueprint;application/x-starmade-template;application/x-tiberian-sun;application/x-ufo-alien-invasion;application/x-vengi;application/x-voxel3d;application/x-voxelbuilder;application/x-voxelmax;application/x-wavefront-object diff --git a/contrib/installer/linux/voxedit.desktop.in b/contrib/installer/linux/voxedit.desktop.in index 2ae1f92d0a..578d621ddc 100644 --- a/contrib/installer/linux/voxedit.desktop.in +++ b/contrib/installer/linux/voxedit.desktop.in @@ -10,4 +10,4 @@ Type=Application Keywords=3D;modeling;voxel;engine;pixel;art Categories=Graphics;2DGraphics;3DGraphics;RasterGraphics; StartupNotify=true -MimeType=application/x-aceofspades;application/x-aceofspades-vxl;application/x-animatoon;application/x-binvox;application/x-build-engine;application/x-chronovox;application/x-cubeworld;application/x-cubzh;application/x-cubzh-world;application/x-fbx;application/x-gl-transmission-format;application/x-goxel;application/x-magicavoxel;application/x-magicavoxel-xraw;application/x-minecraft-level-dat;application/x-minecraft-region;application/x-minecraft-schematic;application/x-minetest;application/x-nicks-voxel-model;application/x-particubes;application/x-polygon-file-format;application/x-quake-1;application/x-quake-2-model;application/x-qubicle-binary;application/x-qubicle-binary-tree;application/x-qubicle-exchange;application/x-qubicle-project;application/x-rooms.xyz-thing;application/x-sandbox-voxedit-collection;application/x-sandbox-voxedit-hierarchy;application/x-sandbox-voxedit-model;application/x-sandbox-voxedit-tilemap;application/x-slab6-vox;application/x-sproxel-csv;application/x-standard-triangle-language;application/x-starmade-blueprint;application/x-starmade-template;application/x-tiberian-sun;application/x-ufo-alien-invasion;application/x-vengi;application/x-voxel3d;application/x-voxelbuilder;application/x-voxelmax;application/x-wavefront-object +MimeType=application/x-aceofspades;application/x-aceofspades-vxl;application/x-animatoon;application/x-binvox;application/x-build-engine;application/x-chronovox;application/x-cubeworld;application/x-cubzh;application/x-cubzh-world;application/x-fbx;application/x-gl-transmission-format;application/x-goxel;application/x-magicavoxel;application/x-magicavoxel-xraw;application/x-minecraft-level-dat;application/x-minecraft-region;application/x-minecraft-schematic;application/x-minetest;application/x-nicks-voxel-model;application/x-particubes;application/x-polygon-file-format;application/x-quake-1;application/x-quake-2-model;application/x-qubicle-binary;application/x-qubicle-binary-tree;application/x-qubicle-exchange;application/x-qubicle-project;application/x-rooms-xyz-thing;application/x-sandbox-voxedit-collection;application/x-sandbox-voxedit-hierarchy;application/x-sandbox-voxedit-model;application/x-sandbox-voxedit-tilemap;application/x-slab6-vox;application/x-sproxel-csv;application/x-standard-triangle-language;application/x-starmade-blueprint;application/x-starmade-template;application/x-tiberian-sun;application/x-ufo-alien-invasion;application/x-vengi;application/x-voxel3d;application/x-voxelbuilder;application/x-voxelmax;application/x-wavefront-object diff --git a/contrib/installer/linux/x-voxel.xml b/contrib/installer/linux/x-voxel.xml index c18d710e19..308595ab05 100644 --- a/contrib/installer/linux/x-voxel.xml +++ b/contrib/installer/linux/x-voxel.xml @@ -248,7 +248,7 @@ Voxel3D - + Rooms.xyz Thing diff --git a/contrib/installer/windows/wixpatch.xml b/contrib/installer/windows/wixpatch.xml index 74162b2f57..7570d2d2a1 100644 --- a/contrib/installer/windows/wixpatch.xml +++ b/contrib/installer/windows/wixpatch.xml @@ -416,7 +416,7 @@ - + @@ -479,7 +479,7 @@ - + diff --git a/tools/html/data.js b/tools/html/data.js index e52434fc0d..2765abf6a0 100644 --- a/tools/html/data.js +++ b/tools/html/data.js @@ -674,7 +674,7 @@ const jsonData = { "thing" ], "magics": [], - "mimetype": "application/x-rooms.xyz-thing", + "mimetype": "application/x-rooms-xyz-thing", "animation": false, "save": false }, From 9b098823ebae288db4cb93d18e755da600029ea6 Mon Sep 17 00:00:00 2001 From: Martin Gerhardy Date: Sun, 5 May 2024 23:12:03 +0200 Subject: [PATCH 8/8] CI: removed nsis artifacts --- .github/workflows/main.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bbd89bd431..0e295016e4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -280,12 +280,6 @@ jobs: name: win-thumbnailer path: build/thumbnailer-install/ - - name: Upload the nsis installer artifacts - uses: actions/upload-artifact@v4 - with: - name: win-installer - path: build/vengi-*-Windows.exe - windows-debug: timeout-minutes: 45 runs-on: windows-2019