From 8665ede01af0481073bbb63114cb29ef7ab1eeb3 Mon Sep 17 00:00:00 2001 From: Andrei Yankovich Date: Tue, 21 Sep 2021 13:41:57 +0300 Subject: [PATCH 1/5] Update CMakeLists.txt --- src/Example/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Example/CMakeLists.txt b/src/Example/CMakeLists.txt index eb7e1e8..253d56e 100644 --- a/src/Example/CMakeLists.txt +++ b/src/Example/CMakeLists.txt @@ -51,6 +51,7 @@ SET(TARGET_DIR "${CMAKE_SOURCE_DIR}/Distro") file(MAKE_DIRECTORY ${TARGET_DIR}) if (ANDROID) + set(ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/android CACHE INTERNAL "") set(SNAKE_EXTRA_LIBS ${PROJECT_NAME} From e15646d31733809fa15ec6f7815b149e6587456c Mon Sep 17 00:00:00 2001 From: EndrII Date: Mon, 25 Oct 2021 17:09:02 +0300 Subject: [PATCH 2/5] added configure deploy files --- src/Example/CMakeLists.txt | 8 ++++++- {Deploy => src/Example/Deploy}/RENAME_ME.json | 0 src/Example/Deploy/RENAME_ME.json.in | 22 +++++++++++++++++++ submodules/CMake | 2 +- 4 files changed, 30 insertions(+), 2 deletions(-) rename {Deploy => src/Example/Deploy}/RENAME_ME.json (100%) create mode 100644 src/Example/Deploy/RENAME_ME.json.in diff --git a/src/Example/CMakeLists.txt b/src/Example/CMakeLists.txt index 253d56e..7fcbb14 100644 --- a/src/Example/CMakeLists.txt +++ b/src/Example/CMakeLists.txt @@ -28,6 +28,7 @@ set(PUBLIC_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") set(PRIVATE_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Private") +updateGitVars() if (${QT_VERSION_MAJOR} EQUAL 6) @@ -85,7 +86,12 @@ if (ANDROID) else() # Desctop deploying - addDeployFromCustomFile("RENAME_ME" "${CMAKE_CURRENT_SOURCE_DIR}/../../Deploy/RENAME_ME.json") + + message(GIT_COMMIT_COUNT = ${GIT_COMMIT_COUNT}) + + set(DeployFile "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/RENAME_ME.json") + configure_file("${DeployFile}.in" ${DeployFile} @ONLY) + addDeployFromCustomFile("RENAME_ME" ${DeployFile}) endif() diff --git a/Deploy/RENAME_ME.json b/src/Example/Deploy/RENAME_ME.json similarity index 100% rename from Deploy/RENAME_ME.json rename to src/Example/Deploy/RENAME_ME.json diff --git a/src/Example/Deploy/RENAME_ME.json.in b/src/Example/Deploy/RENAME_ME.json.in new file mode 100644 index 0000000..f9cf475 --- /dev/null +++ b/src/Example/Deploy/RENAME_ME.json.in @@ -0,0 +1,22 @@ +{ + "bin": [ + "src/build/Debug/RENAME_MEEaxample", + "src/build/Debug/RENAME_MEEaxample.exe" + ], + "clear": true, + "libDir": "./../", + "recursiveDepth": "10", + "deploySystem": false, + "qmlDir": "../", + "ignoreEnv": [ + "./../installer", + "./../Distro", + "./../parts", + "./../snap", + "./../prime", + "./../stage" + ], + "extraLib": "crypto", + "targetDir": "./../DisttibutionKit" +} + diff --git a/submodules/CMake b/submodules/CMake index a36c819..d398f8c 160000 --- a/submodules/CMake +++ b/submodules/CMake @@ -1 +1 @@ -Subproject commit a36c819e1d9434567854646462be0e410505438c +Subproject commit d398f8cd8758a5b2e58eacadba49d8e718b417e6 From f696be41fa945ba34b3d3e441c141ed6b6eb261f Mon Sep 17 00:00:00 2001 From: EndrII Date: Mon, 25 Oct 2021 17:13:07 +0300 Subject: [PATCH 3/5] git ignore fix --- .gitignore | 2 ++ src/Example/CMakeLists.txt | 29 ++++++++++++++----- ...oidManifest.xml => AndroidManifest.xml.in} | 0 3 files changed, 24 insertions(+), 7 deletions(-) rename src/Example/android/{AndroidManifest.xml => AndroidManifest.xml.in} (100%) diff --git a/.gitignore b/.gitignore index c3e225f..6e98a39 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,5 @@ compile_commands.json CTestTestfile.cmake _deps *_autogen* + +src/Example/android/AndroidManifest.xml diff --git a/src/Example/CMakeLists.txt b/src/Example/CMakeLists.txt index 7fcbb14..74b0e74 100644 --- a/src/Example/CMakeLists.txt +++ b/src/Example/CMakeLists.txt @@ -8,6 +8,7 @@ cmake_minimum_required(VERSION 3.14) set(CURRENT_PROJECT "${PROJECT_NAME}Eaxample") +option(SIGN_APP "This option enable od disabled sign apk and aab files" ON) file(GLOB SOURCE_CPP "*.cpp" @@ -62,14 +63,28 @@ if (ANDROID) # find_package(Qt${QT_VERSION_MAJOR} COMPONENTS AndroidExtras REQUIRED) # target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::AndroidExtras) - addDeployAPK(${CURRENT_PROJECT} - "${CMAKE_CURRENT_LIST_DIR}/android" - "QuasarAppProject" - "${SIGPATH}/quasarapp.keystore" - "${SIGPASS_QUASARAPP}" - "${TARGET_DIR}" - "${SNAKE_EXTRA_LIBS}") + if (SIGN_APP) + message("SIGN_APP") + addDeploySignedAPK(${CURRENT_PROJECT} + "${CMAKE_CURRENT_LIST_DIR}/android" + "QuasarAppProject" + "${SIGPATH}/quasarapp.keystore" + "${SIGPASS_QUASARAPP}" + "${TARGET_DIR}" + "${SNAKE_EXTRA_LIBS}") + + else() + message("NO_SIGN_APP") + + addDeployAPK(${CURRENT_PROJECT} + "${CMAKE_CURRENT_LIST_DIR}/android" + "${TARGET_DIR}" + "${SNAKE_EXTRA_LIBS}") + + endif() + set(manifest_file "${CMAKE_CURRENT_SOURCE_DIR}/android/AndroidManifest.xml") + configure_file("${manifest_file}.in" ${manifest_file} @ONLY) file(GLOB java_files "android/src/com/quasarapp/androidtools/*.java" diff --git a/src/Example/android/AndroidManifest.xml b/src/Example/android/AndroidManifest.xml.in similarity index 100% rename from src/Example/android/AndroidManifest.xml rename to src/Example/android/AndroidManifest.xml.in From ceaa0725ad68cf03f5361d822452821fbd49a964 Mon Sep 17 00:00:00 2001 From: EndrII Date: Mon, 25 Oct 2021 17:19:53 +0300 Subject: [PATCH 4/5] fix deploy file --- CMakeLists.txt | 3 +++ src/Example/Deploy/RENAME_ME.json | 22 ---------------------- src/Example/Deploy/RENAME_ME.json.in | 15 ++++++--------- src/Example/android/AndroidManifest.xml.in | 2 +- 4 files changed, 10 insertions(+), 32 deletions(-) delete mode 100644 src/Example/Deploy/RENAME_ME.json diff --git a/CMakeLists.txt b/CMakeLists.txt index 0bef3e6..0af36cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,6 +59,9 @@ endif() initAll() +updateGitVars() +set(RENAME_VERSION "0.${GIT_COMMIT_COUNT}.${GIT_COMMIT_HASH}") + add_subdirectory(src/Library) if (DEFINED RENAME_ME_EXAMPLE) diff --git a/src/Example/Deploy/RENAME_ME.json b/src/Example/Deploy/RENAME_ME.json deleted file mode 100644 index f9cf475..0000000 --- a/src/Example/Deploy/RENAME_ME.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "bin": [ - "src/build/Debug/RENAME_MEEaxample", - "src/build/Debug/RENAME_MEEaxample.exe" - ], - "clear": true, - "libDir": "./../", - "recursiveDepth": "10", - "deploySystem": false, - "qmlDir": "../", - "ignoreEnv": [ - "./../installer", - "./../Distro", - "./../parts", - "./../snap", - "./../prime", - "./../stage" - ], - "extraLib": "crypto", - "targetDir": "./../DisttibutionKit" -} - diff --git a/src/Example/Deploy/RENAME_ME.json.in b/src/Example/Deploy/RENAME_ME.json.in index f9cf475..c2e1630 100644 --- a/src/Example/Deploy/RENAME_ME.json.in +++ b/src/Example/Deploy/RENAME_ME.json.in @@ -4,19 +4,16 @@ "src/build/Debug/RENAME_MEEaxample.exe" ], "clear": true, - "libDir": "./../", + "libDir": "@CMAKE_SOURCE_DIR@", "recursiveDepth": "10", "deploySystem": false, - "qmlDir": "../", + "qmlDir": "@CMAKE_SOURCE_DIR@", "ignoreEnv": [ - "./../installer", - "./../Distro", - "./../parts", - "./../snap", - "./../prime", - "./../stage" + "@CMAKE_SOURCE_DIR@/Distro", ], "extraLib": "crypto", - "targetDir": "./../DisttibutionKit" + "targetDir": "@CMAKE_SOURCE_DIR@/Distro", + "deployVersion": "@RENAME_VERSION@" + } diff --git a/src/Example/android/AndroidManifest.xml.in b/src/Example/android/AndroidManifest.xml.in index b3f4624..0df8cfd 100644 --- a/src/Example/android/AndroidManifest.xml.in +++ b/src/Example/android/AndroidManifest.xml.in @@ -1,5 +1,5 @@ - + From e7938cf8cd37602001bd248ffdf2aaa9232df60e Mon Sep 17 00:00:00 2001 From: EndrII Date: Mon, 25 Oct 2021 17:20:18 +0300 Subject: [PATCH 5/5] fix gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6e98a39..f1c127e 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ _deps *_autogen* src/Example/android/AndroidManifest.xml +src/Example/Deploy/RENAME_ME.json