From 2677b18d7a9c832875480ac555733b4f8f377f53 Mon Sep 17 00:00:00 2001 From: helge Date: Tue, 14 Sep 2004 15:20:54 +0000 Subject: [PATCH] moved xmlrpc_call to own top-level directory git-svn-id: http://svn.opengroupware.org/SOPE/trunk@137 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- GNUmakefile | 1 + sope-appserver/NGXmlRpc/ChangeLog | 5 ++ sope-appserver/NGXmlRpc/GNUmakefile | 3 - sope-appserver/NGXmlRpc/GNUmakefile.preamble | 5 -- sope-appserver/NGXmlRpc/NGXmlRpcClient.h | 2 +- sope-appserver/NGXmlRpc/Version | 2 +- sope-appserver/mod_ngobjweb/handler.c | 4 +- xmlrpc_call/GNUmakefile | 13 ++++ xmlrpc_call/GNUmakefile.preamble | 63 +++++++++++++++++++ xmlrpc_call/fhs.make | 26 ++++++++ .../NGXmlRpc => xmlrpc_call}/xmlrpc_call.m | 0 11 files changed, 113 insertions(+), 11 deletions(-) create mode 100644 xmlrpc_call/GNUmakefile create mode 100644 xmlrpc_call/GNUmakefile.preamble create mode 100644 xmlrpc_call/fhs.make rename {sope-appserver/NGXmlRpc => xmlrpc_call}/xmlrpc_call.m (100%) diff --git a/GNUmakefile b/GNUmakefile index 8244c86b..c6ec2f18 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -10,6 +10,7 @@ SUBPROJECTS += \ sope-ldap \ sope-ical \ sope-gdl1 \ + xmlrpc_call \ -include $(GNUSTEP_MAKEFILES)/GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/aggregate.make diff --git a/sope-appserver/NGXmlRpc/ChangeLog b/sope-appserver/NGXmlRpc/ChangeLog index c4bd7a54..e7c38ef7 100644 --- a/sope-appserver/NGXmlRpc/ChangeLog +++ b/sope-appserver/NGXmlRpc/ChangeLog @@ -1,3 +1,8 @@ +2004-09-14 Helge Hess + + * moved xmlrpc_call tool to own top-level SOPE dir (xmlrpc_call) + (v4.3.7) + 2004-09-11 Marcus Mueller * GNUmakefile.preamble: minor changes for inline compilation with diff --git a/sope-appserver/NGXmlRpc/GNUmakefile b/sope-appserver/NGXmlRpc/GNUmakefile index e69294e2..5b4c75a8 100644 --- a/sope-appserver/NGXmlRpc/GNUmakefile +++ b/sope-appserver/NGXmlRpc/GNUmakefile @@ -5,7 +5,6 @@ include ../Version include ./Version LIBRARY_NAME = libNGXmlRpc -TOOL_NAME = xmlrpc_call libNGXmlRpc_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION) libNGXmlRpc_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION) @@ -50,8 +49,6 @@ libNGXmlRpc_OBJC_FILES = \ NGXmlRpcAction+Registry.m \ -xmlrpc_call_OBJC_FILES = xmlrpc_call.m - -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/library.make include $(GNUSTEP_MAKEFILES)/tool.make diff --git a/sope-appserver/NGXmlRpc/GNUmakefile.preamble b/sope-appserver/NGXmlRpc/GNUmakefile.preamble index b7b303b1..da492fd6 100644 --- a/sope-appserver/NGXmlRpc/GNUmakefile.preamble +++ b/sope-appserver/NGXmlRpc/GNUmakefile.preamble @@ -21,11 +21,6 @@ libNGXmlRpc_LIBRARIES_DEPEND_UPON += \ -lNGMime -lNGStreams -lNGExtensions -lEOControl \ -lXmlRpc -lDOM -lSaxObjC -xmlrpc_call_TOOL_LIBS += \ - -lNGXmlRpc -lNGObjWeb \ - -lNGMime -lNGStreams -lNGExtensions -lEOControl \ - -lXmlRpc -lDOM -lSaxObjC - ifneq ($(GNUSTEP_BUILD_DIR),) RELBUILD_DIR_SOPE=$(GNUSTEP_BUILD_DIR)/.. RELBUILD_DIR_MIME=$(GNUSTEP_BUILD_DIR)/../../sope-mime diff --git a/sope-appserver/NGXmlRpc/NGXmlRpcClient.h b/sope-appserver/NGXmlRpc/NGXmlRpcClient.h index 2af74dc5..4e75e411 100644 --- a/sope-appserver/NGXmlRpc/NGXmlRpcClient.h +++ b/sope-appserver/NGXmlRpc/NGXmlRpcClient.h @@ -29,7 +29,7 @@ NGXmlRpcClient This class is a raw XML-RPC client based on WOHTTPConnection. To see how - it works, take a look at the xmlrpc_call.m tool included in skyrix-sope-42. + it works, take a look at the xmlrpc_call.m tool included in SOPE 4.3. XML-RPC over Unix domain sockets. NGXmlRpcClient (will) support XML-RPC over a Unix domain socket, as used in the ximian_xmlrpclib.py. The transport diff --git a/sope-appserver/NGXmlRpc/Version b/sope-appserver/NGXmlRpc/Version index f3879a62..e25d7408 100644 --- a/sope-appserver/NGXmlRpc/Version +++ b/sope-appserver/NGXmlRpc/Version @@ -1,3 +1,3 @@ # version file -SUBMINOR_VERSION:=6 +SUBMINOR_VERSION:=7 diff --git a/sope-appserver/mod_ngobjweb/handler.c b/sope-appserver/mod_ngobjweb/handler.c index 2b98b091..7f2dd9b7 100644 --- a/sope-appserver/mod_ngobjweb/handler.c +++ b/sope-appserver/mod_ngobjweb/handler.c @@ -514,7 +514,9 @@ int ngobjweb_handler(request_rec *r) { writeError = 1; goto writeErrorHandler; } - + + // TODO: this seems to be broken with some Apache's! + // see: http://www.mail-archive.com/modssl-users@modssl.org/msg16396.html apr_snprintf(tmp, sizeof(tmp), "%s://%s:%i", ap_http_method(r), r->server->server_hostname, diff --git a/xmlrpc_call/GNUmakefile b/xmlrpc_call/GNUmakefile new file mode 100644 index 00000000..ee17aa22 --- /dev/null +++ b/xmlrpc_call/GNUmakefile @@ -0,0 +1,13 @@ +# GNUstep makefile + +include $(GNUSTEP_MAKEFILES)/common.make +include ../Version + +TOOL_NAME = xmlrpc_call + +xmlrpc_call_OBJC_FILES = xmlrpc_call.m + +-include GNUmakefile.preamble +include $(GNUSTEP_MAKEFILES)/tool.make +-include GNUmakefile.postamble +-include fhs.make diff --git a/xmlrpc_call/GNUmakefile.preamble b/xmlrpc_call/GNUmakefile.preamble new file mode 100644 index 00000000..16c65267 --- /dev/null +++ b/xmlrpc_call/GNUmakefile.preamble @@ -0,0 +1,63 @@ +# $Id$ + +SOPE_ROOT=.. +CORE_ROOT=$(SOPE_ROOT)/sope-core +APPSERVER_ROOT=$(SOPE_ROOT)/sope-appserver + +ADDITIONAL_CPPFLAGS += -Wall -DCOMPILE_FOR_GSTEP_MAKE=1 +ADDITIONAL_OBJCFLAGS += -Wall -Wno-import -Wno-protocol + +ADDITIONAL_CPPFLAGS += -pipe -Wall +ADDITIONAL_CPPFLAGS += -DCOMPILING_NGOBJWEB=1 + +ADDITIONAL_INCLUDE_DIRS += \ + -I.. -I. -I../.. \ + -I$(APPSERVER_ROOT)/NGObjWeb/ \ + -I$(APPSERVER_ROOT)/ \ + -I$(CORE_ROOT) \ + -I$(CORE_ROOT)/NGStreams \ + -I$(CORE_ROOT)/NGExtensions \ + -I$(SOPE_ROOT)/sope-xml + +libNGXmlRpc_LIBRARIES_DEPEND_UPON += \ + -lNGObjWeb \ + -lNGMime -lNGStreams -lNGExtensions -lEOControl \ + -lXmlRpc -lDOM -lSaxObjC + +xmlrpc_call_TOOL_LIBS += \ + -lNGXmlRpc -lNGObjWeb \ + -lNGMime -lNGStreams -lNGExtensions -lEOControl \ + -lXmlRpc -lDOM -lSaxObjC + +ifneq ($(GNUSTEP_BUILD_DIR),) +RELBUILD_DIR_SOPE=$(GNUSTEP_BUILD_DIR)/../sope-appserver +RELBUILD_DIR_MIME=$(GNUSTEP_BUILD_DIR)/../sope-mime +RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/$(CORE_ROOT) +RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../sope-xml + +ADDITIONAL_LIB_DIRS += \ + -L$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(RELBUILD_DIR_SOPE)/NGObjWeb/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(RELBUILD_DIR_SOPE)/NGXmlRpc/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(RELBUILD_DIR_MIME)/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(RELBUILD_DIR_SxCore)/NGStreams/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(RELBUILD_DIR_SxCore)/NGExtensions/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(RELBUILD_DIR_SxCore)/EOControl/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(RELBUILD_DIR_SxXml)/XmlRpc/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(RELBUILD_DIR_SxXml)/DOM/$(GNUSTEP_OBJ_DIR_NAME) \ + -L$(RELBUILD_DIR_SxXml)/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME) + +else +ADDITIONAL_LIB_DIRS += \ + -L$(APPSERVER_ROOT)/NGXmlRpc/$(GNUSTEP_OBJ_DIR) \ + -L$(APPSERVER_ROOT)/NGObjWeb/$(GNUSTEP_OBJ_DIR) \ + -L$(SOPE_ROOT)/sope-mime/$(GNUSTEP_OBJ_DIR) \ + -L$(CORE_ROOT)/NGStreams/$(GNUSTEP_OBJ_DIR) \ + -L$(CORE_ROOT)/NGExtensions/$(GNUSTEP_OBJ_DIR) \ + -L$(CORE_ROOT)/EOControl/$(GNUSTEP_OBJ_DIR) \ + -L$(SOPE_ROOT)/sope-xml/XmlRpc/$(GNUSTEP_OBJ_DIR) \ + -L$(SOPE_ROOT)/sope-xml/DOM/$(GNUSTEP_OBJ_DIR) \ + -L$(SOPE_ROOT)/sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR) +endif + +ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib diff --git a/xmlrpc_call/fhs.make b/xmlrpc_call/fhs.make new file mode 100644 index 00000000..901e8c06 --- /dev/null +++ b/xmlrpc_call/fhs.make @@ -0,0 +1,26 @@ +# postprocessing + +# FHS support (this is a hack and is going to be done by gstep-make!) + +ifneq ($(FHS_INSTALL_ROOT),) + +FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/ + +NONFHS_BINDIR="$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR)" + + +fhs-bin-dirs :: + $(MKDIRS) $(FHS_BIN_DIR) + + +move-tools-to-fhs :: fhs-bin-dirs + @echo "moving tools from $(NONFHS_BINDIR) to $(FHS_BIN_DIR) .." + for i in $(TOOL_NAME); do \ + mv "$(NONFHS_BINDIR)/$${i}" $(FHS_BIN_DIR); \ + done + +move-to-fhs :: move-tools-to-fhs + +after-install :: move-to-fhs + +endif diff --git a/sope-appserver/NGXmlRpc/xmlrpc_call.m b/xmlrpc_call/xmlrpc_call.m similarity index 100% rename from sope-appserver/NGXmlRpc/xmlrpc_call.m rename to xmlrpc_call/xmlrpc_call.m -- 2.39.5