diff --git a/login_server/CMakeLists.txt.lib b/login_server/CMakeLists.txt.lib index 9807e6bf0..bf62814c4 100644 --- a/login_server/CMakeLists.txt.lib +++ b/login_server/CMakeLists.txt.lib @@ -139,6 +139,7 @@ ENDFOREACH(cpsp_file) FILE(GLOB CONTROLLER "src/cpp/controller/*.cpp" "src/cpp/controller/*.h") FILE(GLOB TINF "dependencies/tinf/src/*.c" "dependencies/tinf/src/*.h") FILE(GLOB HTTPInterface "src/cpp/HTTPInterface/*.h" "src/cpp/HTTPInterface/*.cpp") +FILE(GLOB COMPILED_PAGES "build/http_pages/*.h" "build/http_pages/*.cpp") FILE(GLOB JSONInterface "src/cpp/JSONInterface/*.h" "src/cpp/JSONInterface/*.cpp") FILE(GLOB TASKS "src/cpp/tasks/*.cpp" "src/cpp/tasks/*.h") FILE(GLOB SINGLETON_MANAGER "src/cpp/SingletonManager/*.h" "src/cpp/SingletonManager/*.cpp") @@ -162,7 +163,7 @@ FILE(GLOB TEST_MODEL_TABLE "src/cpp/test/model/table/*.cpp" "src/cpp/test/model/ FILE(GLOB TEST_CONTROLLER "src/cpp/test/controller/*.cpp" "src/cpp/test/controller/*.h") SET(LOCAL_SRCS - ${CONTROLLER} ${TINF} ${MAIN} ${HTTPInterface} + ${CONTROLLER} ${TINF} ${MAIN} ${HTTPInterface} ${COMPILED_PAGES} ${JSONInterface} ${CRYPTO} ${MODEL} ${MODEL_TABLE} ${MODEL_EMAIL} ${MODEL_HEDERA} ${MODEL_GRADIDO} ${SINGLETON_MANAGER} ${LIB_SRC} ${MYSQL} ${TASKS} @@ -173,31 +174,6 @@ SET(LOCAL_TEST_SRC ) aux_source_directory("src/cpp" LOCAL_SRCS) -if(MSVC) - # src - source_group("controller" FILES ${CONTROLLER}) - source_group("proto\\gradido" FILES ${PROTO_GRADIDO}) - source_group("proto\\hedera" FILES ${PROTO_HEDERA}) - source_group("tinf" FILES ${TINF}) - source_group("Crypto" FILES ${CRYPTO}) - source_group("tasks" FILES ${TASKS}) - source_group("model\\table" FILES ${MODEL_TABLE}) - source_group("model\\email" FILES ${MODEL_EMAIL}) - source_group("model\\hedera" FILES ${MODEL_HEDERA}) - source_group("model\\gradido" FILES ${MODEL_GRADIDO}) - source_group("model" FILES ${MODEL}) - source_group("mysql" FILES ${MYSQL}) - source_group("SingletonManager" FILES ${SINGLETON_MANAGER}) - source_group("lib" FILES ${LIB_SRC}) - source_group("HTTP-Interface" FILES ${HTTPInterface}) - source_group("Json-Interface" FILES ${JSONInterface}) - source_group("Test\\crypto" FILES ${TEST_CRYPTO}) - source_group("Test\\model\\table" FILES ${TEST_MODEL_TABLE}) - source_group("Test\\model" FILES ${TEST_MODEL}) - source_group("Test\\controller" FILES ${TEST_CONTROLLER}) - source_group("Test" FILES ${TEST}) -endif() - add_executable(Gradido_LoginServer ${LOCAL_SRCS}) ############################## find mariadb ################################### diff --git a/login_server/scripts/compile_pot.sh b/login_server/scripts/compile_pot.sh index 1d817be55..6dcd6c560 100755 --- a/login_server/scripts/compile_pot.sh +++ b/login_server/scripts/compile_pot.sh @@ -1,2 +1,3 @@ #!/bin/sh -xgettext -D ../src/cpp -p ../src/LOCALE -o messages.pot --from-code=UTF-8 --files-from=files_to_translate.txt +xgettext -D ../ -p ../src/LOCALE -o messages.pot --from-code=UTF-8 --files-from=files_to_translate.txt + diff --git a/login_server/scripts/files_to_translate.txt b/login_server/scripts/files_to_translate.txt index 9bc694e1e..231056201 100644 --- a/login_server/scripts/files_to_translate.txt +++ b/login_server/scripts/files_to_translate.txt @@ -1,10 +1,10 @@ -HTTPInterface/LoginPage.cpp -HTTPInterface/CheckEmailPage.cpp -HTTPInterface/ResetPassword.cpp -HTTPInterface/PassphrasePage.cpp -model/Session.cpp -model/email/Email.cpp -model/email/EmailCustomReply.cpp -model/email/EmailNotificationCreation.cpp -model/email/EmailNotificationTransfer.cpp -SingletonManager/SessionManager.cpp \ No newline at end of file +build/http_pages/LoginPage.cpp +build/http_pages/CheckEmailPage.cpp +build/http_pages/ResetPasswordPage.cpp +build/http_pages/PassphrasePage.cpp +src/cpp/model/Session.cpp +src/cpp/model/email/Email.cpp +src/cpp/model/email/EmailCustomReply.cpp +src/cpp/model/email/EmailNotificationCreation.cpp +src/cpp/model/email/EmailNotificationTransfer.cpp +src/cpp/SingletonManager/SessionManager.cpp \ No newline at end of file