From 666b3167ed97a78741555cd14a93ba11e61e9b54 Mon Sep 17 00:00:00 2001 From: EndrII Date: Sat, 5 Aug 2023 21:28:00 +0200 Subject: [PATCH] first commit --- .gitmodules | 3 ++ CMakeLists.txt | 20 +++++------ README.md | 2 +- doxygen.conf.in | 8 ++--- init.sh | 35 ------------------- src/Example/CMakeLists.txt | 16 ++++----- ...ME.json.in => MontenegroTransport.json.in} | 6 ++-- src/Example/android/AndroidManifest.xml.in | 2 +- src/Library/CMakeLists.txt | 4 +-- src/Library/MontenegroTransport.qrc | 9 +++++ src/Library/RENAME_ME.qrc | 9 ----- .../MontenegroTransport.qml} | 0 .../src/MontenegroTransportModule/qmldir | 3 ++ src/Library/src/RENAME_MEModule/qmldir | 3 -- ...{RENAME_ME.cpp => MontenegroTransport.cpp} | 8 ++--- .../{RENAME_ME.h => MontenegroTransport.h} | 12 +++---- .../public/MontenegroTransport/global.h.in | 22 ++++++++++++ src/Library/src/public/RENAME_ME/global.h.in | 22 ------------ submodules/CMake | 1 + tests/tstMain.cpp | 2 +- 20 files changed, 78 insertions(+), 109 deletions(-) delete mode 100755 init.sh rename src/Example/Deploy/{RENAME_ME.json.in => MontenegroTransport.json.in} (73%) create mode 100644 src/Library/MontenegroTransport.qrc delete mode 100644 src/Library/RENAME_ME.qrc rename src/Library/src/{RENAME_MEModule/RENAME_ME.qml => MontenegroTransportModule/MontenegroTransport.qml} (100%) create mode 100644 src/Library/src/MontenegroTransportModule/qmldir delete mode 100644 src/Library/src/RENAME_MEModule/qmldir rename src/Library/src/public/{RENAME_ME.cpp => MontenegroTransport.cpp} (68%) rename src/Library/src/public/{RENAME_ME.h => MontenegroTransport.h} (58%) create mode 100644 src/Library/src/public/MontenegroTransport/global.h.in delete mode 100644 src/Library/src/public/RENAME_ME/global.h.in create mode 160000 submodules/CMake diff --git a/.gitmodules b/.gitmodules index f305b28..8b95c0b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "CMake"] path = submodules/CMake url = https://github.com/QuasarApp/CMake.git +[submodule "submodules/CMake"] + path = submodules/CMake + url = https://github.com/QuasarApp/CMake.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 4162994..faf7f77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ # cmake_minimum_required(VERSION 3.18) -project(RENAME_ME LANGUAGES CXX) +project(MontenegroTransport LANGUAGES CXX) if(TARGET ${PROJECT_NAME}) message("The ${PROJECT_NAME} arledy included in main Project") return() @@ -32,18 +32,18 @@ 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") +set(MontenegroTransport_VERSION "0.${GIT_COMMIT_COUNT}.${GIT_COMMIT_HASH}") +set(MontenegroTransport_PACKAGE_ID "quasarapp.core.MontenegroTransport") -option(RENAME_ME_TESTS "This option disables or enables tests of the ${PROJECT_NAME} project" ON) -option(RENAME_ME_EXAMPLE "This option disables or enables example app of the ${PROJECT_NAME} project" ON) +option(MontenegroTransport_TESTS "This option disables or enables tests of the ${PROJECT_NAME} project" ON) +option(MontenegroTransport_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(RENAME_ME_TESTS OFF CACHE BOOL "This option force disbled for ANDROID IOS QA_WASM32 and Not Qt projects" FORCE) + set(MontenegroTransport_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(RENAME_ME_EXAMPLE OFF CACHE BOOL "This option force disbled for Not Qt projects" FORCE) + set(MontenegroTransport_EXAMPLE OFF CACHE BOOL "This option force disbled for Not Qt projects" FORCE) endif() make_directory(Distro) @@ -52,11 +52,11 @@ initAll() add_subdirectory(src/Library) -if (DEFINED RENAME_ME_EXAMPLE) +if (DEFINED MontenegroTransport_EXAMPLE) add_subdirectory(src/Example) endif() -if (RENAME_ME_TESTS) +if (MontenegroTransport_TESTS) add_subdirectory(tests) else() message("The ${PROJECT_NAME} tests is disabled.") @@ -64,4 +64,4 @@ endif() configure_file_in(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf) addDoc(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf) -addDeployFromCustomFile("RENAME_ME" "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/RENAME_ME.json") +addDeployFromCustomFile("MontenegroTransport" "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/MontenegroTransport.json") diff --git a/README.md b/README.md index 0a44cbb..dc8b547 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # CMakeProject Template repository for cmake project -Fork me and replase RENAME_ME to Name of your new project. +Fork me and replase MontenegroTransport to Name of your new project. 1. Clone this repository 2. Run ./init.sh NewProjectName diff --git a/doxygen.conf.in b/doxygen.conf.in index 5857193..348013f 100644 --- a/doxygen.conf.in +++ b/doxygen.conf.in @@ -32,18 +32,18 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = RENAME_ME +PROJECT_NAME = MontenegroTransport # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = @RENAME_ME_VERSION@ +PROJECT_NUMBER = @MontenegroTransport_VERSION@ # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a # quick idea about the purpose of the project. Keep the description short. -PROJECT_BRIEF = RENAME_ME is base back end library for your c++ Qt projects. +PROJECT_BRIEF = MontenegroTransport is base back end library for your c++ Qt projects. # With the PROJECT_LOGO tag one can specify a logo or an icon that is included @@ -1452,7 +1452,7 @@ GENERATE_ECLIPSEHELP = NO # The default value is: org.doxygen.Project. # This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES. -ECLIPSE_DOC_ID = QuasarApp.RENAME_ME +ECLIPSE_DOC_ID = QuasarApp.MontenegroTransport # If you want full control over the layout of the generated HTML pages it might # be necessary to disable the index and replace it with your own. The diff --git a/init.sh b/init.sh deleted file mode 100755 index 4ab4efd..0000000 --- a/init.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -echo "Project name: $1" - -if [ $# -ne 1 ] -then - echo "You call this script wtth wrong arguments." - echo "Example for start script:" - echo "./init.sh MyCmakeProject" - exit 1 -fi - -REPLACESTRING="s+RENAME_ME+$1+g" -echo $REPLACESTRING - -find . -not -path '*/\.*' -type f -exec sed -i $REPLACESTRING {} + -find . -not -path '*/\.*' -type f -exec sed -i $REPLACESTRING {} + - -find src -type d -name '*RENAME_ME*' -exec sh -c 'x="{}"; NEWSTR=$(echo "$x" | sed "s/RENAME_ME/'$1'/"); mv "$x" "$NEWSTR"' \; - -find src -type f -name '*RENAME_ME*' -exec sh -c 'x="{}"; NEWSTR=$(echo "$x" | sed "s/RENAME_ME/'$1'/"); mv "$x" "$NEWSTR"' \; -find Deploy -type f -name '*RENAME_ME*' -exec sh -c 'x="{}"; NEWSTR=$(echo "$x" | sed "s/RENAME_ME/'$1'/"); mv "$x" "$NEWSTR"' \; - -set -e - -git config -f .gitmodules --get-regexp '^submodule\..*\.path$' | - while read path_key path - do - url_key=$(echo $path_key | sed 's/\.path/.url/') - url=$(git config -f .gitmodules --get "$url_key") - git submodule add $url $path - done - - - diff --git a/src/Example/CMakeLists.txt b/src/Example/CMakeLists.txt index 4e0b51e..7f76318 100644 --- a/src/Example/CMakeLists.txt +++ b/src/Example/CMakeLists.txt @@ -58,7 +58,7 @@ if (ANDROID) set(ANDROID_API_VERSION $ENV{ANDROID_API_VERSION}) set(OPENSSL_ROOT_PATH "$ENV{OPENSSL_ROOT_DIR}") - set(RENAME_ME_EXTRA_LIBS + set(MontenegroTransport_EXTRA_LIBS ${PROJECT_NAME}Library # libName ) @@ -74,7 +74,7 @@ if (ANDROID) "${SIGPATH}/quasarapp.keystore" "${SIGPASS_QUASARAPP}" "${TARGET_DIR}" - "${RENAME_ME_EXTRA_LIBS}") + "${MontenegroTransport_EXTRA_LIBS}") else() message("NO_SIGN_APP") @@ -82,7 +82,7 @@ if (ANDROID) addDeployAPK(${CURRENT_PROJECT} "${CMAKE_CURRENT_LIST_DIR}/android" "${TARGET_DIR}" - "${RENAME_ME_EXTRA_LIBS}") + "${MontenegroTransport_EXTRA_LIBS}") endif() set(manifest_file "${CMAKE_CURRENT_SOURCE_DIR}/android/AndroidManifest.xml") @@ -108,19 +108,19 @@ 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} + MACOSX_BUNDLE_GUI_IDENTIFIER ${MontenegroTransport_PACKAGE_ID} + MACOSX_BUNDLE_BUNDLE_VERSION ${MontenegroTransport_VERSION} + MACOSX_BUNDLE_SHORT_VERSION_STRING ${MontenegroTransport_VERSION} ) else() # Desctop deploying message(GIT_COMMIT_COUNT = ${GIT_COMMIT_COUNT}) - set(DeployFile "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/RENAME_ME.json") + set(DeployFile "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/MontenegroTransport.json") configure_file("${DeployFile}.in" ${DeployFile} @ONLY) - addDeployFromCustomFile("RENAME_ME" ${DeployFile}) + addDeployFromCustomFile("MontenegroTransport" ${DeployFile}) endif() diff --git a/src/Example/Deploy/RENAME_ME.json.in b/src/Example/Deploy/MontenegroTransport.json.in similarity index 73% rename from src/Example/Deploy/RENAME_ME.json.in rename to src/Example/Deploy/MontenegroTransport.json.in index 45063d4..68bffbf 100644 --- a/src/Example/Deploy/RENAME_ME.json.in +++ b/src/Example/Deploy/MontenegroTransport.json.in @@ -1,7 +1,7 @@ { "bin": [ - "src/build/Debug/RENAME_MEEaxample", - "src/build/Debug/RENAME_MEEaxample.exe" + "src/build/Debug/MontenegroTransportEaxample", + "src/build/Debug/MontenegroTransportEaxample.exe" ], "clear": true, "binPrefix": "@CMAKE_BINARY_DIR@", @@ -21,7 +21,7 @@ ], "extraLib": "crypto", "targetDir": "@CMAKE_SOURCE_DIR@/Distro", - "deployVersion": "@RENAME_ME_VERSION@", + "deployVersion": "@MontenegroTransport_VERSION@", } diff --git a/src/Example/android/AndroidManifest.xml.in b/src/Example/android/AndroidManifest.xml.in index 7f7beef..8d97f34 100644 --- a/src/Example/android/AndroidManifest.xml.in +++ b/src/Example/android/AndroidManifest.xml.in @@ -1,5 +1,5 @@ - + diff --git a/src/Library/CMakeLists.txt b/src/Library/CMakeLists.txt index 9c84273..54a3b37 100644 --- a/src/Library/CMakeLists.txt +++ b/src/Library/CMakeLists.txt @@ -10,7 +10,7 @@ cmake_minimum_required(VERSION 3.18) get_filename_component(CURRENT_PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR} NAME) set(CURRENT_PROJECT "${PROJECT_NAME}${CURRENT_PROJECT_DIR}") -add_definitions(-DRENAME_ME_LIBRARY) +add_definitions(-DMontenegroTransport_LIBRARY) file(GLOB_RECURSE SOURCE_CPP @@ -45,5 +45,5 @@ prepareQM(${CURRENT_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR} "${LANGS}") set(QML_IMPORT_PATH ${QML_IMPORT_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/src" CACHE STRING "" FORCE) -set(global_file "${CMAKE_CURRENT_SOURCE_DIR}/src/public/RENAME_ME/global.h") +set(global_file "${CMAKE_CURRENT_SOURCE_DIR}/src/public/MontenegroTransport/global.h") configure_file("${global_file}.in" ${global_file} @ONLY) diff --git a/src/Library/MontenegroTransport.qrc b/src/Library/MontenegroTransport.qrc new file mode 100644 index 0000000..65fa8c9 --- /dev/null +++ b/src/Library/MontenegroTransport.qrc @@ -0,0 +1,9 @@ + + + src/MontenegroTransportModule/qmldir + src/MontenegroTransportModule/MontenegroTransport.qml + + + languages/en.qm + + diff --git a/src/Library/RENAME_ME.qrc b/src/Library/RENAME_ME.qrc deleted file mode 100644 index c6c3d8e..0000000 --- a/src/Library/RENAME_ME.qrc +++ /dev/null @@ -1,9 +0,0 @@ - - - src/RENAME_MEModule/qmldir - src/RENAME_MEModule/RENAME_ME.qml - - - languages/en.qm - - diff --git a/src/Library/src/RENAME_MEModule/RENAME_ME.qml b/src/Library/src/MontenegroTransportModule/MontenegroTransport.qml similarity index 100% rename from src/Library/src/RENAME_MEModule/RENAME_ME.qml rename to src/Library/src/MontenegroTransportModule/MontenegroTransport.qml diff --git a/src/Library/src/MontenegroTransportModule/qmldir b/src/Library/src/MontenegroTransportModule/qmldir new file mode 100644 index 0000000..2c0c3b7 --- /dev/null +++ b/src/Library/src/MontenegroTransportModule/qmldir @@ -0,0 +1,3 @@ +module MontenegroTransportModule +MontenegroTransport 1.0 MontenegroTransport.qml + diff --git a/src/Library/src/RENAME_MEModule/qmldir b/src/Library/src/RENAME_MEModule/qmldir deleted file mode 100644 index 966edab..0000000 --- a/src/Library/src/RENAME_MEModule/qmldir +++ /dev/null @@ -1,3 +0,0 @@ -module RENAME_MEModule -RENAME_ME 1.0 RENAME_ME.qml - diff --git a/src/Library/src/public/RENAME_ME.cpp b/src/Library/src/public/MontenegroTransport.cpp similarity index 68% rename from src/Library/src/public/RENAME_ME.cpp rename to src/Library/src/public/MontenegroTransport.cpp index f18b899..b85e1ce 100644 --- a/src/Library/src/public/RENAME_ME.cpp +++ b/src/Library/src/public/MontenegroTransport.cpp @@ -5,18 +5,18 @@ //# of this license document, but changing it is not allowed. //# -#include "RENAME_ME.h" +#include "MontenegroTransport.h" -namespace RENAME_ME { +namespace MontenegroTransport { bool init() { - initRENAME_MEResources(); + initMontenegroTransportResources(); return true; } QString version() { - return RENAME_ME_VERSION; + return MontenegroTransport_VERSION; } diff --git a/src/Library/src/public/RENAME_ME.h b/src/Library/src/public/MontenegroTransport.h similarity index 58% rename from src/Library/src/public/RENAME_ME.h rename to src/Library/src/public/MontenegroTransport.h index bee7dbf..7cbbb24 100644 --- a/src/Library/src/public/RENAME_ME.h +++ b/src/Library/src/public/MontenegroTransport.h @@ -5,23 +5,23 @@ //# of this license document, but changing it is not allowed. //# -#include "RENAME_ME/global.h" +#include "MontenegroTransport/global.h" #include -inline void initRENAME_MEResources() { Q_INIT_RESOURCE(RENAME_ME); } +inline void initMontenegroTransportResources() { Q_INIT_RESOURCE(MontenegroTransport); } -namespace RENAME_ME { +namespace MontenegroTransport { /** - * @brief init main initialize method of The RENAME_ME library + * @brief init main initialize method of The MontenegroTransport library * @return true if library initialized successfull */ -bool RENAME_ME_EXPORT init(); +bool MontenegroTransport_EXPORT init(); /** * @brief version This method return string value of a library version * @return string value of a library version */ -QString RENAME_ME_EXPORT version(); +QString MontenegroTransport_EXPORT version(); }; diff --git a/src/Library/src/public/MontenegroTransport/global.h.in b/src/Library/src/public/MontenegroTransport/global.h.in new file mode 100644 index 0000000..7d2ae99 --- /dev/null +++ b/src/Library/src/public/MontenegroTransport/global.h.in @@ -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 MontenegroTransport_GLOBAL_H +#define MontenegroTransport_GLOBAL_H + +#include + +#define MontenegroTransport_VERSION "@MontenegroTransport_VERSION@" + +#if defined(MontenegroTransport_LIBRARY) +# define MontenegroTransport_EXPORT Q_DECL_EXPORT +#else +# define MontenegroTransport_EXPORT Q_DECL_IMPORT +#endif + +#endif //MontenegroTransport_GLOBAL_H + diff --git a/src/Library/src/public/RENAME_ME/global.h.in b/src/Library/src/public/RENAME_ME/global.h.in deleted file mode 100644 index 312004f..0000000 --- a/src/Library/src/public/RENAME_ME/global.h.in +++ /dev/null @@ -1,22 +0,0 @@ -//# -//# 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 RENAME_ME_GLOBAL_H -#define RENAME_ME_GLOBAL_H - -#include - -#define RENAME_ME_VERSION "@RENAME_ME_VERSION@" - -#if defined(RENAME_ME_LIBRARY) -# define RENAME_ME_EXPORT Q_DECL_EXPORT -#else -# define RENAME_ME_EXPORT Q_DECL_IMPORT -#endif - -#endif //RENAME_ME_GLOBAL_H - diff --git a/submodules/CMake b/submodules/CMake new file mode 160000 index 0000000..3b89e31 --- /dev/null +++ b/submodules/CMake @@ -0,0 +1 @@ +Subproject commit 3b89e311c350868cead4bf2a36fd557989716043 diff --git a/tests/tstMain.cpp b/tests/tstMain.cpp index 3beb3ee..f4e17d6 100644 --- a/tests/tstMain.cpp +++ b/tests/tstMain.cpp @@ -57,7 +57,7 @@ tstMain::tstMain() { char * argv[] = {nullptr}; _app = new QCoreApplication(argc, argv); - QCoreApplication::setApplicationName("testRENAME_ME"); + QCoreApplication::setApplicationName("testMontenegroTransport"); QCoreApplication::setOrganizationName("QuasarApp"); auto path = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);