diff --git a/.license-tools-config.json b/.license-tools-config.json index 20e36f6..48a26d9 100644 --- a/.license-tools-config.json +++ b/.license-tools-config.json @@ -1,22 +1,16 @@ { "author": { - "from_git": true, - "latest_year_only": true + "from_git": false, + "latest_year_only": false }, "title": false, "style_override_for_suffix": { ".yaml": "POUND_STYLE", ".ps1": "POUND_STYLE", - ".nix": "POUND_STYLE", ".bat": "BATCH_STYLE", "": "POUND_STYLE" }, - "exclude": [ - "flake.lock", - "^\\.[^/]+", - "/\\.[^/]+", - "^(.+)\\.(md|svg|png|reg|gif|patch)", - "^(fonts|WinApps-Launcher)(/.*)?", + "include": [ "apps/access/info", "apps/access-o365-x86/info", "apps/access-x86/info", @@ -67,5 +61,5 @@ "license": false, "force_author": false, "force_license": true, - "custom_license": "SPDX-License-Identifier: AGPL-3.0-or-later" + "custom_license": "SPDX-License-Identifier: Proprietary" } diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 09c30ec..dd2bfb1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,9 +3,6 @@ Thank you for contributing to winapps! Before you can contribute, we ask some things of you: - Please follow our Code of Conduct, the Contributor Covenant. You can find a copy in this repository or under https://www.contributor-covenant.org/ -- All Contributors have to sign [a CLA](https://gist.github.com/oskardotglobal/35f0a72eb45fcc7087e535561383dbc5) for legal reasons. When opening a PR, @cla-assitant will prompt you and guide you through the process. However, if you contribute on behalf of a legal entity, we ask of you to sign [a different CLA](https://gist.github.com/oskardotglobal/75a8cc056e56a439fa6a1551129ae47f). In that case, please contact us. +- All Contributors have to sign [a CLA](https://gist.github.com/oskardotglobal/35f0a72eb45fcc7087e535561383dbc5) for legal reasons. When opening a PR, @cla-assistant will prompt you and guide you through the process. However, if you contribute on behalf of a legal entity, we ask of you to sign [a different CLA](https://gist.github.com/oskardotglobal/75a8cc056e56a439fa6a1551129ae47f). In that case, please contact us. - Please follow code conventions enforced by `pre-commit`. To keep down CI usage, please run it locally before committing too. See for installation, then run `pre-commit install` inside the `winapps` repository you cloned. - -All source code files shall have a valid SPDX-Identifier. For more information, see . -This identifier will be generated by a pre-commit hook most of the time. diff --git a/COPYRIGHT.md b/COPYRIGHT.md new file mode 100644 index 0000000..4d8fba9 --- /dev/null +++ b/COPYRIGHT.md @@ -0,0 +1,8 @@ +Some of the files are + + Copyright (c) 2024 fmstrat + +Many files also contain contributions from third parties. +In this case the original copyright of the contributions can be traced through the history of the source version control system. + +When that is not the case, the files contain a prominent notice stating the original copyright and applicable license. \ No newline at end of file diff --git a/LICENSE.md b/LICENSE.md index 42b6cbc..cab3299 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,3 +1,5 @@ +For copyright information, please see the [COPYRIGHT.md](./COPYRIGHT.md) file. + This project has files licensed under different licenses. The original project by Fmstrat is not free software. diff --git a/README.md b/README.md index 6e76f89..4052281 100644 --- a/README.md +++ b/README.md @@ -282,7 +282,7 @@ The following guides are available: - [Creating a Windows VM with `Docker` or `Podman`](docs/docker.md) - [Creating a Windows VM with `libvirt`](docs/libvirt.md) -If you already have a Windows VM or server you wish to use with WinApps, you will still have to follow the [final steps described in the `libvirt` documentation](https://github.com/winapps-org/winapps/blob/main/docs/libvirt.md#final-configuration-steps). +If you already have a Windows VM or server you wish to use with WinApps, you will still have to follow the [final steps described in the `libvirt` documentation](docs/libvirt.md#final-configuration-steps). ### Step 2: Install Dependencies Install the required dependencies. diff --git a/docs/docker.md b/docs/docker.md index afeccaa..34fcd95 100644 --- a/docs/docker.md +++ b/docs/docker.md @@ -12,7 +12,7 @@ Although WinApps supports using `QEMU+KVM+libvirt` as a backend for running Wind You can find a guide for installing `Docker Engine` [here](https://docs.docker.com/engine/install/). ### Setup `Docker` Container -WinApps utilises `docker compose` to configure Windows VMs. A template [`compose.yaml`](https://github.com/winapps-org/winapps/blob/main/compose.yaml) is provided. +WinApps utilises `docker compose` to configure Windows VMs. A template [`compose.yaml`](../compose.yaml) is provided. Prior to installing Windows, you can modify the RAM and number of CPU cores available to the Windows VM by changing `RAM_SIZE` and `CPU_CORES` within `compose.yaml`. diff --git a/docs/libvirt.md b/docs/libvirt.md index 6d1b3bd..0a25cbd 100644 --- a/docs/libvirt.md +++ b/docs/libvirt.md @@ -642,7 +642,7 @@ You can then test whether the host GNU/Linux system can communicate with Windows {"return":{"version":"107.0.1","supported_commands":[{"enabled":true,"name":"guest-get-cpustats","success-response":true},{"enabled":true,"name":"guest-get-diskstats","success-response":true},{"enabled":true,"name":"guest-get-devices","success-response":true},{"enabled":true,"name":"guest-get-osinfo","success-response":true},{"enabled":true,"name":"guest-get-timezone","success-response":true},{"enabled":true,"name":"guest-get-users","success-response":true},{"enabled":true,"name":"guest-get-host-name","success-response":true},{"enabled":true,"name":"guest-exec","success-response":true},{"enabled":true,"name":"guest-exec-status","success-response":true},{"enabled":false,"name":"guest-get-memory-block-info","success-response":true},{"enabled":false,"name":"guest-set-memory-blocks","success-response":true},{"enabled":false,"name":"guest-get-memory-blocks","success-response":true},{"enabled":true,"name":"guest-set-user-password","success-response":true},{"enabled":true,"name":"guest-get-fsinfo","success-response":true},{"enabled":true,"name":"guest-get-disks","success-response":true},{"enabled":false,"name":"guest-set-vcpus","success-response":true},{"enabled":true,"name":"guest-get-vcpus","success-response":true},{"enabled":true,"name":"guest-network-get-interfaces","success-response":true},{"enabled":false,"name":"guest-suspend-hybrid","success-response":false},{"enabled":true,"name":"guest-suspend-ram","success-response":false},{"enabled":true,"name":"guest-suspend-disk","success-response":false},{"enabled":true,"name":"guest-fstrim","success-response":true},{"enabled":true,"name":"guest-fsfreeze-thaw","success-response":true},{"enabled":true,"name":"guest-fsfreeze-freeze-list","success-response":true},{"enabled":true,"name":"guest-fsfreeze-freeze","success-response":true},{"enabled":true,"name":"guest-fsfreeze-status","success-response":true},{"enabled":true,"name":"guest-file-flush","success-response":true},{"enabled":true,"name":"guest-file-seek","success-response":true},{"enabled":true,"name":"guest-file-write","success-response":true},{"enabled":true,"name":"guest-file-read","success-response":true},{"enabled":true,"name":"guest-file-close","success-response":true},{"enabled":true,"name":"guest-file-open","success-response":true},{"enabled":true,"name":"guest-shutdown","success-response":false},{"enabled":true,"name":"guest-info","success-response":true},{"enabled":true,"name":"guest-set-time","success-response":true},{"enabled":true,"name":"guest-get-time","success-response":true},{"enabled":true,"name":"guest-ping","success-response":true},{"enabled":true,"name":"guest-sync","success-response":true},{"enabled":true,"name":"guest-sync-delimited","success-response":true}]}} ``` -Next, you will need to make some registry changes to enable RDP Applications to run on the system. Start by downloading the [RDPApps.reg](https://github.com/winapps-org/winapps/blob/main/oem/RDPApps.reg) file, right-clicking on the `Raw` button, and clicking on `Save target as`. Repeat the same thing for the [install.bat](https://github.com/winapps-org/winapps/blob/main/oem/install.bat) and the [NetProfileCleanup.ps1](https://github.com/winapps-org/winapps/blob/main/oem/NetProfileCleanup.ps1). **Do not download the Container.reg.** +Next, you will need to make some registry changes to enable RDP Applications to run on the system. Start by downloading the [RDPApps.reg](../oem/RDPApps.reg) file, right-clicking on the `Raw` button, and clicking on `Save target as`. Repeat the same thing for the [install.bat](../oem/install.bat) and the [NetProfileCleanup.ps1](../oem/NetProfileCleanup.ps1). **Do not download the Container.reg.**