Merge branch 'support-5044' into 'master'

Support 5044

See merge request !250

CMakeLists.txt

@@ -10,7 +10,6 @@ SET( CPACK_PACKAGE_VERSION_MAJOR 4)
 SET( CPACK_PACKAGE_VERSION_MINOR 4)
 SET( CPACK_PACKAGE_VERSION_PATCH 55)
 
-
 # init CellFrame SDK
 add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}-${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\"")
 set(SUBMODULES_NO_BUILD ON)
@@ -79,6 +78,9 @@ if(UNIX)
     SET( CPACK_SYSTEM_ARCH "amd64")
     SET( CPACK_SYSTEM_CODENAME "${DEBIAN_OS_NAME}")
     SET( CPACK_SYSTEM_NAME "${CPACK_SYSTEM_TYPE}-${CPACK_SYSTEM_VERSION}-${CPACK_SYSTEM_ARCH}-${CPACK_SYSTEM_CODENAME}")
+    if(BUILD_WITH_GDB_DRIVER_PGSQL)
+        SET( CPACK_SYSTEM_NAME "${CPACK_SYSTEM_NAME}-pgsql" )
+    endif()
     if(CMAKE_BUILD_TYPE MATCHES Debug)
         SET( CPACK_SYSTEM_NAME "${CPACK_SYSTEM_NAME}-dbg" )
     endif()

cellframe-sdk @ 39f0cc65

-Subproject commit bd40f27b7a4f3cbca99e4879aa7ce5d6899905bc
+Subproject commit 39f0cc65878ee1a6b089f8a44edd6afff3753a66

prod_build @ 9e35d926

-Subproject commit f6f8d1e4bf8ab62037f6eb5a17f807eef11a2f05
+Subproject commit 9e35d9261d642584e6a6cc94817d40a934acecde

sources/main_node_cli.c

@@ -201,7 +201,14 @@ int main(int argc, const char *argv[])
     SetConsoleOutputCP(1252);
     g_sys_dir_path = dap_strdup_printf("%s/%s", regGetUsrPath(), dap_get_appname());
 #elif DAP_OS_MAC
-    g_sys_dir_path = dap_strdup_printf("/Applications/%s.app/Contents/Resources", dap_get_appname());
+    char * l_username = NULL;
+    exec_with_ret(&l_username,"whoami|tr -d '\n'");
+    if (!l_username){
+        printf("Fatal Error: Can't obtain username");
+        return 2;
+    }
+    g_sys_dir_path = dap_strdup_printf("/Users/%s/Applications/Cellframe.app/Contents/Resources", l_username);
+    DAP_DELETE(l_username);
 #elif DAP_OS_ANDROID
     g_sys_dir_path = dap_strdup_printf("/storage/emulated/0/opt/%s",dap_get_appname());
 #elif DAP_OS_UNIX

sources/main_node_tool.c

@@ -381,7 +381,14 @@ static int s_init( int argc, const char **argv )
     g_sys_dir_path = dap_strdup_printf("%s/%s", regGetUsrPath(), dap_get_appname());
     char * s_log_dir_path = dap_strdup_printf("%s/var/log", g_sys_dir_path) ;
 #elif DAP_OS_MAC
-    g_sys_dir_path = dap_strdup_printf("/Applications/%s.app/Contents/Resources", dap_get_appname());
+    char * l_username = NULL;
+    exec_with_ret(&l_username,"whoami|tr -d '\n'");
+    if (!l_username){
+        printf("Fatal Error: Can't obtain username");
+    return 2;
+    }
+    g_sys_dir_path = dap_strdup_printf("/Users/%s/Applications/Cellframe.app/Contents/Resources", l_username);
+    DAP_DELETE(l_username);
     char * s_log_dir_path = dap_strdup_printf("/Library/%s.app/Logs", dap_get_appname() ) ;
 #elif DAP_OS_ANDROID
     g_sys_dir_path = dap_strdup_printf("/storage/emulated/0/opt/%s",dap_get_appname());