From a8937eb2f77ecea0b5d648bf616badb5fad7dbf3 Mon Sep 17 00:00:00 2001 From: Swann Perarnau Date: Mon, 10 Apr 2017 11:16:49 -0500 Subject: [PATCH] [refactor] Convert repository to autotools Use standard tools to deal with compile/headers and so on. Autotools are not necessary easy to use, but everyone knows how to interact with them. This commit is incomplete: - make check doesn't work right now - config.h is not used/configured properly --- Makefile | 458 ------------------ Makefile.am | 4 + autogen.sh | 2 + configure.ac | 42 ++ src/Makefile.am | 30 ++ acl.cpp => src/acl.cpp | 0 acl.hpp => src/acl.hpp | 0 .../aggregatelogger.cpp | 0 .../aggregatelogger.hpp | 0 argo_container.cpp => src/argo_container.cpp | 0 argo_container.hpp => src/argo_container.hpp | 0 .../argo_nodeos_config.cpp | 0 common.hpp => src/common.hpp | 0 config_reader.cpp => src/config_reader.cpp | 0 config_reader.hpp => src/config_reader.hpp | 0 .../container_manager.cpp | 0 .../container_manager.hpp | 0 defaults.hpp => src/defaults.hpp | 0 filelogger.cpp => src/filelogger.cpp | 0 filelogger.hpp => src/filelogger.hpp | 0 headers.hpp => src/headers.hpp | 0 ilogger.cpp => src/ilogger.cpp | 0 ilogger.hpp => src/ilogger.hpp | 0 .../int_list_parser.cpp | 0 .../int_list_parser.hpp | 0 iparser.cpp => src/iparser.cpp | 0 iparser.hpp => src/iparser.hpp | 0 .../iresource_controller.cpp | 0 .../iresource_controller.hpp | 0 .../iresource_controller_status.cpp | 0 .../iresource_controller_status.hpp | 0 .../log_option_parser.cpp | 0 .../log_option_parser.hpp | 0 .../node_settup_changer.cpp | 0 .../node_setup_changer.hpp | 0 .../node_setup_reader.cpp | 0 .../node_setup_reader.hpp | 0 .../nodeos_exceptions.cpp | 0 .../nodeos_exceptions.hpp | 0 .../resource_controller_type.hpp | 0 .../resource_locker.cpp | 0 .../resource_locker.hpp | 0 .../resource_ownership.hpp | 0 .../resource_ownership_set.hpp | 0 resource_type.hpp => src/resource_type.hpp | 0 stderrlogger.cpp => src/stderrlogger.cpp | 0 stderrlogger.hpp => src/stderrlogger.hpp | 0 string_parser.cpp => src/string_parser.cpp | 0 string_parser.hpp => src/string_parser.hpp | 0 syslogger.cpp => src/syslogger.cpp | 0 syslogger.hpp => src/syslogger.hpp | 0 trace.cpp => src/trace.cpp | 0 trace.hpp => src/trace.hpp | 0 utils.cpp => src/utils.cpp | 0 utils.hpp => src/utils.hpp | 0 55 files changed, 78 insertions(+), 458 deletions(-) delete mode 100644 Makefile create mode 100644 Makefile.am create mode 100755 autogen.sh create mode 100644 configure.ac create mode 100644 src/Makefile.am rename acl.cpp => src/acl.cpp (100%) rename acl.hpp => src/acl.hpp (100%) rename aggregatelogger.cpp => src/aggregatelogger.cpp (100%) rename aggregatelogger.hpp => src/aggregatelogger.hpp (100%) rename argo_container.cpp => src/argo_container.cpp (100%) rename argo_container.hpp => src/argo_container.hpp (100%) rename argo_nodeos_config.cpp => src/argo_nodeos_config.cpp (100%) rename common.hpp => src/common.hpp (100%) rename config_reader.cpp => src/config_reader.cpp (100%) rename config_reader.hpp => src/config_reader.hpp (100%) rename container_manager.cpp => src/container_manager.cpp (100%) rename container_manager.hpp => src/container_manager.hpp (100%) rename defaults.hpp => src/defaults.hpp (100%) rename filelogger.cpp => src/filelogger.cpp (100%) rename filelogger.hpp => src/filelogger.hpp (100%) rename headers.hpp => src/headers.hpp (100%) rename ilogger.cpp => src/ilogger.cpp (100%) rename ilogger.hpp => src/ilogger.hpp (100%) rename int_list_parser.cpp => src/int_list_parser.cpp (100%) rename int_list_parser.hpp => src/int_list_parser.hpp (100%) rename iparser.cpp => src/iparser.cpp (100%) rename iparser.hpp => src/iparser.hpp (100%) rename iresource_controller.cpp => src/iresource_controller.cpp (100%) rename iresource_controller.hpp => src/iresource_controller.hpp (100%) rename iresource_controller_status.cpp => src/iresource_controller_status.cpp (100%) rename iresource_controller_status.hpp => src/iresource_controller_status.hpp (100%) rename log_option_parser.cpp => src/log_option_parser.cpp (100%) rename log_option_parser.hpp => src/log_option_parser.hpp (100%) rename node_settup_changer.cpp => src/node_settup_changer.cpp (100%) rename node_setup_changer.hpp => src/node_setup_changer.hpp (100%) rename node_setup_reader.cpp => src/node_setup_reader.cpp (100%) rename node_setup_reader.hpp => src/node_setup_reader.hpp (100%) rename nodeos_exceptions.cpp => src/nodeos_exceptions.cpp (100%) rename nodeos_exceptions.hpp => src/nodeos_exceptions.hpp (100%) rename resource_controller_type.hpp => src/resource_controller_type.hpp (100%) rename resource_locker.cpp => src/resource_locker.cpp (100%) rename resource_locker.hpp => src/resource_locker.hpp (100%) rename resource_ownership.hpp => src/resource_ownership.hpp (100%) rename resource_ownership_set.hpp => src/resource_ownership_set.hpp (100%) rename resource_type.hpp => src/resource_type.hpp (100%) rename stderrlogger.cpp => src/stderrlogger.cpp (100%) rename stderrlogger.hpp => src/stderrlogger.hpp (100%) rename string_parser.cpp => src/string_parser.cpp (100%) rename string_parser.hpp => src/string_parser.hpp (100%) rename syslogger.cpp => src/syslogger.cpp (100%) rename syslogger.hpp => src/syslogger.hpp (100%) rename trace.cpp => src/trace.cpp (100%) rename trace.hpp => src/trace.hpp (100%) rename utils.cpp => src/utils.cpp (100%) rename utils.hpp => src/utils.hpp (100%) diff --git a/Makefile b/Makefile deleted file mode 100644 index 746e76d..0000000 --- a/Makefile +++ /dev/null @@ -1,458 +0,0 @@ -#DFLAGS= #Debug flags. Meant to be specified outside when invoking make -CFLAGS= -Wall -ggdb -O0 -CC=gcc $(DFLAGS) - -CXXFLAGS= -Wall -I./jsonxx -ggdb -O0 -#CXXFLAGS= -Wall #-I./jsonxx -ggdb -O0 -CXX=g++ -std=c++11 $(DFLAGS) - -BIN=argo_nodeos_config - -C_SOURCES=zounm_utils.c -C_HEADERS=zounm_utils.h - -CXX_SOURCES=argo_nodeos_config.cpp config_reader.cpp node_settup_changer.cpp \ - node_setup_reader.cpp argo_container.hpp container_manager.cpp \ - utils.cpp acl.hpp ilogger.cpp stderrlogger.cpp fileflogger.cpp \ - syslogger.cpp aggregatelogger.cpp log_option_parser.cpp \ - resource_locker.cpp trace.cpp \ - iresource_controller.cpp\ - iresource_controller_status.cpp\ - string_parser.cpp\ - int_list_parser.cpp\ - nodeos_exceptions.cpp\ - thirdparty/jsonxx/jsonxx.cc - -CXX_HEADERS=config_reader.hpp node_setup_changer.hpp node_setup_reader.hpp \ - argo_container.hpp container_manager.hpp utils.hpp acl.cpp \ - common.hpp defaults.hpp ilogger.hpp stderrlogger.hpp filelogger.hpp \ - syslogger.hpp aggregatelogger.hpp headers.hpp log_option_parser.hpp \ - trace.hpp resource_locker.hpp \ - iresource_controller.hpp\ - iresource_controller.hpp\ - resource_controller_type.hpp\ - string_parser.hpp\ - int_list_parser.hpp\ - nodeos_exceptions.hpp\ - resource_ownership.hpp\ - thirdparty/jsonxx/jsonxx.h - -OBJECTS=argo_nodeos_config.o config_reader.o node_settup_changer.o node_setup_reader.o \ - argo_container.o utils.o container_manager.o acl.o ilogger.o stderrlogger.o\ - syslogger.o filelogger.o aggregatelogger.o log_option_parser.o \ - resource_locker.o trace.o \ - iresource_controller.o\ - iresource_controller_status.o\ - string_parser.o\ - int_list_parser.o\ - nodeos_exceptions.o\ - thirdparty/jsonxx/jsonxx.o - -%.o: %.c %.h - $(CC) $(CFLAGS) -c $< - -%.o: %.cpp %.cc $(CXX_HEADERS) - $(CXX) $(CXXFLAGS) -c $< - -#depend: -# makedepend -- $(CXXFLAGS) -- $(CXX_SOURCES) - -$(BIN): $(OBJECTS) - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) - chmod u+s $(BIN) - -clean: - rm -f $(OBJECTS) $(BIN) -# DO NOT DELETE - -argo_nodeos_config.o: headers.hpp acl.hpp utils.hpp /usr/include/sys/types.h -argo_nodeos_config.o: /usr/include/features.h /usr/include/stdc-predef.h -argo_nodeos_config.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h -argo_nodeos_config.o: /usr/include/gnu/stubs.h /usr/include/bits/types.h -argo_nodeos_config.o: /usr/include/bits/typesizes.h /usr/include/time.h -argo_nodeos_config.o: /usr/include/endian.h /usr/include/bits/endian.h -argo_nodeos_config.o: /usr/include/bits/byteswap.h -argo_nodeos_config.o: /usr/include/bits/byteswap-16.h -argo_nodeos_config.o: /usr/include/sys/select.h /usr/include/bits/select.h -argo_nodeos_config.o: /usr/include/bits/sigset.h /usr/include/bits/time.h -argo_nodeos_config.o: /usr/include/sys/sysmacros.h -argo_nodeos_config.o: /usr/include/bits/pthreadtypes.h /usr/include/unistd.h -argo_nodeos_config.o: /usr/include/bits/posix_opt.h -argo_nodeos_config.o: /usr/include/bits/environments.h -argo_nodeos_config.o: /usr/include/bits/confname.h /usr/include/getopt.h -argo_nodeos_config.o: /usr/include/fcntl.h /usr/include/bits/fcntl.h -argo_nodeos_config.o: /usr/include/bits/fcntl-linux.h -argo_nodeos_config.o: /usr/include/bits/stat.h /usr/include/stdint.h -argo_nodeos_config.o: /usr/include/bits/wchar.h /usr/include/errno.h -argo_nodeos_config.o: /usr/include/bits/errno.h /usr/include/linux/errno.h -argo_nodeos_config.o: /usr/include/asm/errno.h -argo_nodeos_config.o: /usr/include/asm-generic/errno.h -argo_nodeos_config.o: /usr/include/asm-generic/errno-base.h -argo_nodeos_config.o: /usr/include/string.h /usr/include/xlocale.h -argo_nodeos_config.o: /usr/include/pthread.h /usr/include/sched.h -argo_nodeos_config.o: /usr/include/bits/sched.h /usr/include/bits/setjmp.h -argo_nodeos_config.o: common.hpp /usr/include/sys/stat.h defaults.hpp -argo_nodeos_config.o: /usr/include/syslog.h /usr/include/sys/syslog.h -argo_nodeos_config.o: /usr/include/bits/syslog-path.h nodeos_exceptions.hpp -argo_nodeos_config.o: argo_container.hpp resource_type.hpp string_parser.hpp -argo_nodeos_config.o: container_manager.hpp resource_ownership.hpp -argo_nodeos_config.o: ilogger.hpp resource_ownership_set.hpp syslogger.hpp -argo_nodeos_config.o: stderrlogger.hpp filelogger.hpp aggregatelogger.hpp -argo_nodeos_config.o: log_option_parser.hpp resource_locker.hpp -argo_nodeos_config.o: /usr/include/stdio.h /usr/include/libio.h -argo_nodeos_config.o: /usr/include/_G_config.h /usr/include/wchar.h -argo_nodeos_config.o: /usr/include/bits/stdio_lim.h -argo_nodeos_config.o: /usr/include/bits/sys_errlist.h -argo_container.o: utils.hpp /usr/include/sys/types.h /usr/include/features.h -argo_container.o: /usr/include/stdc-predef.h /usr/include/sys/cdefs.h -argo_container.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h -argo_container.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h -argo_container.o: /usr/include/time.h /usr/include/endian.h -argo_container.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h -argo_container.o: /usr/include/bits/byteswap-16.h /usr/include/sys/select.h -argo_container.o: /usr/include/bits/select.h /usr/include/bits/sigset.h -argo_container.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h -argo_container.o: /usr/include/bits/pthreadtypes.h /usr/include/unistd.h -argo_container.o: /usr/include/bits/posix_opt.h -argo_container.o: /usr/include/bits/environments.h -argo_container.o: /usr/include/bits/confname.h /usr/include/getopt.h -argo_container.o: /usr/include/fcntl.h /usr/include/bits/fcntl.h -argo_container.o: /usr/include/bits/fcntl-linux.h /usr/include/bits/stat.h -argo_container.o: /usr/include/stdint.h /usr/include/bits/wchar.h -argo_container.o: /usr/include/errno.h /usr/include/bits/errno.h -argo_container.o: /usr/include/linux/errno.h /usr/include/asm/errno.h -argo_container.o: /usr/include/asm-generic/errno.h -argo_container.o: /usr/include/asm-generic/errno-base.h /usr/include/string.h -argo_container.o: /usr/include/xlocale.h /usr/include/pthread.h -argo_container.o: /usr/include/sched.h /usr/include/bits/sched.h -argo_container.o: /usr/include/bits/setjmp.h common.hpp -argo_container.o: /usr/include/sys/stat.h defaults.hpp /usr/include/syslog.h -argo_container.o: /usr/include/sys/syslog.h /usr/include/bits/syslog-path.h -argo_container.o: nodeos_exceptions.hpp resource_type.hpp string_parser.hpp -container_manager.o: container_manager.hpp utils.hpp /usr/include/sys/types.h -container_manager.o: /usr/include/features.h /usr/include/stdc-predef.h -container_manager.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h -container_manager.o: /usr/include/gnu/stubs.h /usr/include/bits/types.h -container_manager.o: /usr/include/bits/typesizes.h /usr/include/time.h -container_manager.o: /usr/include/endian.h /usr/include/bits/endian.h -container_manager.o: /usr/include/bits/byteswap.h -container_manager.o: /usr/include/bits/byteswap-16.h -container_manager.o: /usr/include/sys/select.h /usr/include/bits/select.h -container_manager.o: /usr/include/bits/sigset.h /usr/include/bits/time.h -container_manager.o: /usr/include/sys/sysmacros.h -container_manager.o: /usr/include/bits/pthreadtypes.h /usr/include/unistd.h -container_manager.o: /usr/include/bits/posix_opt.h -container_manager.o: /usr/include/bits/environments.h -container_manager.o: /usr/include/bits/confname.h /usr/include/getopt.h -container_manager.o: /usr/include/fcntl.h /usr/include/bits/fcntl.h -container_manager.o: /usr/include/bits/fcntl-linux.h /usr/include/bits/stat.h -container_manager.o: /usr/include/stdint.h /usr/include/bits/wchar.h -container_manager.o: /usr/include/errno.h /usr/include/bits/errno.h -container_manager.o: /usr/include/linux/errno.h /usr/include/asm/errno.h -container_manager.o: /usr/include/asm-generic/errno.h -container_manager.o: /usr/include/asm-generic/errno-base.h -container_manager.o: /usr/include/string.h /usr/include/xlocale.h -container_manager.o: /usr/include/pthread.h /usr/include/sched.h -container_manager.o: /usr/include/bits/sched.h /usr/include/bits/setjmp.h -container_manager.o: common.hpp /usr/include/sys/stat.h defaults.hpp -container_manager.o: /usr/include/syslog.h /usr/include/sys/syslog.h -container_manager.o: /usr/include/bits/syslog-path.h nodeos_exceptions.hpp -container_manager.o: argo_container.hpp resource_type.hpp string_parser.hpp -container_manager.o: resource_ownership.hpp ilogger.hpp -container_manager.o: resource_ownership_set.hpp /usr/include/sys/mount.h -container_manager.o: /usr/include/sys/ioctl.h /usr/include/bits/ioctls.h -container_manager.o: /usr/include/asm/ioctls.h -container_manager.o: /usr/include/asm-generic/ioctls.h -container_manager.o: /usr/include/linux/ioctl.h /usr/include/asm/ioctl.h -container_manager.o: /usr/include/asm-generic/ioctl.h -container_manager.o: /usr/include/bits/ioctl-types.h -container_manager.o: /usr/include/sys/ttydefaults.h /usr/include/ftw.h -container_manager.o: /usr/include/libgen.h int_list_parser.hpp -container_manager.o: /usr/include/signal.h /usr/include/bits/signum.h -container_manager.o: /usr/include/bits/siginfo.h -container_manager.o: /usr/include/bits/sigaction.h -container_manager.o: /usr/include/bits/sigcontext.h -container_manager.o: /usr/include/bits/sigstack.h /usr/include/sys/ucontext.h -container_manager.o: /usr/include/bits/sigthread.h -utils.o: utils.hpp /usr/include/sys/types.h /usr/include/features.h -utils.o: /usr/include/stdc-predef.h /usr/include/sys/cdefs.h -utils.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h -utils.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h -utils.o: /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h -utils.o: /usr/include/bits/byteswap.h /usr/include/bits/byteswap-16.h -utils.o: /usr/include/sys/select.h /usr/include/bits/select.h -utils.o: /usr/include/bits/sigset.h /usr/include/bits/time.h -utils.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h -utils.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h -utils.o: /usr/include/bits/environments.h /usr/include/bits/confname.h -utils.o: /usr/include/getopt.h /usr/include/fcntl.h /usr/include/bits/fcntl.h -utils.o: /usr/include/bits/fcntl-linux.h /usr/include/bits/stat.h -utils.o: /usr/include/stdint.h /usr/include/bits/wchar.h /usr/include/errno.h -utils.o: /usr/include/bits/errno.h /usr/include/linux/errno.h -utils.o: /usr/include/asm/errno.h /usr/include/asm-generic/errno.h -utils.o: /usr/include/asm-generic/errno-base.h /usr/include/string.h -utils.o: /usr/include/xlocale.h /usr/include/pthread.h /usr/include/sched.h -utils.o: /usr/include/bits/sched.h /usr/include/bits/setjmp.h common.hpp -utils.o: /usr/include/sys/stat.h defaults.hpp /usr/include/syslog.h -utils.o: /usr/include/sys/syslog.h /usr/include/bits/syslog-path.h -utils.o: nodeos_exceptions.hpp /usr/include/ctype.h /usr/include/limits.h -utils.o: /usr/include/bits/posix1_lim.h /usr/include/bits/local_lim.h -utils.o: /usr/include/linux/limits.h /usr/include/bits/posix2_lim.h -utils.o: /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h -utils.o: /usr/include/wchar.h /usr/include/bits/stdio_lim.h -utils.o: /usr/include/bits/sys_errlist.h ilogger.hpp syslogger.hpp -utils.o: filelogger.hpp stderrlogger.hpp aggregatelogger.hpp -acl.o: utils.hpp /usr/include/sys/types.h /usr/include/features.h -acl.o: /usr/include/stdc-predef.h /usr/include/sys/cdefs.h -acl.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h -acl.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h -acl.o: /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h -acl.o: /usr/include/bits/byteswap.h /usr/include/bits/byteswap-16.h -acl.o: /usr/include/sys/select.h /usr/include/bits/select.h -acl.o: /usr/include/bits/sigset.h /usr/include/bits/time.h -acl.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h -acl.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h -acl.o: /usr/include/bits/environments.h /usr/include/bits/confname.h -acl.o: /usr/include/getopt.h /usr/include/fcntl.h /usr/include/bits/fcntl.h -acl.o: /usr/include/bits/fcntl-linux.h /usr/include/bits/stat.h -acl.o: /usr/include/stdint.h /usr/include/bits/wchar.h /usr/include/errno.h -acl.o: /usr/include/bits/errno.h /usr/include/linux/errno.h -acl.o: /usr/include/asm/errno.h /usr/include/asm-generic/errno.h -acl.o: /usr/include/asm-generic/errno-base.h /usr/include/string.h -acl.o: /usr/include/xlocale.h /usr/include/pthread.h /usr/include/sched.h -acl.o: /usr/include/bits/sched.h /usr/include/bits/setjmp.h common.hpp -acl.o: /usr/include/sys/stat.h defaults.hpp /usr/include/syslog.h -acl.o: /usr/include/sys/syslog.h /usr/include/bits/syslog-path.h -acl.o: nodeos_exceptions.hpp -ilogger.o: ilogger.hpp common.hpp /usr/include/sys/types.h -ilogger.o: /usr/include/features.h /usr/include/stdc-predef.h -ilogger.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h -ilogger.o: /usr/include/gnu/stubs.h /usr/include/bits/types.h -ilogger.o: /usr/include/bits/typesizes.h /usr/include/time.h -ilogger.o: /usr/include/endian.h /usr/include/bits/endian.h -ilogger.o: /usr/include/bits/byteswap.h /usr/include/bits/byteswap-16.h -ilogger.o: /usr/include/sys/select.h /usr/include/bits/select.h -ilogger.o: /usr/include/bits/sigset.h /usr/include/bits/time.h -ilogger.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h -ilogger.o: /usr/include/sys/stat.h /usr/include/bits/stat.h defaults.hpp -ilogger.o: /usr/include/string.h /usr/include/xlocale.h /usr/include/errno.h -ilogger.o: /usr/include/bits/errno.h /usr/include/linux/errno.h -ilogger.o: /usr/include/asm/errno.h /usr/include/asm-generic/errno.h -ilogger.o: /usr/include/asm-generic/errno-base.h /usr/include/syslog.h -ilogger.o: /usr/include/sys/syslog.h /usr/include/bits/syslog-path.h -ilogger.o: /usr/include/stdint.h /usr/include/bits/wchar.h utils.hpp -ilogger.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h -ilogger.o: /usr/include/bits/environments.h /usr/include/bits/confname.h -ilogger.o: /usr/include/getopt.h /usr/include/fcntl.h -ilogger.o: /usr/include/bits/fcntl.h /usr/include/bits/fcntl-linux.h -ilogger.o: /usr/include/pthread.h /usr/include/sched.h -ilogger.o: /usr/include/bits/sched.h /usr/include/bits/setjmp.h -ilogger.o: nodeos_exceptions.hpp /usr/include/stdio.h /usr/include/libio.h -ilogger.o: /usr/include/_G_config.h /usr/include/wchar.h -ilogger.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h -ilogger.o: /usr/include/stdlib.h /usr/include/bits/waitflags.h -ilogger.o: /usr/include/bits/waitstatus.h /usr/include/alloca.h -ilogger.o: /usr/include/bits/stdlib-float.h -stderrlogger.o: stderrlogger.hpp ilogger.hpp common.hpp -stderrlogger.o: /usr/include/sys/types.h /usr/include/features.h -stderrlogger.o: /usr/include/stdc-predef.h /usr/include/sys/cdefs.h -stderrlogger.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h -stderrlogger.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h -stderrlogger.o: /usr/include/time.h /usr/include/endian.h -stderrlogger.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h -stderrlogger.o: /usr/include/bits/byteswap-16.h /usr/include/sys/select.h -stderrlogger.o: /usr/include/bits/select.h /usr/include/bits/sigset.h -stderrlogger.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h -stderrlogger.o: /usr/include/bits/pthreadtypes.h /usr/include/sys/stat.h -stderrlogger.o: /usr/include/bits/stat.h defaults.hpp /usr/include/string.h -stderrlogger.o: /usr/include/xlocale.h /usr/include/errno.h -stderrlogger.o: /usr/include/bits/errno.h /usr/include/linux/errno.h -stderrlogger.o: /usr/include/asm/errno.h /usr/include/asm-generic/errno.h -stderrlogger.o: /usr/include/asm-generic/errno-base.h /usr/include/syslog.h -stderrlogger.o: /usr/include/sys/syslog.h /usr/include/bits/syslog-path.h -stderrlogger.o: /usr/include/stdint.h /usr/include/bits/wchar.h trace.hpp -stderrlogger.o: /usr/include/stdio.h /usr/include/libio.h -stderrlogger.o: /usr/include/_G_config.h /usr/include/wchar.h -stderrlogger.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h -stderrlogger.o: utils.hpp /usr/include/unistd.h /usr/include/bits/posix_opt.h -stderrlogger.o: /usr/include/bits/environments.h /usr/include/bits/confname.h -stderrlogger.o: /usr/include/getopt.h /usr/include/fcntl.h -stderrlogger.o: /usr/include/bits/fcntl.h /usr/include/bits/fcntl-linux.h -stderrlogger.o: /usr/include/pthread.h /usr/include/sched.h -stderrlogger.o: /usr/include/bits/sched.h /usr/include/bits/setjmp.h -stderrlogger.o: nodeos_exceptions.hpp -syslogger.o: syslogger.hpp ilogger.hpp common.hpp /usr/include/sys/types.h -syslogger.o: /usr/include/features.h /usr/include/stdc-predef.h -syslogger.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h -syslogger.o: /usr/include/gnu/stubs.h /usr/include/bits/types.h -syslogger.o: /usr/include/bits/typesizes.h /usr/include/time.h -syslogger.o: /usr/include/endian.h /usr/include/bits/endian.h -syslogger.o: /usr/include/bits/byteswap.h /usr/include/bits/byteswap-16.h -syslogger.o: /usr/include/sys/select.h /usr/include/bits/select.h -syslogger.o: /usr/include/bits/sigset.h /usr/include/bits/time.h -syslogger.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h -syslogger.o: /usr/include/sys/stat.h /usr/include/bits/stat.h defaults.hpp -syslogger.o: /usr/include/string.h /usr/include/xlocale.h -syslogger.o: /usr/include/errno.h /usr/include/bits/errno.h -syslogger.o: /usr/include/linux/errno.h /usr/include/asm/errno.h -syslogger.o: /usr/include/asm-generic/errno.h -syslogger.o: /usr/include/asm-generic/errno-base.h /usr/include/syslog.h -syslogger.o: /usr/include/sys/syslog.h /usr/include/bits/syslog-path.h -syslogger.o: /usr/include/stdint.h /usr/include/bits/wchar.h utils.hpp -syslogger.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h -syslogger.o: /usr/include/bits/environments.h /usr/include/bits/confname.h -syslogger.o: /usr/include/getopt.h /usr/include/fcntl.h -syslogger.o: /usr/include/bits/fcntl.h /usr/include/bits/fcntl-linux.h -syslogger.o: /usr/include/pthread.h /usr/include/sched.h -syslogger.o: /usr/include/bits/sched.h /usr/include/bits/setjmp.h -syslogger.o: nodeos_exceptions.hpp trace.hpp /usr/include/stdio.h -syslogger.o: /usr/include/libio.h /usr/include/_G_config.h -syslogger.o: /usr/include/wchar.h /usr/include/bits/stdio_lim.h -syslogger.o: /usr/include/bits/sys_errlist.h -aggregatelogger.o: aggregatelogger.hpp ilogger.hpp common.hpp -aggregatelogger.o: /usr/include/sys/types.h /usr/include/features.h -aggregatelogger.o: /usr/include/stdc-predef.h /usr/include/sys/cdefs.h -aggregatelogger.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h -aggregatelogger.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h -aggregatelogger.o: /usr/include/time.h /usr/include/endian.h -aggregatelogger.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h -aggregatelogger.o: /usr/include/bits/byteswap-16.h /usr/include/sys/select.h -aggregatelogger.o: /usr/include/bits/select.h /usr/include/bits/sigset.h -aggregatelogger.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h -aggregatelogger.o: /usr/include/bits/pthreadtypes.h /usr/include/sys/stat.h -aggregatelogger.o: /usr/include/bits/stat.h defaults.hpp -aggregatelogger.o: /usr/include/string.h /usr/include/xlocale.h -aggregatelogger.o: /usr/include/errno.h /usr/include/bits/errno.h -aggregatelogger.o: /usr/include/linux/errno.h /usr/include/asm/errno.h -aggregatelogger.o: /usr/include/asm-generic/errno.h -aggregatelogger.o: /usr/include/asm-generic/errno-base.h -aggregatelogger.o: /usr/include/syslog.h /usr/include/sys/syslog.h -aggregatelogger.o: /usr/include/bits/syslog-path.h /usr/include/stdint.h -aggregatelogger.o: /usr/include/bits/wchar.h syslogger.hpp stderrlogger.hpp -aggregatelogger.o: filelogger.hpp -log_option_parser.o: log_option_parser.hpp common.hpp -log_option_parser.o: /usr/include/sys/types.h /usr/include/features.h -log_option_parser.o: /usr/include/stdc-predef.h /usr/include/sys/cdefs.h -log_option_parser.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h -log_option_parser.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h -log_option_parser.o: /usr/include/time.h /usr/include/endian.h -log_option_parser.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h -log_option_parser.o: /usr/include/bits/byteswap-16.h -log_option_parser.o: /usr/include/sys/select.h /usr/include/bits/select.h -log_option_parser.o: /usr/include/bits/sigset.h /usr/include/bits/time.h -log_option_parser.o: /usr/include/sys/sysmacros.h -log_option_parser.o: /usr/include/bits/pthreadtypes.h /usr/include/sys/stat.h -log_option_parser.o: /usr/include/bits/stat.h defaults.hpp -log_option_parser.o: /usr/include/string.h /usr/include/xlocale.h -log_option_parser.o: /usr/include/errno.h /usr/include/bits/errno.h -log_option_parser.o: /usr/include/linux/errno.h /usr/include/asm/errno.h -log_option_parser.o: /usr/include/asm-generic/errno.h -log_option_parser.o: /usr/include/asm-generic/errno-base.h -log_option_parser.o: /usr/include/syslog.h /usr/include/sys/syslog.h -log_option_parser.o: /usr/include/bits/syslog-path.h /usr/include/stdint.h -log_option_parser.o: /usr/include/bits/wchar.h utils.hpp -log_option_parser.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h -log_option_parser.o: /usr/include/bits/environments.h -log_option_parser.o: /usr/include/bits/confname.h /usr/include/getopt.h -log_option_parser.o: /usr/include/fcntl.h /usr/include/bits/fcntl.h -log_option_parser.o: /usr/include/bits/fcntl-linux.h /usr/include/pthread.h -log_option_parser.o: /usr/include/sched.h /usr/include/bits/sched.h -log_option_parser.o: /usr/include/bits/setjmp.h nodeos_exceptions.hpp -resource_locker.o: resource_locker.hpp /usr/include/stdio.h -resource_locker.o: /usr/include/features.h /usr/include/stdc-predef.h -resource_locker.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h -resource_locker.o: /usr/include/gnu/stubs.h /usr/include/bits/types.h -resource_locker.o: /usr/include/bits/typesizes.h /usr/include/libio.h -resource_locker.o: /usr/include/_G_config.h /usr/include/wchar.h -resource_locker.o: /usr/include/bits/stdio_lim.h -resource_locker.o: /usr/include/bits/sys_errlist.h utils.hpp -resource_locker.o: /usr/include/sys/types.h /usr/include/time.h -resource_locker.o: /usr/include/endian.h /usr/include/bits/endian.h -resource_locker.o: /usr/include/bits/byteswap.h -resource_locker.o: /usr/include/bits/byteswap-16.h /usr/include/sys/select.h -resource_locker.o: /usr/include/bits/select.h /usr/include/bits/sigset.h -resource_locker.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h -resource_locker.o: /usr/include/bits/pthreadtypes.h /usr/include/unistd.h -resource_locker.o: /usr/include/bits/posix_opt.h -resource_locker.o: /usr/include/bits/environments.h -resource_locker.o: /usr/include/bits/confname.h /usr/include/getopt.h -resource_locker.o: /usr/include/fcntl.h /usr/include/bits/fcntl.h -resource_locker.o: /usr/include/bits/fcntl-linux.h /usr/include/bits/stat.h -resource_locker.o: /usr/include/stdint.h /usr/include/bits/wchar.h -resource_locker.o: /usr/include/errno.h /usr/include/bits/errno.h -resource_locker.o: /usr/include/linux/errno.h /usr/include/asm/errno.h -resource_locker.o: /usr/include/asm-generic/errno.h -resource_locker.o: /usr/include/asm-generic/errno-base.h -resource_locker.o: /usr/include/string.h /usr/include/xlocale.h -resource_locker.o: /usr/include/pthread.h /usr/include/sched.h -resource_locker.o: /usr/include/bits/sched.h /usr/include/bits/setjmp.h -resource_locker.o: common.hpp /usr/include/sys/stat.h defaults.hpp -resource_locker.o: /usr/include/syslog.h /usr/include/sys/syslog.h -resource_locker.o: /usr/include/bits/syslog-path.h nodeos_exceptions.hpp -resource_locker.o: ilogger.hpp /usr/include/sys/file.h trace.hpp -trace.o: trace.hpp /usr/include/stdio.h /usr/include/features.h -trace.o: /usr/include/stdc-predef.h /usr/include/sys/cdefs.h -trace.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h -trace.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h -trace.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h -trace.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h -string_parser.o: string_parser.hpp utils.hpp /usr/include/sys/types.h -string_parser.o: /usr/include/features.h /usr/include/stdc-predef.h -string_parser.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h -string_parser.o: /usr/include/gnu/stubs.h /usr/include/bits/types.h -string_parser.o: /usr/include/bits/typesizes.h /usr/include/time.h -string_parser.o: /usr/include/endian.h /usr/include/bits/endian.h -string_parser.o: /usr/include/bits/byteswap.h /usr/include/bits/byteswap-16.h -string_parser.o: /usr/include/sys/select.h /usr/include/bits/select.h -string_parser.o: /usr/include/bits/sigset.h /usr/include/bits/time.h -string_parser.o: /usr/include/sys/sysmacros.h -string_parser.o: /usr/include/bits/pthreadtypes.h /usr/include/unistd.h -string_parser.o: /usr/include/bits/posix_opt.h -string_parser.o: /usr/include/bits/environments.h -string_parser.o: /usr/include/bits/confname.h /usr/include/getopt.h -string_parser.o: /usr/include/fcntl.h /usr/include/bits/fcntl.h -string_parser.o: /usr/include/bits/fcntl-linux.h /usr/include/bits/stat.h -string_parser.o: /usr/include/stdint.h /usr/include/bits/wchar.h -string_parser.o: /usr/include/errno.h /usr/include/bits/errno.h -string_parser.o: /usr/include/linux/errno.h /usr/include/asm/errno.h -string_parser.o: /usr/include/asm-generic/errno.h -string_parser.o: /usr/include/asm-generic/errno-base.h /usr/include/string.h -string_parser.o: /usr/include/xlocale.h /usr/include/pthread.h -string_parser.o: /usr/include/sched.h /usr/include/bits/sched.h -string_parser.o: /usr/include/bits/setjmp.h common.hpp -string_parser.o: /usr/include/sys/stat.h defaults.hpp /usr/include/syslog.h -string_parser.o: /usr/include/sys/syslog.h /usr/include/bits/syslog-path.h -string_parser.o: nodeos_exceptions.hpp int_list_parser.hpp -int_list_parser.o: int_list_parser.hpp utils.hpp /usr/include/sys/types.h -int_list_parser.o: /usr/include/features.h /usr/include/stdc-predef.h -int_list_parser.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h -int_list_parser.o: /usr/include/gnu/stubs.h /usr/include/bits/types.h -int_list_parser.o: /usr/include/bits/typesizes.h /usr/include/time.h -int_list_parser.o: /usr/include/endian.h /usr/include/bits/endian.h -int_list_parser.o: /usr/include/bits/byteswap.h -int_list_parser.o: /usr/include/bits/byteswap-16.h /usr/include/sys/select.h -int_list_parser.o: /usr/include/bits/select.h /usr/include/bits/sigset.h -int_list_parser.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h -int_list_parser.o: /usr/include/bits/pthreadtypes.h /usr/include/unistd.h -int_list_parser.o: /usr/include/bits/posix_opt.h -int_list_parser.o: /usr/include/bits/environments.h -int_list_parser.o: /usr/include/bits/confname.h /usr/include/getopt.h -int_list_parser.o: /usr/include/fcntl.h /usr/include/bits/fcntl.h -int_list_parser.o: /usr/include/bits/fcntl-linux.h /usr/include/bits/stat.h -int_list_parser.o: /usr/include/stdint.h /usr/include/bits/wchar.h -int_list_parser.o: /usr/include/errno.h /usr/include/bits/errno.h -int_list_parser.o: /usr/include/linux/errno.h /usr/include/asm/errno.h -int_list_parser.o: /usr/include/asm-generic/errno.h -int_list_parser.o: /usr/include/asm-generic/errno-base.h -int_list_parser.o: /usr/include/string.h /usr/include/xlocale.h -int_list_parser.o: /usr/include/pthread.h /usr/include/sched.h -int_list_parser.o: /usr/include/bits/sched.h /usr/include/bits/setjmp.h -int_list_parser.o: common.hpp /usr/include/sys/stat.h defaults.hpp -int_list_parser.o: /usr/include/syslog.h /usr/include/sys/syslog.h -int_list_parser.o: /usr/include/bits/syslog-path.h nodeos_exceptions.hpp -thirdparty/jsonxx/jsonxx.o: thirdparty/jsonxx/jsonxx.h /usr/include/stdio.h /usr/include/features.h -thirdparty/jsonxx/jsonxx.o: /usr/include/stdc-predef.h /usr/include/sys/cdefs.h -thirdparty/jsonxx/jsonxx.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h -thirdparty/jsonxx/jsonxx.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h -thirdparty/jsonxx/jsonxx.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h -thirdparty/jsonxx/jsonxx.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..e8382b7 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,4 @@ +ACLOCAL_AMFLAGS = -I m4 +SUBDIRS = src + +EXTRA_DIST = autogen.sh README.markdown diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..4cd22ac --- /dev/null +++ b/autogen.sh @@ -0,0 +1,2 @@ +#!/bin/sh +autoreconf --verbose --install --force diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..226fa98 --- /dev/null +++ b/configure.ac @@ -0,0 +1,42 @@ +# see semver.org for version info +AC_INIT([argo-nodeos],[0.0.1],[swann@anl.gov]) + +# are we in the right source dir ? +AC_CONFIG_SRCDIR([src/argo_nodeos_config.cpp]) + +# build artefacts in separate dir +AC_CONFIG_AUX_DIR([m4]) +AC_CONFIG_MACRO_DIR([m4]) + +# automake should fail on any error +AM_INIT_AUTOMAKE([-Wall -Werror foreign 1.12]) +AM_PROG_AR + +# check for libtool +LT_INIT + +# check for programs +AC_LANG([C++]) +AC_PROG_CXX + +# support for testing with valgrind +AC_ARG_ENABLE(valgrind, +[AS_HELP_STRING([--enable-valgrind],[Also valgrind on checks (default is no).])], +[valgrind=true],[valgrind=false]) + +if [[ "x$valgrind" = xtrue ]]; then + AC_PATH_PROG(VALGRIND, valgrind, no) + if [[ "x$VALGRIND" = xno ]]; then + AC_MSG_ERROR([Valgrind not found in PATH. ]) + fi +fi +AM_CONDITIONAL([TEST_VALGRIND],[test "x$valgrind" = xtrue]) + +# dependencies + +#config, outputs +AC_CONFIG_HEADERS([src/config.h]) + +AC_CONFIG_FILES([Makefile + src/Makefile]) +AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..7202c9c --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,30 @@ +AM_CXXFLAGS = -ggdb -O0 + +bin_PROGRAMS = argo_nodeos_config +argo_nodeos_config_SOURCES = argo_nodeos_config.cpp config_reader.cpp node_settup_changer.cpp \ + node_setup_reader.cpp argo_container.cpp container_manager.cpp \ + utils.cpp acl.hpp ilogger.cpp stderrlogger.cpp filelogger.cpp \ + syslogger.cpp aggregatelogger.cpp log_option_parser.cpp \ + resource_locker.cpp trace.cpp \ + iresource_controller.cpp\ + iresource_controller_status.cpp\ + string_parser.cpp\ + int_list_parser.cpp\ + nodeos_exceptions.cpp\ + config_reader.hpp node_setup_changer.hpp node_setup_reader.hpp \ + argo_container.hpp container_manager.hpp utils.hpp acl.cpp \ + common.hpp defaults.hpp ilogger.hpp stderrlogger.hpp filelogger.hpp \ + syslogger.hpp aggregatelogger.hpp headers.hpp log_option_parser.hpp \ + trace.hpp resource_locker.hpp \ + iresource_controller.hpp\ + iresource_controller.hpp\ + resource_controller_type.hpp\ + string_parser.hpp\ + int_list_parser.hpp\ + nodeos_exceptions.hpp\ + resource_ownership.hpp + thirdparty/jsonxx/jsonxx.cc thirdparty/jsonxx/jsonxx.h + +# suid +install-exec-hook: + chmod u+s $(DESTDIR)$(bindir)/argo_nodeos_config$(EXEEXT) diff --git a/acl.cpp b/src/acl.cpp similarity index 100% rename from acl.cpp rename to src/acl.cpp diff --git a/acl.hpp b/src/acl.hpp similarity index 100% rename from acl.hpp rename to src/acl.hpp diff --git a/aggregatelogger.cpp b/src/aggregatelogger.cpp similarity index 100% rename from aggregatelogger.cpp rename to src/aggregatelogger.cpp diff --git a/aggregatelogger.hpp b/src/aggregatelogger.hpp similarity index 100% rename from aggregatelogger.hpp rename to src/aggregatelogger.hpp diff --git a/argo_container.cpp b/src/argo_container.cpp similarity index 100% rename from argo_container.cpp rename to src/argo_container.cpp diff --git a/argo_container.hpp b/src/argo_container.hpp similarity index 100% rename from argo_container.hpp rename to src/argo_container.hpp diff --git a/argo_nodeos_config.cpp b/src/argo_nodeos_config.cpp similarity index 100% rename from argo_nodeos_config.cpp rename to src/argo_nodeos_config.cpp diff --git a/common.hpp b/src/common.hpp similarity index 100% rename from common.hpp rename to src/common.hpp diff --git a/config_reader.cpp b/src/config_reader.cpp similarity index 100% rename from config_reader.cpp rename to src/config_reader.cpp diff --git a/config_reader.hpp b/src/config_reader.hpp similarity index 100% rename from config_reader.hpp rename to src/config_reader.hpp diff --git a/container_manager.cpp b/src/container_manager.cpp similarity index 100% rename from container_manager.cpp rename to src/container_manager.cpp diff --git a/container_manager.hpp b/src/container_manager.hpp similarity index 100% rename from container_manager.hpp rename to src/container_manager.hpp diff --git a/defaults.hpp b/src/defaults.hpp similarity index 100% rename from defaults.hpp rename to src/defaults.hpp diff --git a/filelogger.cpp b/src/filelogger.cpp similarity index 100% rename from filelogger.cpp rename to src/filelogger.cpp diff --git a/filelogger.hpp b/src/filelogger.hpp similarity index 100% rename from filelogger.hpp rename to src/filelogger.hpp diff --git a/headers.hpp b/src/headers.hpp similarity index 100% rename from headers.hpp rename to src/headers.hpp diff --git a/ilogger.cpp b/src/ilogger.cpp similarity index 100% rename from ilogger.cpp rename to src/ilogger.cpp diff --git a/ilogger.hpp b/src/ilogger.hpp similarity index 100% rename from ilogger.hpp rename to src/ilogger.hpp diff --git a/int_list_parser.cpp b/src/int_list_parser.cpp similarity index 100% rename from int_list_parser.cpp rename to src/int_list_parser.cpp diff --git a/int_list_parser.hpp b/src/int_list_parser.hpp similarity index 100% rename from int_list_parser.hpp rename to src/int_list_parser.hpp diff --git a/iparser.cpp b/src/iparser.cpp similarity index 100% rename from iparser.cpp rename to src/iparser.cpp diff --git a/iparser.hpp b/src/iparser.hpp similarity index 100% rename from iparser.hpp rename to src/iparser.hpp diff --git a/iresource_controller.cpp b/src/iresource_controller.cpp similarity index 100% rename from iresource_controller.cpp rename to src/iresource_controller.cpp diff --git a/iresource_controller.hpp b/src/iresource_controller.hpp similarity index 100% rename from iresource_controller.hpp rename to src/iresource_controller.hpp diff --git a/iresource_controller_status.cpp b/src/iresource_controller_status.cpp similarity index 100% rename from iresource_controller_status.cpp rename to src/iresource_controller_status.cpp diff --git a/iresource_controller_status.hpp b/src/iresource_controller_status.hpp similarity index 100% rename from iresource_controller_status.hpp rename to src/iresource_controller_status.hpp diff --git a/log_option_parser.cpp b/src/log_option_parser.cpp similarity index 100% rename from log_option_parser.cpp rename to src/log_option_parser.cpp diff --git a/log_option_parser.hpp b/src/log_option_parser.hpp similarity index 100% rename from log_option_parser.hpp rename to src/log_option_parser.hpp diff --git a/node_settup_changer.cpp b/src/node_settup_changer.cpp similarity index 100% rename from node_settup_changer.cpp rename to src/node_settup_changer.cpp diff --git a/node_setup_changer.hpp b/src/node_setup_changer.hpp similarity index 100% rename from node_setup_changer.hpp rename to src/node_setup_changer.hpp diff --git a/node_setup_reader.cpp b/src/node_setup_reader.cpp similarity index 100% rename from node_setup_reader.cpp rename to src/node_setup_reader.cpp diff --git a/node_setup_reader.hpp b/src/node_setup_reader.hpp similarity index 100% rename from node_setup_reader.hpp rename to src/node_setup_reader.hpp diff --git a/nodeos_exceptions.cpp b/src/nodeos_exceptions.cpp similarity index 100% rename from nodeos_exceptions.cpp rename to src/nodeos_exceptions.cpp diff --git a/nodeos_exceptions.hpp b/src/nodeos_exceptions.hpp similarity index 100% rename from nodeos_exceptions.hpp rename to src/nodeos_exceptions.hpp diff --git a/resource_controller_type.hpp b/src/resource_controller_type.hpp similarity index 100% rename from resource_controller_type.hpp rename to src/resource_controller_type.hpp diff --git a/resource_locker.cpp b/src/resource_locker.cpp similarity index 100% rename from resource_locker.cpp rename to src/resource_locker.cpp diff --git a/resource_locker.hpp b/src/resource_locker.hpp similarity index 100% rename from resource_locker.hpp rename to src/resource_locker.hpp diff --git a/resource_ownership.hpp b/src/resource_ownership.hpp similarity index 100% rename from resource_ownership.hpp rename to src/resource_ownership.hpp diff --git a/resource_ownership_set.hpp b/src/resource_ownership_set.hpp similarity index 100% rename from resource_ownership_set.hpp rename to src/resource_ownership_set.hpp diff --git a/resource_type.hpp b/src/resource_type.hpp similarity index 100% rename from resource_type.hpp rename to src/resource_type.hpp diff --git a/stderrlogger.cpp b/src/stderrlogger.cpp similarity index 100% rename from stderrlogger.cpp rename to src/stderrlogger.cpp diff --git a/stderrlogger.hpp b/src/stderrlogger.hpp similarity index 100% rename from stderrlogger.hpp rename to src/stderrlogger.hpp diff --git a/string_parser.cpp b/src/string_parser.cpp similarity index 100% rename from string_parser.cpp rename to src/string_parser.cpp diff --git a/string_parser.hpp b/src/string_parser.hpp similarity index 100% rename from string_parser.hpp rename to src/string_parser.hpp diff --git a/syslogger.cpp b/src/syslogger.cpp similarity index 100% rename from syslogger.cpp rename to src/syslogger.cpp diff --git a/syslogger.hpp b/src/syslogger.hpp similarity index 100% rename from syslogger.hpp rename to src/syslogger.hpp diff --git a/trace.cpp b/src/trace.cpp similarity index 100% rename from trace.cpp rename to src/trace.cpp diff --git a/trace.hpp b/src/trace.hpp similarity index 100% rename from trace.hpp rename to src/trace.hpp diff --git a/utils.cpp b/src/utils.cpp similarity index 100% rename from utils.cpp rename to src/utils.cpp diff --git a/utils.hpp b/src/utils.hpp similarity index 100% rename from utils.hpp rename to src/utils.hpp -- 2.26.2