QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-05-15 10:59:34 +00:00
Code Issues Projects Releases Wiki Activity

update documentations

Browse Source
This commit is contained in:
Andrei Yankovich 2022-10-22 17:24:05 +03:00
parent dfe0300224
commit 998531f475
3 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -48,10 +48,6 @@ if (ANDROID OR IOS OR NOT QT_VERSION_MAJOR OR QA_WASM32)
return() return()
endif() endif()
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) if (${QT_VERSION_MAJOR} LESS 6)
message(WARNING "CQtDeployer tests is not available for qt5. Please build cqtdeployer with qt6") 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) set(CQT_DEPLOYER_TESTS OFF CACHE BOOL "This option force disbled for ANDROID IOS QA_WASM32 and Not Qt projects" FORCE)
@ -63,6 +59,7 @@ initAll()
add_subdirectory(submodules/QuasarAppLib) add_subdirectory(submodules/QuasarAppLib)
add_subdirectory(src/QtELFReader) add_subdirectory(src/QtELFReader)
# disable command line tool of pe-parse
option(BUILD_COMMAND_LINE_TOOLS "Build Command Line Tools" OFF) option(BUILD_COMMAND_LINE_TOOLS "Build Command Line Tools" OFF)
add_subdirectory(submodules/pe-parse) add_subdirectory(submodules/pe-parse)
add_subdirectory(submodules/zip) add_subdirectory(submodules/zip)
@ -83,4 +80,3 @@ endif()
configure_file_in("" "${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf") configure_file_in("" "${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf")
addDoc(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf) addDoc(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf)
addDeployFromCustomFile("CQtDeployer" "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/CQtDeployer.json")

19
md/en/1_6.md
View File

@ -24,6 +24,11 @@ From now cqtdeployer using CMake build system. So from now build from source wil
## Detailed analysis of the most interesting changes. ## Detailed analysis of the most interesting changes.
## New options of the build
* **CQT_DEPLOYER_TESTS** "This option disables or enables tests of the CQtDeployer project. By Default enabled
* **CQT_DEPLOYER_TOOL** "This option disables or enables example app of the CQtDeployer project. By Default enabled
### New build system ### New build system
From now, you can build cqtdeployer from source easier From now, you can build cqtdeployer from source easier
@ -31,41 +36,53 @@ From now, you can build cqtdeployer from source easier
- just clone project - just clone project
``` bash ``` bash
git clone https://github.com/QuasarApp/CQtDeployer.git git clone https://github.com/QuasarApp/CQtDeployer.git
git submodule update --init --recursive git submodule update --init --recursive
cd CQtDeployer cd CQtDeployer
``` ```
- create temp build directory - create temp build directory
``` bash ``` bash
mkdir build mkdir build
cd build cd build
``` ```
- run cmake - run cmake
``` bash ``` bash
cmake .. -DCMAKE_PREFIX_PATH=/path/to/qt/root/dir cmake .. -DCMAKE_PREFIX_PATH=/path/to/qt/root/dir
``` ```
- build cqtdeployer - build cqtdeployer
``` bash ``` bash
make -j8 make -j8
``` ```
- create installers and packages - create installers and packages
``` bash ``` bash
make deploy make deploy
``` ```
Done. Done.
### Note ### Note
if you want to change Qt, Just run cmake with override qt location.
If you want to change Qt, Just run cmake with override qt location.
```bash ```bash
cmake -DCMAKE_PREFIX_PATH=/path/to/qt/root/dir cmake -DCMAKE_PREFIX_PATH=/path/to/qt/root/dir
# or # or
cmake -DCMAKE_PREFIX_PATH=~/Qt/6.4.3/gcc_64 cmake -DCMAKE_PREFIX_PATH=~/Qt/6.4.3/gcc_64

11
src/CQtDeployer/CMakeLists.txt
View File

@ -105,15 +105,18 @@ ADD_CUSTOM_TARGET(
COMMENT python "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/QIFW.py" ${QIFW_PLATFORM} ${QIFW_VERSION} "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/QIFW" COMMENT python "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/QIFW.py" ${QIFW_PLATFORM} ${QIFW_VERSION} "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/QIFW"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
) )
add_dependencies(deploy${CURRENT_PROJECT} downloadQIFW) add_dependencies(deploy${CURRENT_PROJECT} downloadQIFW)
addDeployFromCustomFile(${CURRENT_PROJECT}Single "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/CQtDeployerSingle.json") addDeployFromCustomFile(${CURRENT_PROJECT}Single "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/CQtDeployerSingle.json")
addDeploySnap(${CURRENT_PROJECT} "${CMAKE_SOURCE_DIR}/Distro/") if (UNIX)
addDeploySnap(${CURRENT_PROJECT} "${CMAKE_SOURCE_DIR}/Distro/")
if(TARGET snapcraft${CURRENT_PROJECT}) if(TARGET snapcraft${CURRENT_PROJECT})
message("snap is depends of single deploy") message("snap is depends of single deploy")
add_dependencies(snapcraft${CURRENT_PROJECT} "deploy${CURRENT_PROJECT}Single") add_dependencies(snapcraft${CURRENT_PROJECT} "deploy${CURRENT_PROJECT}Single")
endif() endif()
addReleaseSnap(${CURRENT_PROJECT}) addReleaseSnap(${CURRENT_PROJECT})
endif()