Skip to content

Commit

Permalink
bump version to TinyORM v0.36.0 and tom v0.7.0
Browse files Browse the repository at this point in the history
 - workflows added CI for TinyORM vcpkg ports
 - upgraded to Qt v6.5.3
 - upgraded to Clang-Tidy 17
 - docs added Partial guessing of TINYORM_BUILD_TREE
 - tom enhanced about command
 - tools added deploy.ps1 script 🥳
 - vcpkg revisited vcpkg ports
 - cmake revisited vcpkg-related code
 - cmake added STRICT_MODE option
  • Loading branch information
silverqx committed Oct 17, 2023
1 parent e9e60f1 commit 97ee043
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 23 deletions.
10 changes: 5 additions & 5 deletions NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ Increase/bump the release version:

- bump message format:

bump version to TinyORM v0.35.0 and tom v0.6.1
bump version to TinyORM v0.36.0 and tom v0.7.0

- just simply search the current version number in all files eg. 0.35.0
- just simply search the current version number in all files eg. 0.36.0
- don't forget to update a version number in the silverqx/TinyORM-HelloWorld find_package() call

- TinyORM:
Expand Down Expand Up @@ -66,7 +66,7 @@ Prefer tags in the REF but can also be a commit ID.

The SHA512 is a hash of the source code tinyorm.tar.gz archive, the tools/Get-VcpkgHash.ps1
script can be used to obtain this hash. The URL to download this archive is:
https://github.com/silverqx/TinyORM/archive/v0.35.0.tar.gz
https://github.com/silverqx/TinyORM/archive/v0.36.0.tar.gz
https://github.com/silverqx/TinyORM/archive/ca8909896247b21bf08d62a5109b23e9f65c89e1.tar.gz

If only the vcpkg is updated but the TinyORM version number is not bumped then
Expand Down Expand Up @@ -1102,10 +1102,10 @@ How the Package Config file works:
- I have invested a lot of effort to these info messages
- whether linking against the single, multi, vcpkg builds
- against which TinyORM package is linking eg.:
Found package TinyOrm 0.35.0.0 Debug (requested 0.35.0) at O:/Code/c/qMedia/TinyORM/TinyORM-builds-cmake/build-TinyORM-Desktop_Qt_6_5_3_MSVC2022_64bit-Debug/TinyOrmConfig.cmake
Found package TinyOrm 0.36.0.0 Debug (requested 0.36.0) at O:/Code/c/qMedia/TinyORM/TinyORM-builds-cmake/build-TinyORM-Desktop_Qt_6_5_3_MSVC2022_64bit-Debug/TinyOrmConfig.cmake

- whether Matching build type for Build tree was enabled/disabled eg.:
Matching build type for the TinyOrm 0.35.0.0 package build tree was enabled
Matching build type for the TinyOrm 0.36.0.0 package build tree was enabled
- Matching build type is controlled by the MATCH_EQUAL_EXPORTED_BUILDTREE CMake config. option
during the TinyORM library configure

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

[![TinyORM - www.tinyorm.org][docs-badge]][docs]
[![License MIT][license-badge]][license]
[![TinyORM v0.35.0][version-tinyorm-badge]][docs]
[![tom v0.6.1][version-tom-badge]][docs]
[![TinyORM v0.36.0][version-tinyorm-badge]][docs]
[![tom v0.7.0][version-tom-badge]][docs]

TinyORM is a modern ORM library that makes interacting with a database extremely simple.

Expand Down Expand Up @@ -135,5 +135,5 @@ The following list fastly summarizes all the `TinyORM` features.
[docs]: https://www.tinyorm.org
[license-badge]: https://img.shields.io/github/license/silverqx/TinyORM
[license]: https://github.com/silverqx/TinyORM/blob/main/LICENSE
[version-tinyorm-badge]: https://img.shields.io/badge/TinyORM-v0.35.0-blue
[version-tom-badge]: https://img.shields.io/badge/tom-v0.6.1-blue
[version-tinyorm-badge]: https://img.shields.io/badge/TinyORM-v0.36.0-blue
[version-tom-badge]: https://img.shields.io/badge/tom-v0.7.0-blue
2 changes: 1 addition & 1 deletion cmake/vcpkg/ports/tinyorm-qt5/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "tinyorm-qt5",
"version-semver": "0.35.0",
"version-semver": "0.36.0",
"maintainers": "Silver Zachara <silver.zachara@gmail.com>",
"description": "Modern C++ ORM library for Qt framework",
"homepage": "https://github.com/silverqx/TinyORM",
Expand Down
2 changes: 1 addition & 1 deletion cmake/vcpkg/ports/tinyorm/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "tinyorm",
"version-semver": "0.35.0",
"version-semver": "0.36.0",
"maintainers": "Silver Zachara <silver.zachara@gmail.com>",
"description": "Modern C++ ORM library for Qt framework",
"homepage": "https://github.com/silverqx/TinyORM",
Expand Down
4 changes: 2 additions & 2 deletions docs/README.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ If you don't want to use full [`ORM`](tinyorm/getting-started.mdx), then you can

##### Current versions

- __TinyORM__ v0.35.0
- __tom__ v0.6.1
- __TinyORM__ v0.36.0
- __tom__ v0.7.0
8 changes: 4 additions & 4 deletions docs/building/hello-world.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ add_executable(HelloWorld
)\n
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
find_package(Qt\${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED)
find_package(TinyOrm 0.35.0 CONFIG REQUIRED)\n
find_package(TinyOrm 0.36.0 CONFIG REQUIRED)\n
target_link_libraries(HelloWorld
PRIVATE
Qt\${QT_VERSION_MAJOR}::Core
Expand All @@ -261,7 +261,7 @@ add_executable(HelloWorld
)\n
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
find_package(Qt\${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED)
find_package(TinyOrm 0.35.0 CONFIG REQUIRED)\n
find_package(TinyOrm 0.36.0 CONFIG REQUIRED)\n
target_link_libraries(HelloWorld
PRIVATE
Qt\${QT_VERSION_MAJOR}::Core
Expand Down Expand Up @@ -317,7 +317,7 @@ add_executable(HelloWorld
)\n
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
find_package(Qt\${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED)
find_package(TinyOrm 0.35.0 CONFIG REQUIRED)\n
find_package(TinyOrm 0.36.0 CONFIG REQUIRED)\n
target_link_libraries(HelloWorld
PRIVATE
Qt\${QT_VERSION_MAJOR}::Core
Expand Down Expand Up @@ -348,7 +348,7 @@ add_executable(HelloWorld
)\n
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
find_package(Qt\${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED)
find_package(TinyOrm 0.35.0 CONFIG REQUIRED)\n
find_package(TinyOrm 0.36.0 CONFIG REQUIRED)\n
target_link_libraries(HelloWorld
PRIVATE
Qt\${QT_VERSION_MAJOR}::Core
Expand Down
2 changes: 1 addition & 1 deletion docs/building/migrations.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ tiny_resource_and_manifest(${Tom_target}
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED)
find_package(TinyOrm 0.35.0 CONFIG REQUIRED)
find_package(TinyOrm 0.36.0 CONFIG REQUIRED)
# Unconditional dependencies
target_link_libraries(${Tom_target}
Expand Down
4 changes: 2 additions & 2 deletions docs/building/tinyorm.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ cd TinyORM-builds-cmake/build-debug

##### CMake `STRICT_MODE` option

The `STRICT_MODE` `CMake` configuration option was added in `TinyORM` `v0.35.0`. This option was added to avoid the propagation of aggressive strict warning compiler/linker options and Qt definitions from the `TinyORM` library to user code through the [`TinyOrm::CommonConfig`](https://github.com/silverqx/TinyORM/blob/main/cmake/CommonModules/TinyCommon.cmake) interface library.
The `STRICT_MODE` `CMake` configuration option was added in `TinyORM` `v0.36.0`. This option was added to avoid the propagation of aggressive strict warning compiler/linker options and Qt definitions from the `TinyORM` library to user code through the [`TinyOrm::CommonConfig`](https://github.com/silverqx/TinyORM/blob/main/cmake/CommonModules/TinyCommon.cmake) interface library.

`TinyORM` uses the strictest warning level options, virtually anything that can be enabled is enabled to produce a better code. I highly recommend enabling this option to produce better code and to follow good practices. It also helps to follow the `ISOCPP` [C++ Core Guidelines](https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines) standards.

Expand Down Expand Up @@ -539,7 +539,7 @@ Important `CMake` options.
In your application or library `CMakeLists.txt` file add following `find_package()` call.

```cmake title='CMakeLists.txt'
find_package(TinyOrm 0.35.0 CONFIG REQUIRED)
find_package(TinyOrm 0.36.0 CONFIG REQUIRED)
```

If the `TinyORM` build tree is not exported to the CMake's [`User Package Registry`](https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#user-package-registry) then also add the `TinyORM` build tree or `CMAKE_INSTALL_PREFIX` folder to the `CMAKE_PREFIX_PATH`, so CMake can find TinyORM's package configuration file during `find_package(TinyOrm)` call.
Expand Down
2 changes: 1 addition & 1 deletion include/orm/version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ TINY_SYSTEM_HEADER
https://community.kde.org/Policies/Binary_Compatibility_Issues_With_C++
https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html */
#define TINYORM_VERSION_MAJOR 0
#define TINYORM_VERSION_MINOR 35
#define TINYORM_VERSION_MINOR 36
#define TINYORM_VERSION_BUGFIX 0
#define TINYORM_VERSION_BUILD 0
// Should be empty for stable releases, and use the hyphen before to be compatible with SemVer!
Expand Down
4 changes: 2 additions & 2 deletions tom/include/tom/version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ TINY_SYSTEM_HEADER
#endif

#define TINYTOM_VERSION_MAJOR 0
#define TINYTOM_VERSION_MINOR 6
#define TINYTOM_VERSION_BUGFIX 1
#define TINYTOM_VERSION_MINOR 7
#define TINYTOM_VERSION_BUGFIX 0
#define TINYTOM_VERSION_BUILD 0
// Should be empty for stable releases, and use the hyphen before to be compatible with SemVer!
#define TINYTOM_VERSION_STATUS ""
Expand Down

0 comments on commit 97ee043

Please sign in to comment.