IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

small updates

Browse Source
This commit is contained in:
einhornimmond 2021-06-02 12:02:43 +02:00
parent 43b6e1830b
commit 83af065acd
6 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
login_server/CMakeLists.txt
View File

@ -51,8 +51,9 @@ file(MAKE_DIRECTORY ${PROTOBINDING_PATH}/gradido)
FILE(GLOB DATAMODEL_GRADIDO_PROTOS "${GRADIDO_PROTO_MODEL_PATH}/gradido/*.proto") FILE(GLOB DATAMODEL_GRADIDO_PROTOS "${GRADIDO_PROTO_MODEL_PATH}/gradido/*.proto")
IF(WIN32) IF(WIN32)
find_program(PROTOBUF_PROTOC_EXECUTABLE protoc PATHS "build/dependencies/grpc/third_party/protobuf/bin/Debug" ) set(PROTOC_BIN_PATH "build/dependencies/protobuf/cmake/bin")
find_program(PROTOBUF_PROTOC_EXECUTABLE protoc PATHS "build/dependencies/grpc/third_party/protobuf/bin/Release" ) find_program(PROTOBUF_PROTOC_EXECUTABLE protoc PATHS "${PROTOC_BIN_PATH}/Debug" )
find_program(PROTOBUF_PROTOC_EXECUTABLE protoc PATHS "${PROTOC_BIN_PATH}/Release" )
ELSE() ELSE()
find_program(PROTOBUF_PROTOC_EXECUTABLE protoc PATHS "build/dependencies/protobuf/cmake/bin" ) find_program(PROTOBUF_PROTOC_EXECUTABLE protoc PATHS "build/dependencies/protobuf/cmake/bin" )
ENDIF() ENDIF()
@ -254,7 +255,7 @@ ENDIF()
target_link_libraries(Gradido_LoginServer ${GRPC_LIBS}) target_link_libraries(Gradido_LoginServer ${GRPC_LIBS})
if(WIN32) if(WIN32)
target_link_libraries(Gradido_LoginServer mariadbclient ${CONAN_LIBS}) target_link_libraries(Gradido_LoginServer mariadbclient libprotobuf ${CONAN_LIBS})
#TARGET_LINK_LIBRARIES(Gradido_LoginServer optimized ${MYSQL_LIBRARIES} Shlwapi) #TARGET_LINK_LIBRARIES(Gradido_LoginServer optimized ${MYSQL_LIBRARIES} Shlwapi)
#TARGET_LINK_LIBRARIES(Gradido_LoginServer debug ${COMPILED_MARIADB_CLIENT_DEBUG} Shlwapi) #TARGET_LINK_LIBRARIES(Gradido_LoginServer debug ${COMPILED_MARIADB_CLIENT_DEBUG} Shlwapi)
else() # unix else() # unix

12
login_server/scripts/windows_parse_proto.sh
View File

@ -5,15 +5,9 @@ fi
if [ ! -d "../src/cpp/proto/gradido" ] ; then if [ ! -d "../src/cpp/proto/gradido" ] ; then
mkdir ../src/cpp/proto/gradido mkdir ../src/cpp/proto/gradido
fi fi
PROTOC_PATH=build/bin PROTOC_PATH=../build/dependencies/protobuf/cmake/bin/Debug
CPP_PLUGIN_PATH=build/bin
$PROTOC_PATH/protoc.exe --cpp_out=../src/cpp/proto --proto_path=../src/proto ../src/proto/gradido/*.proto $PROTOC_PATH/protoc.exe --cpp_out=../build/proto/gradido --proto_path=../src/proto ../src/proto/gradido/*.proto
if [ ! -d "./src/cpp/proto/hedera" ] ; then
mkdir ./src/cpp/proto/hedera
fi
GOOGLE_PROTOBUF_INCLUDES=../dependencies/grpc/third_party/protobuf/src
$PROTOC_PATH/protoc.exe --plugin=protoc-gen-grpc=$CPP_PLUGIN_PATH/grpc_cpp_plugin.exe --cpp_out=../src/cpp/proto/hedera --grpc_out=../src/cpp/proto/hedera --proto_path=$GOOGLE_PROTOBUF_INCLUDES --proto_path=../src/proto/hedera/hedera-protobuf/src/main/proto ../src/proto/hedera/hedera-protobuf/src/main/proto/*.proto

6
login_server/src/cpp/lib/Error.cpp
View File

@ -7,6 +7,12 @@ Error::Error(const char* functionName, const char* message)
} }
Error::Error(const char* functionName, const std::string& message)
: Notification(functionName, message)
{
}
Error::~Error() Error::~Error()
{ {

3
login_server/src/cpp/lib/Error.h
View File

@ -19,6 +19,7 @@ class Error : public Notification
{ {
public: public:
Error(const char* functionName, const char* message); Error(const char* functionName, const char* message);
Error(const char* functionName, const std::string& message);
~Error(); ~Error();
const char* getFunctionName() { return mFunctionName.data(); } const char* getFunctionName() { return mFunctionName.data(); }
@ -39,6 +40,8 @@ public:
: Error(functionName, message), mParam(param) {} : Error(functionName, message), mParam(param) {}
ParamError(const char* functionName, const char* message, const std::string& param) ParamError(const char* functionName, const char* message, const std::string& param)
: Error(functionName, message), mParam(param) {} : Error(functionName, message), mParam(param) {}
ParamError(const char* functionName, const std::string& message, const std::string& param)
: Error(functionName, message), mParam(param) {}
ParamError(const char* functioName, const char* message, int param) ParamError(const char* functioName, const char* message, int param)
: Error(functioName, message) { : Error(functioName, message) {

6
login_server/src/cpp/lib/Notification.cpp
View File

@ -4,4 +4,10 @@ Notification::Notification(const char* functionName, const char* message)
: mFunctionName(functionName), mMessage(message) : mFunctionName(functionName), mMessage(message)
{ {
}
Notification::Notification(const char* functionName, const std::string& message)
: mFunctionName(functionName), mMessage(message)
{
} }

1
login_server/src/cpp/lib/Notification.h
View File

@ -7,6 +7,7 @@ class Notification
{ {
public: public:
Notification(const char* functionName, const char* message); Notification(const char* functionName, const char* message);
Notification(const char* functionName, const std::string& message);
const char* getFunctionName() { return mFunctionName.data(); } const char* getFunctionName() { return mFunctionName.data(); }
const char* getMessage() { return mMessage.data(); } const char* getMessage() { return mMessage.data(); }