diff --git a/README.adoc b/README.adoc index 0cf1932b..055e3a59 100644 --- a/README.adoc +++ b/README.adoc @@ -73,12 +73,12 @@ Among project future goals are: GIT repositories: - * https://github.com/LADI/ladish.git[LADI/ladish at github.com] + + * https://gitea.ladish.org/LADI/ladish[Upstream development GIT repository] + + Self-hosted upstream + * https://github.com/LADI/ladish.git[Primary backup GIT repository at github.com] + Cloud hosted - * https://repo.or.cz/ladish.git[Primary backup GIT repository at repo.or.cz] + + * https://repo.or.cz/ladish.git[Secondary backup GIT repository at repo.or.cz] + Cloud hosted - * https://git.nedk.org/lad/ladish.git[Upstream development GIT repository] + - The network node has issues, SSL certificate has expired and node needs reinstall LADI Session Handler was forked from the https://lac.linuxaudio.org/2009/cdm/Thursday/02_Alasuutari/02.pdf[D-Bus-ified LASH project]. @@ -101,8 +101,9 @@ Things that LADISH can do but LASH (D-Bus-ified or not) cannot: See also: + * https://gitea.ladish.org/LADI/ladish[LADI/ladish at Gitea] * https://github.com/LADI/[LADI at GitHub] - * https://ladish.org/jackdbus.html[jackdbus] + * https://jackdbus.ladish.org/[jackdbus] * https://lac.linuxaudio.org/2009/cdm/Thursday/02_Alasuutari/02.pdf[Juuso ALASUUTARI, LASH Audio Session Handler: Past, Present, and Future] For related discussions, you are invited to join diff --git a/daemon/app_supervisor.c b/daemon/app_supervisor.c index 75089e99..9fcf3d87 100644 --- a/daemon/app_supervisor.c +++ b/daemon/app_supervisor.c @@ -975,11 +975,14 @@ bool ladish_app_supervisor_start_app(ladish_app_supervisor_handle supervisor_han char uuid_str[37]; char * js_dir; bool ret; + bool set_env_vars; app_ptr->zombie = false; ASSERT(app_ptr->pid == 0); + set_env_vars = ladish_level_string_to_integer(app_ptr->level) >= 2; + if (strcmp(app_ptr->level, LADISH_APP_LEVEL_JACKSESSION) == 0) { uuid_unparse(app_ptr->uuid, uuid_str); @@ -1003,6 +1006,7 @@ bool ladish_app_supervisor_start_app(ladish_app_supervisor_handle supervisor_han js_dir, app_ptr->terminal, app_ptr->commandline, + set_env_vars, &app_ptr->pid); free(js_dir); diff --git a/daemon/loader.c b/daemon/loader.c index b291cd93..9cb1dc05 100644 --- a/daemon/loader.c +++ b/daemon/loader.c @@ -271,7 +271,8 @@ loader_exec_program( bool run_in_terminal, const char * vgraph_name, const char * project_name, - const char * app_name) + const char * app_name, + bool set_env_vars) { const char * argv[8]; unsigned int i; @@ -293,12 +294,15 @@ loader_exec_program( fprintf(stderr, "Could not change directory to working dir '%s' for app '%s': %s\n", working_dir, app_name, strerror(errno)); } - setenv("LADISH_APP_NAME", app_name, true); - setenv("LADISH_VGRAPH_NAME", vgraph_name, true); - - if (project_name != NULL) + if (set_env_vars) { - setenv("LADISH_PROJECT_NAME", project_name, true); + setenv("LADISH_APP_NAME", app_name, true); + setenv("LADISH_VGRAPH_NAME", vgraph_name, true); + + if (project_name != NULL) + { + setenv("LADISH_PROJECT_NAME", project_name, true); + } } if (session_dir != NULL) @@ -531,6 +535,7 @@ loader_execute( const char * session_dir, bool run_in_terminal, const char * commandline, + bool set_env_vars, pid_t * pid_ptr) { pid_t pid; @@ -642,7 +647,7 @@ loader_execute( set_ldpreload(); - loader_exec_program(commandline, working_dir, session_dir, run_in_terminal, vgraph_name, project_name, app_name); + loader_exec_program(commandline, working_dir, session_dir, run_in_terminal, vgraph_name, project_name, app_name, set_env_vars); return false; /* We should never get here */ } diff --git a/daemon/loader.h b/daemon/loader.h index 537bbdb8..a22a5f5f 100644 --- a/daemon/loader.h +++ b/daemon/loader.h @@ -38,6 +38,7 @@ loader_execute( const char * session_dir, bool run_in_terminal, const char * commandline, + bool set_env_vars, pid_t * pid_ptr); void loader_run(void); diff --git a/wscript b/wscript index 3c2835fc..375a8e0f 100644 --- a/wscript +++ b/wscript @@ -64,11 +64,11 @@ def options(opt): opt.load('parallel_debug') def add_cflag(conf, flag): - conf.env.append_unique('CXXFLAGS', flag) - conf.env.append_unique('CFLAGS', flag) + conf.env.prepend_value('CXXFLAGS', flag) + conf.env.prepend_value('CFLAGS', flag) def add_linkflag(conf, flag): - conf.env.append_unique('LINKFLAGS', flag) + conf.env.prepend_value('LINKFLAGS', flag) def check_gcc_optimizations_enabled(flags): gcc_optimizations_enabled = False @@ -319,6 +319,7 @@ def configure(conf): display_msg(conf, 'C compiler flags', repr(conf.env['CFLAGS'])) display_msg(conf, 'C++ compiler flags', repr(conf.env['CXXFLAGS'])) + display_msg(conf, 'Linker flags', repr(conf.env['LINKFLAGS'])) if not conf.env['BUILD_GLADISH']: display_msg(conf)