Actually configure for appimage when we build it.

Author: Kasper Peeters

.github/workflows/appimage-modern.yml

@@ -182,6 +182,7 @@ jobs:
             cmake -DCMAKE_INSTALL_PREFIX=/usr \
                   -DCMAKE_BUILD_TYPE=Release \
                   -DENABLE_MATHEMATICA=OFF \
+                  -DAPPIMAGE_MODE=ON \
                   ..
 
             VERSION=\$(cat /workspace/build/VERSION)

CMakeLists.txt

@@ -625,66 +625,15 @@ add_custom_target(uninstall
 # Provide target to build AppImage.
 #---------------------------------------------------------------------------
 
-if(APPIMAGE_MODE)
-  # We need linuxdeploy to create the AppImage. It is best to have this built
-  # from source and installed locally. Make sure to first install deps by doing
-  #
-  #   sudo apt install libcimg-dev libgtest-dev
-  #
-  # Then checkout appimagetool, linuxdeploy, linuxdeploy-plugin-appimage using
-  #
-  #   git clone https://github.com/AppImage/appimagetool.git --recurse-submodules
-  #   git clone https://github.com/linuxdeploy/linuxdeploy.git --recurse-submodules
-  #   git clone https://github.com/linuxdeploy/linuxdeploy-plugin-appimage.git --recurse-submodules
-  #
-  # Do *not* forget the `--recurse-submodules` flag!
-  #
-  # Build `appimagetool` as usual, and for the other two use
-  #
-  #   cd linuxdeploy && mkdir build && cd build
-  #   cmake -DBUILD_TESTING=OFF ..
-  #   make && sudo make install
-  #
-  # and ditto for the plugin,
-  #
-  #   cd linuxdeploy && mkdir build && cd build
-  #   cmake -DBUILD_TESTING=OFF ..
-  #   make && sudo make install
-  #
-  # If you do not have it locally, the configure process will download an
-  # AppImage for linuxdeploy, but this does *not* run inside a QEMU container.
-  
-  print_header("Configuring AppImage build")
-  find_program(LINUXDEPLOY linuxdeploy "${CMAKE_BINARY_DIR}")
-  set(DEPLOY         linuxdeploy-${CMAKE_SYSTEM_PROCESSOR}.AppImage)
-  set(DEPLOY_URL     https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/${DEPLOY})
-  set(DEPLOY_GTK_URL https://raw.githubusercontent.com/linuxdeploy/linuxdeploy-plugin-gtk/master/linuxdeploy-plugin-gtk.sh)
-  if(${LINUXDEPLOY} MATCHES "LINUXDEPLOY-NOTFOUND")
-    message(STATUS "The 'linuxdeploy' binary is not present, downloading one")
-    message(STATUS "Generating AppImage using ${DEPLOY_URL}")
-    if(NOT EXISTS "linuxdeploy")
-      message(STATUS "Downloading...")
-      file(DOWNLOAD ${DEPLOY_URL} ${CMAKE_BINARY_DIR}/linuxdeploy)
-      execute_process(COMMAND chmod u+x ${CMAKE_BINARY_DIR}/linuxdeploy)
-    endif()
-    set(LINUXDEPLOY ${CMAKE_BINARY_DIR}/linuxdeploy)
-  else()
-    message(STATUS "Found linuxdeploy at ${LINUXDEPLOY}")
-  endif()
-  if(NOT EXISTS "linuxdeploy-plugin-gtk.sh")
-      file(DOWNLOAD ${DEPLOY_GTK_URL} ${CMAKE_BINARY_DIR}/linuxdeploy-plugin-gtk.sh)
-      execute_process(COMMAND chmod u+x ${CMAKE_BINARY_DIR}/linuxdeploy-plugin-gtk.sh)
-  endif()
-  add_custom_target(appimage
-    COMMAND mkdir -p AppDir/${Python_SITELIB}
-    COMMAND cp -a ${CMAKE_SOURCE_DIR}/config/AppRun AppDir/
-    COMMAND chmod gou+x ${CMAKE_SOURCE_DIR}/config/AppRun AppDir/AppRun
-    COMMAND cp -a ${Python_SITELIB}/setuptools AppDir/${Python_SITELIB}/
-    COMMAND cp -a ${Python_STDARCH}/* AppDir/${Python_STDARCH}/
-    COMMAND ${LINUXDEPLOY} --appdir AppDir --plugin gtk --desktop-file AppDir/usr/share/applications/science.cadabra.cadabra2-gtk.desktop --output appimage
-    COMMAND mv Cadabra_2-${CMAKE_SYSTEM_PROCESSOR}.AppImage Cadabra_${CADABRA_VERSION_SEM}_${CMAKE_SYSTEM_PROCESSOR}.AppImage
-  )
-endif()
+# if(APPIMAGE_MODE)
+#   add_custom_target(appimage
+#     COMMAND mkdir -p AppDir/${Python_SITELIB}
+#     COMMAND cp -a ${CMAKE_SOURCE_DIR}/config/AppRun AppDir/
+#     COMMAND chmod gou+x ${CMAKE_SOURCE_DIR}/config/AppRun AppDir/AppRun
+#     COMMAND cp -a ${Python_SITELIB}/setuptools AppDir/${Python_SITELIB}/
+#     COMMAND cp -a ${Python_STDARCH}/* AppDir/${Python_STDARCH}/
+#   )
+# endif()
 
 if(WIN32)
   add_custom_target(windows-installer

core/CMakeLists.txt

@@ -639,9 +639,9 @@ if(NOT WIN32)
     )
 endif()
 
-if(APPIMAGE_MODE)
-  # Install sympy. Matplotlib would be nice, but that pulls in blas and fortran and zillions of other things,
-  # which then don't link properly anymore either.
-  install(CODE      "execute_process(COMMAND echo \"Installing python things in \$ENV{DESTDIR}|${CMAKE_INSTALL_PREFIX}|${PYTHON_SITE_PATH}\")")
-  install(CODE      "execute_process(COMMAND pip3 install --target \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PATH} sympy matplotlib)")
-endif()
+# if(APPIMAGE_MODE)
+#   # Install sympy. Matplotlib would be nice, but that pulls in blas and fortran and zillions of other things,
+#   # which then don't link properly anymore either.
+#   install(CODE      "execute_process(COMMAND echo \"Installing python things in \$ENV{DESTDIR}|${CMAKE_INSTALL_PREFIX}|${PYTHON_SITE_PATH}\")")
+#   install(CODE      "execute_process(COMMAND pip3 install --target \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PATH} sympy matplotlib)")
+# endif()