Skip to content

Commit

Permalink
mysql-8.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mugiseyebrows committed Nov 19, 2023
1 parent 2cdd647 commit 9c72c4d
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 26 deletions.
14 changes: 6 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,17 @@ jobs:
- name: main
shell: cmd
run: |
set PATH=C:\Qt\Tools\mingw810_64\bin;C:\Qt\5.15.2\mingw81_64\bin;C:\mysql-8.0.33-winx64\lib;C:\mysql-8.0.33-winx64\bin;C:\Qwt-6.2.0\lib;C:\Program Files\PostgreSQL\14\bin;C:\Miniconda3;C:\Miniconda3\Scripts;%USERPROFILE%\Miniconda3;%USERPROFILE%\Miniconda3\Scripts;%PATH%
pip install mugicli
pip install mugideploy
pip install aqtinstall
aqt install-tool windows desktop tools_mingw qt.tools.win64_mingw810 -O C:\Qt
aqt install-qt windows desktop 5.15.2 win64_mingw81 -O C:\Qt
set PATH=C:\Qt\Tools\mingw810_64\bin;C:\Qt\5.15.2\mingw81_64\bin;C:\mysql-8.2.0-winx64\lib;C:\mysql-8.2.0-winx64\bin;C:\Qwt-6.2.0\lib;C:\Program Files\PostgreSQL\14\bin;C:\Miniconda3;C:\Miniconda3\Scripts;%USERPROFILE%\Miniconda3;%USERPROFILE%\Miniconda3\Scripts;%PATH%
pip install mugicli mugideploy aqtinstall
if not exist "C:\qt\Tools\mingw810_64\bin\gcc.exe" aqt install-tool windows desktop tools_mingw qt.tools.win64_mingw810 -O C:\Qt
if not exist "C:\qt\5.15.2\mingw81_64\bin\qmake.exe" aqt install-qt windows desktop 5.15.2 win64_mingw81 -O C:\Qt
curl -L -o qsqlmysql-qt5.15.2-mingw8.1.0-x86_64.zip https://github.com/mugiseyebrows/qsqlmysql-builds/releases/download/5.15.2/qsqlmysql-qt5.15.2-mingw8.1.0-x86_64.zip
if not exist qsqlmysql-qt5.15.2-mingw8.1.0-x86_64 7z x -y qsqlmysql-qt5.15.2-mingw8.1.0-x86_64.zip
copy /y qsqlmysql-qt5.15.2-mingw8.1.0-x86_64\qsqlmysql.dll C:\Qt\5.15.2\mingw81_64\plugins\sqldrivers
copy /y qsqlmysql-qt5.15.2-mingw8.1.0-x86_64\qsqlmysqld.dll C:\Qt\5.15.2\mingw81_64\plugins\sqldrivers
pyfind C:\Qt\5.15.2\mingw81_64\plugins\sqldrivers
curl -L -o mysql-8.0.33-winx64.zip https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-8.0.33-winx64.zip
7z x -y -oC:\ mysql-8.0.33-winx64.zip
curl -L -o mysql-8.2.0-winx64.zip https://cdn.mysql.com/Downloads/MySQL-8.2/mysql-8.2.0-winx64.zip
7z x -y -oC:\ mysql-8.2.0-winx64.zip
curl -L -o qwt6.2.0-qt5.15.2-mingw8.1.0-x86_64.zip https://github.com/mugiseyebrows/qwt-builds/releases/download/qwt6.2.0-qt5.15.2/qwt6.2.0-qt5.15.2-mingw8.1.0-x86_64.zip
7z x -y -oC:\ qwt6.2.0-qt5.15.2-mingw8.1.0-x86_64.zip
qmake
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ data/
mugi-query_resource.rc
users2e78~*
.qtc_clangd/
*.zip
14 changes: 6 additions & 8 deletions build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,17 @@ if not defined CURL (
echo CURL not found
exit /b
)
set PATH=C:\Qt\Tools\mingw810_64\bin;C:\Qt\5.15.2\mingw81_64\bin;C:\mysql-8.0.33-winx64\lib;C:\mysql-8.0.33-winx64\bin;C:\Qwt-6.2.0\lib;C:\Program Files\PostgreSQL\14\bin;C:\Miniconda3;C:\Miniconda3\Scripts;%USERPROFILE%\Miniconda3;%USERPROFILE%\Miniconda3\Scripts;%PATH%
pip install mugicli
pip install mugideploy
pip install aqtinstall
aqt install-tool windows desktop tools_mingw qt.tools.win64_mingw810 -O C:\Qt
aqt install-qt windows desktop 5.15.2 win64_mingw81 -O C:\Qt
set PATH=C:\Qt\Tools\mingw810_64\bin;C:\Qt\5.15.2\mingw81_64\bin;C:\mysql-8.2.0-winx64\lib;C:\mysql-8.2.0-winx64\bin;C:\Qwt-6.2.0\lib;C:\Program Files\PostgreSQL\14\bin;C:\Miniconda3;C:\Miniconda3\Scripts;%USERPROFILE%\Miniconda3;%USERPROFILE%\Miniconda3\Scripts;%PATH%
pip install mugicli mugideploy aqtinstall
if not exist "C:\qt\Tools\mingw810_64\bin\gcc.exe" aqt install-tool windows desktop tools_mingw qt.tools.win64_mingw810 -O C:\Qt
if not exist "C:\qt\5.15.2\mingw81_64\bin\qmake.exe" aqt install-qt windows desktop 5.15.2 win64_mingw81 -O C:\Qt
if not exist qsqlmysql-qt5.15.2-mingw8.1.0-x86_64.zip "%CURL%" -L -o qsqlmysql-qt5.15.2-mingw8.1.0-x86_64.zip https://github.com/mugiseyebrows/qsqlmysql-builds/releases/download/5.15.2/qsqlmysql-qt5.15.2-mingw8.1.0-x86_64.zip
if not exist qsqlmysql-qt5.15.2-mingw8.1.0-x86_64 "%P7Z%" x -y qsqlmysql-qt5.15.2-mingw8.1.0-x86_64.zip
copy /y qsqlmysql-qt5.15.2-mingw8.1.0-x86_64\qsqlmysql.dll C:\Qt\5.15.2\mingw81_64\plugins\sqldrivers
copy /y qsqlmysql-qt5.15.2-mingw8.1.0-x86_64\qsqlmysqld.dll C:\Qt\5.15.2\mingw81_64\plugins\sqldrivers
pyfind C:\Qt\5.15.2\mingw81_64\plugins\sqldrivers
if not exist mysql-8.0.33-winx64.zip "%CURL%" -L -o mysql-8.0.33-winx64.zip https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-8.0.33-winx64.zip
"%P7Z%" x -y -oC:\ mysql-8.0.33-winx64.zip
if not exist mysql-8.2.0-winx64.zip "%CURL%" -L -o mysql-8.2.0-winx64.zip https://cdn.mysql.com/Downloads/MySQL-8.2/mysql-8.2.0-winx64.zip
"%P7Z%" x -y -oC:\ mysql-8.2.0-winx64.zip
if not exist qwt6.2.0-qt5.15.2-mingw8.1.0-x86_64.zip "%CURL%" -L -o qwt6.2.0-qt5.15.2-mingw8.1.0-x86_64.zip https://github.com/mugiseyebrows/qwt-builds/releases/download/qwt6.2.0-qt5.15.2/qwt6.2.0-qt5.15.2-mingw8.1.0-x86_64.zip
"%P7Z%" x -y -oC:\ qwt6.2.0-qt5.15.2-mingw8.1.0-x86_64.zip
qmake
Expand Down
16 changes: 7 additions & 9 deletions build.pbat
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ def main
set_path(
C:\Qt\Tools\mingw810_64\bin,
C:\Qt\5.15.2\mingw81_64\bin,
C:\mysql-8.0.33-winx64\lib,
C:\mysql-8.0.33-winx64\bin,
C:\mysql-8.2.0-winx64\lib,
C:\mysql-8.2.0-winx64\bin,
C:\Qwt-6.2.0\lib,
C:\Program Files\PostgreSQL\14\bin,
C:\Miniconda3,
Expand All @@ -14,20 +14,18 @@ def main
%USERPROFILE%\Miniconda3\Scripts,
%PATH%
)
pip install mugicli
pip install mugideploy
pip install aqtinstall
aqt install-tool windows desktop tools_mingw qt.tools.win64_mingw810 -O C:\Qt
aqt install-qt windows desktop 5.15.2 win64_mingw81 -O C:\Qt
pip install mugicli mugideploy aqtinstall
if not exist "C:\qt\Tools\mingw810_64\bin\gcc.exe" aqt install-tool windows desktop tools_mingw qt.tools.win64_mingw810 -O C:\Qt
if not exist "C:\qt\5.15.2\mingw81_64\bin\qmake.exe" aqt install-qt windows desktop 5.15.2 win64_mingw81 -O C:\Qt
#pyfind C:\Qt -iname qmake.exe gcc.exe qsqlpsql.dll
download(https://github.com/mugiseyebrows/qsqlmysql-builds/releases/download/5.15.2/qsqlmysql-qt5.15.2-mingw8.1.0-x86_64.zip, qsqlmysql-qt5.15.2-mingw8.1.0-x86_64.zip)
unzip(qsqlmysql-qt5.15.2-mingw8.1.0-x86_64.zip, qsqlmysql-qt5.15.2-mingw8.1.0-x86_64)
copy_file(qsqlmysql-qt5.15.2-mingw8.1.0-x86_64\qsqlmysql.dll, C:\Qt\5.15.2\mingw81_64\plugins\sqldrivers)
copy_file(qsqlmysql-qt5.15.2-mingw8.1.0-x86_64\qsqlmysqld.dll, C:\Qt\5.15.2\mingw81_64\plugins\sqldrivers)
pyfind C:\Qt\5.15.2\mingw81_64\plugins\sqldrivers
#pyfind C:\mysql -iname *.dll
download(https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-8.0.33-winx64.zip, mysql-8.0.33-winx64.zip)
unzip(mysql-8.0.33-winx64.zip, :o=C:\)
download(https://cdn.mysql.com/Downloads/MySQL-8.2/mysql-8.2.0-winx64.zip, mysql-8.2.0-winx64.zip)
unzip(mysql-8.2.0-winx64.zip, :o=C:\)
download(https://github.com/mugiseyebrows/qwt-builds/releases/download/qwt6.2.0-qt5.15.2/qwt6.2.0-qt5.15.2-mingw8.1.0-x86_64.zip, qwt6.2.0-qt5.15.2-mingw8.1.0-x86_64.zip)
unzip(qwt6.2.0-qt5.15.2-mingw8.1.0-x86_64.zip, :o=C:\)
qmake
Expand Down
2 changes: 1 addition & 1 deletion mugi-query.pro
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
win32 {

INCLUDEPATH += C:/Qwt-6.2.0/include
LIBS += -LC:/Qwt-6.2.0/lib -LC:/mysql-8.0.33-winx64/lib
LIBS += -LC:/Qwt-6.2.0/lib -LC:/mysql-8.2.0-winx64/lib

CONFIG(debug, debug|release) {
LIBS += -lqwtd
Expand Down

0 comments on commit 9c72c4d

Please sign in to comment.