diff options
author | deva <deva> | 2010-07-05 06:57:54 +0000 |
---|---|---|
committer | deva <deva> | 2010-07-05 06:57:54 +0000 |
commit | da6bfc301203b0181dcf70a9798a7d840d514126 (patch) | |
tree | 756c9058f91e0d5d449b3a881ee6e0b5c9fc434f /server/src | |
parent | 62a37af516fa1b9bf1a0c6750fbb3012687d3f54 (diff) |
Partial commit: Move macrotool to subfolder.
Diffstat (limited to 'server/src')
-rw-r--r-- | server/src/Makefile.am | 43 | ||||
-rw-r--r-- | server/src/macrotool/Makefile.am | 50 | ||||
-rw-r--r-- | server/src/macrotool/macrotool.cc (renamed from server/src/macrotool.cc) | 0 | ||||
-rw-r--r-- | server/src/macrotool/macrotool_dump.cc (renamed from server/src/macrotool_dump.cc) | 14 | ||||
-rw-r--r-- | server/src/macrotool/macrotool_dump.h (renamed from server/src/macrotool_dump.h) | 0 | ||||
-rw-r--r-- | server/src/macrotool/macrotool_fieldnames.cc (renamed from server/src/macrotool_fieldnames.cc) | 1 | ||||
-rw-r--r-- | server/src/macrotool/macrotool_fieldnames.h (renamed from server/src/macrotool_fieldnames.h) | 0 | ||||
-rw-r--r-- | server/src/macrotool/macrotool_filehandler.cc (renamed from server/src/macrotool_filehandler.cc) | 0 | ||||
-rw-r--r-- | server/src/macrotool/macrotool_filehandler.h (renamed from server/src/macrotool_filehandler.h) | 0 | ||||
-rw-r--r-- | server/src/macrotool/macrotool_util.cc (renamed from server/src/macrotool_util.cc) | 4 | ||||
-rw-r--r-- | server/src/macrotool/macrotool_util.h (renamed from server/src/macrotool_util.h) | 0 |
11 files changed, 66 insertions, 46 deletions
diff --git a/server/src/Makefile.am b/server/src/Makefile.am index 26a14e2..0170390 100644 --- a/server/src/Makefile.am +++ b/server/src/Makefile.am @@ -1,5 +1,6 @@ +SUBDIRS = macrotool -bin_PROGRAMS = pracrod macrotool +bin_PROGRAMS = pracrod pracrod_LDADD = $(LD_EFENCE) $(PQXX_LIBS) $(CONFIG_LIBS) \ $(LUA_LIBS) $(HTTPD_LIBS) $(PTHREAD_LIBS) \ @@ -56,40 +57,10 @@ pracrod_SOURCES = \ tcpsocket.cc \ utf8.cc \ versionstr.cc \ + widgetvalue.cc \ widgetgenerator.cc \ xml_encode_decode.cc -macrotool_LDADD = $(LD_EFENCE) $(PQXX_LIBS) $(CONFIG_LIBS) \ - $(LUA_LIBS) $(PTHREAD_LIBS) $(EXPAT_LIBS) - -macrotool_CXXFLAGS = $(PQXX_CXXFLAGS) $(CONFIG_CXXFLAGS) \ - $(LUA_CXXFLAGS) $(PTHREAD_CFLAGS) $(EXPAT_CFLAGS) - -macrotool_SOURCES = \ - macrotool.cc \ - debug.cc \ - configuration.cc \ - configurationparser.cc \ - database.cc \ - entitylist.cc \ - exception.cc \ - inotify.cc \ - log.cc \ - macroheaderparser.cc \ - macrolist.cc \ - macroparser.cc \ - macrotool_dump.cc \ - macrotool_fieldnames.cc \ - macrotool_filehandler.cc \ - macrotool_util.cc \ - mutex.cc \ - pracrodao.cc \ - pracrodaopgsql.cc \ - pracrodaotest.cc \ - saxparser.cc \ - templateparser.cc \ - versionstr.cc - EXTRA_DIST = \ artefact.h \ configuration.h \ @@ -115,10 +86,6 @@ EXTRA_DIST = \ macroheaderparser.h \ macrolist.h \ macroparser.h \ - macrotool_dump.h \ - macrotool_fieldnames.h \ - macrotool_filehandler.h \ - macrotool_util.h \ mutex.h \ pracrodao.h \ pracrodaopgsql.h \ @@ -142,6 +109,7 @@ EXTRA_DIST = \ tcpsocket.h \ utf8.h \ versionstr.h \ + widgetvalue.h \ widgetgenerator.h \ xml_encode_decode.h @@ -149,8 +117,7 @@ EXTRA_DIST = \ # Test Section # ################ -TEST_SOURCE_DEPS = ${pracrod_SOURCES} ${macrotool_SOURCES} \ - ${EXTRA_DIST} +TEST_SOURCE_DEPS = ${pracrod_SOURCES} ${EXTRA_DIST} TEST_SCRIPT_DIR = $(top_srcdir)/../tools include ${TEST_SCRIPT_DIR}/Makefile.am.test diff --git a/server/src/macrotool/Makefile.am b/server/src/macrotool/Makefile.am new file mode 100644 index 0000000..e6fdc94 --- /dev/null +++ b/server/src/macrotool/Makefile.am @@ -0,0 +1,50 @@ + +bin_PROGRAMS = macrotool + +macrotool_LDADD = $(LD_EFENCE) $(PQXX_LIBS) $(CONFIG_LIBS) \ + $(LUA_LIBS) $(PTHREAD_LIBS) $(EXPAT_LIBS) + +macrotool_CXXFLAGS = -I.. $(PQXX_CXXFLAGS) $(CONFIG_CXXFLAGS) \ + $(LUA_CXXFLAGS) $(PTHREAD_CFLAGS) $(EXPAT_CFLAGS) + +macrotool_SOURCES = \ + macrotool.cc \ + macrotool_dump.cc \ + macrotool_fieldnames.cc \ + macrotool_filehandler.cc \ + macrotool_util.cc \ + ../debug.cc \ + ../configuration.cc \ + ../configurationparser.cc \ + ../database.cc \ + ../entitylist.cc \ + ../exception.cc \ + ../inotify.cc \ + ../log.cc \ + ../macroheaderparser.cc \ + ../macrolist.cc \ + ../macroparser.cc \ + ../mutex.cc \ + ../pracrodao.cc \ + ../pracrodaopgsql.cc \ + ../pracrodaotest.cc \ + ../saxparser.cc \ + ../templateparser.cc \ + ../versionstr.cc + +EXTRA_DIST = \ + macrotool_dump.h \ + macrotool_fieldnames.h \ + macrotool_filehandler.h \ + macrotool_util.h + +################ +# Test Section # +################ + +#TEST_SOURCE_DEPS = ${macrotool_SOURCES} ${EXTRA_DIST} +#TEST_SCRIPT_DIR = $(top_srcdir)/../../tools + +#include ${TEST_SCRIPT_DIR}/Makefile.am.test + +#include Makefile.am.test
\ No newline at end of file diff --git a/server/src/macrotool.cc b/server/src/macrotool/macrotool.cc index 40ca845..40ca845 100644 --- a/server/src/macrotool.cc +++ b/server/src/macrotool/macrotool.cc diff --git a/server/src/macrotool_dump.cc b/server/src/macrotool/macrotool_dump.cc index f3f7e42..7e7d06f 100644 --- a/server/src/macrotool_dump.cc +++ b/server/src/macrotool/macrotool_dump.cc @@ -27,6 +27,14 @@ */ #include "macrotool_dump.h" +#include <vector> +#include <map> +#include <set> + +#include <config.h> + +#include <stdio.h> + #include "macrotool_util.h" #include "debug.h" @@ -34,12 +42,6 @@ #include "macroparser.h" #include "templateparser.h" -#include <vector> -#include <map> -#include <set> - -#include <config.h> - #include "configuration.h" #include "exception.h" diff --git a/server/src/macrotool_dump.h b/server/src/macrotool/macrotool_dump.h index 1f2101d..1f2101d 100644 --- a/server/src/macrotool_dump.h +++ b/server/src/macrotool/macrotool_dump.h diff --git a/server/src/macrotool_fieldnames.cc b/server/src/macrotool/macrotool_fieldnames.cc index 3a6e651..2a9681a 100644 --- a/server/src/macrotool_fieldnames.cc +++ b/server/src/macrotool/macrotool_fieldnames.cc @@ -28,6 +28,7 @@ #include "macrotool_fieldnames.h" #include <string.h> +#include <stdio.h> #include "macrotool_util.h" #include "macroparser.h" diff --git a/server/src/macrotool_fieldnames.h b/server/src/macrotool/macrotool_fieldnames.h index 0ac2759..0ac2759 100644 --- a/server/src/macrotool_fieldnames.h +++ b/server/src/macrotool/macrotool_fieldnames.h diff --git a/server/src/macrotool_filehandler.cc b/server/src/macrotool/macrotool_filehandler.cc index c52921a..c52921a 100644 --- a/server/src/macrotool_filehandler.cc +++ b/server/src/macrotool/macrotool_filehandler.cc diff --git a/server/src/macrotool_filehandler.h b/server/src/macrotool/macrotool_filehandler.h index 70777fc..70777fc 100644 --- a/server/src/macrotool_filehandler.h +++ b/server/src/macrotool/macrotool_filehandler.h diff --git a/server/src/macrotool_util.cc b/server/src/macrotool/macrotool_util.cc index 003e929..3c18ab7 100644 --- a/server/src/macrotool_util.cc +++ b/server/src/macrotool/macrotool_util.cc @@ -27,11 +27,11 @@ */ #include "macrotool_util.h" -#include "debug.h" - +#include <stdio.h> #include <sys/types.h> #include <dirent.h> +#include "debug.h" #include "configuration.h" static std::vector<std::string> listdir(std::string path) diff --git a/server/src/macrotool_util.h b/server/src/macrotool/macrotool_util.h index 2e41f6b..2e41f6b 100644 --- a/server/src/macrotool_util.h +++ b/server/src/macrotool/macrotool_util.h |