Issue #13367: use correct AppImage and MSIX IDs for continuous builds.

Also make sure we ship the relevant graphviz runtime dependencies when
the debug menu is visible.

build/linux/appimage/3_dist-gimp-goappimage.sh

@@ -99,7 +99,7 @@ fi
 eval $(sed -n 's/^#define  *\([^ ]*\)  *\(.*\) *$/export \1=\2/p' $BUILD_DIR/config.h)
 
 ## Set proper AppImage update channel and App ID
-if [ -z "$GIMP_RELEASE" ] && [ "$GIMP_UNSTABLE" ] || [ "$GIMP_IS_RC_GIT" ]; then
+if [ -z "$GIMP_RELEASE" ] || [ "$GIMP_IS_RC_GIT" ]; then
   export CHANNEL="Continuous"
 elif [ "$GIMP_RELEASE" ] && [ "$GIMP_UNSTABLE" ] || [ "$GIMP_RC_VERSION" ]; then
   export CHANNEL="Pre"
@@ -324,7 +324,9 @@ bund_usr "$UNIX_PREFIX" "share/poppler"
 ### file-wmf support
 bund_usr "$UNIX_PREFIX" "share/fonts/type1/urw-base35/Nimbus*" --dest "share/libwmf/fonts"
 bund_usr "$UNIX_PREFIX" "share/fonts/type1/urw-base35/StandardSymbols*" --dest "share/libwmf/fonts"
-if [ "$GIMP_UNSTABLE" ]; then
+# Note: we want the same test as around the global variable
+# show_debug_menu in app/main.c
+if [ "$GIMP_UNSTABLE" ] || [ -z "$GIMP_RELEASE" ]; then
   ### Image graph support
   bund_usr "$UNIX_PREFIX" "bin/libgvc*" --rename "bin/dot"
   bund_usr "$UNIX_PREFIX" "lib/graphviz/config*"

build/windows/2_bundle-gimp-uni_base.sh

@@ -157,7 +157,9 @@ bundle "$GIMP_PREFIX" bin/gimp*.exe
 bundle "$GIMP_PREFIX" bin/libgimp*.dll
 ### Bundled just to promote GEGL. See: https://gitlab.gnome.org/GNOME/gimp/-/issues/10580
 bundle "$GIMP_PREFIX" bin/gegl.exe
-if [ "$GIMP_UNSTABLE" ] && [[ ! "$MSYSTEM_PREFIX" =~ "32" ]]; then
+# Note: we want the same test as around the global variable
+# show_debug_menu in app/main.c
+if [ "$GIMP_UNSTABLE" ] || [ -z "$GIMP_RELEASE" ] && [[ ! "$MSYSTEM_PREFIX" =~ "32" ]]; then
   ### Needed for 'Show image graph'.
   #### See: https://gitlab.gnome.org/GNOME/gimp/-/issues/6045
   bundle "$MSYSTEM_PREFIX" bin/dot.exe
@@ -171,7 +173,7 @@ bundle "$MSYSTEM_PREFIX" bin/gdbus.exe
 ### Needed for hyperlink support etc... See: https://gitlab.gnome.org/GNOME/gimp/-/issues/12288
 #...when running from `gimp*.exe --verbose`
 bundle "$MSYSTEM_PREFIX" bin/gspawn*-console.exe
-if [ -z "$GIMP_UNSTABLE" ]; then
+if [ -z "$GIMP_UNSTABLE" ] && [ "$GIMP_RELEASE" ]; then
   #...when running from `gimp*.exe`
   bundle "$MSYSTEM_PREFIX" bin/gspawn*-helper.exe
 fi
@@ -189,7 +191,7 @@ if [ -z "$QUASI_MSYS2_ROOT" ]; then
 
   #python.exe is needed for plug-ins output in `gimp-console*.exe`
   bundle "$MSYSTEM_PREFIX" bin/python.exe
-  if [ -z "$GIMP_UNSTABLE" ]; then
+  if [ -z "$GIMP_UNSTABLE" ] && [ "$GIMP_RELEASE" ]; then
     #pythonw.exe is needed to run plug-ins silently in `gimp*.exe`
     bundle "$MSYSTEM_PREFIX" bin/pythonw.exe
   fi

build/windows/store/3_dist-gimp-winsdk.ps1

@@ -92,7 +92,7 @@ ForEach ($line in $(Select-String 'define' $config_path -AllMatches))
   }
 
 ## Get Identity Name (the dir shown in Explorer)
-if (-not $GIMP_RELEASE -and $GIMP_UNSTABLE -or $GIMP_IS_RC_GIT)
+if (-not $GIMP_RELEASE -or $GIMP_IS_RC_GIT)
   {
     $IDENTITY_NAME="GIMP.GIMPInsider"
   }
@@ -211,11 +211,11 @@ foreach ($bundle in $supported_archs)
         (Get-Content $msix_arch\AppxManifest.xml) | Foreach-Object {$_ -replace "@IDENTITY_NAME@","$IDENTITY_NAME"} |
         Set-Content $msix_arch\AppxManifest.xml
         ### Set Display Name (the name shown in MS Store)
-        if (-not $GIMP_RELEASE -and $GIMP_UNSTABLE -or $GIMP_IS_RC_GIT)
+        if (-not $GIMP_RELEASE -or $GIMP_IS_RC_GIT)
           {
             $display_name='GIMP (Insider)'
           }
-        elseif ($GIMP_RELEASE -and $GIMP_UNSTABLE -or $GIMP_RC_VERSION)
+        elseif (($GIMP_RELEASE -and $GIMP_UNSTABLE) -or $GIMP_RC_VERSION)
           {
             $display_name='GIMP (Preview)'
           }