Skip to content

Commit 79dea4e

Browse files
n0f4ph4mst3rn0f4ph4mst3r
committed
v0.1.0
2 parents 4c98007 + 5cda133 commit 79dea4e

40 files changed

+1902
-256
lines changed

‎.github/workflows/ccpp-ubuntu-clang.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: C/C++ CI (Ubuntu Clang)
2+
3+
on: [push, pull_request, workflow_dispatch]
4+
5+
jobs:
6+
build:
7+
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- uses: actions/checkout@v3
12+
with:
13+
submodules: true
14+
fetch-depth: 0
15+
16+
- uses: lukka/get-cmake@latest
17+
- name: List $RUNNER_WORKSPACE before vcpkg is setup
18+
run: find $RUNNER_WORKSPACE
19+
shell: bash
20+
21+
- name: Setup vcpkg
22+
uses: lukka/run-vcpkg@main
23+
id: runvcpkg
24+
25+
- name: List $RUNNER_WORKSPACE before build
26+
run: find $RUNNER_WORKSPACE
27+
shell: bash
28+
29+
- name: Prints output of run-vcpkg's action.
30+
run: echo "root='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_ROOT_OUT }}', triplet='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_DEFAULT_TRIPLET_OUT }}' "
31+
32+
- name: Install dependencies
33+
run: |
34+
sudo apt-get install autoconf-archive '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev
35+
36+
- name: Set up Clang
37+
uses: egor-tensin/setup-clang@v1
38+
with:
39+
version: 15
40+
platform: x64
41+
42+
- name: Run CMake
43+
uses: lukka/run-cmake@v10
44+
with:
45+
configurePreset: 'ninja-clang'
46+
configurePresetAdditionalArgs: "['-DVCPKG_ROOT_TRIPLET=x64-linux-release']"
47+
buildPreset: 'clang'
48+
49+
- name: List $RUNNER_WORKSPACE after build
50+
run: find $RUNNER_WORKSPACE
51+
shell: bash

‎.github/workflows/ccpp-ubuntu-gcc.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: C/C++ CI (Ubuntu GCC)
2+
3+
on: [push, pull_request, workflow_dispatch]
4+
5+
jobs:
6+
build:
7+
8+
runs-on: ubuntu-latest
9+
env:
10+
VCPKG_DEFAULT_HOST_TRIPLET: x64-linux-release
11+
VCPKG_DEFAULT_TRIPLET: x64-linux-release
12+
13+
steps:
14+
- uses: actions/checkout@v3
15+
with:
16+
submodules: true
17+
fetch-depth: 0
18+
19+
- uses: lukka/get-cmake@latest
20+
- name: List $RUNNER_WORKSPACE before vcpkg is setup
21+
run: find $RUNNER_WORKSPACE
22+
shell: bash
23+
24+
- name: Setup vcpkg
25+
uses: lukka/run-vcpkg@main
26+
id: runvcpkg
27+
28+
- name: List $RUNNER_WORKSPACE before build
29+
run: find $RUNNER_WORKSPACE
30+
shell: bash
31+
32+
- name: Prints output of run-vcpkg's action.
33+
run: echo "root='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_ROOT_OUT }}', triplet='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_DEFAULT_TRIPLET_OUT }}' "
34+
35+
- name: Install dependencies
36+
run: |
37+
sudo apt-get install autoconf-archive '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev
38+
39+
- name: Compiler check
40+
run: g++ --version
41+
42+
- name: Run CMake
43+
uses: lukka/run-cmake@v10
44+
with:
45+
configurePreset: 'ninja-gcc'
46+
configurePresetAdditionalArgs: "['-DVCPKG_ROOT_TRIPLET=x64-linux-release']"
47+
buildPreset: 'gcc'
48+
49+
- name: List $RUNNER_WORKSPACE after build
50+
run: find $RUNNER_WORKSPACE
51+
shell: bash

‎.github/workflows/ccpp-windows-x64.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: C/C++ CI (Windows x64)
2+
3+
on: [push, pull_request, workflow_dispatch]
4+
5+
jobs:
6+
build:
7+
8+
runs-on: windows-latest
9+
10+
steps:
11+
- uses: actions/checkout@v3
12+
with:
13+
submodules: true
14+
fetch-depth: 0
15+
16+
- uses: lukka/get-cmake@latest
17+
- name: List $RUNNER_WORKSPACE before vcpkg is setup
18+
run: find $RUNNER_WORKSPACE
19+
shell: bash
20+
21+
- name: Setup vcpkg
22+
uses: lukka/run-vcpkg@main
23+
id: runvcpkg
24+
25+
- name: List $RUNNER_WORKSPACE before build
26+
run: find $RUNNER_WORKSPACE
27+
shell: bash
28+
29+
- name: Prints output of run-vcpkg's action.
30+
run: echo "root='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_ROOT_OUT }}', triplet='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_DEFAULT_TRIPLET_OUT }}' "
31+
32+
- name: Run CMake
33+
uses: lukka/run-cmake@v10
34+
with:
35+
configurePreset: 'msbuild-default'
36+
configurePresetAdditionalArgs: "['-DVCPKG_ROOT_TRIPLET=x64-windows-release']"
37+
buildPreset: 'msvc'
38+
buildPresetAdditionalArgs: '[`--config Release`]'
39+
40+
- name: List $RUNNER_WORKSPACE after build
41+
run: find $RUNNER_WORKSPACE
42+
shell: bash
43+
44+
- name: Deploy application
45+
run: |
46+
vcpkg_installed/x64-windows-release/tools/Qt6/bin/windeployqt.exe Release/qSQLbrowser.exe
47+
working-directory: ./build
48+
49+
- name: Run app
50+
run: >-
51+
build\Release\qSQLbrowser.exe

‎.gitignore

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -366,13 +366,9 @@ FodyWeavers.xsd
366366

367367
# Ignore build directory
368368
build/
369-
debug/
370-
release/
371-
msvc/
372-
msbuild/
373369

374370
# Ignore install directory
375-
out/
371+
bin/
376372

377373
# Ignore vscode files
378374
/.vscode

‎CHANGELOG.md

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
### v0.1.0 (2023-08-07)
2+
3+
##### Chores
4+
5+
* **CMakeLists.txt:**
6+
* change install prefix [820d4901](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/820d4901)
7+
* reconfigure vcpkg triplets [f0f5c3ee](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/f0f5c3ee)
8+
* reconfigure deploy script [f0f5c3ee](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/a8aaf989)
9+
* add CI/CD workflows files [81022554](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/81022554)
10+
* add license commentary in source files [0da7100b](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/0da7100b)
11+
* **vcpkg.json:** dump version to 0.1.0 [32d1f190](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/32d1f190)
12+
* **.gitignore:** update [26e26608](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/26e26608)
13+
* **CMakePresets.json:** reconfigure presets [90c0cd76](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/90c0cd76)
14+
15+
##### Documentation Changes
16+
17+
* add license [007d379b](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/007d379b)
18+
* **README.md:** update README file [9b6716df](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/9b6716df)
19+
20+
##### New Features
21+
22+
* implement SQL query [4c7bfa73](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/4c7bfa73)
23+
* implement connection to database [81d367e4](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/81d367e4)
24+
25+
##### Bug Fixes
26+
27+
* **CMakeLists.txt:** fix target name in deploy script [202be615](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/202be615)
28+
29+
##### Other Changes
30+
31+
* **UI:**
32+
* add more icons [2c2c9e7d](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/2c2c9e7d)
33+
* change MainWindows title [bcf0b2d2](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/bcf0b2d2)
34+
* change size of widgets [1815890f](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/1815890f)
35+
* add menubar [b0f19653](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/b0f19653)
36+
37+
##### Refactors
38+
39+
* **QSqlCtrl:** remove widget [2e587e8c](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/2e587e8c)
40+
41+
#### 2023-08-07
42+
43+
##### Chores
44+
45+
* **CMakeLists.txt:**
46+
* change install prefix [820d4901](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/820d4901)
47+
* reconfigure vcpkg triplets [f0f5c3ee](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/f0f5c3ee)
48+
* reconfigure deploy script [a8aaf989](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/a8aaf989)
49+
* add CI/CD workflows files [81022554](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/81022554)
50+
* add license commentary in source files [0da7100b](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/0da7100b)
51+
* **vcpkg.json:** dump version to 0.1.0 [32d1f190](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/32d1f190)
52+
* **.gitignore:** update [26e26608](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/26e26608)
53+
* **CMakePresets.json:** reconfigure presets [90c0cd76](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/90c0cd76)
54+
55+
##### Documentation Changes
56+
57+
* add license [007d379b](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/007d379b)
58+
* **README.md:** update README file [9b6716df](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/9b6716df)
59+
60+
##### New Features
61+
62+
* implement SQL query [4c7bfa73](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/4c7bfa73)
63+
* implement connection to database [81d367e4](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/81d367e4)
64+
65+
##### Bug Fixes
66+
67+
* **CMakeLists.txt:** fix target name in deploy script [202be615](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/202be615)
68+
69+
##### Other Changes
70+
71+
* **UI:**
72+
* add more icons [2c2c9e7d](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/2c2c9e7d)
73+
* change MainWindows title [bcf0b2d2](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/bcf0b2d2)
74+
* change size of widgets [1815890f](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/1815890f)
75+
* add menubar [b0f19653](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/b0f19653)
76+
77+
##### Refactors
78+
79+
* **QSqlCtrl:** remove widget [2e587e8c](https://github.com/n0f4ph4mst3r/qSQLbrowser/commit/2e587e8c)

‎CMakeLists.txt

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,28 @@ if(NOT DEFINED ${CMAKE_TOOLCHAIN_FILE})
44
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake CACHE STRING "Vcpkg toolchain file")
55
endif()
66

7+
option(VCPKG_ROOT_TRIPLET "Vcpkg triplet" OFF)
78
set(VCPKG_OVERLAY_TRIPLETS ${CMAKE_CURRENT_SOURCE_DIR}/triplets)
8-
if (WIN32)
9-
set(VCPKG_TARGET_TRIPLET x64-windows-mixed)
10-
set(VCPKG_HOST_TRIPLET x64-windows-mixed)
11-
elseif (UNIX)
12-
set(VCPKG_HOST_TRIPLET x64-linux-mixed)
13-
set(VCPKG_TARGET_TRIPLET x64-linux-mixed)
9+
if(NOT VCPKG_ROOT_TRIPLET)
10+
if (WIN32)
11+
set(VCPKG_HOST_TRIPLET x64-windows-mixed)
12+
set(VCPKG_TARGET_TRIPLET x64-windows-mixed)
13+
elseif (UNIX)
14+
set(VCPKG_HOST_TRIPLET x64-linux-mixed)
15+
set(VCPKG_TARGET_TRIPLET x64-linux-mixed)
16+
endif()
17+
else()
18+
set(VCPKG_HOST_TRIPLET ${VCPKG_ROOT_TRIPLET})
19+
set(VCPKG_TARGET_TRIPLET ${VCPKG_ROOT_TRIPLET})
20+
endif()
21+
22+
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
23+
set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/bin" CACHE PATH "Default install path" FORCE)
1424
endif()
1525

1626
project(qSQLbrowser)
1727

28+
set(CMAKE_INSTALL_BINDIR .)
1829
find_package(Qt6 REQUIRED COMPONENTS Widgets Sql)
1930
qt_standard_project_setup()
2031

@@ -37,13 +48,18 @@ set_target_properties(qSQLbrowser PROPERTIES
3748

3849
set(CMAKE_INSTALL_MESSAGE "-- Installing: ${CMAKE_INSTALL_PREFIX}")
3950
install(TARGETS qSQLbrowser
40-
BUNDLE DESTINATION bin
41-
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
51+
BUNDLE DESTINATION .
4252
)
4353

44-
qt_generate_deploy_app_script(
45-
TARGET QSqlBrowser
54+
qt_generate_deploy_script(
55+
TARGET qSQLbrowser
4656
OUTPUT_SCRIPT deploy_script
47-
NO_UNSUPPORTED_PLATFORM_ERROR
48-
)
57+
CONTENT "
58+
qt_deploy_runtime_dependencies(
59+
EXECUTABLE \"./$<TARGET_FILE_NAME:qSQLbrowser>\"
60+
GENERATE_QT_CONF
61+
PLUGINS_DIR QtPlugins
62+
VERBOSE
63+
NO_TRANSLATIONS
64+
)")
4965
install(SCRIPT ${deploy_script})

0 commit comments

Comments
 (0)