From: helge Date: Mon, 23 Aug 2004 15:41:47 +0000 (+0000) Subject: minor fixes for MacOSX X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=082912072d1ea5428e3d036e80ee820f8cc640ff;p=sope minor fixes for MacOSX git-svn-id: http://svn.opengroupware.org/SOPE/trunk@42 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index da1ef58d..5839ebff 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,5 +1,7 @@ 2004-08-23 Helge Hess + * GNUmakefile.preamble: removed libjs linking path (v4.3.7) + * moved NGXmlRpc/xmlrpc_call to a separate project (v4.3.6) * v4.3.5 diff --git a/sope-appserver/NGObjWeb/GNUmakefile.preamble b/sope-appserver/NGObjWeb/GNUmakefile.preamble index 5832b6ce..5815cd3b 100644 --- a/sope-appserver/NGObjWeb/GNUmakefile.preamble +++ b/sope-appserver/NGObjWeb/GNUmakefile.preamble @@ -32,8 +32,7 @@ ADDITIONAL_LIB_DIRS += \ -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) \ - -L$(RELBUILD_DIR_JS)/$(GNUSTEP_OBJ_DIR_NAME) + -L$(RELBUILD_DIR_SxXml)/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME) else libNGObjWeb_LIB_DIRS += \ diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index c4af3d32..97f41aa2 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=6 +SUBMINOR_VERSION:=7 # v4.2.413 requires libSaxObjC v4.2.33 # v4.2.341 requires libNGExtensions v4.2.77 diff --git a/sope-appserver/NGXmlRpc/ChangeLog b/sope-appserver/NGXmlRpc/ChangeLog index a88032d9..51c964c6 100644 --- a/sope-appserver/NGXmlRpc/ChangeLog +++ b/sope-appserver/NGXmlRpc/ChangeLog @@ -1,4 +1,11 @@ -2004-08-23 Helge Hess +2004-08-23 Helge Hess + + * v4.3.2 + + * xmlrpc_call.m: properly include UnixSignalHandler from NGObjWeb on + non-lF platforms + + * GNUmakefile.preamble: removed libjs linking path * moved NGXmlRpc to own subproject (v4.3.1) diff --git a/sope-appserver/NGXmlRpc/GNUmakefile.preamble b/sope-appserver/NGXmlRpc/GNUmakefile.preamble index 7bffdf42..5fbe7ef1 100644 --- a/sope-appserver/NGXmlRpc/GNUmakefile.preamble +++ b/sope-appserver/NGXmlRpc/GNUmakefile.preamble @@ -42,8 +42,7 @@ ADDITIONAL_LIB_DIRS += \ -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) \ - -L$(RELBUILD_DIR_JS)/$(GNUSTEP_OBJ_DIR_NAME) + -L$(RELBUILD_DIR_SxXml)/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME) else ADDITIONAL_LIB_DIRS += \ diff --git a/sope-appserver/NGXmlRpc/NGXmlRpcAction.m b/sope-appserver/NGXmlRpc/NGXmlRpcAction.m index 5a38954f..35e22db4 100644 --- a/sope-appserver/NGXmlRpc/NGXmlRpcAction.m +++ b/sope-appserver/NGXmlRpc/NGXmlRpcAction.m @@ -1,7 +1,7 @@ /* - Copyright (C) 2000-2003 SKYRIX Software AG + Copyright (C) 2000-2004 SKYRIX Software AG - This file is part of OGo + This file is part of OpenGroupware.org. OGo is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ #include #include @@ -33,6 +32,10 @@ #include "common.h" +@interface NSException(UserInfoExt) +- (void)setUserInfo:(NSDictionary *)_ui; +@end + @implementation WOCoreApplication(XmlRpcActionClass) - (Class)defaultActionClassForRequest:(WORequest *)_request { diff --git a/sope-appserver/NGXmlRpc/Version b/sope-appserver/NGXmlRpc/Version index 93f90d16..ed045adf 100644 --- a/sope-appserver/NGXmlRpc/Version +++ b/sope-appserver/NGXmlRpc/Version @@ -1,3 +1,3 @@ # version file -SUBMINOR_VERSION:=1 +SUBMINOR_VERSION:=2 diff --git a/sope-appserver/NGXmlRpc/xmlrpc_call.m b/sope-appserver/NGXmlRpc/xmlrpc_call.m index 235d18bf..4934ea6e 100644 --- a/sope-appserver/NGXmlRpc/xmlrpc_call.m +++ b/sope-appserver/NGXmlRpc/xmlrpc_call.m @@ -37,7 +37,7 @@ #include #if !LIB_FOUNDATION_LIBRARY -# include "UnixSignalHandler.h" +# include #endif #include "common.h" diff --git a/sope-appserver/SoOFS/ChangeLog b/sope-appserver/SoOFS/ChangeLog index 8cb226b7..0315ddf7 100644 --- a/sope-appserver/SoOFS/ChangeLog +++ b/sope-appserver/SoOFS/ChangeLog @@ -1,5 +1,7 @@ 2004-08-23 Helge Hess + * GNUmakefile.preamble: removed libjs linking path (v4.3.3) + * GNUmakefile.preamble: link SoOFS product bundle against the library to ensure that the class are available (v4.3.2) diff --git a/sope-appserver/SoOFS/GNUmakefile.preamble b/sope-appserver/SoOFS/GNUmakefile.preamble index c7d9fbb9..9281f608 100644 --- a/sope-appserver/SoOFS/GNUmakefile.preamble +++ b/sope-appserver/SoOFS/GNUmakefile.preamble @@ -47,8 +47,7 @@ ADDITIONAL_LIB_DIRS += \ -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) \ - -L$(RELBUILD_DIR_JS)/$(GNUSTEP_OBJ_DIR_NAME) + -L$(RELBUILD_DIR_SxXml)/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME) else ADDITIONAL_LIB_DIRS += \ diff --git a/sope-appserver/SoOFS/Version b/sope-appserver/SoOFS/Version index ed045adf..81d0f5a4 100644 --- a/sope-appserver/SoOFS/Version +++ b/sope-appserver/SoOFS/Version @@ -1,3 +1,3 @@ # version file -SUBMINOR_VERSION:=2 +SUBMINOR_VERSION:=3