Skip to content

Only copy files if they exist #479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jim-portegies wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Only copy files if they exist #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10ba6dc
Add some logic to copying files from sources in windows installer script
jim-portegies Aug 24, 2025
91608ce
Follow a bit more logical flow
jim-portegies Aug 25, 2025
c945bcf
Fix syntax for system call
jim-portegies Aug 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion windows/Coq.nsi
View file
Open in desktop
Copy link
Collaborator

@MSoegtropIMC MSoegtropIMC Aug 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jim-portegies : I guess the two icon files are the same and coq-shell.ico always exists, so I think we should always use this one and remove the ifs.

Copy link
Contributor Author

@jim-portegies jim-portegies Aug 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do think the icons are in fact different

Copy link
Collaborator

@MSoegtropIMC MSoegtropIMC Aug 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I remember that one should be a console icon with a Coq on top of it.

Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,9 @@ FunctionEnd
; if sections exist (by !ifdef <section_index_var>) 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"'
!system 'if not exist coq.ico echo !define MUI_ICON "coq-shell.ico"'

;!define MUI_CUSTOMFUNCTION_GUIINIT PreselectSections

!insertmacro MUI_PAGE_WELCOME
Expand Down
14 changes: 11 additions & 3 deletions windows/create_installer_windows.sh
View file
Open in desktop
Copy link
Collaborator

@MSoegtropIMC MSoegtropIMC Aug 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My comment is more or less the same as above: instead of switching between various icons, we should just make the method to retrieve the icon independend of CoqIDE.

Copy link
Contributor Author

@jim-portegies jim-portegies Aug 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MSoegtropIMC I agree, shall I try to make an update to the PR?

Copy link
Collaborator

@MSoegtropIMC MSoegtropIMC Aug 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, please. It would be nice if installers for older version still would get the old icon.

Original file line number Diff line number Diff line change
Expand Up @@ -468,10 +468,18 @@ 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 .
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
Expand Down
Loading