From d8670c129400dabe39dd7fc6f164d41e6f5d4229 Mon Sep 17 00:00:00 2001 From: helge Date: Tue, 16 Aug 2005 15:10:29 +0000 Subject: [PATCH] more OSX framework stuff git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1034 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- .../NGObjWeb/DynamicElements/WOForm.m | 4 +- sope-ldap/NGLdap/GNUmakefile | 1 - sope-ldap/NGLdap/GNUmakefile.postamble | 8 --- sope-ldap/NGLdap/GNUmakefile.preamble | 16 ++++- sope-ldap/README-OSX.txt | 2 - sope-ldap/samples/ChangeLog | 4 ++ sope-ldap/samples/GNUmakefile | 3 - sope-ldap/samples/GNUmakefile.preamble | 66 +++++++++++-------- xmlrpc_call/ChangeLog | 4 ++ xmlrpc_call/GNUmakefile.preamble | 62 ++++++++--------- 10 files changed, 93 insertions(+), 77 deletions(-) delete mode 100644 sope-ldap/NGLdap/GNUmakefile.postamble diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOForm.m b/sope-appserver/NGObjWeb/DynamicElements/WOForm.m index bceb3e7e..29f74015 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOForm.m +++ b/sope-appserver/NGObjWeb/DynamicElements/WOForm.m @@ -115,7 +115,7 @@ static int debugTakeValues = -1; WOComponent *sComponent = [_ctx component]; BOOL doTakeValues = NO; - if (self->queryParameters) { + if (self->queryParameters != nil) { /* apply values to ?style parameters */ NSEnumerator *keys; NSString *key; @@ -132,6 +132,7 @@ static int debugTakeValues = -1; } } + // TODO: explain this href comparison if ([[self->href stringValueInComponent:sComponent] isEqualToString:[_rq uri]]) { if (debugTakeValues) { @@ -150,6 +151,7 @@ static int debugTakeValues = -1; doTakeValues = YES; } else if (alwaysPassIn) { + // Note: this does not call the component! Bug? (see 'else' below) if (debugTakeValues) NSLog(@"%s: taking values from foreign request ",__PRETTY_FUNCTION__); doTakeValues = YES; diff --git a/sope-ldap/NGLdap/GNUmakefile b/sope-ldap/NGLdap/GNUmakefile index c42ae6ee..c374918d 100644 --- a/sope-ldap/NGLdap/GNUmakefile +++ b/sope-ldap/NGLdap/GNUmakefile @@ -55,7 +55,6 @@ libNGLdap_OBJC_FILES = \ NGLdap_HEADER_FILES = $(libNGLdap_HEADER_FILES) NGLdap_OBJC_FILES = $(libNGLdap_OBJC_FILES) -NGLdap_SUBPROJECTS = $(libNGLdap_SUBPROJECTS) # building diff --git a/sope-ldap/NGLdap/GNUmakefile.postamble b/sope-ldap/NGLdap/GNUmakefile.postamble deleted file mode 100644 index 2bd83b9f..00000000 --- a/sope-ldap/NGLdap/GNUmakefile.postamble +++ /dev/null @@ -1,8 +0,0 @@ -# $Id$ - -ifeq ($(GNUSTEP_TARGET_OS),mingw32) -libNGLdap_LIBRARIES_DEPEND_UPON += -lFoundation -lobjc -endif -ifeq ($(GNUSTEP_TARGET_OS),cygwin32) -libNGLdap_LIBRARIES_DEPEND_UPON += -lFoundation -lobjc -endif diff --git a/sope-ldap/NGLdap/GNUmakefile.preamble b/sope-ldap/NGLdap/GNUmakefile.preamble index e8a9a2a2..e374b012 100644 --- a/sope-ldap/NGLdap/GNUmakefile.preamble +++ b/sope-ldap/NGLdap/GNUmakefile.preamble @@ -1,5 +1,7 @@ # compiler flags +SOPE_ROOT=../.. + ADDITIONAL_INCLUDE_DIRS += \ -I.. \ -I../../sope-core/NGExtensions \ @@ -8,6 +10,7 @@ ADDITIONAL_INCLUDE_DIRS += \ ADDITIONAL_CPPFLAGS += -Wall -Wno-protocol + # dependencies libNGLdap_LIBRARIES_DEPEND_UPON += \ @@ -23,10 +26,11 @@ NGLdap_LIBRARIES_DEPEND_UPON += \ ifeq ($(reentrant),yes) ADDITIONAL_CPPFLAGS += -D_REENTRANT=1 libNGLdap_LIBRARIES_DEPEND_UPON += -lldap_r -llber -lpthread +NGLdap_LIBRARIES_DEPEND_UPON += -lldap_r -llber -lpthread else libNGLdap_LIBRARIES_DEPEND_UPON += -lldap -llber +NGLdap_LIBRARIES_DEPEND_UPON += -lldap -llber endif -NGLdap_LIBRARIES_DEPEND_UPON += $(libNGLdap_LIBRARIES_DEPEND_UPON) # SASL/SSL dependencies @@ -82,3 +86,13 @@ endif #ADDITIONAL_INCLUDE_DIRS += -I/usr/local/openldap/include #SYSTEM_LIB_DIR += -L/usr/local/openldap/lib #endif + + +# Windows + +ifeq ($(GNUSTEP_TARGET_OS),mingw32) +libNGLdap_LIBRARIES_DEPEND_UPON += -lFoundation -lobjc +endif +ifeq ($(GNUSTEP_TARGET_OS),cygwin32) +libNGLdap_LIBRARIES_DEPEND_UPON += -lFoundation -lobjc +endif diff --git a/sope-ldap/README-OSX.txt b/sope-ldap/README-OSX.txt index 08cd417e..4cf78f8b 100644 --- a/sope-ldap/README-OSX.txt +++ b/sope-ldap/README-OSX.txt @@ -1,5 +1,3 @@ -# $Id: README-OSX.txt 4 2004-08-20 17:04:31Z helge $ - Building Notes ============== diff --git a/sope-ldap/samples/ChangeLog b/sope-ldap/samples/ChangeLog index 9e9ab11c..34b5d95d 100644 --- a/sope-ldap/samples/ChangeLog +++ b/sope-ldap/samples/ChangeLog @@ -1,3 +1,7 @@ +2005-08-16 Helge Hess + + * GNUmakefile, GNUmakefile.preamble: added OSX framework compilation + 2005-07-23 Sebastian Reitenbach * GNUmakefile.preamble: added OpenBSD linking flags diff --git a/sope-ldap/samples/GNUmakefile b/sope-ldap/samples/GNUmakefile index bbf963fd..c5ba6ec6 100644 --- a/sope-ldap/samples/GNUmakefile +++ b/sope-ldap/samples/GNUmakefile @@ -15,9 +15,6 @@ ldapchkpwd_OBJC_FILES = ldapchkpwd.m #TOOL_NAME = #pwd-check #pwd-check_OBJC_FILES = pwd-check.m -ldapls_TOOL_LIBS += -lNGLdap -ldap2dsml_TOOL_LIBS += -lNGLdap -ldapchkpwd_TOOL_LIBS += -lNGLdap -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/tool.make diff --git a/sope-ldap/samples/GNUmakefile.preamble b/sope-ldap/samples/GNUmakefile.preamble index 963d8bee..d0777389 100644 --- a/sope-ldap/samples/GNUmakefile.preamble +++ b/sope-ldap/samples/GNUmakefile.preamble @@ -1,41 +1,51 @@ # compilation settings +SOPE_ROOT=../.. + ADDITIONAL_INCLUDE_DIRS += \ - -I.. \ - -I../../sope-core/NGStreams \ - -I../../sope-core/NGExtensions \ - -I../../sope-core \ - -I../../sope-xml \ - -ifneq ($(GNUSTEP_BUILD_DIR),) -RELBUILD_DIR_SOPE=$(GNUSTEP_BUILD_DIR)/../.. -RELBUILD_DIR_Core=$(RELBUILD_DIR_SOPE)/sope-core -RELBUILD_DIR_Xml=$(RELBUILD_DIR_SOPE)/sope-xml -RELBUILD_DIR_Ldap=$(RELBUILD_DIR_SOPE)/sope-ldap + -I.. \ + -I$(SOPE_ROOT)/sope-core/NGStreams \ + -I$(SOPE_ROOT)/sope-core/NGExtensions \ + -I$(SOPE_ROOT)/sope-core \ + -I$(SOPE_ROOT)/sope-xml + + +# dependencies + +ifneq ($(frameworks),yes) +ADDITIONAL_TOOL_LIBS += \ + -lNGLdap \ + -lNGStreams -lNGExtensions -lEOControl \ + -lDOM -lSaxObjC +else +ADDITIONAL_TOOL_LIBS += \ + -framework NGLdap \ + -framework NGStreams -framework NGExtensions -framework EOControl \ + -framework DOM -framework SaxObjC +endif + + +# library/framework search pathes +DEP_DIRS = \ + ../NGLdap \ + $(SOPE_ROOT)/sope-core/NGStreams \ + $(SOPE_ROOT)/sope-core/NGExtensions \ + $(SOPE_ROOT)/sope-core/EOControl \ + $(SOPE_ROOT)/sope-xml/DOM \ + $(SOPE_ROOT)/sope-xml/SaxObjC + +ifneq ($(frameworks),yes) ADDITIONAL_LIB_DIRS += \ - -L$(RELBUILD_DIR_Core)/EOControl/$(GNUSTEP_OBJ_DIR_NAME) \ - -L$(RELBUILD_DIR_Core)/NGExtensions/$(GNUSTEP_OBJ_DIR_NAME) \ - -L$(RELBUILD_DIR_Core)/NGStreams/$(GNUSTEP_OBJ_DIR_NAME) \ - -L$(RELBUILD_DIR_Xml)/DOM/$(GNUSTEP_OBJ_DIR_NAME) \ - -L$(RELBUILD_DIR_Xml)/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME) \ - -L$(RELBUILD_DIR_Ldap)/NGLdap/$(GNUSTEP_OBJ_DIR_NAME) \ - -L$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_OBJ_DIR_NAME) + $(foreach dir,$(DEP_DIRS),\ + -L$(GNUSTEP_BUILD_DIR)/$(dir)/$(GNUSTEP_OBJ_DIR_NAME)) else ADDITIONAL_LIB_DIRS += \ - -L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR) \ - -L../../sope-core/NGExtensions/$(GNUSTEP_OBJ_DIR) \ - -L../../sope-core/NGStreams/$(GNUSTEP_OBJ_DIR) \ - -L../../sope-xml/DOM/$(GNUSTEP_OBJ_DIR) \ - -L../../sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR) \ - -L../NGLdap/$(GNUSTEP_OBJ_DIR) + $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir)) endif -SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib +SYSTEM_LIB_DIR += -L/usr/local/lib -ADDITIONAL_TOOL_LIBS += \ - -lNGStreams -lNGExtensions -lEOControl \ - -lDOM -lSaxObjC # OS dependend stuff ifeq ($(findstring openbsd3, $(GNUSTEP_TARGET_OS)), openbsd3) diff --git a/xmlrpc_call/ChangeLog b/xmlrpc_call/ChangeLog index 77df915a..6f66edc1 100644 --- a/xmlrpc_call/ChangeLog +++ b/xmlrpc_call/ChangeLog @@ -1,3 +1,7 @@ +2005-08-16 Helge Hess + + * GNUmakefile.preamble: added OSX framework compilation + 2005-07-23 Sebastian Reitenbach * GNUmakefile.preamble: added OpenBSD linking flags diff --git a/xmlrpc_call/GNUmakefile.preamble b/xmlrpc_call/GNUmakefile.preamble index 8d634218..beea0e75 100644 --- a/xmlrpc_call/GNUmakefile.preamble +++ b/xmlrpc_call/GNUmakefile.preamble @@ -4,12 +4,9 @@ SOPE_ROOT=.. CORE_ROOT=$(SOPE_ROOT)/sope-core APPSERVER_ROOT=$(SOPE_ROOT)/sope-appserver -ADDITIONAL_CPPFLAGS += -Wall -DCOMPILE_FOR_GSTEP_MAKE=1 +ADDITIONAL_CPPFLAGS += -Wall 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/ \ @@ -19,49 +16,48 @@ ADDITIONAL_INCLUDE_DIRS += \ -I$(CORE_ROOT)/NGExtensions \ -I$(SOPE_ROOT)/sope-xml -libNGXmlRpc_LIBRARIES_DEPEND_UPON += \ - -lNGObjWeb \ - -lNGMime -lNGStreams -lNGExtensions -lEOControl \ - -lXmlRpc -lDOM -lSaxObjC +# dependencies + +ifneq ($(frameworks),yes) xmlrpc_call_TOOL_LIBS += \ -lNGXmlRpc -lNGObjWeb \ -lNGMime -lNGStreams -lNGExtensions -lEOControl \ -lXmlRpc -lDOM -lSaxObjC +else +xmlrpc_call_TOOL_LIBS += \ + -framework NGXmlRpc -framework NGObjWeb \ + -framework NGMime \ + -framework NGStreams -framework NGExtensions -framework EOControl \ + -framework XmlRpc -framework DOM -framework SaxObjC +endif -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) +# library/framework search pathes + +DEP_DIRS = \ + $(SOPE_ROOT)/sope-appserver/NGXmlRpc \ + $(SOPE_ROOT)/sope-appserver/NGObjWeb \ + $(SOPE_ROOT)/sope-mime/NGMime \ + $(SOPE_ROOT)/sope-core/NGStreams \ + $(SOPE_ROOT)/sope-core/NGExtensions \ + $(SOPE_ROOT)/sope-core/EOControl \ + $(SOPE_ROOT)/sope-xml/XmlRpc \ + $(SOPE_ROOT)/sope-xml/DOM \ + $(SOPE_ROOT)/sope-xml/SaxObjC +ifneq ($(frameworks),yes) +ADDITIONAL_LIB_DIRS += \ + $(foreach dir,$(DEP_DIRS),\ + -L$(GNUSTEP_BUILD_DIR)/$(dir)/$(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) + $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir)) endif SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib + # OS dependend stuff ifeq ($(findstring openbsd3, $(GNUSTEP_HOST_OS)), openbsd3) xmlrpc_call_TOOL_LIBS += -liconv -- 2.39.5