diff --git a/CMakeLists.txt b/CMakeLists.txt index a1dcc38..e490075 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,12 +19,14 @@ set(CMAKE_AUTOUIC ON) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(BUILD_SHARED_LIBS ON) if (IOS) - set(BUILD_SHARED_LIBS OFF) + option(BUILD_SHARED_LIBS "This option forece build ${PROJECT_NAME} as a shared project with separated libraries as" OFF) +elseif() + option(BUILD_SHARED_LIBS "This option forece build ${PROJECT_NAME} as a shared project with separated libraries as" ON) endif() + if (NOT QT_VERSION_MAJOR) find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Test QUIET) endif() @@ -82,3 +84,8 @@ endif() configure_file_in("" "${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf") addDoc(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf) + + +install(TARGETS CQtDeployer + BUNDLE DESTINATION . + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/md/en/1_6.md b/md/en/1_6.md index b0b5d56..a6d444f 100755 --- a/md/en/1_6.md +++ b/md/en/1_6.md @@ -15,20 +15,22 @@ From now cqtdeployer using CMake build system. So from now build from source wil - Refactoring all project structure - Improved QML parser - Add support qt 6.4 +- Added support (snap version) deploy apps that was buildet with Qt from system ### Fixes - Fixed snap version of cqtdeployer - Fixed deploy of windows apps -- Added support deploy apps that was buildet with Qt from system +- Fixed documentation web city (added support of backend search engine) -## Detailed analysis of the most interesting changes. - -## New options of the build +### 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 + +## Detailed analysis of the most interesting changes. + ### New build system From now, you can build cqtdeployer from source easier @@ -52,7 +54,7 @@ From now, you can build cqtdeployer from source easier ``` -- run cmake +- run cmake (this step requires install Qt libraries, you can install qt from system or from official site of Qt corporation.) ``` bash @@ -67,7 +69,8 @@ From now, you can build cqtdeployer from source easier make -j8 ``` -- create installers and packages + +- create installers and packages (this step requires installers cqtdeployer tool) ``` bash @@ -77,15 +80,25 @@ From now, you can build cqtdeployer from source easier Done. + ### Note +If you do not have installed cqtdeployer on your build machine, you can compile cqtdeployer tool as a static. For this, disable the BUILD_SHARED_LIBS option. + +```bash + +cmake .. -DBUILD_SHARED_LIBS=0 +make install + +``` + If you want to change Qt, Just run cmake with override qt location. ```bash -cmake -DCMAKE_PREFIX_PATH=/path/to/qt/root/dir +cmake .. -DCMAKE_PREFIX_PATH=/path/to/qt/root/dir # or -cmake -DCMAKE_PREFIX_PATH=~/Qt/6.4.3/gcc_64 +cmake .. -DCMAKE_PREFIX_PATH=~/Qt/6.4.3/gcc_64 ``` diff --git a/md/en/Build-and-Install.md b/md/en/Build-and-Install.md index 531bc85..71a7abc 100644 --- a/md/en/Build-and-Install.md +++ b/md/en/Build-and-Install.md @@ -129,3 +129,25 @@ sudo snap connect cqtdeployer:system-backup ``` bash migw32-make deploy ``` + + +### Note + +If you do not have installed cqtdeployer on your build machine, you can compile cqtdeployer tool as a static. For this, disable the BUILD_SHARED_LIBS option. + +```bash + +cmake .. -DBUILD_SHARED_LIBS=0 +make install + +``` + +If you want to change Qt, Just run cmake with override qt location. + +```bash + +cmake .. -DCMAKE_PREFIX_PATH=/path/to/qt/root/dir +# or +cmake .. -DCMAKE_PREFIX_PATH=~/Qt/6.4.3/gcc_64 + +``` diff --git a/md/en/Changelog.md b/md/en/Changelog.md index 18394ea..bfbafeb 100755 --- a/md/en/Changelog.md +++ b/md/en/Changelog.md @@ -1,5 +1,114 @@ # Change log +## CQtDeployer 1.6 + +### New features + +- Move to Cmake build system +- Refactoring all project structure +- Improved QML parser +- Add support qt 6.4 +- Added support (snap version) deploy apps that was buildet with Qt from system + +### Fixes + +- Fixed snap version of cqtdeployer +- Fixed deploy of windows apps +- Fixed documentation web city (added support of backend search engine) + +### 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 + + +## CQtDeployer v1.5.4.17 + +### Bug fixes : + +* Update qifw to 4.4 by @EndrII in #701 + +## CQtDeployer v1.5.4.16 + +### Bug fixes : + +* Added support of the binarycreator option by @EndrII in #700 + + +## CQtDeployer v1.5.4.15 + +### Bug fixes : + +* Added support the QtShaderToolsModule by @EndrII in #697 + + +## CQtDeployer v1.5.4.14 + +### Bug fixes : + +* Fix qifw in cqtdeployer of the snap-store, by @EndrII in #693 +* Fix deploy network module (Qt6) by @EndrII in #692 + + +## CQtDeployer v1.5.4.13 + +### Bug fixes : + +* Added new option for change archive format of qifw by @EndrII in #689 + + +## CQtDeployer v1.5.4.12 + +### Bug fixes : + +* Allow to deploy libstdc++ library by @EndrII in #684 +* Added 'platform' option by @EndrII in #687 + + +## CQtDeployer v1.5.4.11 + +### Bug fixes : + +* Update qifw by @EndrII in #675 +* Add a 'disable pe library' option by @EndrII in #678 +* Add support for gcc4 by @EndrII in #679 +* Add support search targets from the path by @EndrII in #683 + + +## CQtDeployer v1.5.4.10 + +### Bug fixes : + +* Simple bug fixes update CQtDeployer v1.5.4.10 + +## CQtDeployer v1.5.4.8 + +### Bug fixes : + +* Little grammar fixes for Readme by @Kickoman in #666 +* Arm build by @EndrII in #670 +* Added support folders for the tr option by @EndrII in #673 + +## CQtDeployer v1.5.4.7 + +### Bug fixes : + +* Fix windows shortcuts by @EndrII in #658 +* Fix deploy icons by @EndrII in #660 and @EndrII in #662 +* Add manual tests for icons option by @EndrII in #664 + + +## CQtDeployer v1.5.4.3 + +### Bug fixes : + +* Fix custom icons #659 + +## CQtDeployer v1.5.4.3 + +### Bug fixes : +Fix custom icons #659 + ## CQtDeployer 1.5.4 diff --git a/src/CQtDeployer/CMakeLists.txt b/src/CQtDeployer/CMakeLists.txt index 389528a..dfc3890 100644 --- a/src/CQtDeployer/CMakeLists.txt +++ b/src/CQtDeployer/CMakeLists.txt @@ -87,7 +87,7 @@ add_custom_target(${name}Templates ALL # sets qifw variable set(ApplicationsDir "@HomeDir@") set(QIFW_PLATFORM linux) -set(INSTALLER_SUFIX run) +set(INSTALLER_SUFIX .run) if (WIN32) set(QIFW_PLATFORM windows) set(INSTALLER_SUFIX exe) diff --git a/src/CQtDeployer/Deploy/CQtDeployer.json.in b/src/CQtDeployer/Deploy/CQtDeployer.json.in index 33ca91a..6952ac9 100644 --- a/src/CQtDeployer/Deploy/CQtDeployer.json.in +++ b/src/CQtDeployer/Deploy/CQtDeployer.json.in @@ -73,7 +73,7 @@ "deploySystem": false, "deb": false, "qif": "./QIFWTemplate", - "qifOut": "CQtDeployer_@CQT_DEPLOYER_VERSION@_@CMAKE_SYSTEM_NAME@_@CMAKE_SYSTEM_PROCESSOR@.@INSTALLER_SUFIX@", + "qifOut": "CQtDeployer_@CQT_DEPLOYER_VERSION@_@CMAKE_SYSTEM_NAME@_@CMAKE_SYSTEM_PROCESSOR@@INSTALLER_SUFIX@", "zip": false, "ignoreEnv": [ "@CMAKE_SOURCE_DIR@/Distro" diff --git a/src/Deploy/CMakeLists.txt b/src/Deploy/CMakeLists.txt index eae2542..7fade26 100644 --- a/src/Deploy/CMakeLists.txt +++ b/src/Deploy/CMakeLists.txt @@ -44,3 +44,7 @@ prepareQM(${CURRENT_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR} "${LANGS}") set(QML_IMPORT_PATH ${QML_IMPORT_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/src" CACHE STRING "" FORCE) configure_file_in(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/src/deploy_global.h") + +install(TARGETS ${CURRENT_PROJECT} + BUNDLE DESTINATION . + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/src/QtELFReader/CMakeLists.txt b/src/QtELFReader/CMakeLists.txt index 86051c5..883d1b1 100644 --- a/src/QtELFReader/CMakeLists.txt +++ b/src/QtELFReader/CMakeLists.txt @@ -34,3 +34,7 @@ target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR}) configure_file_in(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/src/elfreader_global.h") + +install(TARGETS ${CURRENT_PROJECT} + BUNDLE DESTINATION . + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})