added support packages ids

.gitignore

@@ -65,3 +65,8 @@ compile_commands.json
 CTestTestfile.cmake
 _deps
 *_autogen*
+
+# Configured files
+build.gradle
+AndroidManifest.xml
+src/Example/Deploy/RENAME_ME.json

CMakeLists.txt

@@ -20,7 +20,7 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-if (ANDROID)
+if (ANDROID OR IOS)
     set(BUILD_SHARED_LIBS ON)
 endif()
 
@@ -31,6 +31,10 @@ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Test QUIET)
 
 include(submodules/CMake/QuasarApp.cmake)
 
+updateGitVars()
+set(RENAME_ME_VERSION "0.${GIT_COMMIT_COUNT}.${GIT_COMMIT_HASH}")
+set(RENAME_ME_PACKAGE_ID "quasarapp.core.RENAME_ME")
+
 if (NOT DEFINED RENAME_ME_TESTS)
     set(RENAME_ME_TESTS ON)
 
@@ -40,7 +44,7 @@ if (NOT DEFINED RENAME_ME_TESTS)
         endif()
     endif()
 
-    if (ANDROID)
+    if (ANDROID OR IOS)
         set(RENAME_ME_TESTS OFF)
     endif()
 

src/Example/CMakeLists.txt

@@ -52,7 +52,12 @@ file(MAKE_DIRECTORY ${TARGET_DIR})
 
 if (ANDROID)
 
-    set(SNAKE_EXTRA_LIBS
+    set(ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/android CACHE INTERNAL "")
+    set(ENV{ANDROID_API_VERSION} 31)
+    set(ANDROID_API_VERSION $ENV{ANDROID_API_VERSION})
+    set(OPENSSL_ROOT_PATH "$ENV{OPENSSL_ROOT_DIR}")
+
+    set(RENAME_ME_EXTRA_LIBS
         ${PROJECT_NAME}
 #        libName
         )
@@ -66,8 +71,13 @@ if (ANDROID)
                 "${SIGPATH}/quasarapp.keystore"
                 "${SIGPASS_QUASARAPP}"
                 "${TARGET_DIR}"
-                "${SNAKE_EXTRA_LIBS}")
+                "${RENAME_ME_EXTRA_LIBS}")
 
+    set(manifest_file "${CMAKE_CURRENT_SOURCE_DIR}/android/AndroidManifest.xml")
+    configure_file("${manifest_file}.in" ${manifest_file} @ONLY)
+
+    set(gradle_file "${CMAKE_CURRENT_SOURCE_DIR}/android/build.gradle")
+    configure_file("${gradle_file}.in" ${gradle_file} @ONLY)
 
     file(GLOB java_files
        "android/src/com/quasarapp/androidtools/*.java"
@@ -82,9 +92,23 @@ if (ANDROID)
         SOURCES ${java_files}
     )
 
+elseif(IOS)
+#    set_xcode_property(${CURRENT_PROJECT} PRODUCT_BUNDLE_IDENTIFIER ${CHEATCARD_PACKAGE_ID} All)
+
+    set_target_properties(${CURRENT_PROJECT} PROPERTIES
+        MACOSX_BUNDLE_GUI_IDENTIFIER ${RENAME_ME_PACKAGE_ID}
+        MACOSX_BUNDLE_BUNDLE_VERSION ${RENAME_ME_VERSION}
+        MACOSX_BUNDLE_SHORT_VERSION_STRING ${RENAME_ME_VERSION}
+    )
 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()
 

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": "../",
     "ignoreEnv": [
-        "./../installer",
+         "@CMAKE_SOURCE_DIR@/Distro"
-        "./../Distro",
-        "./../parts",
-        "./../snap",
-        "./../prime",
-        "./../stage"
         ],
     "extraLib": "crypto",
-    "targetDir": "./../DisttibutionKit"
+    "targetDir": "@CMAKE_SOURCE_DIR@/Distro",
+    "deployVersion": "@CHEAT_CARD_VERSION@",
+
 }
 

src/Example/android/AndroidManifest.xml.in

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="quasarapp.project.RENAME_ME" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="-- %%INSERT_VERSION_CODE%% --" android:installLocation="auto">
+<manifest package="@RENAME_ME_PACKAGE_ID@" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="@RENAME_ME_VERSION@" android:versionCode="@GIT_COMMIT_COUNT@" android:installLocation="auto">
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
          Remove the comment if you do not require these default permissions. -->
     <!-- %%INSERT_PERMISSIONS -->

src/Example/android/build.gradle.in

@@ -73,6 +73,6 @@ android {
         resConfig "en"
         multiDexEnabled true
         minSdkVersion = 28
-        targetSdkVersion = 30
+        targetSdkVersion = @ANDROID_API_VERSION@
     }
 }

submodules/CMake

@@ -1 +1 @@
-Subproject commit a36c819e1d9434567854646462be0e410505438c
+Subproject commit 279845091b1998a023d91c8c333bb7f6f069ac84