Use -nightly icons suffix for snapshots builds (openscad#4488)

gsohler · Jan 10, 2023 · 5f92c4d · 5f92c4d
1 parent f72e9fc
commit 5f92c4d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 16 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -208,7 +208,7 @@ jobs:
           name: Build OpenSCAD
           command: |
             export NUMCPU=$(($(sysctl -n hw.ncpu) * 3 / 2))
-            time ./scripts/release-common.sh -snapshot
+            time ./scripts/release-common.sh snapshot
             cd build
             OPENSCAD_NAME=$(ls OpenSCAD-*.dmg)
             shasum -a 256 "$OPENSCAD_NAME" > "$OPENSCAD_NAME".sha256

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -840,13 +840,11 @@ else()
 endif()
 
 if (SNAPSHOT)
+  set(SNAPSHOT_SUFFIX "-nightly")
   target_compile_definitions(OpenSCAD PRIVATE OPENSCAD_SNAPSHOT)
-  set(MACOSX_BUNDLE_ICON_FILE icon-nightly.icns)
-  set(WINDOWS_RESOURCE_PATH ${RESOURCE_DIR}/openscad_win32-nightly.rc)
-else()
-  set(MACOSX_BUNDLE_ICON_FILE OpenSCAD.icns)
-  set(WINDOWS_RESOURCE_PATH ${RESOURCE_DIR}/openscad_win32.rc)
 endif()
+set(WINDOWS_RESOURCE_PATH ${RESOURCE_DIR}/openscad_win32${SNAPSHOT_SUFFIX}.rc)
+set(MACOSX_BUNDLE_ICON_FILE icon${SNAPSHOT_SUFFIX}.icns)
 
 if (APPLE)
   list(APPEND RESOURCE_FILES ${RESOURCE_DIR}/mac.qrc)
@@ -938,11 +936,11 @@ if(NOT APPLE OR APPLE_UNIX)
     install(FILES ${CMAKE_CURRENT_LIST_DIR}/openscad.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo RENAME org.openscad.OpenSCAD${SUFFIX_WITH_DASH}.appdata.xml)
     install(FILES ${RESOURCE_DIR}/icons/openscad.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications RENAME openscad${SUFFIX_WITH_DASH}.desktop)
     install(FILES ${RESOURCE_DIR}/icons/openscad.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/mime/packages RENAME openscad${SUFFIX_WITH_DASH}.xml)
-    install(FILES ${RESOURCE_DIR}/icons/openscad${SUFFIX_WITH_DASH}-48.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps RENAME openscad${SUFFIX_WITH_DASH}.png)
-    install(FILES ${RESOURCE_DIR}/icons/openscad${SUFFIX_WITH_DASH}-64.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/apps RENAME openscad${SUFFIX_WITH_DASH}.png)
-    install(FILES ${RESOURCE_DIR}/icons/openscad${SUFFIX_WITH_DASH}-128.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/128x128/apps RENAME openscad${SUFFIX_WITH_DASH}.png)
-    install(FILES ${RESOURCE_DIR}/icons/openscad${SUFFIX_WITH_DASH}-256.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps RENAME openscad${SUFFIX_WITH_DASH}.png)
-    install(FILES ${RESOURCE_DIR}/icons/openscad${SUFFIX_WITH_DASH}-512.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/512x512/apps RENAME openscad${SUFFIX_WITH_DASH}.png)
+    install(FILES ${RESOURCE_DIR}/icons/openscad${SNAPSHOT_SUFFIX}-48.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps RENAME openscad${SNAPSHOT_SUFFIX}.png)
+    install(FILES ${RESOURCE_DIR}/icons/openscad${SNAPSHOT_SUFFIX}-64.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/apps RENAME openscad${SNAPSHOT_SUFFIX}.png)
+    install(FILES ${RESOURCE_DIR}/icons/openscad${SNAPSHOT_SUFFIX}-128.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/128x128/apps RENAME openscad${SNAPSHOT_SUFFIX}.png)
+    install(FILES ${RESOURCE_DIR}/icons/openscad${SNAPSHOT_SUFFIX}-256.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps RENAME openscad${SNAPSHOT_SUFFIX}.png)
+    install(FILES ${RESOURCE_DIR}/icons/openscad${SNAPSHOT_SUFFIX}-512.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/512x512/apps RENAME openscad${SNAPSHOT_SUFFIX}.png)
   endif()
   install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/color-schemes DESTINATION "${OPENSCAD_INSTALL_RESOURCEDIR}")
   install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/examples DESTINATION "${OPENSCAD_INSTALL_RESOURCEDIR}")

diff --git a/openscad.appdata.xml.in b/openscad.appdata.xml.in
@@ -4,7 +4,7 @@
   <metadata_license>CC0-1.0</metadata_license>
   <name>OpenSCAD</name>
   <summary>The Programmers Solid 3D CAD Modeller</summary>
-  <icon type="remote">https://www.openscad.org/images/openscad${SUFFIX_WITH_DASH}.png</icon>
+  <icon type="remote">https://www.openscad.org/images/openscad${SNAPSHOT_SUFFIX}.png</icon>
   <categories>
     <category>Graphics</category>
     <category>3DGraphics</category>

diff --git a/resources/common.qrc.in b/resources/common.qrc.in
@@ -21,7 +21,7 @@
     <file>icons/information-icons-info.png</file>
     <file>icons/information-icons-question.png</file>
     <file>icons/information-icons-warning.png</file>
-    <file alias="logo.png">icons/openscad${SUFFIX_WITH_DASH}.png</file>
+    <file alias="logo.png">icons/openscad${SNAPSHOT_SUFFIX}.png</file>
 
     <file>icons/button.png</file>
     <file>icons/background-welcome-screen.svg</file>

diff --git a/resources/icons/openscad.desktop.in b/resources/icons/openscad.desktop.in
@@ -3,8 +3,8 @@ Type=Application
 Version=1.0
 Name=OpenSCAD
 Comment=The Programmers Solid 3D CAD Modeller
-Icon=openscad@SUFFIX_WITH_DASH@
-Exec=openscad@SUFFIX_WITH_DASH@ %f
+Icon=openscad${SNAPSHOT_SUFFIX}
+Exec=openscad${SUFFIX_WITH_DASH} %f
 MimeType=application/x-openscad;
 Categories=Graphics;3DGraphics;Engineering;
 Keywords=3d;solid;geometry;csg;model;stl;
diff --git a/resources/mac.qrc.in b/resources/mac.qrc.in
@@ -1,5 +1,5 @@
 <RCC>
   <qresource>
-    <file alias="icon-macos.png" >icons/openscad${SUFFIX_WITH_DASH}-macos.png</file>
+    <file alias="icon-macos.png" >icons/openscad${SNAPSHOT_SUFFIX}-macos.png</file>
   </qresource>
 </RCC>