From 81c6a66fe6c54e8756e6741ec570bb6fbdafd6dc Mon Sep 17 00:00:00 2001 From: erickson Date: Thu, 21 Jun 2007 16:19:20 +0000 Subject: [PATCH] Merged libopensrf source directories (libtransport, libstack, and utils) into a single libopensrf directory Moved opensrf headers to trunk/include/opensrf Moved objson headers to trunk/include/objson Updated #include's throughout to be fully qualified. e.g. , Removed old, unused trunk/src/xinclude code Cleaned up Makefiles to support new directory layout git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@957 9efc2488-bf62-4759-914b-345cdb29e865 --- Makefile | 14 +- {src => include}/objson/json2xml.h | 7 +- {src => include}/objson/json_parser.h | 5 +- {src => include}/objson/object.h | 3 +- {src => include}/objson/xml2json.h | 9 +- {src/utils => include/opensrf}/log.h | 3 +- {src/utils => include/opensrf}/md5.h | 0 .../libstack => include/opensrf}/osrfConfig.h | 8 +- .../opensrf}/osrf_app_session.h | 21 +- .../opensrf}/osrf_application.h | 11 +- .../opensrf}/osrf_big_hash.h | 4 +- .../opensrf}/osrf_big_list.h | 2 +- .../libstack => include/opensrf}/osrf_cache.h | 8 +- {src/libstack => include/opensrf}/osrf_hash.h | 6 +- {src/libstack => include/opensrf}/osrf_list.h | 2 +- .../opensrf}/osrf_message.h | 10 +- .../opensrf}/osrf_prefork.h | 12 +- .../opensrf}/osrf_settings.h | 10 +- .../libstack => include/opensrf}/osrf_stack.h | 6 +- .../opensrf}/osrf_system.h | 12 +- .../opensrf}/osrf_transgroup.h | 12 +- {src/utils => include/opensrf}/sha.h | 0 .../utils => include/opensrf}/socket_bundle.h | 5 +- {src/utils => include/opensrf}/string_array.h | 4 +- .../opensrf}/transport_client.h | 6 +- .../opensrf}/transport_message.h | 6 +- .../opensrf}/transport_session.h | 8 +- {src/utils => include/opensrf}/utils.h | 0 {src/utils => include/opensrf}/xml_utils.h | 2 +- src/Makefile | 130 +++------- .../basic_client.c | 2 +- src/{libtransport => libopensrf}/component.c | 2 +- src/{utils => libopensrf}/log.c | 2 +- src/{utils => libopensrf}/md5.c | 3 +- src/{libstack => libopensrf}/opensrf.c | 6 +- src/{libstack => libopensrf}/osrfConfig.c | 2 +- .../osrf_app_session.c | 2 +- .../osrf_application.c | 4 +- src/{libstack => libopensrf}/osrf_big_hash.c | 2 +- src/{libstack => libopensrf}/osrf_big_list.c | 2 +- src/{libstack => libopensrf}/osrf_cache.c | 2 +- src/{libstack => libopensrf}/osrf_hash.c | 2 +- src/{libstack => libopensrf}/osrf_list.c | 2 +- src/{libstack => libopensrf}/osrf_message.c | 2 +- src/{libstack => libopensrf}/osrf_prefork.c | 6 +- src/{libstack => libopensrf}/osrf_settings.c | 2 +- src/{libstack => libopensrf}/osrf_stack.c | 4 +- src/{libstack => libopensrf}/osrf_system.c | 6 +- .../osrf_transgroup.c | 2 +- src/{utils => libopensrf}/sha.c | 0 src/{utils => libopensrf}/socket_bundle.c | 2 +- src/{utils => libopensrf}/socket_test.c | 2 +- src/{utils => libopensrf}/string_array.c | 2 +- .../transport_client.c | 2 +- .../transport_message.c | 2 +- .../transport_session.c | 2 +- src/{utils => libopensrf}/utils.c | 2 +- src/{utils => libopensrf}/xml_utils.c | 2 +- src/libstack/Makefile | 63 ----- src/libtransport/Makefile | 18 -- src/objson/Makefile | 47 ++-- src/objson/json2xml.c | 2 +- src/objson/json_parser.c | 2 +- src/objson/object.c | 4 +- src/objson/objson_test.c | 4 +- src/objson/xml2json.c | 2 +- src/srfsh/srfsh.h | 10 +- src/utils/Makefile | 21 -- src/utils/fieldmapper-c.pl | 229 ------------------ src/xinclude/Makefile | 22 -- src/xinclude/mod_xinclude.c | 76 ------ 71 files changed, 191 insertions(+), 706 deletions(-) rename {src => include}/objson/json2xml.h (60%) rename {src => include}/objson/json_parser.h (97%) rename {src => include}/objson/object.h (99%) rename {src => include}/objson/xml2json.h (66%) rename {src/utils => include/opensrf}/log.h (98%) rename {src/utils => include/opensrf}/md5.h (100%) rename {src/libstack => include/opensrf}/osrfConfig.h (96%) rename {src/libstack => include/opensrf}/osrf_app_session.h (96%) rename {src/libstack => include/opensrf}/osrf_application.h (98%) rename {src/libstack => include/opensrf}/osrf_big_hash.h (97%) rename {src/libstack => include/opensrf}/osrf_big_list.h (99%) rename {src/libstack => include/opensrf}/osrf_cache.h (95%) rename {src/libstack => include/opensrf}/osrf_hash.h (96%) rename {src/libstack => include/opensrf}/osrf_list.h (99%) rename {src/libstack => include/opensrf}/osrf_message.h (95%) rename {src/libstack => include/opensrf}/osrf_prefork.h (92%) rename {src/libstack => include/opensrf}/osrf_settings.h (78%) rename {src/libstack => include/opensrf}/osrf_stack.h (84%) rename {src/libstack => include/opensrf}/osrf_system.h (90%) rename {src/libstack => include/opensrf}/osrf_transgroup.h (95%) rename {src/utils => include/opensrf}/sha.h (100%) rename {src/utils => include/opensrf}/socket_bundle.h (98%) rename {src/utils => include/opensrf}/string_array.h (95%) rename {src/libtransport => include/opensrf}/transport_client.h (97%) rename {src/libtransport => include/opensrf}/transport_message.h (97%) rename {src/libtransport => include/opensrf}/transport_session.h (98%) rename {src/utils => include/opensrf}/utils.h (100%) rename {src/utils => include/opensrf}/xml_utils.h (96%) rename src/{libtransport => libopensrf}/basic_client.c (98%) rename src/{libtransport => libopensrf}/component.c (97%) rename src/{utils => libopensrf}/log.c (99%) rename src/{utils => libopensrf}/md5.c (99%) rename src/{libstack => libopensrf}/opensrf.c (89%) rename src/{libstack => libopensrf}/osrfConfig.c (98%) rename src/{libstack => libopensrf}/osrf_app_session.c (99%) rename src/{libstack => libopensrf}/osrf_application.c (99%) rename src/{libstack => libopensrf}/osrf_big_hash.c (98%) rename src/{libstack => libopensrf}/osrf_big_list.c (98%) rename src/{libstack => libopensrf}/osrf_cache.c (98%) rename src/{libstack => libopensrf}/osrf_hash.c (99%) rename src/{libstack => libopensrf}/osrf_list.c (99%) rename src/{libstack => libopensrf}/osrf_message.c (99%) rename src/{libstack => libopensrf}/osrf_prefork.c (99%) rename src/{libstack => libopensrf}/osrf_settings.c (98%) rename src/{libstack => libopensrf}/osrf_stack.c (99%) rename src/{libstack => libopensrf}/osrf_system.c (98%) rename src/{libstack => libopensrf}/osrf_transgroup.c (99%) rename src/{utils => libopensrf}/sha.c (100%) rename src/{utils => libopensrf}/socket_bundle.c (99%) rename src/{utils => libopensrf}/socket_test.c (94%) rename src/{utils => libopensrf}/string_array.c (98%) rename src/{libtransport => libopensrf}/transport_client.c (99%) rename src/{libtransport => libopensrf}/transport_message.c (99%) rename src/{libtransport => libopensrf}/transport_session.c (99%) rename src/{utils => libopensrf}/utils.c (99%) rename src/{utils => libopensrf}/xml_utils.c (98%) delete mode 100644 src/libstack/Makefile delete mode 100644 src/libtransport/Makefile delete mode 100644 src/utils/Makefile delete mode 100755 src/utils/fieldmapper-c.pl delete mode 100644 src/xinclude/Makefile delete mode 100644 src/xinclude/mod_xinclude.c diff --git a/Makefile b/Makefile index a23c57c..8441861 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,18 @@ all: - @source install.conf && make -s -C src all + @echo -e "\n * Run 'make verbose' to see full make output\n" + source install.conf && make -s -C src all + +verbose: + source install.conf && make -C src all jserver: - @source install.conf && make -s -C src jserver + source install.conf && make -s -C src jserver install: - @source install.conf && make -s -C src install + source install.conf && make -s -C src install jserver-install: - @source install.conf && make -s -C src jserver-install + source install.conf && make -s -C src jserver-install clean: - @make -s -C src clean + make -s -C src clean diff --git a/src/objson/json2xml.h b/include/objson/json2xml.h similarity index 60% rename from src/objson/json2xml.h rename to include/objson/json2xml.h index e4d2b44..9eaa1c0 100644 --- a/src/objson/json2xml.h +++ b/include/objson/json2xml.h @@ -3,10 +3,9 @@ #include /* the JSON parser, so we can read the response we're XMLizing */ -#include "object.h" -#include "json_parser.h" -//#include "opensrf/utils.h" -#include "utils.h" +#include +#include +#include char* jsonObjectToXML(jsonObject*); diff --git a/src/objson/json_parser.h b/include/objson/json_parser.h similarity index 97% rename from src/objson/json_parser.h rename to include/objson/json_parser.h index bba852f..ede5d91 100644 --- a/src/objson/json_parser.h +++ b/include/objson/json_parser.h @@ -23,9 +23,8 @@ GNU General Public License for more details. #define JSON_PARSER_H #include -#include "object.h" -//#include "opensrf/utils.h" -#include "utils.h" +#include +#include diff --git a/src/objson/object.h b/include/objson/object.h similarity index 99% rename from src/objson/object.h rename to include/objson/object.h index 8764e89..8d62c1a 100644 --- a/src/objson/object.h +++ b/include/objson/object.h @@ -26,8 +26,7 @@ GNU General Public License for more details. #include #include -//#include "opensrf/utils.h" -#include "utils.h" +#include /* json object types */ #define JSON_HASH 0 diff --git a/src/objson/xml2json.h b/include/objson/xml2json.h similarity index 66% rename from src/objson/xml2json.h rename to include/objson/xml2json.h index 35ed4ac..a9ded67 100644 --- a/src/objson/xml2json.h +++ b/include/objson/xml2json.h @@ -7,11 +7,10 @@ #include #include -#include "object.h" -#include "json_parser.h" -#include "utils.h" -#include "osrf_list.h" - +#include +#include +#include +#include jsonObject* jsonXMLToJSONObject(const char* xml); diff --git a/src/utils/log.h b/include/opensrf/log.h similarity index 98% rename from src/utils/log.h rename to include/opensrf/log.h index 1928d41..4aafad3 100644 --- a/src/utils/log.h +++ b/include/opensrf/log.h @@ -1,6 +1,7 @@ +#include + #include #include -#include "utils.h" #include #include diff --git a/src/utils/md5.h b/include/opensrf/md5.h similarity index 100% rename from src/utils/md5.h rename to include/opensrf/md5.h diff --git a/src/libstack/osrfConfig.h b/include/opensrf/osrfConfig.h similarity index 96% rename from src/libstack/osrfConfig.h rename to include/opensrf/osrfConfig.h index c0a6459..75dbcfd 100644 --- a/src/libstack/osrfConfig.h +++ b/include/opensrf/osrfConfig.h @@ -16,10 +16,10 @@ GNU General Public License for more details. #ifndef _OSRF_CONFIG_H #define _OSRF_CONFIG_H -#include "xml_utils.h" -#include "opensrf/utils.h" -#include "opensrf/string_array.h" -#include "objson/object.h" +#include +#include +#include +#include typedef struct { jsonObject* config; diff --git a/src/libstack/osrf_app_session.h b/include/opensrf/osrf_app_session.h similarity index 96% rename from src/libstack/osrf_app_session.h rename to include/opensrf/osrf_app_session.h index af35af5..aae373c 100644 --- a/src/libstack/osrf_app_session.h +++ b/include/opensrf/osrf_app_session.h @@ -1,17 +1,16 @@ #ifndef _OSRF_APP_SESSION #define _OSRF_APP_SESSION -#include "opensrf/transport_client.h" -#include "objson/object.h" -#include "osrf_message.h" -#include "osrf_system.h" -#include "opensrf/string_array.h" -#include "osrfConfig.h" -#include "osrf_hash.h" -#include "osrf_list.h" - -#include "objson/object.h" -#include "objson/json_parser.h" +#include +#include +#include +#include +#include +#include +#include + +#include +#include diff --git a/src/libstack/osrf_application.h b/include/opensrf/osrf_application.h similarity index 98% rename from src/libstack/osrf_application.h rename to include/opensrf/osrf_application.h index 0980a81..ac548a2 100644 --- a/src/libstack/osrf_application.h +++ b/include/opensrf/osrf_application.h @@ -1,10 +1,11 @@ +#include +#include +#include +#include + +#include #include #include -#include "opensrf/utils.h" -#include "opensrf/log.h" -#include "objson/object.h" -#include "osrf_app_session.h" -#include "osrf_hash.h" /** diff --git a/src/libstack/osrf_big_hash.h b/include/opensrf/osrf_big_hash.h similarity index 97% rename from src/libstack/osrf_big_hash.h rename to include/opensrf/osrf_big_hash.h index 22e0a46..a738755 100644 --- a/src/libstack/osrf_big_hash.h +++ b/include/opensrf/osrf_big_hash.h @@ -2,8 +2,8 @@ #define OSRF_HASH_H #include -#include "opensrf/utils.h" -#include "opensrf/string_array.h" +#include +#include #define OSRF_HASH_MAXKEY 256 diff --git a/src/libstack/osrf_big_list.h b/include/opensrf/osrf_big_list.h similarity index 99% rename from src/libstack/osrf_big_list.h rename to include/opensrf/osrf_big_list.h index 523f28d..ebe3da7 100644 --- a/src/libstack/osrf_big_list.h +++ b/include/opensrf/osrf_big_list.h @@ -3,7 +3,7 @@ #include -#include "opensrf/utils.h" +#include #include /** diff --git a/src/libstack/osrf_cache.h b/include/opensrf/osrf_cache.h similarity index 95% rename from src/libstack/osrf_cache.h rename to include/opensrf/osrf_cache.h index 317cdd0..5a755ff 100644 --- a/src/libstack/osrf_cache.h +++ b/include/opensrf/osrf_cache.h @@ -14,10 +14,10 @@ GNU General Public License for more details. */ -#include "objson/object.h" -#include "objson/json_parser.h" -#include "memcache.h" -#include "log.h" +#include +#include +#include +#include /** osrfCache is a globally shared cache API diff --git a/src/libstack/osrf_hash.h b/include/opensrf/osrf_hash.h similarity index 96% rename from src/libstack/osrf_hash.h rename to include/opensrf/osrf_hash.h index 02e62c2..132e43e 100644 --- a/src/libstack/osrf_hash.h +++ b/include/opensrf/osrf_hash.h @@ -1,9 +1,9 @@ #ifndef OSRF_HASH_H #define OSRF_HASH_H -#include "opensrf/utils.h" -#include "opensrf/string_array.h" -#include "osrf_list.h" +#include +#include +#include /* 0x100 is a good size for small hashes */ //#define OSRF_HASH_LIST_SIZE 0x100 /* size of the main hash list */ diff --git a/src/libstack/osrf_list.h b/include/opensrf/osrf_list.h similarity index 99% rename from src/libstack/osrf_list.h rename to include/opensrf/osrf_list.h index d829ab7..f59669a 100644 --- a/src/libstack/osrf_list.h +++ b/include/opensrf/osrf_list.h @@ -1,7 +1,7 @@ #ifndef OSRF_LIST_H #define OSRF_LIST_H -#include "opensrf/utils.h" +#include #define OSRF_LIST_DEFAULT_SIZE 48 /* most opensrf lists are small... */ #define OSRF_LIST_INC_SIZE 256 diff --git a/src/libstack/osrf_message.h b/include/opensrf/osrf_message.h similarity index 95% rename from src/libstack/osrf_message.h rename to include/opensrf/osrf_message.h index b87a97e..12e14c6 100644 --- a/src/libstack/osrf_message.h +++ b/include/opensrf/osrf_message.h @@ -1,8 +1,8 @@ -#include "opensrf/string_array.h" -#include "opensrf/utils.h" -#include "opensrf/log.h" -#include "objson/object.h" -#include "objson/json_parser.h" +#include +#include +#include +#include +#include /* libxml stuff for the config reader */ diff --git a/src/libstack/osrf_prefork.h b/include/opensrf/osrf_prefork.h similarity index 92% rename from src/libstack/osrf_prefork.h rename to include/opensrf/osrf_prefork.h index 9515445..543343c 100644 --- a/src/libstack/osrf_prefork.h +++ b/include/opensrf/osrf_prefork.h @@ -7,12 +7,12 @@ #include #include -#include "opensrf/utils.h" -#include "opensrf/transport_message.h" -#include "opensrf/transport_client.h" -#include "osrf_stack.h" -#include "osrf_settings.h" -#include "osrfConfig.h" +#include +#include +#include +#include +#include +#include //#define READ_BUFSIZE 4096 #define READ_BUFSIZE 1024 diff --git a/src/libstack/osrf_settings.h b/include/opensrf/osrf_settings.h similarity index 78% rename from src/libstack/osrf_settings.h rename to include/opensrf/osrf_settings.h index fecfc32..9aa0d47 100644 --- a/src/libstack/osrf_settings.h +++ b/include/opensrf/osrf_settings.h @@ -8,12 +8,12 @@ #include #include -#include "opensrf/log.h" -#include "opensrf/utils.h" -#include "objson/object.h" -#include "objson/json_parser.h" -#include "osrf_app_session.h" +#include +#include +#include +#include +#include typedef struct { char* hostname; diff --git a/src/libstack/osrf_stack.h b/include/opensrf/osrf_stack.h similarity index 84% rename from src/libstack/osrf_stack.h rename to include/opensrf/osrf_stack.h index 0ef6d00..da2db3d 100644 --- a/src/libstack/osrf_stack.h +++ b/include/opensrf/osrf_stack.h @@ -1,6 +1,6 @@ -#include "opensrf/transport_client.h" -#include "osrf_message.h" -#include "osrf_app_session.h" +#include +#include +#include #ifndef OSRF_STACK_H #define OSRF_STACK_H diff --git a/src/libstack/osrf_system.h b/include/opensrf/osrf_system.h similarity index 90% rename from src/libstack/osrf_system.h rename to include/opensrf/osrf_system.h index 3a87008..540e8d1 100644 --- a/src/libstack/osrf_system.h +++ b/include/opensrf/osrf_system.h @@ -1,12 +1,12 @@ #ifndef OSRF_SYSTEM_H #define OSRF_SYSTEM_H -#include "opensrf/transport_client.h" -#include "opensrf/utils.h" -#include "opensrf/log.h" -#include "osrf_settings.h" -#include "osrfConfig.h" -#include "osrf_cache.h" +#include +#include +#include +#include +#include +#include diff --git a/src/libstack/osrf_transgroup.h b/include/opensrf/osrf_transgroup.h similarity index 95% rename from src/libstack/osrf_transgroup.h rename to include/opensrf/osrf_transgroup.h index 57ee1be..9788d93 100644 --- a/src/libstack/osrf_transgroup.h +++ b/include/opensrf/osrf_transgroup.h @@ -1,9 +1,9 @@ -#include "opensrf/transport_client.h" -#include "opensrf/transport_message.h" -#include "osrf_list.h" -#include "osrf_hash.h" -#include "osrfConfig.h" -#include "opensrf/utils.h" +#include +#include +#include +#include +#include +#include #include /** diff --git a/src/utils/sha.h b/include/opensrf/sha.h similarity index 100% rename from src/utils/sha.h rename to include/opensrf/sha.h diff --git a/src/utils/socket_bundle.h b/include/opensrf/socket_bundle.h similarity index 98% rename from src/utils/socket_bundle.h rename to include/opensrf/socket_bundle.h index 28a5405..f290cdc 100644 --- a/src/utils/socket_bundle.h +++ b/include/opensrf/socket_bundle.h @@ -1,12 +1,11 @@ -#include "utils.h" +#include +#include #include #include #include #include -#include "utils.h" -#include "log.h" //--------------------------------------------------------------- // Unix headers diff --git a/src/utils/string_array.h b/include/opensrf/string_array.h similarity index 95% rename from src/utils/string_array.h rename to include/opensrf/string_array.h index c235b93..77b3de0 100644 --- a/src/utils/string_array.h +++ b/include/opensrf/string_array.h @@ -1,7 +1,7 @@ #include -#include "utils.h" -#include "log.h" +#include +#include #define STRING_ARRAY_MAX_SIZE 1024 diff --git a/src/libtransport/transport_client.h b/include/opensrf/transport_client.h similarity index 97% rename from src/libtransport/transport_client.h rename to include/opensrf/transport_client.h index 50a2c66..e61f840 100644 --- a/src/libtransport/transport_client.h +++ b/include/opensrf/transport_client.h @@ -1,6 +1,6 @@ -#include "transport_session.h" -#include "opensrf/utils.h" -#include "opensrf/log.h" +#include +#include +#include #include diff --git a/src/libtransport/transport_message.h b/include/opensrf/transport_message.h similarity index 97% rename from src/libtransport/transport_message.h rename to include/opensrf/transport_message.h index 4e94e24..ddd8f39 100644 --- a/src/libtransport/transport_message.h +++ b/include/opensrf/transport_message.h @@ -6,9 +6,9 @@ #include #include -#include "opensrf/utils.h" -#include "opensrf/xml_utils.h" -#include "opensrf/log.h" +#include +#include +#include #ifndef TRANSPORT_MESSAGE_H #define TRANSPORT_MESSAGE_H diff --git a/src/libtransport/transport_session.h b/include/opensrf/transport_session.h similarity index 98% rename from src/libtransport/transport_session.h rename to include/opensrf/transport_session.h index 78d108b..5aa8597 100644 --- a/src/libtransport/transport_session.h +++ b/include/opensrf/transport_session.h @@ -3,11 +3,11 @@ // a SAX push parser as it arrives. When key Jabber documetn elements are met, // logic ensues. // --------------------------------------------------------------------------------- -#include "transport_message.h" +#include -#include "opensrf/utils.h" -#include "opensrf/log.h" -#include "opensrf/socket_bundle.h" +#include +#include +#include #include "sha.h" diff --git a/src/utils/utils.h b/include/opensrf/utils.h similarity index 100% rename from src/utils/utils.h rename to include/opensrf/utils.h diff --git a/src/utils/xml_utils.h b/include/opensrf/xml_utils.h similarity index 96% rename from src/utils/xml_utils.h rename to include/opensrf/xml_utils.h index a329061..2b3a030 100644 --- a/src/utils/xml_utils.h +++ b/include/opensrf/xml_utils.h @@ -1,7 +1,7 @@ #ifndef _XML_UTILS_H #define _XML_UTILS_H -#include "objson/object.h" +#include #include #include diff --git a/src/Makefile b/src/Makefile index 4ff75c2..0cf5657 100644 --- a/src/Makefile +++ b/src/Makefile @@ -9,62 +9,12 @@ export PERLDIR = $(LIBDIR)/perl5 export INCLUDEDIR = $(PREFIX)/include export LDLIBS += -export LDFLAGS += -Wl,-rpath=$(LIBDIR) -L $(TMPDIR) -L . -L /opt/lib -export CFLAGS += -pipe -g -Wall -O2 -fPIC -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) \ - -I$(LIBXML2_HEADERS)/libxml -I$(TMP) \ - -I$(APR_HEADERS) -I$(TMPDIR) - -LIBOPENSRF = libopensrf.so - -OPENSRF_TARGETS = libtransport/transport_session.o \ - libtransport/transport_client.o \ - libtransport/transport_message.o \ - libstack/osrf_app_session.o \ - libstack/osrf_stack.o \ - libstack/osrfConfig.o \ - libstack/osrf_settings.o \ - libstack/osrf_message.o \ - libstack/osrf_prefork.o \ - libstack/osrf_system.o \ - libstack/osrf_application.o \ - libstack/osrf_cache.o \ - libstack/xml_utils.o \ - libstack/osrf_transgroup.o \ - libstack/osrf_list.o \ - libstack/osrf_hash.o \ - utils/socket_bundle.o \ - utils/string_array.o \ - utils/utils.o \ - utils/log.o \ - utils/md5.o \ - utils/sha.o - -OPENSRF_HEADERS = libtransport/transport_session.h \ - libtransport/transport_client.h \ - libtransport/transport_message.h \ - libstack/osrf_app_session.h \ - libstack/osrf_stack.h \ - libstack/osrfConfig.h \ - libstack/osrf_settings.h \ - libstack/osrf_message.h \ - libstack/osrf_prefork.h \ - libstack/osrf_system.h \ - libstack/osrf_application.h \ - libstack/osrf_cache.h \ - libstack/xml_utils.h \ - libstack/osrf_transgroup.h \ - libstack/osrf_list.h \ - libstack/osrf_hash.h \ - utils/socket_bundle.h \ - utils/string_array.h \ - utils/utils.h \ - utils/log.h \ - utils/md5.h \ - utils/sha.h +export LDFLAGS += -Wl,-rpath=$(LIBDIR) -L $(TMPDIR) -L . +export CFLAGS += -pipe -g -Wall -O2 -fPIC -I ../../include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) \ + -I$(LIBXML2_HEADERS)/libxml -I$(APR_HEADERS) all: prep \ - libopensrf.so \ - libstack/opensrf \ + opensrf \ router \ srfsh \ jserver \ @@ -79,56 +29,35 @@ install: install-prep \ perl-install \ objson-install -prep: - mkdir -p $(TMPDIR) - -libopensrf.so: objson/libobjson.so - @echo utils - make -C utils - @echo transport - make -C libtransport - @echo stack - make -C libstack - @echo $@ - $(CC) -shared -W1 $(LDFLAGS) -lxml2 -lmemcache -lobjson $(OPENSRF_TARGETS) -o $(TMPDIR)/$(LIBOPENSRF) - @echo apps - make -C c-apps +# -------------------------------------------------------------------------------- +# BINARIES and LIBS +# -------------------------------------------------------------------------------- -opensrf-install: objson-install - @echo $@ - cp $(TMPDIR)/$(LIBOPENSRF) $(LIBDIR)/$(LIBOPENSRF) - cp $(OPENSRF_HEADERS) $(INCLUDEDIR)/opensrf/ - cp libstack/opensrf $(BINDIR)/opensrf-c - make -C c-apps install - +prep: + mkdir -p $(TMPDIR) objson/libobjson.so: prep @echo $@ make -C objson -# -------------------------------------------------------------------------------- -# BINARIES -# -------------------------------------------------------------------------------- -libstack/opensrf.o: libstack/opensrf.c libopensrf.so -libstack/opensrf: libstack/opensrf.o - @echo $@ - $(CC) $(CFLAGS) $(LDFLAGS) -lxml2 -lopensrf -lobjson libstack/opensrf.o -o $@ - +opensrf: objson/libobjson.so + make -C libopensrf + make -C c-apps -router: libopensrf.so +router: opensrf @echo $@ make -C router -srfsh: libopensrf.so +srfsh: opensrf @echo $@ make -C srfsh -gateway: libopensrf.so +gateway: opensrf @echo $@ make -C gateway -jserver: libopensrf.so +jserver: opensrf @echo $@ make -C jserver @@ -136,22 +65,32 @@ jserver: libopensrf.so # -------------------------------------------------------------------------------- # INSTALL # -------------------------------------------------------------------------------- + +# make sure the install directories exist install-prep: @echo $@ mkdir -p $(LIBDIR) mkdir -p $(BINDIR) mkdir -p $(PERLDIR) mkdir -p $(INCLUDEDIR) - mkdir -p $(INCLUDEDIR)/$(OPENSRF) mkdir -p $(ETCDIR) objson-install: install-prep @echo $@ make -C objson install -libopensrf-install: install-prep +# installs libopensrf.so, opensrf-c, headers, example configs, and osrf_ctl.sh +opensrf-install: objson-install @echo $@ - cp $(TMPDIR)/$(LIBOPENSRF) $(LIBDIR) + cp $(TMPDIR)/libopensrf.so $(LIBDIR)/libopensrf.so + cp -r ../include/opensrf $(INCLUDEDIR) + cp libopensrf/opensrf $(BINDIR)/opensrf-c + make -C c-apps install + cp ../examples/bootstrap.conf.example $(ETCDIR) + cp ../bin/osrf_ctl.sh $(BINDIR) + cp ../examples/opensrf.xml.example $(ETCDIR) + cp ../examples/opensrf_core.xml.example $(ETCDIR) + cp ../examples/srfsh.xml.example $(ETCDIR) gateway-install: install-prep opensrf-install @echo $@ @@ -172,28 +111,19 @@ jserver-install: install-prep perl-install: install-prep @echo $@ cp -r perlmods/* $(PERLDIR)/ - cp ../examples/bootstrap.conf.example $(ETCDIR) - cp ../bin/osrf_ctl.sh $(BINDIR) - cp ../examples/opensrf.xml.example $(ETCDIR) - cp ../examples/opensrf_core.xml.example $(ETCDIR) - cp ../examples/srfsh.xml.example $(ETCDIR) # -------------------------------------------------------------------------------- # CLEAN # -------------------------------------------------------------------------------- clean: - @echo $@ - make -C libtransport clean - make -C libstack clean + make -C libopensrf clean make -C router clean make -C gateway clean make -C jserver clean - make -C utils clean make -C objson clean make -C srfsh clean make -C c-apps clean - echo "Removing directory [$(TMPDIR)]" /bin/rm -rf $(TMPDIR) *.o diff --git a/src/libtransport/basic_client.c b/src/libopensrf/basic_client.c similarity index 98% rename from src/libtransport/basic_client.c rename to src/libopensrf/basic_client.c index d7fa9a1..5cf8f76 100644 --- a/src/libtransport/basic_client.c +++ b/src/libopensrf/basic_client.c @@ -1,4 +1,4 @@ -#include "transport_client.h" +#include #include "signal.h" pid_t pid; diff --git a/src/libtransport/component.c b/src/libopensrf/component.c similarity index 97% rename from src/libtransport/component.c rename to src/libopensrf/component.c index 1f909d2..c63dd44 100644 --- a/src/libtransport/component.c +++ b/src/libopensrf/component.c @@ -1,4 +1,4 @@ -#include "transport_client.h" +#include #include "signal.h" diff --git a/src/utils/log.c b/src/libopensrf/log.c similarity index 99% rename from src/utils/log.c rename to src/libopensrf/log.c index 624cd10..35d2756 100644 --- a/src/utils/log.c +++ b/src/libopensrf/log.c @@ -1,4 +1,4 @@ -#include "log.h" +#include static int _osrfLogType = -1; static int _osrfLogFacility = LOG_LOCAL0; diff --git a/src/utils/md5.c b/src/libopensrf/md5.c similarity index 99% rename from src/utils/md5.c rename to src/libopensrf/md5.c index 7da3d60..c8d7688 100644 --- a/src/utils/md5.c +++ b/src/libopensrf/md5.c @@ -129,7 +129,8 @@ const char data[] = " printf (\"\\n\");\n }\n return 0;\n}\n"; -#include "md5.h" +//#include "md5.h" +#include "opensrf/md5.h" /* --- The MD5 routines --- */ diff --git a/src/libstack/opensrf.c b/src/libopensrf/opensrf.c similarity index 89% rename from src/libstack/opensrf.c rename to src/libopensrf/opensrf.c index 9291930..5532f73 100644 --- a/src/libstack/opensrf.c +++ b/src/libopensrf/opensrf.c @@ -1,6 +1,6 @@ -#include "osrf_system.h" -#include "osrf_hash.h" -#include "osrf_list.h" +#include +//#include +//#include int main( int argc, char* argv[] ) { diff --git a/src/libstack/osrfConfig.c b/src/libopensrf/osrfConfig.c similarity index 98% rename from src/libstack/osrfConfig.c rename to src/libopensrf/osrfConfig.c index b02b6fd..7fd9dbd 100644 --- a/src/libstack/osrfConfig.c +++ b/src/libopensrf/osrfConfig.c @@ -1,5 +1,5 @@ /* defines the currently used bootstrap config file */ -#include "osrfConfig.h" +#include static osrfConfig* osrfConfigDefault = NULL; diff --git a/src/libstack/osrf_app_session.c b/src/libopensrf/osrf_app_session.c similarity index 99% rename from src/libstack/osrf_app_session.c rename to src/libopensrf/osrf_app_session.c index 095e50e..d89c445 100644 --- a/src/libstack/osrf_app_session.c +++ b/src/libopensrf/osrf_app_session.c @@ -1,4 +1,4 @@ -#include "osrf_app_session.h" +#include #include /* the global app_session cache */ diff --git a/src/libstack/osrf_application.c b/src/libopensrf/osrf_application.c similarity index 99% rename from src/libstack/osrf_application.c rename to src/libopensrf/osrf_application.c index 1d62642..1f12b86 100644 --- a/src/libstack/osrf_application.c +++ b/src/libopensrf/osrf_application.c @@ -1,5 +1,5 @@ -#include "osrf_application.h" -#include "objson/object.h" +#include +#include //osrfApplication* __osrfAppList = NULL; diff --git a/src/libstack/osrf_big_hash.c b/src/libopensrf/osrf_big_hash.c similarity index 98% rename from src/libstack/osrf_big_hash.c rename to src/libopensrf/osrf_big_hash.c index 41d5131..3e69f2f 100644 --- a/src/libstack/osrf_big_hash.c +++ b/src/libopensrf/osrf_big_hash.c @@ -1,4 +1,4 @@ -#include "osrf_big_hash.h" +#include osrfBigHash* osrfNewBigHash() { osrfBigHash* hash = safe_malloc(sizeof(osrfBigHash)); diff --git a/src/libstack/osrf_big_list.c b/src/libopensrf/osrf_big_list.c similarity index 98% rename from src/libstack/osrf_big_list.c rename to src/libopensrf/osrf_big_list.c index 5d7e3dc..26ff7b6 100644 --- a/src/libstack/osrf_big_list.c +++ b/src/libopensrf/osrf_big_list.c @@ -1,4 +1,4 @@ -#include "osrf_big_list.h" +#include osrfBigList* osrfNewBigList() { diff --git a/src/libstack/osrf_cache.c b/src/libopensrf/osrf_cache.c similarity index 98% rename from src/libstack/osrf_cache.c rename to src/libopensrf/osrf_cache.c index 13cb272..940af11 100644 --- a/src/libstack/osrf_cache.c +++ b/src/libopensrf/osrf_cache.c @@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. */ -#include "osrf_cache.h" +#include struct memcache* __osrfCache = NULL; time_t __osrfCacheMaxSeconds = -1; diff --git a/src/libstack/osrf_hash.c b/src/libopensrf/osrf_hash.c similarity index 99% rename from src/libstack/osrf_hash.c rename to src/libopensrf/osrf_hash.c index 778c282..e00f09c 100644 --- a/src/libstack/osrf_hash.c +++ b/src/libopensrf/osrf_hash.c @@ -1,4 +1,4 @@ -#include "osrf_hash.h" +#include osrfHash* osrfNewHash() { osrfHash* hash; diff --git a/src/libstack/osrf_list.c b/src/libopensrf/osrf_list.c similarity index 99% rename from src/libstack/osrf_list.c rename to src/libopensrf/osrf_list.c index 0e58f0f..2d37b02 100644 --- a/src/libstack/osrf_list.c +++ b/src/libopensrf/osrf_list.c @@ -1,4 +1,4 @@ -#include "osrf_list.h" +#include osrfList* osrfNewList() { osrfList* list; diff --git a/src/libstack/osrf_message.c b/src/libopensrf/osrf_message.c similarity index 99% rename from src/libstack/osrf_message.c rename to src/libopensrf/osrf_message.c index beb52d0..313216a 100644 --- a/src/libstack/osrf_message.c +++ b/src/libopensrf/osrf_message.c @@ -1,4 +1,4 @@ -#include "osrf_message.h" +#include osrf_message* osrf_message_init( enum M_TYPE type, int thread_trace, int protocol ) { diff --git a/src/libstack/osrf_prefork.c b/src/libopensrf/osrf_prefork.c similarity index 99% rename from src/libstack/osrf_prefork.c rename to src/libopensrf/osrf_prefork.c index 1ea5959..01a97cc 100644 --- a/src/libstack/osrf_prefork.c +++ b/src/libopensrf/osrf_prefork.c @@ -1,7 +1,7 @@ -#include "osrf_prefork.h" +#include +#include +#include #include -#include "osrf_app_session.h" -#include "osrf_application.h" /* true if we just deleted a child. This will allow us to make sure we're not trying to use freed memory */ diff --git a/src/libstack/osrf_settings.c b/src/libopensrf/osrf_settings.c similarity index 98% rename from src/libstack/osrf_settings.c rename to src/libopensrf/osrf_settings.c index 26e3b8f..a732b08 100644 --- a/src/libstack/osrf_settings.c +++ b/src/libopensrf/osrf_settings.c @@ -1,4 +1,4 @@ -#include "osrf_settings.h" +#include osrf_host_config* config = NULL; diff --git a/src/libstack/osrf_stack.c b/src/libopensrf/osrf_stack.c similarity index 99% rename from src/libstack/osrf_stack.c rename to src/libopensrf/osrf_stack.c index fe59c92..231ccbc 100644 --- a/src/libstack/osrf_stack.c +++ b/src/libopensrf/osrf_stack.c @@ -1,5 +1,5 @@ -#include "osrf_stack.h" -#include "osrf_application.h" +#include +#include osrf_message* _do_client( osrf_app_session*, osrf_message* ); osrf_message* _do_server( osrf_app_session*, osrf_message* ); diff --git a/src/libstack/osrf_system.c b/src/libopensrf/osrf_system.c similarity index 98% rename from src/libstack/osrf_system.c rename to src/libopensrf/osrf_system.c index dc6b2ba..c378b7b 100644 --- a/src/libstack/osrf_system.c +++ b/src/libopensrf/osrf_system.c @@ -1,7 +1,7 @@ -#include "osrf_system.h" +#include +#include +#include #include -#include "osrf_application.h" -#include "osrf_prefork.h" static int _osrfSystemInitCache( void ); diff --git a/src/libstack/osrf_transgroup.c b/src/libopensrf/osrf_transgroup.c similarity index 99% rename from src/libstack/osrf_transgroup.c rename to src/libopensrf/osrf_transgroup.c index 1d3d3f4..72b203f 100644 --- a/src/libstack/osrf_transgroup.c +++ b/src/libopensrf/osrf_transgroup.c @@ -1,4 +1,4 @@ -#include "osrf_transgroup.h" +#include #include diff --git a/src/utils/sha.c b/src/libopensrf/sha.c similarity index 100% rename from src/utils/sha.c rename to src/libopensrf/sha.c diff --git a/src/utils/socket_bundle.c b/src/libopensrf/socket_bundle.c similarity index 99% rename from src/utils/socket_bundle.c rename to src/libopensrf/socket_bundle.c index 4356ef6..6196410 100644 --- a/src/utils/socket_bundle.c +++ b/src/libopensrf/socket_bundle.c @@ -1,4 +1,4 @@ -#include "socket_bundle.h" +#include /* buffer used to read from the sockets */ #define RBUFSIZE 1024 diff --git a/src/utils/socket_test.c b/src/libopensrf/socket_test.c similarity index 94% rename from src/utils/socket_test.c rename to src/libopensrf/socket_test.c index 4bc7653..c921ac6 100644 --- a/src/utils/socket_test.c +++ b/src/libopensrf/socket_test.c @@ -1,4 +1,4 @@ -#include "socket_bundle.h" +#include int count = 0; void printme(void* blob, socket_manager* mgr, diff --git a/src/utils/string_array.c b/src/libopensrf/string_array.c similarity index 98% rename from src/utils/string_array.c rename to src/libopensrf/string_array.c index ee8c542..3197718 100644 --- a/src/utils/string_array.c +++ b/src/libopensrf/string_array.c @@ -1,4 +1,4 @@ -#include "string_array.h" +#include osrfStringArray* osrfNewStringArray(int size) { return init_string_array(size); diff --git a/src/libtransport/transport_client.c b/src/libopensrf/transport_client.c similarity index 99% rename from src/libtransport/transport_client.c rename to src/libopensrf/transport_client.c index a318127..9a14291 100644 --- a/src/libtransport/transport_client.c +++ b/src/libopensrf/transport_client.c @@ -1,4 +1,4 @@ -#include "transport_client.h" +#include //int main( int argc, char** argv ); diff --git a/src/libtransport/transport_message.c b/src/libopensrf/transport_message.c similarity index 99% rename from src/libtransport/transport_message.c rename to src/libopensrf/transport_message.c index f0e63af..5c6862b 100644 --- a/src/libtransport/transport_message.c +++ b/src/libopensrf/transport_message.c @@ -1,4 +1,4 @@ -#include "transport_message.h" +#include // --------------------------------------------------------------------------------- diff --git a/src/libtransport/transport_session.c b/src/libopensrf/transport_session.c similarity index 99% rename from src/libtransport/transport_session.c rename to src/libopensrf/transport_session.c index c62306c..43483f0 100644 --- a/src/libtransport/transport_session.c +++ b/src/libopensrf/transport_session.c @@ -1,4 +1,4 @@ -#include "transport_session.h" +#include diff --git a/src/utils/utils.c b/src/libopensrf/utils.c similarity index 99% rename from src/utils/utils.c rename to src/libopensrf/utils.c index 47b3d2f..07ed9a2 100644 --- a/src/utils/utils.c +++ b/src/libopensrf/utils.c @@ -12,7 +12,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. */ -#include "utils.h" +#include #include inline void* safe_malloc( int size ) { diff --git a/src/utils/xml_utils.c b/src/libopensrf/xml_utils.c similarity index 98% rename from src/utils/xml_utils.c rename to src/libopensrf/xml_utils.c index cb2164f..e3ef206 100644 --- a/src/utils/xml_utils.c +++ b/src/libopensrf/xml_utils.c @@ -1,4 +1,4 @@ -#include "xml_utils.h" +#include void recurse_doc( xmlNodePtr node ) { diff --git a/src/libstack/Makefile b/src/libstack/Makefile deleted file mode 100644 index 82fae9a..0000000 --- a/src/libstack/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# OSRF_LOG_PARAMS log all incoming method params at OSRF_INFO log level. -# OSRF_STRICT_PARAMS instructs the app handler to return an error if the number of method arguments -# provided to any method is not at least as large as the 'argc' setting for the method - -CFLAGS += -DASSUME_STATELESS -DOSRF_LOG_PARAMS -DOSRF_STRICT_PARAMS -rdynamic -fno-strict-aliasing -LDLIBS += -lxml2 -lobjson -ldl -lmemcache - -TARGETS = osrf_message.o \ - osrf_app_session.o \ - osrf_stack.o \ - osrf_system.o \ - osrf_settings.o \ - osrf_prefork.o \ - osrfConfig.o \ - osrf_application.o \ - osrf_cache.o \ - osrf_transgroup.o \ - osrf_list.o \ - osrf_hash.o \ - xml_utils.o - -HEADERS = osrf_message.h \ - osrf_app_session.h \ - osrf_stack.h \ - osrf_system.h \ - osrf_settings.h \ - osrf_prefork.h \ - osrfConfig.h \ - osrf_application.h \ - osrf_cache.h \ - osrf_transgroup.h \ - osrf_list.h \ - osrf_hash.h \ - xml_utils.h - -all: xml_utils.o $(TARGETS) copy - -xml_utils.o: - cp ../utils/xml_utils.h . - cp ../utils/xml_utils.c . - $(CC) -c $(CFLAGS) xml_utils.c -o $@ - -copy: - cp $(HEADERS) $(TMPDIR)/ - -osrf_message.o: osrf_message.c osrf_message.h -osrf_app_session.o: osrf_app_session.c osrf_app_session.h -osrf_stack.o: osrf_stack.c osrf_stack.h -osrf_system.o: osrf_system.c osrf_system.h -osrf_settings.o: osrf_settings.c osrf_settings.h -osrf_prefork.o: osrf_prefork.c osrf_prefork.h -osrfConfig.o: osrfConfig.c osrfConfig.h xml_utils.o -osrf_application.o: osrf_application.c osrf_application.h -osrf_cache.o: osrf_cache.c osrf_cache.h -osrf_list.o: osrf_list.c osrf_list.h -#osrf_big_list.o: osrf_big_list.c osrf_big_list.h -osrf_hash.o: osrf_hash.c osrf_hash.h -#osrf_big_hash.o: osrf_big_hash.c osrf_big_hash.h - - -clean: - /bin/rm -f *.o libopensrf_stack.so xml_utils.h xml_utils.c opensrf - diff --git a/src/libtransport/Makefile b/src/libtransport/Makefile deleted file mode 100644 index 643e81c..0000000 --- a/src/libtransport/Makefile +++ /dev/null @@ -1,18 +0,0 @@ - -TARGETS = transport_message.o transport_session.o transport_client.o -HEADERS = transport_message.h transport_session.h transport_client.h - -TARGET = libopensrf_transport.so - -all: $(TARGETS) copy - -copy: - cp $(HEADERS) $(TMPDIR) - -transport_session.o: transport_session.c transport_session.h -transport_message.o: transport_message.c transport_message.h -transport_client.o: transport_client.c transport_client.h - - -clean: - /bin/rm -f *.o diff --git a/src/objson/Makefile b/src/objson/Makefile index 5f26dae..a113a92 100644 --- a/src/objson/Makefile +++ b/src/objson/Makefile @@ -26,45 +26,28 @@ # # -------------------------------------------------------------------- -OBJS = md5.o utils.o json2xml.o object.o json_parser.o xml2json.o -UTIL_DIR = ../utils -DEST_INCLUDE = objson -CFLAGS += -DSTRICT_JSON_WRITE #-DSTRICT_JSON_READ +OBJS = utils.o json2xml.o object.o json_parser.o xml2json.o +CFLAGS += -DSTRICT_JSON_WRITE -DOSRF_DISABLE_MD5 +TARGETS = object.o json_parser.o json2xml.o xml2json.o ../libopensrf/utils.o ../libopensrf/md5.o +JSON_INC = ../../include/objson -JSON_HEADERS = object.h json_parser.h json2xml.h xml2json.h -all: test - -test: libobjson.so objson_test.o - -objson_test.o: objson_test.c -object.o: object.h object.c -json_parser.o: json_parser.h json_parser.c -json2xml.o: json2xml.h json2xml.c -xml2json.o: xml2json.h xml2json.c +all: libobjson.so +object.o: object.c $(JSON_INC)/object.h +json_parser.o: json_parser.c $(JSON_INC)/json_parser.h +json2xml.o: json2xml.c $(JSON_INC)/json2xml.h +xml2json.o: xml2json.c $(JSON_INC)/xml2json.h +../libopensrf/utils.o: ../libopensrf/utils.c ../../include/opensrf/utils.h +../libopensrf/md5.o: ../libopensrf/md5.c ../../include/opensrf/md5.h install: - mkdir -p $(INCLUDEDIR)/$(DEST_INCLUDE) - cp $(TMPDIR)/$(DEST_INCLUDE)/*.h $(INCLUDEDIR)/objson/ + cp -r ../../include/objson $(INCLUDEDIR) cp $(TMPDIR)/libobjson.so $(LIBDIR)/libobjson.so -libobjson.so: $(OBJS) - $(CC) -shared -W1 $(OBJS) -o $(TMPDIR)/libobjson.so - $(CC) -shared -W1 $(OBJS) -o libobjson.so - mkdir -p $(TMPDIR)/$(DEST_INCLUDE)/ - cp $(JSON_HEADERS) $(TMPDIR)/$(DEST_INCLUDE)/ - -utils.o: $(UTIL_DIR)/utils.h $(UTIL_DIR)/utils.c - cp $(UTIL_DIR)/utils.h . - cp $(UTIL_DIR)/utils.c . - $(CC) -c $(CFLAGS) utils.c -o $@ - -md5.o: $(UTIL_DIR)/md5.h $(UTIL_DIR)/md5.c - cp $(UTIL_DIR)/md5.h . - cp $(UTIL_DIR)/md5.c . - $(CC) -c $(CFLAGS) md5.c -o $@ +libobjson.so: $(TARGETS) + $(CC) -shared -W1 $(TARGETS) -o $(TMPDIR)/libobjson.so clean: - /bin/rm -f *.o *.so utils.c utils.h libobjson.so + /bin/rm -f *.o *.so diff --git a/src/objson/json2xml.c b/src/objson/json2xml.c index ef4fa19..5abf2ed 100644 --- a/src/objson/json2xml.c +++ b/src/objson/json2xml.c @@ -1,5 +1,5 @@ -#include "json2xml.h" +#include static char* _escape_xml (char*); static int _recurse_jsonObjectToXML(jsonObject*, growing_buffer*); diff --git a/src/objson/json_parser.c b/src/objson/json_parser.c index d75431f..8313872 100644 --- a/src/objson/json_parser.c +++ b/src/objson/json_parser.c @@ -14,7 +14,7 @@ GNU General Public License for more details. */ -#include "json_parser.h" +#include /* keep a copy of the length of the current json string so we don't * have to calculate it in each function diff --git a/src/objson/object.c b/src/objson/object.c index 782379b..3983576 100644 --- a/src/objson/object.c +++ b/src/objson/object.c @@ -13,8 +13,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. */ -#include "object.h" -#include "json_parser.h" +#include +#include /* ---------------------------------------------------------------------- */ diff --git a/src/objson/objson_test.c b/src/objson/objson_test.c index 20cf2ff..5813780 100644 --- a/src/objson/objson_test.c +++ b/src/objson/objson_test.c @@ -14,8 +14,8 @@ GNU General Public License for more details. */ //#include "utils.h" -#include "object.h" -#include "json_parser.h" +#include +#include #include #include diff --git a/src/objson/xml2json.c b/src/objson/xml2json.c index efdcfb0..d3dfaa0 100644 --- a/src/objson/xml2json.c +++ b/src/objson/xml2json.c @@ -1,4 +1,4 @@ -#include "xml2json.h" +#include struct osrfXMLGatewayParserStruct { osrfList* objStack; diff --git a/src/srfsh/srfsh.h b/src/srfsh/srfsh.h index f6fc7ca..6497231 100644 --- a/src/srfsh/srfsh.h +++ b/src/srfsh/srfsh.h @@ -1,13 +1,13 @@ -#include "opensrf/transport_client.h" -#include "opensrf/osrf_message.h" -#include "opensrf/osrf_app_session.h" +#include +#include +#include #include #include #include #include -#include "utils.h" -#include "log.h" +#include +#include #include diff --git a/src/utils/Makefile b/src/utils/Makefile deleted file mode 100644 index 77eae02..0000000 --- a/src/utils/Makefile +++ /dev/null @@ -1,21 +0,0 @@ - -UTIL_HEADERS = md5.h log.h utils.h socket_bundle.h sha.h string_array.h xml_utils.h -UTIL_OBJECTS = md5.o log.o utils.o socket_bundle.o sha.o string_array.o - -all: $(UTIL_OBJECTS) copy - -copy: - cp $(UTIL_HEADERS) $(TMPDIR) - -log.o: log.c log.h -utils.o: utils.c utils.h -socket_bundle.o: socket_bundle.c socket_bundle.h -md5.o: md5.c md5.h -sha.o: sha.c sha.h -string_array.o: string_array.c string_array.h - - -clean: - /bin/rm -f *.o - - diff --git a/src/utils/fieldmapper-c.pl b/src/utils/fieldmapper-c.pl deleted file mode 100755 index 80a59e5..0000000 --- a/src/utils/fieldmapper-c.pl +++ /dev/null @@ -1,229 +0,0 @@ -#!/usr/bin/perl -use strict; use warnings; -use Data::Dumper; -use OpenILS::Utils::Fieldmapper; - - -if(!$ARGV[1]) { - print "usage: $0 \n"; - exit; -} - -warn "Generating fieldmapper-c code...\n"; - -#open(HEADER, ">fieldmapper.h"); -#open(SOURCE, ">fieldmapper.c"); - -print $ARGV[0] . "\n"; -print $ARGV[1] . "\n"; - -open(HEADER, ">$ARGV[0]"); -open(SOURCE, ">$ARGV[1]"); - -my $map = $Fieldmapper::fieldmap; - -print HEADER <classname. */ -fm_obj* fm_factory(object*); - -/* builds a new fieldmapper object by class name */ -fm_obj* fm_factory_string(char*); - -void fm_free(fm_obj* fm); -C - -print SOURCE <array); - free(fm); -} -C - -my $factory_string = <classname) return NULL; - fm_obj* fm = NULL; - -C - -my $fstring_string = <{$object}->{hint}; - my $func_header_string = ""; - my $func_code_string = ""; - my $constructor_string = ""; - - $factory_string .= <classname,"$short_name")) - fm = (fm_obj*) fm_new_$short_name(obj); -CODE - - $fstring_string .= <set_class(obj, "$short_name"); -CODE - - my $header_string = <array) return NULL; - growing_buffer* buf = buffer_init(256); - buffer_fadd(buf, "%s => {\\n", fm->classname); - object* o; -CODE - - $constructor_string .= <array = new_object(NULL); - fm->array->is_array = 1; - fm->array->set_class(fm->array, "$short_name"); - - } else { - - /* we don't want invalid objects */ - if (!obj_array->classname) return NULL; - if(strcmp(obj_array->classname, "$short_name")) return NULL; - - char* s = obj_array->to_json(obj_array); - fm->array = json_parse_string(s); - free(s); - } - - fm->classname = fm->array->classname; - fm->to_string = &fm_${short_name}_to_string; -CODE - - for my $field (keys %{$map->{$object}->{fields}}) { - my $position = $map->{$object}->{fields}->{$field}->{position}; - - $to_string .= <array->get_index(fm->array, $position); - if(o) { - char* str = o->to_json(o); - buffer_fadd(buf, " $field\\t: %s\\n", str); - free(str); - }; -CODE - - $fstring_string .= <is_null = 1; - obj->set_index(obj, $position, tmp); -CODE - - $header_string .= <set_$field = &fm_${short_name}_set_$field; - fm->get_$field = &fm_${short_name}_get_$field; -CODE - - $func_header_string .= <array) return NULL; - return fm->array->get_index(fm->array, $position); - } - - void fm_${short_name}_set_$field(fm_$short_name* fm, object* obj) { - if(!fm || !fm->array || !obj) return; - fm->array->set_index(fm->array, $position, obj); - } -CODE - - } - - $fstring_string .= < -#include - -#define MODULE_NAME "xinclude_module" - -static int mod_xinclude_handler (request_rec *r) { - - /* make sure we're needed first thing*/ - if (strcmp(r->handler, MODULE_NAME )) - return DECLINED; - - /* set content type */ - ap_set_content_type(r, "text/html"); - - - /* which file are we parsing */ - char* file = r->filename; - - if(!file) { - fprintf(stderr, "No XML file to parse"); - fflush(stderr); - return HTTP_INTERNAL_SERVER_ERROR; - } - - /* parse the doc */ - xmlDocPtr doc = xmlParseFile(file); - - if(!doc) { - fprintf(stderr, "Error parsing XML file %s\n", file); - fflush(stderr); - return HTTP_INTERNAL_SERVER_ERROR; - } - - /* process the xincludes */ - int status = xmlXIncludeProcess(doc); - - if(status < 0) { - fprintf(stderr, "Error processing XIncludes in XML file %s\n", file); - fflush(stderr); - return HTTP_INTERNAL_SERVER_ERROR; - } - - xmlBufferPtr xmlbuf = xmlBufferCreate(); - xmlNodeDump( xmlbuf, doc, xmlDocGetRootElement(doc), 0, 0); - char* xml = (char*) (xmlBufferContent(xmlbuf)); - - ap_rputs(xml,r); - - xmlBufferFree(xmlbuf); - xmlFreeDoc(doc); - - return OK; -} - - -static void mod_xinclude_register_hooks (apr_pool_t *p) { - ap_hook_handler(mod_xinclude_handler, NULL, NULL, APR_HOOK_MIDDLE); -} - -module AP_MODULE_DECLARE_DATA xinclude_module = { - STANDARD20_MODULE_STUFF, - NULL, - NULL, - NULL, - NULL, - NULL, - mod_xinclude_register_hooks, -}; - -- 2.43.2