Also test on Windows ARM64. Fix ldd typo.

Author: Kasper Peeters

.github/workflows/windows.yml

@@ -132,15 +132,23 @@ jobs:
     needs: msys2-ucrt64
     strategy:
       matrix:
-        os: [windows-2019, windows-2022]
+        include:
+          - os: windows-2022
+            name: x86_64
+            display-name: "Windows 11 x86_64"
+          - os: windows-2022
+            name: x86_64
+            display-name: "Windows 10 x86_64"
+          - os: windows-11-arm
+            name: arm64
+            display-name: "Windows 11 arm64"
     runs-on: ${{ matrix.os }}
 
     steps:
     - name: Download installer
       uses: actions/download-artifact@v4
       with:
-        name: cadabra2-windows-x86_64.msi
-#        name: cadabra2-win64-${{ matrix.os }}.msi
+        name: cadabra2-windows-${{ matrix.os }}.msi
 
     - name: Install silently
       shell: pwsh

CMakeLists.txt

@@ -529,7 +529,7 @@ if(WIN32)
   add_custom_command(
     OUTPUT  dummy1
     COMMAND cp core/cadabra2.pyd core/cadabra2.dll
-    COMMAND ${CMAKE_COMMAND} -E env bash -c "ldd /${MSYS_ENV}/lib/gdk-pixbuf-2.0/2.10.0/loaders/pixbufloader-svg.dll core/cadabra2.dll ${LEXECUTABLES} | sed -e '/not found/d' -e '/Windows/d' -e '/System32/d' -e '/SysWOW64/d' | grep '=>' | sed -e 's/^[^=]*=>[ ]*\\([^ ]*\\).*/\\1/' | sort | uniq > ${CMAKE_BINARY_DIR}/ldd_dependencies.txt"
+    COMMAND ${CMAKE_COMMAND} -E env bash -c "ldd /${MSYS_ENV}/lib/gdk-pixbuf-2.0/2.10.0/loaders/pixbufloader_svg.dll core/cadabra2.dll ${LEXECUTABLES} | sed -e '/not found/d' -e '/Windows/d' -e '/System32/d' -e '/SysWOW64/d' | grep '=>' | sed -e 's/^[^=]*=>[ ]*\\([^ ]*\\).*/\\1/' | sort | uniq > ${CMAKE_BINARY_DIR}/ldd_dependencies.txt"
     COMMAND touch dummy1
     VERBATIM
     DEPENDS  core/cadabra2.pyd ${EXECUTABLES}

core/cadabra2-cli.cc

@@ -486,7 +486,8 @@ void Shell::handle_error()
 
 void Shell::handle_error(py::error_already_set& err)
 	{
-	if (err.matches(PyExc_SystemExit)) {
+	if(err.matches(PyExc_SystemExit)) {
+		std::cerr << "SystemExit" << std::endl;
 		auto value = err.value();
 		if (PyExceptionInstance_Check(value.ptr())) {
 			_Py_Identifier PyId_code;

web2/cadabra2/source/changelog.html

@@ -53,8 +53,10 @@ <h3>github devel branch (2.5.11)</h3>
   <li>New, more modern Windows installer, which also adds a desktop icon.</li>
   <li>Removed terminal window on Windows.</li>
   <li>Fix export of notebooks to HTML.</li>
-  <li>Packages are now provided for <tt>arm64</tt> in addition to <tt>x86_64</tt>
-    (e.g. to run Cadabra inside a Linux VM on your Apple Silicon MacBook).</li>
+  <li>Packages are now provided for <tt>arm64</tt> in addition
+    to <tt>x86_64</tt> for various Linux distributions (e.g. to run
+    Cadabra inside a Linux VM on your Apple Silicon MacBook) and for
+    Windows.</li>
   <li>The command line client <tt>cadabra2-cli</tt> is now the default (with a symlink
     <tt>cadabra2</tt> for backward compatibility) to streamline code and prepare
     for future improvements.</li>