Skip to content

add the rnote cli to the windows inno build#1758

Merged
flxzt merged 5 commits into
flxzt:mainfrom
Doublonmousse:cli_windows
Jul 20, 2026
Merged

add the rnote cli to the windows inno build#1758
flxzt merged 5 commits into
flxzt:mainfrom
Doublonmousse:cli_windows

Conversation

@Doublonmousse

@Doublonmousse Doublonmousse commented May 1, 2026

Copy link
Copy Markdown
Collaborator

CI test on : https://github.com/Doublonmousse/rnote/actions/runs/25228946601

Fixes #1757

TODO

  • cleanup the script (does it work with -Dcli=false? I'm not sure whether it fails when failing to copy a file or how to adapt the script more cleanly for this)
  • add to path? For now this is in the bin folder, not in the window path

@flxzt

flxzt commented May 1, 2026

Copy link
Copy Markdown
Owner

Not sure if it is possible with Inno, but I've seen installers asking whether they can add a path entry to PATH. Would be cool if we could do the same!

@Doublonmousse

Doublonmousse commented May 6, 2026

Copy link
Copy Markdown
Collaborator Author

Now this works with -Dcli=false calling manually meson.

The only part that doesn't work is the just build-win-installer command if the cli = false option is selected as this invokes

build:
    meson compile ui-cargo-build -C {{ build_folder }}
    meson compile cli-cargo-build -C {{ build_folder }}

and the second command doesn't exist if the cli = false option is selected. It errors with

ERROR: Can't invoke target `cli-cargo-build`: target not found
error: Recipe `build` failed on line 186 with exit code 1

@Doublonmousse

Copy link
Copy Markdown
Collaborator Author

This is so running with `-Dcli=false` works.

- The meson configuration file checks whether the conditions are there (windows and build cli enabled)
- If so, a `-DMyAppCliExeName=...` string is passed to the ìnno_build.py` file and passed with the iscc command as an argument
- An if Defined statement is used in the iss file
- Optional adding/removing from path the rnote-cli command
@Doublonmousse

Doublonmousse commented May 6, 2026

Copy link
Copy Markdown
Collaborator Author

Updated to include the optional path update in the installer

image

Window release CI: https://github.com/Doublonmousse/rnote/actions/runs/25447031215

@Doublonmousse
Doublonmousse marked this pull request as ready for review May 6, 2026 16:14
Comment thread build-aux/inno_build.py Outdated
We pass the cli name from the meson build to the inno script only if we want to package it, and the script takes care of doing the define itself
@Doublonmousse
Doublonmousse marked this pull request as draft July 16, 2026 19:46
@Doublonmousse

Copy link
Copy Markdown
Collaborator Author

Waiting for the window release CI to pass : https://github.com/Doublonmousse/rnote/actions/runs/29529431184 (and to double check we do get the cli.exe)

@Doublonmousse
Doublonmousse marked this pull request as ready for review July 20, 2026 10:15
@flxzt

flxzt commented Jul 20, 2026

Copy link
Copy Markdown
Owner

looks good now 👍 Tested the artifact and confirmed the CLI is bundled and added to PATH on installation.

@flxzt
flxzt merged commit f072d1f into flxzt:main Jul 20, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add rnote-cli to windows install

2 participants