From d4b1caedd51bd1d54054f407ac810a3be32982f6 Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Tue, 28 Jan 2025 21:48:32 +0100 Subject: [PATCH] Disable inclusion of (currently failing) MCPL cross-compile buils --- meta-pkgs/windows/McStas-metapackage64.iss | 2 -- meta-pkgs/windows/McXtrace-metapackage64.iss | 2 -- 2 files changed, 4 deletions(-) diff --git a/meta-pkgs/windows/McStas-metapackage64.iss b/meta-pkgs/windows/McStas-metapackage64.iss index fd9d39ff07..4319057f8f 100644 --- a/meta-pkgs/windows/McStas-metapackage64.iss +++ b/meta-pkgs/windows/McStas-metapackage64.iss @@ -53,7 +53,6 @@ Source: "dist\mcstas-tools-python-mcdisplay-pyqtgraph-NSIS64-@VERSION@-mingw64.e Source: "dist\mcstas-tools-python-mcdisplay-matplotlib-NSIS64-@VERSION@-mingw64.exe"; DestDir: "{tmp}" Source: "dist\mcstas-tools-python-mcdisplay-mantid-NSIS64-@VERSION@-mingw64.exe"; DestDir: "{tmp}" Source: "dist\mcstas-tools-python-mcdoc-NSIS64-@VERSION@-mingw64.exe"; DestDir: "{tmp}" -Source: "dist\mcstas-mcpl-NSIS64-@VERSION@-mingw64.exe"; DestDir: "{tmp}" Source: "Support\Miniforge3-Windows-x86_64.exe"; DestDir: "{tmp}" [Run] @@ -76,7 +75,6 @@ Filename: "{tmp}\mcstas-tools-python-mcdisplay-pyqtgraph-NSIS64-@VERSION@-mingw6 Filename: "{tmp}\mcstas-tools-python-mcdisplay-matplotlib-NSIS64-@VERSION@-mingw64.exe"; Parameters: "/S" Filename: "{tmp}\mcstas-tools-python-mcdisplay-mantid-NSIS64-@VERSION@-mingw64.exe"; Parameters: "/S" Filename: "{tmp}\mcstas-tools-python-mcdoc-NSIS64-@VERSION@-mingw64.exe"; Parameters: "/S" -Filename: "{tmp}\mcstas-mcpl-NSIS64-@VERSION@-mingw64.exe"; Parameters: "/S" Filename: "{tmp}\docupdate.bat"; ; NOTE: Don't use "Flags: ignoreversion" on any shared system files diff --git a/meta-pkgs/windows/McXtrace-metapackage64.iss b/meta-pkgs/windows/McXtrace-metapackage64.iss index 2d03e3d1cf..44c5f15b03 100644 --- a/meta-pkgs/windows/McXtrace-metapackage64.iss +++ b/meta-pkgs/windows/McXtrace-metapackage64.iss @@ -48,7 +48,6 @@ Source: "dist\mcxtrace-tools-python-mxdisplay-webgl-NSIS64-@VERSION@-mingw64.exe Source: "dist\mcxtrace-tools-python-mxdisplay-pyqtgraph-NSIS64-@VERSION@-mingw64.exe"; DestDir: "{tmp}" Source: "dist\mcxtrace-tools-python-mxdisplay-matplotlib-NSIS64-@VERSION@-mingw64.exe"; DestDir: "{tmp}" Source: "dist\mcxtrace-tools-python-mxdoc-NSIS64-@VERSION@-mingw64.exe"; DestDir: "{tmp}" -Source: "dist\mcxtrace-mcpl-NSIS64-@VERSION@-mingw64.exe"; DestDir: "{tmp}" Source: "Support\Miniforge3-Windows-x86_64.exe"; DestDir: "{tmp}" [Run] @@ -66,7 +65,6 @@ Filename: "{tmp}\mcxtrace-tools-python-mxdisplay-webgl-NSIS64-@VERSION@-mingw64. Filename: "{tmp}\mcxtrace-tools-python-mxdisplay-pyqtgraph-NSIS64-@VERSION@-mingw64.exe"; Parameters: "/S" Filename: "{tmp}\mcxtrace-tools-python-mxdisplay-matplotlib-NSIS64-@VERSION@-mingw64.exe"; Parameters: "/S" Filename: "{tmp}\mcxtrace-tools-python-mxdoc-NSIS64-@VERSION@-mingw64.exe"; Parameters: "/S" -Filename: "{tmp}\mcxtrace-mcpl-NSIS64-@VERSION@-mingw64.exe"; Parameters: "/S" Filename: "{tmp}\docupdate.bat"; ; NOTE: Don't use "Flags: ignoreversion" on any shared system files