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 da1ef58dfec69b6a7a1f730fc4d3e020b4c65e32..5839ebffa6b1b9da0ed90c3d4b3ea0aee6d23e8d 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,5 +1,7 @@
 2004-08-23  Helge Hess  <helge.hess@opengroupware.org>
 
+       * 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 5832b6cec36660a42bf65320934215a8d9560874..5815cd3b7e05733f80ba37d6d7eb4d6b54a38f95 100644 (file)
--- 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 c4af3d320c6438f47e0664583b0df05f877b62d0..97f41aa240859f9ec5c0755ed4b405a79a537682 100644 (file)
--- 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 a88032d952af5f220b3d76380c1707899610a386..51c964c64e631dfb9b81286ff1056ea30f740f2a 100644 (file)
--- a/sope-appserver/NGXmlRpc/ChangeLog
+++ b/sope-appserver/NGXmlRpc/ChangeLog
@@ -1,4 +1,11 @@
-2004-08-23  Helge Hess  <helge@dogbert.in.skyrix.com>
+2004-08-23  Helge Hess  <helge.hess@skyrix.com>
+
+       * 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 7bffdf422bcc640638e8285cd10bf4cb283ba5c5..5fbe7ef19896f2fba52bec5c6da6b7b9ee3887ea 100644 (file)
--- 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 5a38954ff8e2a6f9a8485e8d21444050e7879a96..35e22db4767ddd1066256c798db5a7fda0302e6b 100644 (file)
--- 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 <NGXmlRpc/NGXmlRpcAction.h>
 #include <NGXmlRpc/NGAsyncResultProxy.h>
@@ -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 93f90d160d934db19ec53d743f5928d2ae1f646f..ed045adfeab4736fa025a4a2ef062f6515fc7a9c 100644 (file)
--- 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 235d18bf20b2b0451b5afc2eecbd48530a80d0f3..4934ea6e4311114af674f2d99b7ed18048d59bdc 100644 (file)
--- a/sope-appserver/NGXmlRpc/xmlrpc_call.m
+++ b/sope-appserver/NGXmlRpc/xmlrpc_call.m
@@ -37,7 +37,7 @@
 #include <NGStreams/NGNet.h>
 
 #if !LIB_FOUNDATION_LIBRARY
-#  include "UnixSignalHandler.h"
+#  include <NGObjWeb/UnixSignalHandler.h>
 #endif
 
 #include "common.h"

diff --git a/sope-appserver/SoOFS/ChangeLog b/sope-appserver/SoOFS/ChangeLog
index 8cb226b71fb6dd013ecf927e677e768595cf277d..0315ddf7a5c563f44cdfb7e3b1b3908b608d7091 100644 (file)
--- a/sope-appserver/SoOFS/ChangeLog
+++ b/sope-appserver/SoOFS/ChangeLog
@@ -1,5 +1,7 @@
 2004-08-23  Helge Hess  <helge.hess@opengroupware.org>
 
+       * 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 c7d9fbb9c36d9c57a8ee9baddcc5289b0cbbe4fd..9281f608f91ea22c086dcd1d20592c1b5f8176d5 100644 (file)
--- 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 ed045adfeab4736fa025a4a2ef062f6515fc7a9c..81d0f5a4cff3edc3be75e404954d4eed90c1bd38 100644 (file)
--- a/sope-appserver/SoOFS/Version
+++ b/sope-appserver/SoOFS/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=2
+SUBMINOR_VERSION:=3