Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added support of the cmake build system #554

Merged
merged 76 commits into from
Oct 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
a2c796b
remove submodules
EndrII Aug 8, 2022
32d2203
restructure project
EndrII Aug 8, 2022
8d688d1
added depends
EndrII Aug 8, 2022
650fba8
begin to move tests classes
EndrII Aug 8, 2022
617f03c
second commit with port tests to cmake
EndrII Aug 9, 2022
ba8baf2
addee more ported tests
EndrII Aug 10, 2022
9a3fac2
separate all tests to multiple files
EndrII Aug 13, 2022
4e561ec
fix build for linux
EndrII Aug 13, 2022
6c041e4
fix default deploy stem for linux
EndrII Aug 13, 2022
b9b8719
added cqtdeployer configuration
EndrII Aug 13, 2022
e82d05b
fix installer deploy script
EndrII Aug 14, 2022
755be52
adde deb and zip deploy steps
EndrII Aug 14, 2022
2a40da9
added base support of the snap generation
EndrII Aug 15, 2022
222474b
added tests projects
EndrII Aug 17, 2022
037dbf5
simple fixes for Qt6.3
EndrII Aug 17, 2022
f5056a5
fix build for qt6
EndrII Aug 20, 2022
1ef954d
fix crashes on tests
EndrII Aug 21, 2022
3ca4e57
fix pather urls of the test utils
EndrII Aug 22, 2022
0c7d3f4
added first qt6 module
EndrII Aug 24, 2022
99c03a5
simple fixes
EndrII Aug 25, 2022
c9e271c
fix qtTest
EndrII Aug 27, 2022
3ae39ee
fix virtual keyboard test
EndrII Aug 28, 2022
0d8c9e9
fix weengine test for linux
EndrII Aug 28, 2022
638a85e
update qa lib
EndrII Aug 28, 2022
e75fd02
fix conffile test
EndrII Oct 2, 2022
743c24b
fix extradata outdir packages and qifwresources tests
EndrII Oct 3, 2022
8938be6
fix the extraplugins test
EndrII Oct 4, 2022
fe631a5
fix linux tests
EndrII Oct 5, 2022
2478675
added support qt 6.4 (tests)
EndrII Oct 5, 2022
3952fc0
fix res files
EndrII Oct 6, 2022
26eef5a
fix tests log
EndrII Oct 7, 2022
27f7a24
limitation for windows tests
EndrII Oct 7, 2022
2c4c516
disable builds for wasm, ios and android platforms
EndrII Oct 9, 2022
4ed83a6
update gitignore
EndrII Oct 10, 2022
35dd0aa
remove translations from installer
EndrII Oct 10, 2022
602ee66
remove lxd arguments from snap creating
EndrII Oct 11, 2022
b30c2ff
fix deploy snaps
EndrII Oct 12, 2022
7b2b23a
add logs
EndrII Oct 12, 2022
09872b3
try fix depends
EndrII Oct 12, 2022
d248dcf
added depgraf log
EndrII Oct 12, 2022
23fe6ce
fix depends
EndrII Oct 12, 2022
93c40ae
disable clear old biulds
EndrII Oct 13, 2022
56c61c9
fix meta file of snap
EndrII Oct 13, 2022
29867a7
update quasarapp lib
EndrII Oct 13, 2022
b2129a6
update cnap yaml
EndrII Oct 15, 2022
32488e7
added verbose log
EndrII Oct 15, 2022
0b6b0cc
fix deploy qt libs
EndrII Oct 15, 2022
37124ae
fix qmake bug
EndrII Oct 15, 2022
97c2405
update out names
EndrII Oct 15, 2022
ddd0019
added verbose logs
EndrII Oct 15, 2022
6e70dfc
fix snapcraft source
EndrII Oct 15, 2022
6af9bf7
fix dump
EndrII Oct 16, 2022
f082479
update cmake
EndrII Oct 16, 2022
2ed3478
added options for force deploy qt6 libs (tmp solution)
EndrII Oct 16, 2022
7d42757
fix extraLibs
EndrII Oct 16, 2022
d7fa22f
fix pathes
EndrII Oct 16, 2022
04f8c40
fix deploy
EndrII Oct 16, 2022
45c199a
fix deploy
EndrII Oct 16, 2022
a95eb28
update quasarapp lib (fix build, cmake step)
EndrII Oct 16, 2022
9451cda
disable verbose log
EndrII Oct 16, 2022
eb18f50
update submodule
EndrII Oct 16, 2022
6a0e24f
change snap basse distro
EndrII Oct 16, 2022
a9c18d7
fix build snap packages
EndrII Oct 16, 2022
f403009
fix snap build
EndrII Oct 16, 2022
a9ea7e0
added fontconfig package into snap
EndrII Oct 16, 2022
91b1fee
adde libxcb-glx0 into snap pacakage
EndrII Oct 16, 2022
89c0c01
update depends of snap
EndrII Oct 16, 2022
7c17871
fix type mistacke
EndrII Oct 16, 2022
b72f12f
update snap depends
EndrII Oct 17, 2022
a38f484
Revert "update snap depends"
EndrII Oct 18, 2022
d70f0da
update release snaps
EndrII Oct 18, 2022
94a4bfe
fix documentations
EndrII Oct 18, 2022
3910085
fix documentation
EndrII Oct 18, 2022
c22493b
try fix search
EndrII Oct 18, 2022
e523867
fix documentations
EndrII Oct 18, 2022
17417a7
fix logo
EndrII Oct 18, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
30 changes: 17 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@ ui_*.h
*.qmlc
*.jsc
Makefile*
*build-*
*/build/*
stage/*
prime/*
parts/*
*cqtdeployer_resource.rc
sharedQtWin64/*

Expand Down Expand Up @@ -63,15 +58,7 @@ sharedQtWin64/
distro/
Distro/
deployTests/
QIFData/packages/cqtdeployer*/data/
QIFData/packages/QIF/data/
staticQt/
staticQtWin32/
staticQtWin64/
build
UnitTests/release/*
UnitTests/debug/*
UnitTests/res_qmlcache.qrc

# cmake
CMakeLists.txt.user
Expand All @@ -85,3 +72,20 @@ install_manifest.txt
compile_commands.json
CTestTestfile.cmake
_deps

# cmake configured files
src/Deploy/src/deploy_global.h
src/QtELFReader/src/elfreader_global.h
src/CQtDeployer/Deploy/CQtDeployer.json
src/CQtDeployer/Deploy/QIFWTemplate/packages/CQtDeployer/meta/package.xml
src/CQtDeployer/Deploy/QIFWTemplate/packages/CQtDeployer.1_6/meta/package.xml
src/CQtDeployer/Deploy/QIFWTemplate/packages/QIF/meta/package.xml
src/CQtDeployer/Deploy/QIFW/
src/CQtDeployer/Deploy/CQtDeployerSingle.json
src/CQtDeployer/Deploy/QIFWTemplate/config/config.xml
snap/snapcraft.yaml
src/LibDeploy/src/deploy_global.h
doxygen.conf

# binaries
testcases/bin/
19 changes: 7 additions & 12 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
[submodule "QuasarAppLib"]
path = QuasarAppLib
[submodule "submodules/QuasarAppLib"]
path = submodules/QuasarAppLib
url = https://github.com/QuasarApp/QuasarAppLib.git
[submodule "qtTools"]
path = qtTools
url = https://github.com/qt/qttools.git
[submodule "pe"]
path = pe
[submodule "submodules/pe-parse"]
path = submodules/pe-parse
url = https://github.com/QuasarApp/pe-parse.git
[submodule "QuasarAppScripts"]
path = QuasarAppScripts
url = https://github.com/QuasarApp/QuasarAppScripts.git
[submodule "zip"]
path = zip
[submodule "submodules/zip"]
path = submodules/zip
url = https://github.com/QuasarApp/zip.git

81 changes: 75 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,86 @@
#
# Copyright (C) 2018-2021 QuasarApp.
# Distributed under the lgplv3 software license, see the accompanying
# Copyright (C) 2020-2022 QuasarApp.
# Distributed under the GPLv3 software license, see the accompanying
# Everyone is permitted to copy and distribute verbatim copies
# of this license document, but changing it is not allowed.
#
# This is a stub for the cmake build system.

cmake_minimum_required(VERSION 3.18)
project(CQtDeployer LANGUAGES CXX)
if(TARGET ${PROJECT_NAME})
message("The ${PROJECT_NAME} arledy included in main Project")
return()
endif()

set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)

project(CQtDeployer LANGUAGES CXX)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(BUILD_SHARED_LIBS ON)

if (IOS)
set(BUILD_SHARED_LIBS OFF)
endif()

if (NOT QT_VERSION_MAJOR)
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Test QUIET)
endif()
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Test QUIET)

include(submodules/QuasarAppLib/CMake/QuasarApp.cmake)

updateGitVars()

string(TIMESTAMP TODAY "%Y-%m-%d")
set(CQT_DEPLOYER_VERSION_SHORT_PREFIX "1.6")
set(CQT_DEPLOYER_VERSION "${CQT_DEPLOYER_VERSION_SHORT_PREFIX}.${GIT_COMMIT_COUNT}.${GIT_COMMIT_HASH}")
set(QIFW_VERSION "4.4")

option(CQT_DEPLOYER_TESTS "This option disables or enables tests of the ${PROJECT_NAME} project" ON)
option(CQT_DEPLOYER_TOOL "This option disables or enables example app of the ${PROJECT_NAME} project" ON)

if (ANDROID OR IOS OR NOT QT_VERSION_MAJOR OR QA_WASM32)
message(WARNING "CQtDeployer is not availabel for wasm, android and ios platforms")
initAll()
return()
endif()

cmake_minimum_required(VERSION 3.1)
include(QuasarAppLib/CMake/QuasarAppCITargets.cmake)
if (NOT QT_VERSION_MAJOR)
set(CQT_DEPLOYER_TOOL OFF CACHE BOOL "This option force disbled for Not Qt projects" FORCE)
endif()

if (${QT_VERSION_MAJOR} LESS 6)
message(WARNING "CQtDeployer tests is not available for qt5. Please build cqtdeployer with qt6")
set(CQT_DEPLOYER_TESTS OFF CACHE BOOL "This option force disbled for ANDROID IOS QA_WASM32 and Not Qt projects" FORCE)
endif()

make_directory(Distro)

initAll()
add_subdirectory(submodules/QuasarAppLib)
add_subdirectory(src/QtELFReader)

option(BUILD_COMMAND_LINE_TOOLS "Build Command Line Tools" OFF)
add_subdirectory(submodules/pe-parse)
add_subdirectory(submodules/zip)

add_subdirectory(src/Deploy)

if (DEFINED CQT_DEPLOYER_TOOL)
add_subdirectory(src/CQtDeployer)
endif()

if (CQT_DEPLOYER_TESTS)
add_subdirectory(testcases)
add_subdirectory(tests)
else()
message("The ${PROJECT_NAME} tests is disabled.")
endif()

configure_file_in("" "${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf")

addDoc(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf)
addDeployFromCustomFile("CQtDeployer" "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/CQtDeployer.json")
78 changes: 0 additions & 78 deletions CQtDeployer.pro

This file was deleted.

44 changes: 0 additions & 44 deletions CQtDeployer/CQtDeployer.pro

This file was deleted.

25 changes: 0 additions & 25 deletions Deploy/Deploy.pri

This file was deleted.

Loading