lename lib

CMakeLists.txt

@@ -5,7 +5,7 @@
 # of this license document, but changing it is not allowed.
 #
 
-cmake_minimum_required(VERSION 3.18)
+cmake_minimum_required(VERSION 3.19)
 project(easyssl LANGUAGES CXX)
 if(TARGET ${PROJECT_NAME})
   message("The ${PROJECT_NAME} arledy included in main Project")
@@ -32,31 +32,31 @@ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Test QUIET)
 include(submodules/CMake/QuasarApp.cmake)
 
 updateGitVars()
-set(easyssl_VERSION "0.${GIT_COMMIT_COUNT}.${GIT_COMMIT_HASH}")
+set(EASYSSL_VERSION "0.${GIT_COMMIT_COUNT}.${GIT_COMMIT_HASH}")
-set(easyssl_PACKAGE_ID "quasarapp.core.easyssl")
+set(EASYSSL_PACKAGE_ID "quasarapp.core.easyssl")
 
-option(easyssl_TESTS "This option disables or enables tests of the ${PROJECT_NAME} project"  ON)
+option(EASYSSL_TESTS "This option disables or enables tests of the ${PROJECT_NAME} project"  ON)
-option(easyssl_EXAMPLE "This option disables or enables example app of the ${PROJECT_NAME} project" ON)
+option(EASYSSL_EXAMPLE "This option disables or enables example app of the ${PROJECT_NAME} project" ON)
 
 if (ANDROID OR IOS OR NOT QT_VERSION_MAJOR OR QA_WASM32)
-    set(easyssl_TESTS OFF CACHE BOOL "This option force disbled for ANDROID IOS QA_WASM32 and Not Qt projects" FORCE)
+    set(EASYSSL_TESTS OFF CACHE BOOL "This option force disbled for ANDROID IOS QA_WASM32 and Not Qt projects" FORCE)
 endif()
 
 if (NOT QT_VERSION_MAJOR)
-    set(easyssl_EXAMPLE OFF CACHE BOOL "This option force disbled for Not Qt projects" FORCE)
+    set(EASYSSL_EXAMPLE OFF CACHE BOOL "This option force disbled for Not Qt projects" FORCE)
 endif()
 
 make_directory(Distro)
 
 initAll()
 
-add_subdirectory(src/Library)
+add_subdirectory(src/lib)
 
-if (DEFINED easyssl_EXAMPLE)
+if (DEFINED EASYSSL_EXAMPLE)
-    add_subdirectory(src/Example)
+    add_subdirectory(src/example)
 endif()
 
-if (easyssl_TESTS)
+if (EASYSSL_TESTS)
     add_subdirectory(tests)
 else()
     message("The ${PROJECT_NAME} tests is disabled.")

src/Library/easyssl.qrc

@@ -1,9 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>src/easysslModule/qmldir</file>
-        <file>src/easysslModule/easyssl.qml</file>
-    </qresource>
-    <qresource prefix="/easysslTr">
-        <file>languages/en.qm</file>
-    </qresource>
-</RCC>

src/Library/src/easysslModule/easyssl.qml

@@ -1,12 +0,0 @@
-//#
-//# Copyright (C) 2021-2023 QuasarApp.
-//# Distributed under the lgplv3 software license, see the accompanying
-//# Everyone is permitted to copy and distribute verbatim copies
-//# of this license document, but changing it is not allowed.
-//#
-
-import QtQuick 2.15
-
-Item {
-
-}

src/Library/src/easysslModule/qmldir

@@ -1,3 +0,0 @@
-module easysslModule
-easyssl 1.0 easyssl.qml
-

src/example/CMakeLists.txt

@@ -5,7 +5,7 @@
 # of this license document, but changing it is not allowed.
 #
 
-cmake_minimum_required(VERSION 3.18)
+cmake_minimum_required(VERSION 3.19)
 
 get_filename_component(CURRENT_PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR} NAME)
 
@@ -43,7 +43,7 @@ else()
 
 endif()
 
-target_link_libraries(${CURRENT_PROJECT} PUBLIC ${PROJECT_NAME}Library)
+target_link_libraries(${CURRENT_PROJECT} PUBLIC ${PROJECT_NAME}lib)
 
 target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR})
 target_include_directories(${CURRENT_PROJECT} PRIVATE ${PRIVATE_INCUDE_DIR})
@@ -58,7 +58,7 @@ if (ANDROID)
     set(ANDROID_API_VERSION $ENV{ANDROID_API_VERSION})
     set(OPENSSL_ROOT_PATH "$ENV{OPENSSL_ROOT_DIR}")
 
-    set(easyssl_EXTRA_LIBS
+    set(EASYSSL_EXTRA_LIBS
         ${PROJECT_NAME}Library
 #        libName
         )
@@ -74,7 +74,7 @@ if (ANDROID)
             "${SIGPATH}/quasarapp.keystore"
             "${SIGPASS_QUASARAPP}"
             "${TARGET_DIR}"
-            "${easyssl_EXTRA_LIBS}")
+            "${EASYSSL_EXTRA_LIBS}")
 
     else()
         message("NO_SIGN_APP")
@@ -82,7 +82,7 @@ if (ANDROID)
         addDeployAPK(${CURRENT_PROJECT}
             "${CMAKE_CURRENT_LIST_DIR}/android"
             "${TARGET_DIR}"
-            "${easyssl_EXTRA_LIBS}")
+            "${EASYSSL_EXTRA_LIBS}")
 
     endif()
     set(manifest_file "${CMAKE_CURRENT_SOURCE_DIR}/android/AndroidManifest.xml")
@@ -108,9 +108,9 @@ elseif(IOS)
 #    set_xcode_property(${CURRENT_PROJECT} PRODUCT_BUNDLE_IDENTIFIER ${CHEATCARD_PACKAGE_ID} All)
 
     set_target_properties(${CURRENT_PROJECT} PROPERTIES
-        MACOSX_BUNDLE_GUI_IDENTIFIER ${easyssl_PACKAGE_ID}
+        MACOSX_BUNDLE_GUI_IDENTIFIER ${EASYSSL_PACKAGE_ID}
-        MACOSX_BUNDLE_BUNDLE_VERSION ${easyssl_VERSION}
+        MACOSX_BUNDLE_BUNDLE_VERSION ${EASYSSL_VERSION}
-        MACOSX_BUNDLE_SHORT_VERSION_STRING ${easyssl_VERSION}
+        MACOSX_BUNDLE_SHORT_VERSION_STRING ${EASYSSL_VERSION}
     )
 else()
     # Desctop deploying

src/example/Deploy/easyssl.json

@@ -0,0 +1,27 @@
+{
+    "bin": [
+        "src/build/Debug/easysslEaxample",
+        "src/build/Debug/easysslEaxample.exe"
+        ],
+    "clear": true,
+    "binPrefix": "/media/D/builds/build-easyssl-Desktop_Qt_5_15_2_GCC_64bit-Debug",
+    "libDir": [
+    "/media/D/builds/easyssl",
+    "/home/andrei/Qt/5.15.2/gcc_64",
+    "/media/D/builds/build-easyssl-Desktop_Qt_5_15_2_GCC_64bit-Debug"
+    ],
+    "recursiveDepth": "10",
+    "deploySystem": false,
+    "qmlDir": "../",
+    "deb": true,
+    "qif": true,
+    "zip": true,
+    "ignoreEnv": [
+         "/media/D/builds/easyssl/Distro"
+        ],
+    "extraLib": "crypto",
+    "targetDir": "/media/D/builds/easyssl/Distro",
+    "deployVersion": "0.2.a2c421a",
+
+}
+

src/example/Deploy/easyssl.json.in

@@ -21,7 +21,7 @@
         ],
     "extraLib": "crypto",
     "targetDir": "@CMAKE_SOURCE_DIR@/Distro",
-    "deployVersion": "@easyssl_VERSION@",
+    "deployVersion": "@EASYSSL_VERSION@",
 
 }
 

src/lib/CMakeLists.txt

@@ -5,12 +5,12 @@
 # of this license document, but changing it is not allowed.
 #
 
-cmake_minimum_required(VERSION 3.18)
+cmake_minimum_required(VERSION 3.19)
 
 get_filename_component(CURRENT_PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR} NAME)
 
 set(CURRENT_PROJECT "${PROJECT_NAME}${CURRENT_PROJECT_DIR}")
-add_definitions(-Deasyssl_LIBRARY)
+add_definitions(-DEASYSSL_LIBRARY)
 
 
 file(GLOB_RECURSE SOURCE_CPP

src/lib/src/public/easyssl.cpp

@@ -16,7 +16,7 @@ bool init() {
 }
 
 QString version() {
-    return easyssl_VERSION;
+    return EASYSSL_VERSION;
 }
 
 

src/lib/src/public/easyssl.h

@@ -16,12 +16,12 @@ namespace easyssl {
  * @brief init main initialize method of The easyssl library
  * @return true if library initialized successfull
  */
-bool easyssl_EXPORT init();
+bool EASYSSL_EXPORT init();
 
 /**
  * @brief version This method return string value of a library version
  * @return string value of a library version
  */
-QString easyssl_EXPORT version();
+QString EASYSSL_EXPORT version();
 
 };

src/lib/src/public/easyssl/global.h

@@ -0,0 +1,22 @@
+//#
+//# Copyright (C) 2018-2023 QuasarApp.
+//# Distributed under the GPLv3 software license, see the accompanying
+//# Everyone is permitted to copy and distribute verbatim copies
+//# of this license document, but changing it is not allowed.
+//#
+
+#ifndef EASYSSL_GLOBAL_H
+#define EASYSSL_GLOBAL_H
+
+#include <QtCore/qglobal.h>
+
+#define EASYSSL_VERSION "0.2.a2c421a"
+
+#if defined(EASYSSL_LIBRARY)
+#  define EASYSSL_EXPORT Q_DECL_EXPORT
+#else
+#  define EASYSSL_EXPORT Q_DECL_IMPORT
+#endif
+
+#endif //EASYSSL_GLOBAL_H
+

src/lib/src/public/easyssl/global.h.in

@@ -5,18 +5,18 @@
 //# of this license document, but changing it is not allowed.
 //#
 
-#ifndef easyssl_GLOBAL_H
+#ifndef EASYSSL_GLOBAL_H
-#define easyssl_GLOBAL_H
+#define EASYSSL_GLOBAL_H
 
 #include <QtCore/qglobal.h>
 
-#define easyssl_VERSION "@easyssl_VERSION@"
+#define EASYSSL_VERSION "@EASYSSL_VERSION@"
 
-#if defined(easyssl_LIBRARY)
+#if defined(EASYSSL_LIBRARY)
-#  define easyssl_EXPORT Q_DECL_EXPORT
+#  define EASYSSL_EXPORT Q_DECL_EXPORT
 #else
-#  define easyssl_EXPORT Q_DECL_IMPORT
+#  define EASYSSL_EXPORT Q_DECL_IMPORT
 #endif
 
-#endif //easyssl_GLOBAL_H
+#endif //EASYSSL_GLOBAL_H
 

tests/CMakeLists.txt

@@ -5,7 +5,7 @@
 # of this license document, but changing it is not allowed.
 #
 
-cmake_minimum_required(VERSION 3.18)
+cmake_minimum_required(VERSION 3.19)
 
 get_filename_component(CURRENT_PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR} NAME)
 
@@ -20,7 +20,7 @@ set(PUBLIC_INCUDE_DIR ${PUBLIC_INCUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/units")
 
 
 add_executable(${CURRENT_PROJECT} ${SOURCE_CPP})
-target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::Test ${PROJECT_NAME}Library)
+target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::Test ${PROJECT_NAME}lib)
 
 target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR})