From a787fc8e85e24ee5dbe2c2f2cf5602cbc24c9e88 Mon Sep 17 00:00:00 2001 From: techguy16 <88870951+techguy16@users.noreply.github.com> Date: Fri, 1 Sep 2023 11:55:22 +1200 Subject: [PATCH 1/9] Fix Windows Build --- .github/workflows/windows.yml | 36 +++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 27a3d67..d930b8d 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -30,10 +30,27 @@ jobs: build-32bit: runs-on: windows-latest steps: - - name: Install v141_xp - uses: thepwrtank18/install-vs-components@v1.0.0 - with: - components: Microsoft.VisualStudio.Component.WinXP + # https://github.com/actions/runner-images/issues/6067#issuecomment-1213069040 + - name: Install Windows XP Support for Visual Studio + run: | + Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\" + $InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" + $componentsToAdd = @( + "Microsoft.VisualStudio.Component.WinXP" + ) + [string]$workloadArgs = $componentsToAdd | ForEach-Object {" --add " + $_} + $Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"",$workloadArgs, '--quiet', '--norestart', '--nocache') + $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden + if ($process.ExitCode -eq 0) + { + Write-Host "components have been successfully added" + Get-ChildItem C:\ProgramData\Microsoft\VisualStudio\Packages\Microsoft.Windows.XPSupport.* + } + else + { + Write-Host "components were not installed" + exit 1 + } - name: Download And Install 32-bit OpenSSL 3.1.2 run: | @@ -64,7 +81,7 @@ jobs: - name: Build UMSKT working-directory: build - run: msbuild ALL_BUILD.vcxproj /P:Configuration=Release /P:XPDeprecationWarning=false + run: msbuild ALL_BUILD.vcxproj /P:Configuration=Release - name: Upload build artifact uses: actions/upload-artifact@v3.1.2 @@ -75,11 +92,6 @@ jobs: build-64bit: runs-on: windows-latest steps: - - name: Install v141_xp - uses: thepwrtank18/install-vs-components@v1.0.0 - with: - components: Microsoft.VisualStudio.Component.WinXP - - name: Download And Install 64-bit OpenSSL 3.1.2 run: | $installDir = "$Env:ProgramFiles\OpenSSL" @@ -103,11 +115,11 @@ jobs: uses: threeal/cmake-action@v1.2.0 with: generator: "Visual Studio 17 2022" - args: -A "x64" -T v141_xp + args: -A "x64" - name: Build UMSKT working-directory: build - run: msbuild ALL_BUILD.vcxproj /P:Configuration=Release /P:XPDeprecationWarning=false + run: msbuild ALL_BUILD.vcxproj /P:Configuration=Release - name: Upload build artifact uses: actions/upload-artifact@v3.1.2 From 1bb00cf53d6043248fd89951394fe88c4191ece9 Mon Sep 17 00:00:00 2001 From: techguy16 <88870951+techguy16@users.noreply.github.com> Date: Fri, 1 Sep 2023 11:56:37 +1200 Subject: [PATCH 2/9] Remove unnecessary zipping. --- .github/workflows/macos.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index ea3ae00..0623445 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -53,11 +53,6 @@ jobs: cd build/actions_upload ./umskt - - name: Zip artifact - run: | - cd build/actions_upload - zip -r UMSKT-macOS-${{ matrix.arch }}-static.zip umskt - - name: Upload build artifact uses: actions/upload-artifact@v3.1.2 with: From 453151f20faf312f6306510040ce52751bc91bea Mon Sep 17 00:00:00 2001 From: techguy16 <88870951+techguy16@users.noreply.github.com> Date: Fri, 1 Sep 2023 12:47:39 +1200 Subject: [PATCH 3/9] Add Tests for FreeBSD --- .github/workflows/freebsd.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml index c8eaa49..00c2a05 100644 --- a/.github/workflows/freebsd.yml +++ b/.github/workflows/freebsd.yml @@ -48,6 +48,7 @@ jobs: cmake .. make ./umskt # Execute the test here + ./umskt -l - name: Move files to correct directory run: | From 06b9d937b1e2e502af48ae7234ee93555eb13061 Mon Sep 17 00:00:00 2001 From: techguy16 <88870951+techguy16@users.noreply.github.com> Date: Fri, 1 Sep 2023 20:14:46 +1200 Subject: [PATCH 4/9] Update freebsd.yml --- .github/workflows/freebsd.yml | 123 +++++++++++++++++----------------- 1 file changed, 61 insertions(+), 62 deletions(-) diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml index 00c2a05..bb94049 100644 --- a/.github/workflows/freebsd.yml +++ b/.github/workflows/freebsd.yml @@ -1,62 +1,61 @@ -# This file is a part of the UMSKT Project -# -# Copyleft (C) 2019-2023 UMSKT Contributors (et.al.) -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -# @FileCreated by techguy16 on 07/23/2023 -# @Maintainer techguy16 - -name: C/C++ CI (FreeBSD) - -on: - push: - branches: [ "master" ] - pull_request: - branches: [ "master" ] - -jobs: - build: - runs-on: macos-12 - name: build-x86_64 - steps: - - uses: actions/checkout@v3 - - - name: Build & Test in FreeBSD - id: test - uses: vmactions/freebsd-vm@v0 - with: - envs: 'MYTOKEN MYTOKEN2' - usesh: true - prepare: | - pkg install -y cmake openssl git bash - - run: | - mkdir build - cd build - cmake .. - make - ./umskt # Execute the test here - ./umskt -l - - - name: Move files to correct directory - run: | - mkdir -p build/actions_upload - mv build/umskt build/actions_upload/umskt - - - name: Upload build artifact - uses: actions/upload-artifact@v3.1.2 - with: - name: UMSKT-FreeBSD - path: build/actions_upload +# This file is a part of the UMSKT Project + # + # Copyleft (C) 2019-2023 UMSKT Contributors (et.al.) + # + # This program is free software: you can redistribute it and/or modify + # it under the terms of the GNU Affero General Public License as published by + # the Free Software Foundation, either version 3 of the License, or + # (at your option) any later version. + # + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU Affero General Public License for more details. + # + # You should have received a copy of the GNU Affero General Public License + # along with this program. If not, see . + # + # @FileCreated by techguy16 on 07/23/2023 + # @Maintainer techguy16 + + name: C/C++ CI (FreeBSD) + + on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + + jobs: + build: + runs-on: macos-12 + name: build-x86_64 + steps: + - uses: actions/checkout@v3 + + - name: Build & Test in FreeBSD + id: test + uses: vmactions/freebsd-vm@v0 + with: + envs: 'MYTOKEN MYTOKEN2' + usesh: true + prepare: | + pkg install -y cmake openssl git bash + + run: | + mkdir build + cd build + cmake .. + make + ./umskt # Execute the test here + + - name: Move files to correct directory + run: | + mkdir -p build/actions_upload + mv build/umskt build/actions_upload/umskt + + - name: Upload build artifact + uses: actions/upload-artifact@v3.1.2 + with: + name: UMSKT-FreeBSD + path: build/actions_upload \ No newline at end of file From 8619fccb111ad8db7ff3c3340b4c9d3bde11ee42 Mon Sep 17 00:00:00 2001 From: techguy16 <88870951+techguy16@users.noreply.github.com> Date: Sat, 2 Sep 2023 09:12:52 +1200 Subject: [PATCH 5/9] Update freebsd.yml --- .github/workflows/freebsd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml index bb94049..0dab457 100644 --- a/.github/workflows/freebsd.yml +++ b/.github/workflows/freebsd.yml @@ -28,7 +28,7 @@ jobs: build: - runs-on: macos-12 + runs-on: macos-latest name: build-x86_64 steps: - uses: actions/checkout@v3 @@ -58,4 +58,4 @@ uses: actions/upload-artifact@v3.1.2 with: name: UMSKT-FreeBSD - path: build/actions_upload \ No newline at end of file + path: build/actions_upload From 95803054badf4a80215c3ebab1898805dfcc9af6 Mon Sep 17 00:00:00 2001 From: techguy16 <88870951+techguy16@users.noreply.github.com> Date: Sat, 2 Sep 2023 09:46:19 +1200 Subject: [PATCH 6/9] Tidy up Readme - Order Operating Systems - Add separators - Fix build instructions (git clone doesn't just get the code, you need the url) --- README.md | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 7f81a21..abf00b0 100644 --- a/README.md +++ b/README.md @@ -6,17 +6,24 @@ [![libera.chat - #mspid](https://img.shields.io/badge/libera.chat-%23mspid-brightgreen)](https://web.libera.chat/gamja/?nick=Guest?#mspid) **Build status** -[![C/C++ CI (Linux)](https://github.com/UMSKT/UMSKT/actions/workflows/linux.yml/badge.svg)](../../actions/workflows/linux.yml) + [![C/C++ CI (Windows)](https://github.com/UMSKT/UMSKT/actions/workflows/windows.yml/badge.svg)](../../actions/workflows/windows.yml) + [![C/C++ CI (macOS)](https://github.com/UMSKT/UMSKT/actions/workflows/macos.yml/badge.svg)](../../actions/workflows/macos.yml) -[![C/C++ CI (DOS DJGPP)](https://github.com/UMSKT/UMSKT/actions/workflows/dos-djgpp.yml/badge.svg)](../../actions/workflows/freebsd.yml) + +[![C/C++ CI (Linux)](https://github.com/UMSKT/UMSKT/actions/workflows/linux.yml/badge.svg)](../../actions/workflows/linux.yml) + [![C/C++ CI (FreeBSD)](https://github.com/UMSKT/UMSKT/actions/workflows/freebsd.yml/badge.svg)](../../actions/workflows/dos-djgpp.yml) -Plan of Action / ToDo List +[![C/C++ CI (DOS DJGPP)](https://github.com/UMSKT/UMSKT/actions/workflows/dos-djgpp.yml/badge.svg)](../../actions/workflows/freebsd.yml) + +------ + +### Plan of Action / ToDo List In light of the recent exponential interest in this project I've decided to put updates of this project here: - Please see ticket #8 for more information +[Please see ticket #8 for more information](https://github.com/UMSKT/UMSKT/issues/8) ------ @@ -34,6 +41,7 @@ In light of the recent exponential interest in this project I've decided to put * It all comes down to four simple steps: +------ ### **Usage** #### 1. Download the latest version of UMSKT @@ -46,9 +54,9 @@ In light of the recent exponential interest in this project I've decided to put * ~~Download the latest release for your operating system and architecture from [the releases page](../../releases)~~ * No official releases right now, use the other method to get the latest version. -* **Note:** Before continuing, please ensure you have the `umskt` executable extracted. +* **Note:** Before continuing, please ensure you have the `umskt` executable extracted and on UNIX-like systems, have execution permissions (`chmod +x umskt`). -#### 2. Run `umskt` to generate a key, or add `--help` to see more options. +#### 2. Run `umskt` to generate a key, or add `--help` or `-h` to see more options. #### 3. *(Activation step for `Retail` and `OEM` only)* * After installation, you will be prompted to activate Windows. @@ -81,20 +89,26 @@ The list of people who have helped to bring the XP generation to where it is now ### **Development Requirements:** -* `CMake, make, gcc` (`build-essential`) +* `build-essential` + * `cmake` + * `make` + * `gcc` + * `g++` * `git` #### Build Steps: -1. `git clone` -2. `cd build/ && cmake ../ && make` +1. `git clone https://github.com/UMSKT/UMSKT` +2. `cd UMSKT/build` +3. `cmake ..` +4. `make` ----- ### **Known Ports** -| Language | Author | Repo URL | -|----------|-----------|-------------------------------------------------------| -| Rust | Alex Page | [anpage/umskt-rs](https://github.com/anpage/umskt-rs) | -| Python | techguy16 | [techguy16/umsktpy](https://github.com/techguy16/umsktpy) | +| Language | Author | Repo URL | +|----------|-----------|-----------------------------------------------------------| +| Rust | Alex Page | [anpage/umskt-rs](https://github.com/anpage/umskt-rs) | +| Python | techguy16 | [techguy16/umsktpy](https://github.com/techguy16/umsktpy) | From 93732e152bb955b80fbcd4af263f8b0aa4a24a4f Mon Sep 17 00:00:00 2001 From: TheTank20 Date: Fri, 1 Sep 2023 18:07:02 -0400 Subject: [PATCH 7/9] Add XP support for x64 --- .github/workflows/windows.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index d930b8d..aaa9f7d 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -92,6 +92,27 @@ jobs: build-64bit: runs-on: windows-latest steps: + - name: Install Windows XP Support for Visual Studio + run: | + Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\" + $InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" + $componentsToAdd = @( + "Microsoft.VisualStudio.Component.WinXP" + ) + [string]$workloadArgs = $componentsToAdd | ForEach-Object {" --add " + $_} + $Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"",$workloadArgs, '--quiet', '--norestart', '--nocache') + $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden + if ($process.ExitCode -eq 0) + { + Write-Host "components have been successfully added" + Get-ChildItem C:\ProgramData\Microsoft\VisualStudio\Packages\Microsoft.Windows.XPSupport.* + } + else + { + Write-Host "components were not installed" + exit 1 + } + - name: Download And Install 64-bit OpenSSL 3.1.2 run: | $installDir = "$Env:ProgramFiles\OpenSSL" From 02c85b50b111b9c9f38f2d3158cb8ea249926cfe Mon Sep 17 00:00:00 2001 From: TheTank20 Date: Fri, 1 Sep 2023 18:08:53 -0400 Subject: [PATCH 8/9] Change build config to v141_xp --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index aaa9f7d..32188c1 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -136,7 +136,7 @@ jobs: uses: threeal/cmake-action@v1.2.0 with: generator: "Visual Studio 17 2022" - args: -A "x64" + args: -A "x64" -T "v141_xp" - name: Build UMSKT working-directory: build From 1679583e6428bdfa4953bfdc9e255454ed349e5c Mon Sep 17 00:00:00 2001 From: TheTank20 Date: Fri, 1 Sep 2023 18:19:35 -0400 Subject: [PATCH 9/9] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index abf00b0..e2f2702 100644 --- a/README.md +++ b/README.md @@ -82,6 +82,7 @@ The list of people who have helped to bring the XP generation to where it is now * TheTank20 * InvoxiPlayGames * brakmic +* techguy16 (the list will be updated to add more collaborators)