first commit

This commit is contained in:
Andrei Yankovich 2023-08-05 21:28:00 +02:00
parent 4bdcb76839
commit 666b3167ed
20 changed files with 78 additions and 109 deletions

3
.gitmodules vendored
View File

@ -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

View File

@ -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")

View File

@ -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

View File

@ -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

35
init.sh
View File

@ -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

View File

@ -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()

View File

@ -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@",
}

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<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">
<manifest package="@MontenegroTransport_PACKAGE_ID@" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="@MontenegroTransport_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 -->

View File

@ -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)

View File

@ -0,0 +1,9 @@
<RCC>
<qresource prefix="/">
<file>src/MontenegroTransportModule/qmldir</file>
<file>src/MontenegroTransportModule/MontenegroTransport.qml</file>
</qresource>
<qresource prefix="/MontenegroTransportTr">
<file>languages/en.qm</file>
</qresource>
</RCC>

View File

@ -1,9 +0,0 @@
<RCC>
<qresource prefix="/">
<file>src/RENAME_MEModule/qmldir</file>
<file>src/RENAME_MEModule/RENAME_ME.qml</file>
</qresource>
<qresource prefix="/RENAME_METr">
<file>languages/en.qm</file>
</qresource>
</RCC>

View File

@ -0,0 +1,3 @@
module MontenegroTransportModule
MontenegroTransport 1.0 MontenegroTransport.qml

View File

@ -1,3 +0,0 @@
module RENAME_MEModule
RENAME_ME 1.0 RENAME_ME.qml

View File

@ -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;
}

View File

@ -5,23 +5,23 @@
//# of this license document, but changing it is not allowed.
//#
#include "RENAME_ME/global.h"
#include "MontenegroTransport/global.h"
#include <QString>
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();
};

View File

@ -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 <QtCore/qglobal.h>
#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

View File

@ -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 <QtCore/qglobal.h>
#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

1
submodules/CMake Submodule

@ -0,0 +1 @@
Subproject commit 3b89e311c350868cead4bf2a36fd557989716043

View File

@ -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);