Commit Graph

3795 Commits

Author SHA1 Message Date
silverqx f564890a38 workflows disabled MySQL TLS for MSYS2 UCRT64
Because maria client can't connect to the MySQL >= 8.0.34 or >=8.1,
there is some problem in TLS 1.2 and 1.3 connection, it can't select
correct cipher. I will revert this back in the future when it will be
fixed.

Tag: to revert (in future)
2023-08-12 09:38:54 +02:00
silverqx 28e3ec78d3 workflows added group 2023-08-12 09:16:36 +02:00
silverqx 6977e47740 bugfix .gitignore 2023-08-11 18:42:34 +02:00
silverqx e59c06f590 qmake prettified conditions 2023-08-11 18:42:34 +02:00
silverqx 4b63c6a329 qmake added $$quote() 2023-08-11 18:42:34 +02:00
silverqx ed853cbf97 qmake whitespaces 2023-08-11 18:42:34 +02:00
silverqx b77553fc03 qmake used LIBS_PRIVATE for MySQL C connector 2023-08-11 18:42:33 +02:00
silverqx ac299bc199 qmake fixtypo 2023-08-11 18:42:33 +02:00
silverqx 1c1beb990f qmake removed vcpkgconf.pri
It was used in the vcpkg port file to build the TinyORM using qmake
build system, it's not used anymore as the CMake build is used instead.
2023-08-11 18:42:33 +02:00
silverqx 312687f5ac qmake updated conf.pri.example (mariadb) 2023-08-11 18:42:33 +02:00
silverqx 7fe781af5a added todo task 2023-08-11 18:42:33 +02:00
silverqx 3dd7f08ff7 qmake initialize and unset variable 2023-08-11 18:42:32 +02:00
silverqx 46da62de53 qmake added comment 2023-08-11 18:42:32 +02:00
silverqx 0503557ad8 updated NOTES.txt 2023-08-11 18:42:32 +02:00
silverqx 01fc5af3b0 qmake renamed to tiny_ccache_win32 2023-08-11 18:42:32 +02:00
silverqx a6e01a5da0 qmake show warning in tiny_add_system_includepath 2023-08-11 18:42:32 +02:00
silverqx f783da3e24 docs updated vcpkg.json 2023-08-11 18:42:31 +02:00
silverqx e25e36a3df docs updated build folders to 6_5_2 2023-08-11 18:42:31 +02:00
silverqx d98e10f4ec qmake used tiny_find_packages in TinyOrm.pri and tom.pri
This will ensure all the new auto-detect features.

 - also updated comments
2023-08-11 18:42:31 +02:00
silverqx ad18c57ecf updated .gitignore 2023-08-09 20:34:19 +02:00
silverqx d401dda13c qmake moved functions up 2023-08-09 20:34:18 +02:00
silverqx d0d4e2b628 qmake added tiny_autoconf feature
The tiny_autoconf and tiny_dotenv qmake CONFIG were added in the TinyORM
v0.34.0. These new features allow to auto-configure TinyORM, and with
their help, the conf.pri files can be skipped entirely. The
tiny_autoconf is designed to find the vcpkg installation and tiny_dotenv
to include the .env and .env.$$QMAKE_PLATFORM files in the project's
root folder. They can be configured using qmake and environment
variables, and they also contain some guessing logic if these variables
are not defined.

These are qmake and environment variables that affect the
auto-configuration feature:

- TINY_VCPKG_ROOT - path to the vcpkg installation folder (if not
  defined then it tries to use the VCPKG_ROOT environment variable)
- TINY_VCPKG_TRIPLET - vcpkg triplet to use
  (vcpkg/installed/$$TINY_VCPKG_TRIPLET/); if not defined then it tries
  to guess the vcpkg triplet on the base of the current compiler and OS
  (QMAKESPEC)
- TINY_MYSQL_ROOT - path to the MySQL installation folder (if not
  defined then it tries to guess the MySQL installation folder:
  $$(ProgramFiles)/MySQL/MySQL Server (8.1|8.0|5.7)/)

You can set these variables in the .env or .conf files (recommended), in
the qmake file (or wherever you want), or as environment variables.

These variables are set after the auto-configuration is done:

- TINY_VCPKG_INCLUDE - path to vcpkg include folder
  (vcpkg/installed/<triplet>/include/)
- TINY_MYSQL_INCLUDE - path to the MySQL include folder (MySQL Server
  8.1/include/)
- TINY_MYSQL_LIB - path to the MySQL lib folder (MySQL Server
  8.1/include/)

The TINY_MYSQL_INCLUDE and TINY_MYSQL_LIB are only set on win32 except
mingw.
2023-08-09 20:34:18 +02:00
silverqx 274dd31fd1 qmake added tiny_dotenv feature
It allows to load the .env and .env.$$TINY_DOTENV_PLATFORM files. These
files are included as early as possible so they can setup or affect
other configuration steps.

The .env file is included always and the .env.$$TINY_DOTENV_PLATFORM
file is included only for the current platform.
The $$TINY_DOTENV_PLATFORM qmake variable is auto-detected from
the $$QMAKE_PLATFORM.

The opposite thing to this feature are conf.pri files in which you can
override the entire configuration because they are included as late
as possible.
2023-08-09 20:34:12 +02:00
silverqx 153e2fe154 qmake enhanced tiny_vcpkg.prf
- added TINY_VCPKG_ROOT and TINY_VCPKG_TRIPLET env. variables checks
 - added clean_path()
 - updated comments
2023-08-09 18:46:44 +02:00
silverqx 3690c5af3e updated .gitignore 2023-08-08 15:02:03 +02:00
silverqx 12a892fe6c testdata renamed sql file 2023-08-06 15:11:30 +02:00
silverqx d6add2c325 docs updated MySQL documentation links to 8.1 2023-08-05 18:43:50 +02:00
silverqx d1b196c930 docs added note about supported database servers 2023-08-05 18:41:57 +02:00
silverqx e15a7a465c qmake renamed local variable 2023-08-04 14:10:55 +02:00
silverqx 0db01fc209 qmake whitespaces 2023-08-04 09:22:19 +02:00
silverqx f01f61e538 qmake enhanced TinyOrm.pri and tom.pri
These configuration .pri files were greatly enhanced, they detect and
configure everything now.

 - added comment at the beginning
 - enhanced linking against TinyORM library
 - configure also the vcpkg

Others:

 - added the tiny_system_includepath.prf for cross-platform INCLUDEPATH
 - added the tiny_vcpkg.prf that helps with vcpkg configuration
2023-08-03 16:26:37 +02:00
silverqx 0a3c994c98 qmake enhanced TinyOrm.pri and tom.pri
Moved the LIBS += -lTinyOrm outside of the exists($$TINYORM_BUILD_TREE)
condition because the TinyOrm library can be on the system path or
LD_LIBRARY_PATH so don't depend on the TINYORM_BUILD_TREE.

 - also formatting
2023-08-02 20:11:53 +02:00
silverqx c599adadb9 qmake added comments 2023-08-02 20:05:42 +02:00
silverqx 428ad430e1 qmake fixtypo 2023-08-02 20:04:48 +02:00
silverqx 9bc35edae6 qmake removed useless code
The same logic is done in the qmake/common.pri file.
2023-08-02 20:04:35 +02:00
silverqx dc60273fbe qmake used += for QMAKE_DIST/CLEAN 2023-08-02 18:53:48 +02:00
silverqx bbd84334c7 qmake moved comment up 2023-08-02 18:53:48 +02:00
silverqx 9056a53695 qmake updated error message 2023-08-02 18:53:48 +02:00
silverqx 7a2fc63f6c vcpkg updated description 2023-08-02 18:53:47 +02:00
silverqx 56c5b99118 vcpkg updated to new $schema URL 2023-08-02 18:53:47 +02:00
silverqx 368a9b24b5 qmake fixtypo 2023-08-02 18:53:10 +02:00
silverqx 4b5781633f qmake whitespace 2023-08-02 18:53:10 +02:00
silverqx df18476c3c qmake used *= instead of += 2023-08-02 18:53:10 +02:00
silverqx 963f302539 qmake enhanced formatting 2023-08-02 18:53:10 +02:00
silverqx 23b8babd3a qmake bugfix in condition 2023-08-02 18:53:10 +02:00
silverqx 09227e2013 qmake/cmake renamed to PROJECT_TOM_EXAMPLE 2023-08-02 18:53:10 +02:00
silverqx 567b894cd8 qmake removed commented useless code 2023-08-02 18:53:09 +02:00
silverqx 31453c32db qmake updated error message
- used the $$TARGET instead of a hardcoded target
2023-08-02 18:53:09 +02:00
silverqx 017c47f7ac qmake/cmake updated comment 2023-08-02 18:53:09 +02:00
silverqx b38bf94c95 qmake fixtypo 2023-08-02 18:53:09 +02:00