diff --git a/.github/workflows/cmake-builds.yml b/.github/workflows/cmake-builds.yml index dab9c7a4..974b4177 100644 --- a/.github/workflows/cmake-builds.yml +++ b/.github/workflows/cmake-builds.yml @@ -34,8 +34,8 @@ jobs: - name: Upload DEB uses: actions/upload-artifact@v3 with: - name: simh-4.0.0-x86_64-${{matrix.os}}.deb - path: cmake/build-ninja/simh-4.0.0-x86_64-${{matrix.os}}.deb + name: simh-4.1.0-x86_64-${{matrix.os}}.deb + path: cmake/build-ninja/simh-4.1.0-x86_64-${{matrix.os}}.deb cmake-macOS: @@ -68,13 +68,13 @@ jobs: - name: Upload ZIP uses: actions/upload-artifact@v3 with: - name: simh-4.0.0-x86_64.${{matrix.os}}.zip - path: cmake/build-xcode/simh-4.0.0-x86_64.${{matrix.os}}.zip + name: simh-4.1.0-x86_64.${{matrix.os}}.zip + path: cmake/build-xcode/simh-4.1.0-x86_64.${{matrix.os}}.zip - name: Upload DMG uses: actions/upload-artifact@v3 with: - name: simh-4.0.0-x86_64.${{matrix.os}}.dmg - path: cmake/build-xcode/simh-4.0.0-x86_64.${{matrix.os}}.dmg + name: simh-4.1.0-x86_64.${{matrix.os}}.dmg + path: cmake/build-xcode/simh-4.1.0-x86_64.${{matrix.os}}.dmg ## This looks like it's doing the right thing on the Github CI/CD pipeline because @@ -248,13 +248,13 @@ jobs: - name: Upload ZIP uses: actions/upload-artifact@v3 with: - name: simh-4.0.0-win32-vs2022xp.zip - path: cmake/build-vs2022-xp/simh-4.0.0-win32-xp.zip + name: simh-4.1.0-win32-vs2022xp.zip + path: cmake/build-vs2022-xp/simh-4.1.0-win32-xp.zip - name: Upload MSI uses: actions/upload-artifact@v3 with: - name: simh-4.0.0-win32-vs2022xp.zip - path: cmake/build-vs2022-xp/simh-4.0.0-win32-xp.msi + name: simh-4.1.0-win32-vs2022xp.zip + path: cmake/build-vs2022-xp/simh-4.1.0-win32-xp.msi cmake-vs2022: name: VS 2022 Win10 native VCPKG @@ -295,15 +295,15 @@ jobs: - name: Upload ZIP uses: actions/upload-artifact@v3 with: - name: simh-4.0.0-win32-vs2022.zip - path: cmake/build-vs2022/simh-4.0.0-win32-native.zip + name: simh-4.1.0-win32-vs2022.zip + path: cmake/build-vs2022/simh-4.1.0-win32-native.zip - name: Upload EXE installer uses: actions/upload-artifact@v3 with: - name: simh-4.0.0-win32-vs2022.exe - path: cmake/build-vs2022/simh-4.0.0-win32-native.exe + name: simh-4.1.0-win32-vs2022.exe + path: cmake/build-vs2022/simh-4.1.0-win32-native.exe - name: Upload MSI installer uses: actions/upload-artifact@v3 with: - name: simh-4.0.0-win32-vs2022.msi - path: cmake/build-vs2022/simh-4.0.0-win32-native.msi + name: simh-4.1.0-win32-vs2022.msi + path: cmake/build-vs2022/simh-4.1.0-win32-native.msi diff --git a/CMakeLists.txt b/CMakeLists.txt index 12000fe9..a926652d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,7 +75,7 @@ endif() ## SIMH Version variables: set(SIMH_VERSION_MAJOR 4) -set(SIMH_VERSION_MINOR 0) +set(SIMH_VERSION_MINOR 1) set(SIMH_VERSION_PATCH 0) set(SIMH_VERSION "${SIMH_VERSION_MAJOR}.${SIMH_VERSION_MINOR}.${SIMH_VERSION_PATCH}") diff --git a/README-CMake.md b/README-CMake.md index 7f7257ab..63146b0b 100644 --- a/README-CMake.md +++ b/README-CMake.md @@ -547,7 +547,7 @@ or video support. --cppcheck Enable cppcheck static code analysis rules --cpack_suffix Specify CPack's packaging suffix, e.g., "ubuntu-22.04" - to produce the "simh-4.0.0-ubuntu-22.04.deb" Debian + to produce the "simh-4.1.0-ubuntu-22.04.deb" Debian package. --verbose Turn on verbose build output diff --git a/cmake/GitHub-release.md b/cmake/GitHub-release.md index 2ce7db05..7575702b 100644 --- a/cmake/GitHub-release.md +++ b/cmake/GitHub-release.md @@ -18,14 +18,14 @@ Welcome to SIMH's pre-built binaries! TO INSTALL. If you do, you are likely to get a Windows Defender popup box that will prevent you from installing SIMH. Instead, use a CMD or PowerShell command window and execute the `.exe` from the command line prompt. For - example, to install `simh-4.0.0-win32-native.exe`: + example, to install `simh-4.1.0-win32-native.exe`: ``` ## PowerShell: - PS> .\simh-4.0.0-win32-native + PS> .\simh-4.1.0-win32-native ## CMD: - > .\simh-4.0.0-win32-native + > .\simh-4.1.0-win32-native ``` - `.msi`: WiX toolkit-created Windows MSI installer. @@ -37,5 +37,5 @@ Welcome to SIMH's pre-built binaries! or CMD command window: ``` - > msiexec /qf /i simh-4.0.0-win32-native.msi + > msiexec /qf /i simh-4.1.0-win32-native.msi ``` diff --git a/cmake/cmake-builder.sh b/cmake/cmake-builder.sh index 2ed9763b..ba64c6f6 100755 --- a/cmake/cmake-builder.sh +++ b/cmake/cmake-builder.sh @@ -41,7 +41,7 @@ Options: --cppcheck Enable cppcheck static code analysis rules --cpack_suffix Specify CPack's packaging suffix, e.g., "ubuntu-22.04" - to produce the "simh-4.0.0-ubuntu-22.04.deb" Debian + to produce the "simh-4.1.0-ubuntu-22.04.deb" Debian package. --verbose Turn on verbose build output diff --git a/vcpkg.json b/vcpkg.json index b050f3db..1c63ed53 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,6 @@ { "name": "simh", - "version-string": "4.0.0", + "version-string": "4.1.0", "description": [ "SIMH: The historical computer architecture simulation suite." ], @@ -11,4 +11,4 @@ "sdl2", "sdl2-ttf" ] -} \ No newline at end of file +}