From 16d3642103845b781913a4329413da192274995d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= <peri4ko@yandex.ru>
Date: Tue, 21 Apr 2020 06:58:23 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@1064
 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

---
 CMakeLists.txt               |   2 +-
 cmake/DeployMacros.cmake     |  36 ++++++++++++++++++++++-------------
 cmake/android_debug.keystore | Bin 0 -> 2103 bytes
 cmake/gradle.properties.in   |   1 +
 4 files changed, 25 insertions(+), 14 deletions(-)
 create mode 100644 cmake/android_debug.keystore

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dba0b82d..7688a760 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -662,7 +662,7 @@ if(LIB)
 	# Precompiled header
 	#add_custom_target(pip_pch ALL COMMAND ${CMAKE_CXX_COMPILER} -O2 -fPIC -g3 ${CMAKE_INSTALL_PREFIX}/include/pip/pip.h DEPENDS pip SOURCES ${HDRS})
 	#list(APPEND HDRS "pip.h.gch")
-	file(GLOB CMAKES "cmake/*.cmake" "cmake/*.in")
+	file(GLOB CMAKES "cmake/*.cmake" "cmake/*.in" "cmake/android_debug.keystore")
 	install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules)
 else()
 	if(NOT PIP_FREERTOS)
diff --git a/cmake/DeployMacros.cmake b/cmake/DeployMacros.cmake
index e3db6bd2..1d719376 100644
--- a/cmake/DeployMacros.cmake
+++ b/cmake/DeployMacros.cmake
@@ -49,6 +49,19 @@ You can setup several properties in one command
 
 
 
+make_rc(<target> <rc_out_file>)
+
+Generate Windows *.rc file from deploy properties
+and return file path to <rc_out_file>
+On other platforms this variable set to empty
+
+You should set version and deploy properties
+before call this macro, see
+"set_version()" and "set_deploy_property()"
+
+
+
+
 deploy_target(<target> [DEPLOY_DIR <dir>] [DESTINATION <dir>]
 						[RESOURCES <dir|file> [<dir|file> ...] ]
 						[PLUGINS <dir|file> [<dir|file> ...] ]
@@ -98,19 +111,6 @@ depends on target platform
 DEPLOY_ADD_LIBPATH variable used as additional
 library search path
 
-
-
-
-make_rc(<target> <rc_out_file>)
-
-Generate Windows *.rc file from deploy properties
-and return file path to <rc_out_file>
-On other platforms this variable set to empty
-
-You should set version and deploy properties
-before call this macro, see
-"set_version()" and "set_deploy_property()"
-
 ]]
 
 
@@ -358,6 +358,9 @@ macro(__add_file_or_dir _DIR_VAR _FILE_VAR _PATH _RELPATH)
 	endif()
 	#if (EXISTS "${_p}")
 		if ("${_p}" MATCHES ".*/")
+			string(LENGTH "${_p}" __sl)
+			math(EXPR __sl ${__sl}-1)
+			string(SUBSTRING "${_p}" 0 ${__sl} _p)
 			list(APPEND ${_DIR_VAR} "${_p}")
 		else()
 			list(APPEND ${_FILE_VAR} "${_p}")
@@ -495,6 +498,9 @@ set(__macos_privacies
 #}
 set(__gradle_sign
 "	signingConfigs {
+		debug {
+			storeFile file(DEBUG_STORE_FILE)
+		}
 		release {
 			storeFile file(RELEASE_STORE_FILE)
 			storePassword RELEASE_STORE_PASSWORD
@@ -504,6 +510,9 @@ set(__gradle_sign
 	}
 
 	buildTypes {
+		debug {
+			signingConfig signingConfigs.debug
+		}
 		release {
 			signingConfig signingConfigs.release
 		}
@@ -823,6 +832,7 @@ macro(deploy_target _T)
 		if (NOT IS_ABSOLUTE "${ANDROID_STORE_FILE}")
 			set(ANDROID_STORE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/android/${ANDROID_STORE_FILE}")
 		endif()
+		set(__ANDROID_DEBUG_KEYSTORE__ "${_modules_dir}/android_debug.keystore")
 		set(QT_DIR ${Qt5_ROOT})
 		set(_out_json "${CMAKE_CURRENT_BINARY_DIR}/${_T}_android_deployment_settings.json")
 		configure_file("${CMAKE_BINARY_DIR}/android_deployment_settings.json.in" "${_out_json}")
diff --git a/cmake/android_debug.keystore b/cmake/android_debug.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..bd7bac48e81c43e00c7df1cc97af261f47124a17
GIT binary patch
literal 2103
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

literal 0
HcmV?d00001

diff --git a/cmake/gradle.properties.in b/cmake/gradle.properties.in
index 65e0429f..ab415867 100644
--- a/cmake/gradle.properties.in
+++ b/cmake/gradle.properties.in
@@ -2,6 +2,7 @@ androidBuildToolsVersion=
 androidCompileSdkVersion=@ANDROID_TARGET_SDK@
 buildDir=build
 qt5AndroidDir=@Qt5_ROOT@/src/android/java
+DEBUG_STORE_FILE=@__ANDROID_DEBUG_KEYSTORE__@
 RELEASE_STORE_FILE=@ANDROID_STORE_FILE@
 RELEASE_STORE_PASSWORD=@ANDROID_STORE_PASSWORD@
 RELEASE_KEY_PASSWORD=@ANDROID_KEY_PASSWORD@