Skip to content
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.

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

Add builderv2 and win10/11 support #4

Open
wants to merge 74 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
c4abef7
Cleanup for win10
omeg Jan 4, 2024
f69460a
Add submodules and complete VS solution
omeg Jan 4, 2024
2d3c944
Add readme
omeg Jan 4, 2024
996e45c
Update readme
omeg Jan 4, 2024
84becb4
Test-sign all binaries
omeg Jan 20, 2024
432f0cf
Update pvdrivers submodule
omeg Jan 22, 2024
5394d27
Update readme
omeg Jan 22, 2024
647b59d
Update pvdrivers submodule
omeg Feb 7, 2024
1679939
Add proper installer project
omeg Feb 7, 2024
1729041
Update submodules
omeg Feb 10, 2024
67f4b7d
Add GUI agent component
omeg Feb 10, 2024
fffbba9
Set bundle icon
omeg Feb 10, 2024
b6bbaa1
Use VC redist package from EWDK
omeg Feb 10, 2024
a2480f7
Add missing license rtf
omeg Feb 13, 2024
9dfcf4c
installer: Add disk and network pvdrivers
omeg Feb 13, 2024
bd912bf
installer: add missing banner
omeg Feb 14, 2024
c6bf9e6
Update solution
omeg Feb 14, 2024
f8d45ae
Fix installer build from clean state
omeg Feb 14, 2024
5bf5f2d
Update gui agent
omeg Feb 15, 2024
b918a6a
gitignore: filter VS .user files
omeg Feb 15, 2024
0b82989
Move install helper source from the VS dir
omeg Feb 15, 2024
11eda03
Add the dump-windows utility to solution
omeg Feb 15, 2024
2bbdea9
Update gui agent
omeg Feb 27, 2024
d0d2c84
Update pvdrivers
omeg Feb 27, 2024
fa4e4b1
Update gui agent
omeg Feb 27, 2024
eca6051
Allow installing core pvdrivers separately from Qubes services
omeg Mar 2, 2024
8bdbf15
Update submodules
omeg Mar 2, 2024
7be33f9
Make project outputs separate to eliminate postbuild copy overlap
omeg Mar 5, 2024
dae50d7
Add dump-windows to solution build
omeg Mar 5, 2024
ad0c97a
Update submodules
omeg Mar 5, 2024
5cf0c8a
Update gui agent
omeg Mar 7, 2024
59ea712
Fix the wix extension instructions in the readme
omeg Mar 7, 2024
e6aa139
Add missing default config values to registry
omeg Mar 23, 2024
44bf49a
Run file-sender as current user
omeg Mar 23, 2024
fa3d9b7
Update submodules
omeg Mar 23, 2024
a1ed82b
install-helper: add symlink creation privilege to Users group
omeg Apr 2, 2024
4c05f28
installer: enable long paths for FS APIs in the system configuration
omeg Apr 2, 2024
312cb6b
Update submodules
omeg Apr 2, 2024
7fed029
Remove unused ask-vm-and-run
omeg Apr 2, 2024
1fdb8de
Remove unused window-icon-updater
omeg Apr 3, 2024
ed2c860
Update submodules
omeg Apr 8, 2024
c59db8f
installer: allow simulating CTRL+ALT+DEL in registry config
omeg Apr 18, 2024
aab4c52
Update submodules
omeg Apr 18, 2024
59785ea
Set installer version
omeg Apr 22, 2024
5eceded
Don't install VC runtime if already installed
omeg May 6, 2024
0109469
Initialize private.img volume
omeg May 8, 2024
9da1642
Remove unused prepare-volume utility
omeg May 8, 2024
6edf324
installer: add network setup service
omeg Jun 15, 2024
1f147ad
installer: display product version
omeg Jun 15, 2024
5239af7
installer: explicitly generate new product GUID each build
omeg Jun 15, 2024
6c32dee
Update submodules
omeg Jun 15, 2024
127e7ba
Add feature to move user profiles to the private image
omeg Jul 10, 2024
42daf8a
Update submodules
omeg Jul 10, 2024
72900c3
Use different installer output file name for debug build
omeg Jul 16, 2024
c90bf0a
Add version to installer file name
omeg Jul 16, 2024
ee615f7
Allow installing disk and network pvdrivers separately
omeg Jul 16, 2024
5038c3d
installer: disable hibernation
omeg Jul 16, 2024
3a1ea8e
Update gui agent
omeg Aug 15, 2024
f262798
qrexec-agent: parse RPC definitions from private volume if present
omeg Oct 12, 2024
19c783a
Support builder v2
omeg Nov 6, 2024
cc68e66
Re-add code signing for builder v2
omeg Nov 15, 2024
ba3c7cf
Fix typo in helper script
omeg Nov 15, 2024
71da154
Add qubes.VMExec rpc service
omeg Nov 30, 2024
4300d52
Add missing file
omeg Dec 9, 2024
53cd78b
Fix local build
omeg Dec 9, 2024
8aefe7f
Update readme and gitignore
omeg Dec 18, 2024
add96dc
Fix debug build
omeg Dec 18, 2024
acf3aa8
Run network-setup as autostart instead of service
omeg Dec 18, 2024
0f163a6
Fix/update development instructions
omeg Dec 18, 2024
4fa9e20
Fix distfiles nuget source
omeg Dec 18, 2024
54b4db0
Update gitignore
omeg Dec 20, 2024
868405f
Reduce default log level to warning
omeg Mar 7, 2025
d63c4fb
ci: switch to R4.3
marmarek Mar 9, 2025
7605a3d
Move installation directory to Program Files
omeg Mar 10, 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
16 changes: 4 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
rpm/
*.msi
*.exe
components/
pkgs/
bin/
*.sdf
*.suo
vs*/x64
vs*/*/x64
vs*/*/Debug
vs*/*/Release
/**/.vs
/*.exe
/*.wixpdb
/.distfiles
6 changes: 4 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
include:
- project: 'QubesOS/qubes-continuous-integration'
file: '/r4.1/gitlab-base.yml'
file: '/r4.3/gitlab-base.yml'
ref: $CI_BRANCH_REF
- project: 'QubesOS/qubes-continuous-integration'
file: '/r4.1/gitlab-dom0-qwt.yml'
file: '/r4.3/gitlab-host-qwt.yml'
ref: $CI_BRANCH_REF
Empty file added .gitmodules
Empty file.
22 changes: 22 additions & 0 deletions .qubesbuilder
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
source:
files:
- url: https://www.nuget.org/api/v2/package/WixToolset.Sdk/4.0.5#/wixtoolset.sdk.4.0.5.nupkg
sha256: wixtoolset.sdk.4.0.5.nupkg.sha256
- url: https://www.nuget.org/api/v2/package/WixToolset.Bal.wixext/4.0.5#/wixtoolset.bal.wixext.4.0.5.nupkg
sha256: wixtoolset.bal.wixext.4.0.5.nupkg.sha256
- url: https://www.nuget.org/api/v2/package/WixToolset.DifxApp.wixext/4.0.5#/wixtoolset.difxapp.wixext.4.0.5.nupkg
sha256: wixtoolset.difxapp.wixext.4.0.5.nupkg.sha256
- url: https://www.nuget.org/api/v2/package/WixToolset.Iis.wixext/4.0.5#/wixtoolset.iis.wixext.4.0.5.nupkg
sha256: wixtoolset.iis.wixext.4.0.5.nupkg.sha256
- url: https://www.nuget.org/api/v2/package/WixToolset.UI.wixext/4.0.5#/wixtoolset.ui.wixext.4.0.5.nupkg
sha256: wixtoolset.ui.wixext.4.0.5.nupkg.sha256
- url: https://www.nuget.org/api/v2/package/WixToolset.Util.wixext/4.0.5#/wixtoolset.util.wixext.4.0.5.nupkg
sha256: wixtoolset.util.wixext.4.0.5.nupkg.sha256
vm:
windows:
build:
- vs2022/installer.sln
bin:
- qubes-windows-tools-@[email protected]
skip-test-sign:
- qubes-windows-tools-@[email protected]
213 changes: 213 additions & 0 deletions LICENSE.rtf

Large diffs are not rendered by default.

16 changes: 0 additions & 16 deletions Makefile

This file was deleted.

45 changes: 0 additions & 45 deletions Makefile.builder

This file was deleted.

25 changes: 25 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Installer for Qubes Windows Tools

## Local command-line build on Windows

### Prerequisites

- Microsoft EWDK iso mounted as a drive
- `qubes-builderv2`
- `powershell-yaml` PowerShell package (run `powershell -command Install-Package powershell-yaml` as admin)
(TODO: provide offline installer for this)
- `vmm-xen-windows-pvdrivers`, `core-vchan-xen`, `windows-utils`, `core-qubesdb`,
`core-agent-windows`, `gui-common` and `gui-agent-windows` sources in the same directory as the installer
(without the `qubes-` prefix)

### Build

- Run `powershell qubes-builderv2\qubesbuilder\plugins\build_windows\scripts\local\build-qwt.ps1 src_dir Release|Debug`
- All output will be copied to `repository` in the current directory.

### Development

Open `vs2022\qwt.sln` in Visual Studio (see Prerequisites for how to prepare component sources).
Includes/libs should be set up automatically and everything except the installer should build.
If VS insists that it doesn't see component includes, try changing solution configuration to/from
debug/release -- this seems to fix the issue.
1 change: 0 additions & 1 deletion components-versions/version-core-agent-windows

This file was deleted.

1 change: 0 additions & 1 deletion components-versions/version-core-qubesdb

This file was deleted.

1 change: 0 additions & 1 deletion components-versions/version-core-vchan-xen

This file was deleted.

1 change: 0 additions & 1 deletion components-versions/version-gui-agent-windows

This file was deleted.

1 change: 0 additions & 1 deletion components-versions/version-gui-common

This file was deleted.

1 change: 0 additions & 1 deletion components-versions/version-vmm-xen-windows-pvdrivers

This file was deleted.

1 change: 0 additions & 1 deletion components-versions/version-windows-utils

This file was deleted.

51 changes: 0 additions & 51 deletions iso-README.txt

This file was deleted.

2 changes: 0 additions & 2 deletions iso-content/.gitignore

This file was deleted.

Loading