Merge branch 'task_113' into dev

.gitignore

@@ -31,11 +31,6 @@ ui_*.h
 *.qmlc
 *.jsc
 Makefile*
-*build-*
-*/build/*
-stage/*
-prime/*
-parts/*
 *cqtdeployer_resource.rc
 sharedQtWin64/*
 
@@ -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
@@ -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/

.gitmodules

@@ -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
+

CMakeLists.txt

@@ -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")