folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CMake: Bump project version to 4.1.0

Browse source 
- Bump SIMH_VERSION_MINOR in CMakeLists.txt. This propagates down
  through the rest of the CMake infrastructure.

- README-CMake.md, cmake/{GitHub-release.md,cmake-builder.sh}: Update
  documentation. (Prettiness.)

- vcpkg.json: Update simh version-string. (Consistency.)

NOTE: Github CI/CD: There has to be an automated way to update version
numbers; researching.
This commit is contained in:
B. Scott Michel 2023-07-21 09:47:36 -07:00 • committed by Paul Koning
parent 9247b96b37
commit 487f243c28
6 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
.github/workflows/cmake-builds.yml vendored
View file

@ -34,8 +34,8 @@ jobs:
- name: Upload DEB - name: Upload DEB
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: 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.0.0-x86_64-${{matrix.os}}.deb path: cmake/build-ninja/simh-4.1.0-x86_64-${{matrix.os}}.deb
cmake-macOS: cmake-macOS:
@ -68,13 +68,13 @@ jobs:
- name: Upload ZIP - name: Upload ZIP
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: 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.0.0-x86_64.${{matrix.os}}.zip path: cmake/build-xcode/simh-4.1.0-x86_64.${{matrix.os}}.zip
- name: Upload DMG - name: Upload DMG
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: 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.0.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 ## This looks like it's doing the right thing on the Github CI/CD pipeline because
@ -248,13 +248,13 @@ jobs:
- name: Upload ZIP - name: Upload ZIP
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: simh-4.0.0-win32-vs2022xp.zip name: simh-4.1.0-win32-vs2022xp.zip
path: cmake/build-vs2022-xp/simh-4.0.0-win32-xp.zip path: cmake/build-vs2022-xp/simh-4.1.0-win32-xp.zip
- name: Upload MSI - name: Upload MSI
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: simh-4.0.0-win32-vs2022xp.zip name: simh-4.1.0-win32-vs2022xp.zip
path: cmake/build-vs2022-xp/simh-4.0.0-win32-xp.msi path: cmake/build-vs2022-xp/simh-4.1.0-win32-xp.msi
cmake-vs2022: cmake-vs2022:
name: VS 2022 Win10 native VCPKG name: VS 2022 Win10 native VCPKG
@ -295,15 +295,15 @@ jobs:
- name: Upload ZIP - name: Upload ZIP
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: simh-4.0.0-win32-vs2022.zip name: simh-4.1.0-win32-vs2022.zip
path: cmake/build-vs2022/simh-4.0.0-win32-native.zip path: cmake/build-vs2022/simh-4.1.0-win32-native.zip
- name: Upload EXE installer - name: Upload EXE installer
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: simh-4.0.0-win32-vs2022.exe name: simh-4.1.0-win32-vs2022.exe
path: cmake/build-vs2022/simh-4.0.0-win32-native.exe path: cmake/build-vs2022/simh-4.1.0-win32-native.exe
- name: Upload MSI installer - name: Upload MSI installer
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: simh-4.0.0-win32-vs2022.msi name: simh-4.1.0-win32-vs2022.msi
path: cmake/build-vs2022/simh-4.0.0-win32-native.msi path: cmake/build-vs2022/simh-4.1.0-win32-native.msi

2
CMakeLists.txt
View file

@ -75,7 +75,7 @@ endif()
## SIMH Version variables: ## SIMH Version variables:
set(SIMH_VERSION_MAJOR 4) set(SIMH_VERSION_MAJOR 4)
set(SIMH_VERSION_MINOR 0) set(SIMH_VERSION_MINOR 1)
set(SIMH_VERSION_PATCH 0) set(SIMH_VERSION_PATCH 0)
set(SIMH_VERSION "${SIMH_VERSION_MAJOR}.${SIMH_VERSION_MINOR}.${SIMH_VERSION_PATCH}") set(SIMH_VERSION "${SIMH_VERSION_MAJOR}.${SIMH_VERSION_MINOR}.${SIMH_VERSION_PATCH}")

2
README-CMake.md
View file

@ -547,7 +547,7 @@ or video support.
--cppcheck Enable cppcheck static code analysis rules --cppcheck Enable cppcheck static code analysis rules
--cpack_suffix Specify CPack's packaging suffix, e.g., "ubuntu-22.04" --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. package.
--verbose Turn on verbose build output --verbose Turn on verbose build output

8
cmake/GitHub-release.md
View file

@ -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 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 will prevent you from installing SIMH. Instead, use a CMD or PowerShell
command window and execute the `.exe` from the command line prompt. For 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: ## PowerShell:
PS> .\simh-4.0.0-win32-native PS> .\simh-4.1.0-win32-native
## CMD: ## CMD:
> .\simh-4.0.0-win32-native > .\simh-4.1.0-win32-native
``` ```
- `.msi`: WiX toolkit-created Windows MSI installer. - `.msi`: WiX toolkit-created Windows MSI installer.
@ -37,5 +37,5 @@ Welcome to SIMH's pre-built binaries!
or CMD command window: or CMD command window:
``` ```
> msiexec /qf /i simh-4.0.0-win32-native.msi > msiexec /qf /i simh-4.1.0-win32-native.msi
``` ```

2
cmake/cmake-builder.sh
View file

@ -41,7 +41,7 @@ Options:
--cppcheck Enable cppcheck static code analysis rules --cppcheck Enable cppcheck static code analysis rules
--cpack_suffix Specify CPack's packaging suffix, e.g., "ubuntu-22.04" --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. package.
--verbose Turn on verbose build output --verbose Turn on verbose build output

2
vcpkg.json
View file

@ -1,6 +1,6 @@
{ {
"name": "simh", "name": "simh",
"version-string": "4.0.0", "version-string": "4.1.0",
"description": [ "description": [
"SIMH: The historical computer architecture simulation suite." "SIMH: The historical computer architecture simulation suite."
], ],