From 10ba6dc1624700523c7184020904f65df760247c Mon Sep 17 00:00:00 2001 From: Portegies Date: Sun, 24 Aug 2025 21:40:49 +0200 Subject: [PATCH 1/3] Add some logic to copying files from sources in windows installer script --- windows/create_installer_windows.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/windows/create_installer_windows.sh b/windows/create_installer_windows.sh index 5ba47caffa..f3cee5616f 100755 --- a/windows/create_installer_windows.sh +++ b/windows/create_installer_windows.sh @@ -468,10 +468,19 @@ fi # Copy some files from source cp source/coq/LICENSE . -cp source/coqide/ide/coqide/coq.ico . mkdir -p files/bin -cp source/coqide/ide/coqide/coq.ico files/bin/ -cp source/coq-compcert/LICENSE coq-compcert-license.txt +if opam list --installed --silent coqide +then + cp source/coqide/ide/coqide/coq.ico . + cp source/coqide/ide/coqide/coq.ico files/bin/ +else + cp /platform/windows/coq-shell.ico . + cp /platform/windows/coq-shell.ico files/bin/coq.ico +fi +if opam list --installed --silent coq-compcert +then + cp source/coq-compcert/LICENSE coq-compcert-license.txt +fi if [ -n "$NSIS_VST_CHECK" ] then cp source/$vst_pkg/LICENSE coq-vst-license.txt From 91608ce34ade00d836b1334a46a84c9176e0dca4 Mon Sep 17 00:00:00 2001 From: Portegies Date: Mon, 25 Aug 2025 07:19:37 +0200 Subject: [PATCH 2/3] Follow a bit more logical flow --- windows/Coq.nsi | 3 ++- windows/create_installer_windows.sh | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/Coq.nsi b/windows/Coq.nsi index 549c70ae1a..94fd71685c 100644 --- a/windows/Coq.nsi +++ b/windows/Coq.nsi @@ -411,7 +411,8 @@ FunctionEnd ; if sections exist (by !ifdef ) to decide if the license page must be included. ; The section index variables are only defined after the section definitions. - !define MUI_ICON "coq.ico" + !system "if exist coq.ico (echo !define MUI_ICON \"coq.ico\") else (echo !define MUI_ICON \"coq-shell.ico\")" + ;!define MUI_CUSTOMFUNCTION_GUIINIT PreselectSections !insertmacro MUI_PAGE_WELCOME diff --git a/windows/create_installer_windows.sh b/windows/create_installer_windows.sh index f3cee5616f..4a4212434b 100755 --- a/windows/create_installer_windows.sh +++ b/windows/create_installer_windows.sh @@ -475,7 +475,6 @@ then cp source/coqide/ide/coqide/coq.ico files/bin/ else cp /platform/windows/coq-shell.ico . - cp /platform/windows/coq-shell.ico files/bin/coq.ico fi if opam list --installed --silent coq-compcert then From c945bcf470ed9ae18f0b864a943a6df2798a45c2 Mon Sep 17 00:00:00 2001 From: jim_jwp Date: Mon, 25 Aug 2025 11:35:47 +0200 Subject: [PATCH 3/3] Fix syntax for system call --- windows/Coq.nsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/windows/Coq.nsi b/windows/Coq.nsi index 94fd71685c..057178c8ec 100644 --- a/windows/Coq.nsi +++ b/windows/Coq.nsi @@ -411,7 +411,8 @@ FunctionEnd ; if sections exist (by !ifdef ) to decide if the license page must be included. ; The section index variables are only defined after the section definitions. - !system "if exist coq.ico (echo !define MUI_ICON \"coq.ico\") else (echo !define MUI_ICON \"coq-shell.ico\")" + !system 'if exist coq.ico echo !define MUI_ICON "coq.ico"' + !system 'if not exist coq.ico echo !define MUI_ICON "coq-shell.ico"' ;!define MUI_CUSTOMFUNCTION_GUIINIT PreselectSections