LADI
/
ladish
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

waf buildable daemon

This commit is contained in:
Nedko Arnaudov 2009-07-12 22:56:19 +03:00
parent d1d3807512
commit d364193985
49 changed files with 165 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/safety.c
View File

@ -26,8 +26,8 @@
#include <stdint.h>
#include <string.h>
#include "common/safety.h"
#include "common/debug.h"
#include "safety.h"
#include "debug.h"
void
_lash_free(void **ptr)

53
daemon/Makefile.am
View File

@ -1,53 +0,0 @@
include $(top_srcdir)/common.am
bin_PROGRAMS = lashd
lashd_SOURCES = \
main.c \
log.c \
file.c file.h \
client.c client.h \
client_dependency.c client_dependency.h \
loader.c loader.h \
project.c project.h \
store.c store.h \
server.c server.h \
dbus_iface_server.c dbus_iface_server.h \
dbus_iface_control.c dbus_iface_control.h \
dbus_service.c dbus_service.h \
jack_patch.c jack_patch.h \
jack_mgr_client.c jack_mgr_client.h \
appdb.c appdb.h \
sigsegv.c sigsegv.h \
proctitle.c proctitle.h \
procfs.c procfs.h \
types.h \
$(top_srcdir)/common/safety.c
lashd_SOURCES += \
jackdbus_mgr.c jackdbus_mgr.h
lashd_LDADD = \
$(XML2_LIBS) \
$(UUID_LIBS) \
$(DBUS_LIBS) \
$(top_builddir)/dbus/liblashdbus.a \
-lstdc++ -lutil
AM_CFLAGS = \
$(LASH_CFLAGS) \
$(XML2_CFLAGS) \
$(DBUS_CFLAGS) \
-DDTDDIR=\"$(dtddir)\"
# Dbus service file
servicedir = $(DBUS_SERVICES_DIR)
service_in_files = org.nongnu.lash.service.in
service_DATA = $(service_in_files:.service.in=.service)
EXTRA_DIST = $(service_in_files)
CLEANFILES = $(service_DATA)
# Rule to make the service file with bindir expanded
$(service_DATA): $(service_in_files) Makefile
@sed -e "s|\@bindir\@|$(bindir)|" $< > $@

4
daemon/appdb.c
View File

@ -26,8 +26,8 @@
#include <assert.h>
#include "appdb.h"
#include "common/debug.h"
#include "common/safety.h"
#include "../common/debug.h"
#include "../common/safety.h"
void
lash_appdb_free_entry(

2
daemon/appdb.h
View File

@ -22,7 +22,7 @@
#ifndef APPDB_H__4839D031_68EF_43F5_BDE2_2317C6B956A9__INCLUDED
#define APPDB_H__4839D031_68EF_43F5_BDE2_2317C6B956A9__INCLUDED
#include "common/klist.h"
#include "../common/klist.h"
/* all strings except name can be not present (NULL) */
/* all strings are utf-8 */

6
daemon/client.c
View File

@ -21,13 +21,13 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "../config.h"
#include "config.h"
#include <string.h>
#include <dbus/dbus.h>
#include "common/safety.h"
#include "common/debug.h"
#include "../common/safety.h"
#include "../common/debug.h"
#include "client.h"
#include "server.h"

4
daemon/client.h
View File

@ -31,9 +31,9 @@
#include <sys/types.h>
#include <dbus/dbus.h>
#include "common/klist.h"
#include "../common/klist.h"
#include "lash/types.h"
#include "../lash_compat/lash/types.h"
#include "types.h"

6
daemon/client_dependency.c
View File

@ -18,12 +18,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "../config.h"
#include "config.h"
#include <stdbool.h>
#include "common/safety.h"
#include "common/debug.h"
#include "../common/safety.h"
#include "../common/debug.h"
#include "client_dependency.h"
#include "client.h"

2
daemon/client_dependency.h
View File

@ -23,7 +23,7 @@
#include <uuid/uuid.h>
#include "common/klist.h"
#include "../common/klist.h"
#include "types.h"
#include "client.h"

10
daemon/dbus_iface_control.c
View File

@ -21,13 +21,13 @@
#include "config.h"
#include "common/safety.h"
#include "../common/safety.h"
#define LASH_DEBUG
#include "common/debug.h"
#include "common/klist.h"
#include "../common/debug.h"
#include "../common/klist.h"
#include "dbus/interface.h"
#include "dbus/error.h"
#include "../dbus/interface.h"
#include "../dbus/error.h"
#include "server.h"
#include "project.h"

2
daemon/dbus_iface_control.h
View File

@ -23,7 +23,7 @@
#include <stdint.h>
#include "dbus/interface.h"
#include "../dbus/interface.h"
extern const interface_t g_lashd_interface_control;

11
daemon/dbus_iface_server.c
View File

@ -31,12 +31,11 @@
#include "server.h"
#include "client.h"
#include "project.h"
#include "common/safety.h"
#include "common/debug.h"
#include "common/klist.h"
#include "dbus/interface.h"
#include "dbus/error.h"
#include "lash/types.h"
#include "../common/safety.h"
#include "../common/debug.h"
#include "../common/klist.h"
#include "../dbus/interface.h"
#include "../dbus/error.h"
#include "store.h"
static void

2
daemon/dbus_iface_server.h
View File

@ -21,7 +21,7 @@
#ifndef __LASHD_DBUS_IFACE_SERVER_H__
#define __LASHD_DBUS_IFACE_SERVER_H__
#include "dbus/interface.h"
#include "../dbus/interface.h"
extern const interface_t g_lashd_interface_server;

4
daemon/dbus_service.c
View File

@ -28,8 +28,8 @@
#include "server.h"
#include "dbus_iface_server.h"
#include "dbus_iface_control.h"
#include "common/debug.h"
#include "dbus/object_path.h"
#include "../common/debug.h"
#include "../dbus/object_path.h"
#include "client.h"
static DBusHandlerResult

2
daemon/dbus_service.h
View File

@ -21,7 +21,7 @@
#ifndef __LASHD_DBUS_SERVICE_H__
#define __LASHD_DBUS_SERVICE_H__
#include "dbus/service.h"
#include "../dbus/service.h"
#include "types.h"
service_t *

4
daemon/file.c
View File

@ -29,8 +29,8 @@
#include <errno.h>
#include "file.h"
#include "common/safety.h"
#include "common/debug.h"
#include "../common/safety.h"
#include "../common/debug.h"
bool
lash_file_exists(const char *file)

2
daemon/file.h
View File

@ -25,7 +25,7 @@
#include <stdlib.h>
#include <stdbool.h>
#include "common/safety.h"
#include "../common/safety.h"
#define get_store_and_return_fqn(dir, file) \
static char *fqn = NULL; \

4
daemon/jack_mgr_client.c
View File

@ -23,8 +23,8 @@
#include <string.h>
#include "common/safety.h"
#include "common/debug.h"
#include "../common/safety.h"
#include "../common/debug.h"
#include "jack_mgr_client.h"
#include "jack_patch.h"

6
daemon/jack_mgr_client.h
View File

@ -22,15 +22,15 @@
#ifndef __LASHD_JACK_MGR_CLIENT_H__
#define __LASHD_JACK_MGR_CLIENT_H__
#include "../config.h"
#include "config.h"
#include <sys/types.h>
#include <uuid/uuid.h>
#include <dbus/dbus.h>
#include "common/klist.h"
#include "lashd/types.h"
#include "../common/klist.h"
#include "types.h"
struct _jack_mgr_client
{

2
daemon/jack_patch.c
View File

@ -22,7 +22,7 @@
#include "jack_patch.h"
#include "jack_mgr_client.h"
#include "common/safety.h"
#include "../common/safety.h"
jack_patch_t *
jack_patch_new(void)

4
daemon/jack_patch.h
View File

@ -21,7 +21,7 @@
#ifndef __LASHD_JACK_PATCH_H__
#define __LASHD_JACK_PATCH_H__
#include "../config.h"
#include "config.h"
#include <stdbool.h>
#include <uuid/uuid.h>
@ -30,7 +30,7 @@
#include <dbus/dbus.h>
#include "types.h"
#include "common/klist.h"
#include "../common/klist.h"
struct _jack_patch
{

4
daemon/jackdbus_mgr.c
View File

@ -24,8 +24,8 @@
#include <string.h>
#include <dbus/dbus.h>
#include "common/safety.h"
#include "common/debug.h"
#include "../common/safety.h"
#include "../common/debug.h"
#include "jackdbus_mgr.h"
#include "jack_patch.h"

2
daemon/jackdbus_mgr.h
View File

@ -26,7 +26,7 @@
#include <uuid/uuid.h>
#include <dbus/dbus.h>
#include "common/klist.h"
#include "../common/klist.h"
#include "types.h"
#include "client.h"

8
daemon/loader.c
View File

@ -35,11 +35,11 @@
#include <sys/resource.h>
#include <uuid/uuid.h>
#include "common/safety.h"
#include "common/debug.h"
#include "common/klist.h"
#include "../common/safety.h"
#include "../common/debug.h"
#include "../common/klist.h"
#include "lash/types.h"
#include "../lash_compat/lash/types.h"
#include "loader.h"
#include "server.h"

4
daemon/log.c
View File

@ -29,8 +29,8 @@
#include <string.h>
#include <time.h>
#include "common/debug.h"
#include "common/safety.h"
#include "../common/debug.h"
#include "../common/safety.h"
#define DEFAULT_XDG_LOG "/.log"
#define LASH_XDG_SUBDIR "/lash"

39
daemon/main.c
View File

@ -22,7 +22,7 @@
#define _GNU_SOURCE
#include "../config.h"
#include "config.h"
#include <string.h>
#include <getopt.h>
@ -36,11 +36,11 @@
#include <jack/jack.h>
#include <libxml/tree.h>
#include "common/debug.h"
#include "../common/debug.h"
#include "server.h"
#include "loader.h"
#include "svnversion.h"
//#include "version.h"
#ifdef LASH_DEBUG
# include <mcheck.h>
@ -56,26 +56,6 @@ term_handler(int signum)
g_server->quit = true;
}
static void
print_help(const char *argv0)
{
printf("lashd version %s\n"
"Copyright (C) 2002 Robert Ham <rah@bash.sh>\n"
"\n"
"This program comes with ABSOLUTELY NO WARRANTY. You are licensed to use it\n"
"under the terms of the GNU General Public License, version 2 or later. See\n"
"the COPYING file that came with this software for details.\n"
"\n"
"Compiled with D-Bus %s, libxml2 %s"
"\n\n"
"Usage: %s [OPTION]\n"
"\n"
" -d, --default-dir PATH store projects in $HOME/PATH\n\n",
" -h, --help display this help and exit\n"
PACKAGE_VERSION, LASH_DBUS_VERSION, LASH_XML2_VERSION,
argv0);
}
int
main(int argc,
char **argv,
@ -110,26 +90,21 @@ main(int argc,
while ((opt = getopt_long(argc, argv, options, long_options, NULL)) != -1) {
switch (opt) {
case 'h':
print_help(argv[0]);
exit(EXIT_SUCCESS);
break;
case 'd':
default_dir = optarg;
break;
default:
print_help(argv[0]);
exit(EXIT_FAILURE);
break;
}
}
if (!default_dir)
default_dir = DEFAULT_PROJECT_DIR;
// if (!default_dir)
// default_dir = DEFAULT_PROJECT_DIR;
lash_info("------------------");
lash_info("LASH activated. Version %s (%s) built on %s",
PACKAGE_VERSION, SVN_VERSION, timestamp_str);
//lash_info("LASH activated. Version %s (%s) built on %s",
// PACKAGE_VERSION, SVN_VERSION, timestamp_str);
lash_debug("Default dir: '%s'", default_dir);

2
daemon/procfs.c
View File

@ -30,7 +30,7 @@
#include <unistd.h>
#include "procfs.h"
#include "common/debug.h"
#include "../common/debug.h"
#define BUFFER_SIZE 4096

2
daemon/proctitle.c
View File

@ -24,7 +24,7 @@
#include <stdarg.h>
#include <string.h>
#include "common/debug.h"
#include "../common/debug.h"
static char * g_argv_begin;
static char * g_argv_end;

6
daemon/project.c
View File

@ -22,7 +22,7 @@
#define _GNU_SOURCE
#include "../config.h"
#include "config.h"
#include <stdlib.h>
#include <sys/types.h>
@ -49,8 +49,8 @@
#include "server.h"
#include "loader.h"
#include "dbus_iface_control.h"
#include "common/safety.h"
#include "common/debug.h"
#include "../common/safety.h"
#include "../common/debug.h"
#include "jackdbus_mgr.h"

2
daemon/project.h
View File

@ -27,7 +27,7 @@
#include <uuid/uuid.h>
#include <libxml/tree.h>
#include "common/klist.h"
#include "../common/klist.h"
#include "types.h"

6
daemon/server.c
View File

@ -41,9 +41,9 @@
#include "file.h"
#include "client_dependency.h"
#include "dbus_iface_control.h"
#include "common/safety.h"
#include "common/debug.h"
#include "common/klist.h"
#include "../common/safety.h"
#include "../common/debug.h"
#include "../common/klist.h"
#include "jack_mgr_client.h"
#include "jackdbus_mgr.h"

6
daemon/server.h
View File

@ -21,16 +21,14 @@
#ifndef __LASHD_SERVER_H__
#define __LASHD_SERVER_H__
#include "../config.h"
#include <stdbool.h>
#include <sys/types.h>
#include <dbus/dbus.h>
#include <uuid/uuid.h>
#include "types.h"
#include "dbus/service.h"
#include "common/klist.h"
#include "../dbus/service.h"
#include "../common/klist.h"
extern server_t *g_server;

4
daemon/sigsegv.c
View File

@ -15,7 +15,7 @@
#include "config.h"
#endif
//#define NO_CPP_DEMANGLE
#define NO_CPP_DEMANGLE
#define SIGSEGV_NO_AUTO_INIT
#ifndef _GNU_SOURCE
@ -35,7 +35,7 @@
char * __cxa_demangle(const char * __mangled_name, char * __output_buffer, size_t * __length, int * __status);
#endif
#include "common/debug.h"
#include "../common/debug.h"
#if defined(REG_RIP)
# define SIGSEGV_STACK_IA64

8
daemon/store.c
View File

@ -32,10 +32,10 @@
#include "store.h"
#include "file.h"
#include "common/safety.h"
#include "common/debug.h"
#include "dbus/method.h"
#include "lash/types.h"
#include "../common/safety.h"
#include "../common/debug.h"
#include "../dbus/method.h"
#include "../lash_compat/lash/types.h"
#define STORE_INFO_FILE ".store_info"

2
daemon/store.h
View File

@ -26,7 +26,7 @@
#include <sys/types.h>
#include <dbus/dbus.h>
#include "common/klist.h"
#include "../common/klist.h"
#include "types.h"

8
dbus/error.c
View File

@ -22,11 +22,11 @@
#include <stdio.h>
#include <dbus/dbus.h>
#include "common/debug.h"
#include "../common/debug.h"
#include "dbus/error.h"
#include "dbus/method.h"
#include "dbus/interface.h"
#include "error.h"
#include "method.h"
#include "interface.h"
void
lash_dbus_error(method_call_t *call_ptr,

2
dbus/error.h
View File

@ -22,7 +22,7 @@
#ifndef __LASH_DBUS_ERROR_H__
#define __LASH_DBUS_ERROR_H__
#include "dbus/types.h"
#include "types.h"
#define LASH_DBUS_ERROR_UNKNOWN_METHOD "org.nongnu.LASH.Error.UnknownMethod"
#define LASH_DBUS_ERROR_SERVER_NOT_RUNNING "org.nongnu.LASH.Error.ServerNotRunning"

6
dbus/interface.c
View File

@ -21,10 +21,10 @@
#include <string.h>
#include "common/debug.h"
#include "../common/debug.h"
#include "dbus/interface.h"
#include "dbus/error.h"
#include "interface.h"
#include "error.h"
/*
* Execute a method's function if the method specified in the method call

6
dbus/interface.h
View File

@ -24,9 +24,9 @@
#include <stdbool.h>
#include "dbus/types.h"
#include "dbus/method.h"
#include "dbus/signal.h"
#include "types.h"
#include "method.h"
#include "signal.h"
struct _interface
{

10
dbus/introspection.c
View File

@ -24,11 +24,11 @@
#include <string.h>
#include <dbus/dbus.h>
#include "common/safety.h"
#include "common/debug.h"
#include "dbus/introspection.h"
#include "dbus/signal.h"
#include "dbus/method.h"
#include "../common/safety.h"
#include "../common/debug.h"
#include "introspection.h"
#include "signal.h"
#include "method.h"
#define write_buf(args...) buf_ptr += sprintf(buf_ptr, ## args)

6
dbus/introspection.h
View File

@ -21,9 +21,9 @@
#ifndef __LASH_DBUS_INTROSPECTION_H__
#define __LASH_DBUS_INTROSPECTION_H__
#include "dbus/types.h"
#include "dbus/interface.h"
#include "dbus/object_path.h"
#include "types.h"
#include "interface.h"
#include "object_path.h"
DBusMessage *
introspection_new(object_path_t *path);

8
dbus/method.c
View File

@ -19,11 +19,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "common/safety.h"
#include "common/debug.h"
#include "../common/safety.h"
#include "../common/debug.h"
#include "dbus/method.h"
#include "dbus/service.h"
#include "method.h"
#include "service.h"
/*
* Construct a void method return.

2
dbus/method.h
View File

@ -25,7 +25,7 @@
#include <stdbool.h>
#include <dbus/dbus.h>
#include "dbus/types.h"
#include "types.h"
#define DIRECTION_OUT (0)
#define DIRECTION_IN (1)

10
dbus/object_path.c
View File

@ -23,11 +23,11 @@
#include <string.h>
#include <stdarg.h>
#include "dbus/object_path.h"
#include "common/safety.h"
#include "common/debug.h"
#include "dbus/introspection.h" /* g_dbus_interface_dtor_introspectable */
#include "dbus/error.h" /* lash_dbus_error() */
#include "object_path.h"
#include "../common/safety.h"
#include "../common/debug.h"
#include "introspection.h" /* g_dbus_interface_dtor_introspectable */
#include "error.h" /* lash_dbus_error() */
static DBusHandlerResult
object_path_handler(DBusConnection *connection,

4
dbus/object_path.h
View File

@ -24,8 +24,8 @@
#include <dbus/dbus.h>
#include "dbus/types.h"
#include "dbus/interface.h"
#include "types.h"
#include "interface.h"
/**
* Object path descriptor.

6
dbus/service.c
View File

@ -23,9 +23,9 @@
#include <stdarg.h>
#include <string.h> /* strerror() */
#include "common/safety.h"
#include "common/debug.h"
#include "dbus/service.h"
#include "../common/safety.h"
#include "../common/debug.h"
#include "service.h"
service_t *
service_new(const char *service_name,

2
dbus/service.h
View File

@ -24,7 +24,7 @@
#include <stdbool.h>
#include <dbus/dbus.h>
#include "dbus/object_path.h"
#include "object_path.h"
struct _service
{

6
dbus/signal.c
View File

@ -20,9 +20,9 @@
#include <stdarg.h>
#include "common/debug.h"
#include "dbus/signal.h"
#include "dbus/service.h"
#include "../common/debug.h"
#include "signal.h"
#include "service.h"
static void
signal_send(signal_msg_t *signal);

2
dbus/signal.h
View File

@ -24,7 +24,7 @@
#include <dbus/dbus.h>
#include "dbus/types.h"
#include "types.h"
struct _signal_msg
{

53
wscript
View File

@ -64,6 +64,8 @@ def configure(conf):
errmsg = "not installed, see http://xmlsoft.org/",
args='--cflags --libs')
conf.write_config_header('config.h')
display_msg(conf)
display_msg(conf, "==================")
@ -96,7 +98,56 @@ def configure(conf):
display_msg(conf)
def build(bld):
pass
daemon = bld.new_task_gen('cc', 'program')
daemon.target = 'ladishd'
daemon.includes = "build/default" # XXX config.h version.h and other generated files
daemon.uselib = 'DBUS-1 LIBXML-2.0 UUID'
daemon.env.append_value("LINKFLAGS", ["-lutil"])
daemon.source = []
for source in [
'main.c',
'server.c',
'loader.c',
'log.c',
'sigsegv.c',
'proctitle.c',
'project.c',
'appdb.c',
'client.c',
'store.c',
'procfs.c',
'jack_patch.c',
'file.c',
'dbus_service.c',
'jackdbus_mgr.c',
'dbus_iface_control.c',
'dbus_iface_server.c',
'client_dependency.c',
'jack_mgr_client.c',
]:
daemon.source.append(os.path.join("daemon", source))
for source in [
'service.c',
'signal.c',
'method.c',
'error.c',
'object_path.c',
'introspection.c',
'interface.c',
]:
daemon.source.append(os.path.join("dbus", source))
daemon.source.append("common/safety.c")
# process org.jackaudio.service.in -> org.jackaudio.service
#import misc
#obj = bld.new_task_gen('subst')
#obj.source = 'org.jackaudio.service.in'
#obj.target = 'org.jackaudio.service'
#obj.dict = {'BINDIR': bld.env['PREFIX'] + '/bin'}
#obj.install_path = '${DBUS_SERVICES_DIR}/'
#obj.fun = misc.subst_func
def dist_hook():
pass