CI: Update valid script & use png icon [gen-appimage]

- Better explanation on configure generation warnings
- Use PNG file, XPM seems to have a problem on debian (rt)

Makefile.am

@@ -11,24 +11,24 @@ if LKT_APPIMAGE
 # Build appimages, needs for lektor to be installed
 appimage: install
 	[ -d AppImage ] || mkdir -p AppImage
-	cp $(top_srcdir)/inc/lektor/icon.xpm AppImage/lektor.xpm
+	cp $(top_srcdir)/utils/desktop/lektor.png AppImage/lektor.png
 
 	$(LKT_LINUXDEPLOY) --appdir AppImage/lektord                    \
 		--desktop-file $(top_srcdir)/utils/desktop/lektord.desktop  \
-		--icon-file AppImage/lektor.xpm                             \
+		--icon-file AppImage/lektor.png                             \
 		--executable $(bindir)/lektord
 	$(LKT_APPIMAGETOOL) AppImage/lektord
 
 	$(LKT_LINUXDEPLOY) --appdir AppImage/lkt                        \
 		--desktop-file $(top_srcdir)/utils/desktop/lkt.desktop      \
-		--icon-file AppImage/lektor.xpm                             \
+		--icon-file AppImage/lektor.png                             \
 		--executable $(bindir)/lkt
 	$(LKT_APPIMAGETOOL) AppImage/lkt
 
 if LKT_KLKT
 	$(LKT_LINUXDEPLOY) --appdir AppImage/klkt                       \
 		--desktop-file $(top_srcdir)/utils/desktop/klkt.desktop     \
-		--icon-file AppImage/lektor.xpm                             \
+		--icon-file AppImage/lektor.png                             \
 		--executable $(bindir)/klkt
 	$(LKT_APPIMAGETOOL) AppImage/klkt
 endif

Makefile.in

@@ -957,23 +957,23 @@ uninstall-am: uninstall-binSCRIPTS
 # Build appimages, needs for lektor to be installed
 @LKT_APPIMAGE_TRUE@appimage: install
 @LKT_APPIMAGE_TRUE@	[ -d AppImage ] || mkdir -p AppImage
-@LKT_APPIMAGE_TRUE@	cp $(top_srcdir)/inc/lektor/icon.xpm AppImage/lektor.xpm
+@LKT_APPIMAGE_TRUE@	cp $(top_srcdir)/utils/desktop/lektor.png AppImage/lektor.png
 
 @LKT_APPIMAGE_TRUE@	$(LKT_LINUXDEPLOY) --appdir AppImage/lektord                    \
 @LKT_APPIMAGE_TRUE@		--desktop-file $(top_srcdir)/utils/desktop/lektord.desktop  \
-@LKT_APPIMAGE_TRUE@		--icon-file AppImage/lektor.xpm                             \
+@LKT_APPIMAGE_TRUE@		--icon-file AppImage/lektor.png                             \
 @LKT_APPIMAGE_TRUE@		--executable $(bindir)/lektord
 @LKT_APPIMAGE_TRUE@	$(LKT_APPIMAGETOOL) AppImage/lektord
 
 @LKT_APPIMAGE_TRUE@	$(LKT_LINUXDEPLOY) --appdir AppImage/lkt                        \
 @LKT_APPIMAGE_TRUE@		--desktop-file $(top_srcdir)/utils/desktop/lkt.desktop      \
-@LKT_APPIMAGE_TRUE@		--icon-file AppImage/lektor.xpm                             \
+@LKT_APPIMAGE_TRUE@		--icon-file AppImage/lektor.png                             \
 @LKT_APPIMAGE_TRUE@		--executable $(bindir)/lkt
 @LKT_APPIMAGE_TRUE@	$(LKT_APPIMAGETOOL) AppImage/lkt
 
 @LKT_APPIMAGE_TRUE@@LKT_KLKT_TRUE@	$(LKT_LINUXDEPLOY) --appdir AppImage/klkt                       \
 @LKT_APPIMAGE_TRUE@@LKT_KLKT_TRUE@		--desktop-file $(top_srcdir)/utils/desktop/klkt.desktop     \
-@LKT_APPIMAGE_TRUE@@LKT_KLKT_TRUE@		--icon-file AppImage/lektor.xpm                             \
+@LKT_APPIMAGE_TRUE@@LKT_KLKT_TRUE@		--icon-file AppImage/lektor.png                             \
 @LKT_APPIMAGE_TRUE@@LKT_KLKT_TRUE@		--executable $(bindir)/klkt
 @LKT_APPIMAGE_TRUE@@LKT_KLKT_TRUE@	$(LKT_APPIMAGETOOL) AppImage/klkt
 @LKT_APPIMAGE_TRUE@clean-local:

configure

@@ -21211,7 +21211,7 @@ LKT_CONFIG_RESULT="
 #
 ### Qt options (needed only for klkt)
 #
-# Compiler C++............. $(test x$CXX   == 'x' || { basename $CXX   ; echo -ne '(' ; echo -ne $(which $CXX) ; echo -ne ')'; })
+# Compiler C++............. $(basenale $CXX) ($(which $CXX))
 # QMake.................... $(test x$QMAKE == 'x' || { basename $QMAKE ; echo -ne '(' ; echo $QMAKE            ; echo -ne ')'; })
 # MOC...................... $(test x$MOC   == 'x' || { basename $MOC   ; echo -ne '(' ; echo $MOC              ; echo -ne ')'; })
 # RCC...................... $(test x$RCC   == 'x' || { basename $RCC   ; echo -ne '(' ; echo $RCC              ; echo -ne ')'; })

configure.ac

@@ -339,7 +339,7 @@ LKT_CONFIG_RESULT="
 #
 ### Qt options (needed only for klkt)
 #
-# Compiler C++............. $(test x$CXX   == 'x' || { basename $CXX   ; echo -ne '(' ; echo -ne $(which $CXX) ; echo -ne ')'; })
+# Compiler C++............. $(basenale $CXX) ($(which $CXX))
 # QMake.................... $(test x$QMAKE == 'x' || { basename $QMAKE ; echo -ne '(' ; echo $QMAKE            ; echo -ne ')'; })
 # MOC...................... $(test x$MOC   == 'x' || { basename $MOC   ; echo -ne '(' ; echo $MOC              ; echo -ne ')'; })
 # RCC...................... $(test x$RCC   == 'x' || { basename $RCC   ; echo -ne '(' ; echo $RCC              ; echo -ne ')'; })

utils/scripts/validate.bash

@@ -127,6 +127,10 @@ function do_check_configure ()
     check_cp configure configure.bak
     check_autoreconf
     check_cd $LKT_DIR
+    echo "### Note on the diff command:"
+    echo "# < line            <- was on the file you pushed and was removed"
+    echo "# > line            <- was added to the file you pushed"
+    echo "### That's it, showing diff from configure.bak to configure:"
     diff configure.bak configure
     if test $? -eq 0 ; then
         echo "Configure script correctly created"