LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: 40a7f11491111f2eb805d4198decee8951ba0cf6 

Monotone-Revision: 15e04e20f70b9b47fd1b07515f92cf8a50629f0b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-02-26T14:40:22
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2008-02-26 14:40:22 +00:00
parent 60fad625ca
commit ba02cb287e
4 changed files with 255 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
SOPE/sope-gsmake2.diff
View File

@ -185,16 +185,16 @@ Index: configure
else
cfgwrite "# configured for GNUstep install"
+ cfgwrite ""
+ cfgwrite "SOPE_SYSLIBDIR=\${DESTDIR}\${GNUSTEP_LIBRARIES}"
+ cfgwrite "SOPE_LIBDIR=\${DESTDIR}\${GNUSTEP_LIBRARY}"
+ cfgwrite "SOPE_SYSLIBDIR=\${GNUSTEP_LIBRARIES}"
+ cfgwrite "SOPE_LIBDIR=\${GNUSTEP_LIBRARY}"
+ cfgwrite "SOPE_DBADAPTORS=\${SOPE_LIBDIR}/GDLAdaptors-\${MAJOR_VERSION}.\${MINOR_VERSION}"
+ cfgwrite "SOPE_PRODUCTS=\${SOPE_LIBDIR}/SoProducts-\${MAJOR_VERSION}.\${MINOR_VERSION}"
+ cfgwrite "SOPE_SAXDRIVERS=\${SOPE_LIBDIR}/SaxDrivers-\${MAJOR_VERSION}.\${MINOR_VERSION}"
+ cfgwrite "SOPE_NGOBJWEB=\${DESTDIR}\${GNUSTEP_RESOURCES}/NGObjWeb"
+ cfgwrite "SOPE_WOXBUILDERS=\${DESTDIR}/\${GNUSTEP_LIBRARY}/WOxElemBuilders-\${MAJOR_VERSION}.\${MINOR_VERSION}"
+ cfgwrite "SOPE_SAXMAPPINGS=\${DESTDIR}/\${GNUSTEP_LIBRARY}/SaxMappings"
+ cfgwrite "SOPE_TOOLS=\${DESTDIR}/\${GNUSTEP_TOOLS}"
+ cfgwrite "SOPE_ADMIN_TOOLS=\${DESTDIR}\${GNUSTEP_ADMIN_TOOLS}"
+ cfgwrite "SOPE_NGOBJWEB=\${GNUSTEP_RESOURCES}/NGObjWeb"
+ cfgwrite "SOPE_WOXBUILDERS=\${GNUSTEP_LIBRARY}/WOxElemBuilders-\${MAJOR_VERSION}.\${MINOR_VERSION}"
+ cfgwrite "SOPE_SAXMAPPINGS=\${GNUSTEP_LIBRARY}/SaxMappings"
+ cfgwrite "SOPE_TOOLS=\${GNUSTEP_TOOLS}"
+ cfgwrite "SOPE_ADMIN_TOOLS=\${GNUSTEP_ADMIN_TOOLS}"
fi
if test $ARG_WITH_DEBUG = 1; then

473
SOPE/sope-patchset-r1608.diff
View File

@ -1,6 +1,184 @@
Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
===================================================================
--- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (révision 1608)
+++ sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (copie de travail)
@@ -713,6 +713,39 @@
return ms;
}
+/* GCSEOAdaptorChannel protocol */
+static NSString *sqlFolderFormat = (@"CREATE TABLE %@ (\n" \
+ @" c_name VARCHAR (256) NOT NULL,\n"
+ @" c_content VARCHAR (100000) NOT NULL,\n"
+ @" c_creationdate INT4 NOT NULL,\n"
+ @" c_lastmodified INT4 NOT NULL,\n"
+ @" c_version INT4 NOT NULL,\n"
+ @" c_deleted INT4 NULL\n"
+ @")");
+static NSString *sqlFolderACLFormat = (@"CREATE TABLE %@ (\n" \
+ @" c_uid VARCHAR (256) NOT NULL,\n"
+ @" c_object VARCHAR (256) NOT NULL,\n"
+ @" c_role VARCHAR (80) NOT NULL\n"
+ @")");
+
+- (NSException *) createGCSFolderTableWithName: (NSString *) tableName
+{
+ NSString *sql;
+
+ sql = [NSString stringWithFormat: sqlFolderFormat, tableName];
+
+ return [self evaluateExpressionX: sql];
+}
+
+- (NSException *) createGCSFolderACLTableWithName: (NSString *) tableName
+{
+ NSString *sql;
+
+ sql = [NSString stringWithFormat: sqlFolderACLFormat, tableName];
+
+ return [self evaluateExpressionX: sql];
+}
+
@end /* PostgreSQL72Channel */
@implementation PostgreSQL72Channel(PrimaryKeyGeneration)
Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m
===================================================================
--- sope-gdl1/Oracle8/OracleAdaptorChannel.m (révision 1608)
+++ sope-gdl1/Oracle8/OracleAdaptorChannel.m (copie de travail)
@@ -30,6 +30,7 @@
#import <NGExtensions/NSObject+Logs.h>
+static BOOL debugOn = NO;
//
//
//
@@ -41,10 +42,19 @@
@implementation OracleAdaptorChannel (Private)
-- (void) _cleanup
++ (void) initialize
{
+ NSUserDefaults *ud;
+
+ ud = [NSUserDefaults standardUserDefaults];
+ debugOn = [ud boolForKey: @"OracleAdaptorDebug"];
+}
+
+- (void) _cleanup
+{
column_info *info;
int c;
+ sword result;
[_resultSetProperties removeAllObjects];
@@ -58,11 +68,29 @@
// so we just free the value instead.
if (info->value)
{
- if (OCIDescriptorFree((dvoid *)info->value, (ub4)OCI_DTYPE_LOB) != OCI_SUCCESS)
+ if (info->type == SQLT_CLOB
+ || info->type == SQLT_BLOB
+ || info->type == SQLT_BFILEE
+ || info->type == SQLT_CFILEE)
+ {
+ result = OCIDescriptorFree((dvoid *)info->value, (ub4) OCI_DTYPE_LOB);
+ if (result != OCI_SUCCESS)
+ {
+ NSLog (@"value was not a LOB descriptor");
+ abort();
+ }
+ }
+ else
free(info->value);
info->value = NULL;
}
- free(info);
+ else
+ {
+ NSLog (@"trying to free an already freed value!");
+ abort();
+ }
+ free(info);
+
[_row_buffer removeObjectAtIndex: c];
}
@@ -231,6 +259,9 @@
[self _cleanup];
+ if (debugOn)
+ [self logWithFormat: @"expression: %@", theExpression];
+
if (!theExpression || ![theExpression length])
{
[NSException raise: @"OracleInvalidExpressionException"
@@ -302,7 +333,9 @@
// We read the maximum width of a column
info->max_width = 0;
status = OCIAttrGet((dvoid*)param, (ub4)OCI_DTYPE_PARAM, (dvoid*)&(info->max_width), (ub4 *)0, (ub4)OCI_ATTR_DATA_SIZE, (OCIError *)_oci_err);
-
+
+ if (debugOn)
+ NSLog(@"name: %s, type: %d", cname, info->type);
attribute = [EOAttribute attributeWithOracleType: info->type name: cname length: clen width: info->max_width];
[_resultSetProperties addObject: attribute];
Index: sope-gdl1/Oracle8/OracleAdaptorChannelController.m
===================================================================
--- sope-gdl1/Oracle8/OracleAdaptorChannelController.m (révision 1608)
+++ sope-gdl1/Oracle8/OracleAdaptorChannelController.m (copie de travail)
@@ -31,6 +31,8 @@
#import <Foundation/Foundation.h>
#import <GDLAccess/EOSQLExpression.h>
+static BOOL debugOn = NO;
+
//
//
//
@@ -48,6 +50,14 @@
//
@implementation OracleAdaptorChannelController
++ (void) initialize
+{
+ NSUserDefaults *ud;
+
+ ud = [NSUserDefaults standardUserDefaults];
+ debugOn = [ud boolForKey: @"OracleAdaptorDebug"];
+}
+
- (EODelegateResponse) adaptorChannel: (id) theChannel
willInsertRow: (NSMutableDictionary *) theRow
forEntity: (EOEntity *) theEntity
@@ -56,7 +66,8 @@
NSArray *keys;
int i, c;
- NSLog(@"willInsertRow: %@ %@", [theRow description], [theEntity description]);
+ if (debugOn)
+ NSLog(@"willInsertRow: %@ %@", [theRow description], [theEntity description]);
s = AUTORELEASE([[NSMutableString alloc] init]);
@@ -101,7 +112,8 @@
NSArray *keys;
int i, c;
- NSLog(@"willUpdatetRow: %@ %@", [theRow description], [theQualifier description]);
+ if (debugOn)
+ NSLog(@"willUpdateRow: %@ %@", [theRow description], [theQualifier description]);
s = AUTORELEASE([[NSMutableString alloc] init]);
Index: sope-mime/NGImap4/NGImap4Connection.m
===================================================================
--- sope-mime/NGImap4/NGImap4Connection.m (révision 1605)
--- sope-mime/NGImap4/NGImap4Connection.m (révision 1608)
+++ sope-mime/NGImap4/NGImap4Connection.m (copie de travail)
@@ -381,7 +381,7 @@
@ -13,7 +191,7 @@ Index: sope-mime/NGImap4/NGImap4Connection.m
[self errorWithFormat:@"Could not list mailbox hierarchy!"];
Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m
===================================================================
--- sope-mime/NGImap4/NGImap4ResponseNormalizer.m (révision 1605)
--- sope-mime/NGImap4/NGImap4ResponseNormalizer.m (révision 1608)
+++ sope-mime/NGImap4/NGImap4ResponseNormalizer.m (copie de travail)
@@ -648,14 +648,13 @@
enumerator = [_flags objectEnumerator];
@ -39,7 +217,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m
if (objs) free(objs);
Index: sope-mime/NGImap4/NGImap4ResponseParser.m
===================================================================
--- sope-mime/NGImap4/NGImap4ResponseParser.m (révision 1605)
--- sope-mime/NGImap4/NGImap4ResponseParser.m (révision 1608)
+++ sope-mime/NGImap4/NGImap4ResponseParser.m (copie de travail)
@@ -84,6 +84,8 @@
static NSDictionary *_parseMultipartBody(NGImap4ResponseParser *self,
@ -264,7 +442,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m
{
Index: sope-mime/NGMail/NGSmtpClient.m
===================================================================
--- sope-mime/NGMail/NGSmtpClient.m (révision 1605)
--- sope-mime/NGMail/NGSmtpClient.m (révision 1608)
+++ sope-mime/NGMail/NGSmtpClient.m (copie de travail)
@@ -24,6 +24,82 @@
#include "NGSmtpReplyCodes.h"
@ -420,7 +598,7 @@ Index: sope-mime/NGMail/NGSmtpClient.m
reply = [self receiveReply];
Index: sope-mime/NGMail/NGMimeMessageGenerator.m
===================================================================
--- sope-mime/NGMail/NGMimeMessageGenerator.m (révision 1605)
--- sope-mime/NGMail/NGMimeMessageGenerator.m (révision 1608)
+++ sope-mime/NGMail/NGMimeMessageGenerator.m (copie de travail)
@@ -86,37 +86,40 @@
char *des = NULL;
@ -486,7 +664,7 @@ Index: sope-mime/NGMail/NGMimeMessageGenerator.m
unsigned isoEndLen = 2;
Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m
===================================================================
--- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (révision 1605)
--- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (révision 1608)
+++ sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (copie de travail)
@@ -19,88 +19,45 @@
02111-1307, USA.
@ -881,7 +1059,7 @@ Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m
#if 0
Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m
===================================================================
--- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (révision 1605)
--- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (révision 1608)
+++ sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (copie de travail)
@@ -77,6 +77,7 @@
[rfc822Set setGenerator:gen forField:@"bcc"];
@ -893,7 +1071,7 @@ Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m
Index: sope-mime/NGMime/NGMimeBodyPart.m
===================================================================
--- sope-mime/NGMime/NGMimeBodyPart.m (révision 1605)
--- sope-mime/NGMime/NGMimeBodyPart.m (révision 1608)
+++ sope-mime/NGMime/NGMimeBodyPart.m (copie de travail)
@@ -31,18 +31,6 @@
return 2;
@ -931,7 +1109,7 @@ Index: sope-mime/NGMime/NGMimeBodyPart.m
- (NSString *)contentId {
Index: sope-mime/NGMime/GNUmakefile.preamble
===================================================================
--- sope-mime/NGMime/GNUmakefile.preamble (révision 1605)
--- sope-mime/NGMime/GNUmakefile.preamble (révision 1608)
+++ sope-mime/NGMime/GNUmakefile.preamble (copie de travail)
@@ -5,6 +5,11 @@
-DLIBRARY_MINOR_VERSION=${MINOR_VERSION} \
@ -947,7 +1125,7 @@ Index: sope-mime/NGMime/GNUmakefile.preamble
-I../../sope-core/NGStreams/ \
Index: sope-mime/NGMime/NGMimeBodyParser.m
===================================================================
--- sope-mime/NGMime/NGMimeBodyParser.m (révision 1605)
--- sope-mime/NGMime/NGMimeBodyParser.m (révision 1608)
+++ sope-mime/NGMime/NGMimeBodyParser.m (copie de travail)
@@ -67,7 +67,10 @@
if (_data == nil) return nil;
@ -963,7 +1141,7 @@ Index: sope-mime/NGMime/NGMimeBodyParser.m
Index: sope-mime/NGMime/NGMimePartParser.h
===================================================================
--- sope-mime/NGMime/NGMimePartParser.h (révision 1605)
--- sope-mime/NGMime/NGMimePartParser.h (révision 1608)
+++ sope-mime/NGMime/NGMimePartParser.h (copie de travail)
@@ -117,6 +117,7 @@
BOOL parserParseRawBodyDataOfPart:1;
@ -985,7 +1163,7 @@ Index: sope-mime/NGMime/NGMimePartParser.h
@interface NSObject(NGMimePartParser)
Index: sope-mime/NGMime/NGMimePartParser.m
===================================================================
--- sope-mime/NGMime/NGMimePartParser.m (révision 1605)
--- sope-mime/NGMime/NGMimePartParser.m (révision 1608)
+++ sope-mime/NGMime/NGMimePartParser.m (copie de travail)
@@ -227,7 +227,7 @@
}
@ -1010,7 +1188,7 @@ Index: sope-mime/NGMime/NGMimePartParser.m
: [NGMimeType mimeType:[ctype stringValue]];
Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m
===================================================================
--- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (révision 1605)
--- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (révision 1608)
+++ sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (copie de travail)
@@ -130,8 +130,13 @@
@ -1041,7 +1219,7 @@ Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m
bufLen = [data length];
Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m
===================================================================
--- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (révision 1605)
--- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (révision 1608)
+++ sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (copie de travail)
@@ -49,80 +49,70 @@
@ -1175,187 +1353,9 @@ Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m
}
return data;
}
Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
===================================================================
--- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (révision 1605)
+++ sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (copie de travail)
@@ -713,6 +713,39 @@
return ms;
}
+/* GCSEOAdaptorChannel protocol */
+static NSString *sqlFolderFormat = (@"CREATE TABLE %@ (\n" \
+ @" c_name VARCHAR (256) NOT NULL,\n"
+ @" c_content VARCHAR (100000) NOT NULL,\n"
+ @" c_creationdate INT4 NOT NULL,\n"
+ @" c_lastmodified INT4 NOT NULL,\n"
+ @" c_version INT4 NOT NULL,\n"
+ @" c_deleted INT4 NULL\n"
+ @")");
+static NSString *sqlFolderACLFormat = (@"CREATE TABLE %@ (\n" \
+ @" c_uid VARCHAR (256) NOT NULL,\n"
+ @" c_object VARCHAR (256) NOT NULL,\n"
+ @" c_role VARCHAR (80) NOT NULL\n"
+ @")");
+
+- (NSException *) createGCSFolderTableWithName: (NSString *) tableName
+{
+ NSString *sql;
+
+ sql = [NSString stringWithFormat: sqlFolderFormat, tableName];
+
+ return [self evaluateExpressionX: sql];
+}
+
+- (NSException *) createGCSFolderACLTableWithName: (NSString *) tableName
+{
+ NSString *sql;
+
+ sql = [NSString stringWithFormat: sqlFolderACLFormat, tableName];
+
+ return [self evaluateExpressionX: sql];
+}
+
@end /* PostgreSQL72Channel */
@implementation PostgreSQL72Channel(PrimaryKeyGeneration)
Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m
===================================================================
--- sope-gdl1/Oracle8/OracleAdaptorChannel.m (révision 1605)
+++ sope-gdl1/Oracle8/OracleAdaptorChannel.m (copie de travail)
@@ -30,6 +30,7 @@
#import <NGExtensions/NSObject+Logs.h>
+static BOOL debugOn = NO;
//
//
//
@@ -41,10 +42,19 @@
@implementation OracleAdaptorChannel (Private)
-- (void) _cleanup
++ (void) initialize
{
+ NSUserDefaults *ud;
+
+ ud = [NSUserDefaults standardUserDefaults];
+ debugOn = [ud boolForKey: @"OracleAdaptorDebug"];
+}
+
+- (void) _cleanup
+{
column_info *info;
int c;
+ sword result;
[_resultSetProperties removeAllObjects];
@@ -58,11 +68,29 @@
// so we just free the value instead.
if (info->value)
{
- if (OCIDescriptorFree((dvoid *)info->value, (ub4)OCI_DTYPE_LOB) != OCI_SUCCESS)
+ if (info->type == SQLT_CLOB
+ || info->type == SQLT_BLOB
+ || info->type == SQLT_BFILEE
+ || info->type == SQLT_CFILEE)
+ {
+ result = OCIDescriptorFree((dvoid *)info->value, (ub4) OCI_DTYPE_LOB);
+ if (result != OCI_SUCCESS)
+ {
+ NSLog (@"value was not a LOB descriptor");
+ abort();
+ }
+ }
+ else
free(info->value);
info->value = NULL;
}
- free(info);
+ else
+ {
+ NSLog (@"trying to free an already freed value!");
+ abort();
+ }
+ free(info);
+
[_row_buffer removeObjectAtIndex: c];
}
@@ -231,6 +259,9 @@
[self _cleanup];
+ if (debugOn)
+ [self logWithFormat: @"expression: %@", theExpression];
+
if (!theExpression || ![theExpression length])
{
[NSException raise: @"OracleInvalidExpressionException"
@@ -302,7 +333,9 @@
// We read the maximum width of a column
info->max_width = 0;
status = OCIAttrGet((dvoid*)param, (ub4)OCI_DTYPE_PARAM, (dvoid*)&(info->max_width), (ub4 *)0, (ub4)OCI_ATTR_DATA_SIZE, (OCIError *)_oci_err);
-
+
+ if (debugOn)
+ NSLog(@"name: %s, type: %d", cname, info->type);
attribute = [EOAttribute attributeWithOracleType: info->type name: cname length: clen width: info->max_width];
[_resultSetProperties addObject: attribute];
Index: sope-gdl1/Oracle8/OracleAdaptorChannelController.m
===================================================================
--- sope-gdl1/Oracle8/OracleAdaptorChannelController.m (révision 1605)
+++ sope-gdl1/Oracle8/OracleAdaptorChannelController.m (copie de travail)
@@ -31,6 +31,8 @@
#import <Foundation/Foundation.h>
#import <GDLAccess/EOSQLExpression.h>
+static BOOL debugOn = NO;
+
//
//
//
@@ -48,6 +50,14 @@
//
@implementation OracleAdaptorChannelController
++ (void) initialize
+{
+ NSUserDefaults *ud;
+
+ ud = [NSUserDefaults standardUserDefaults];
+ debugOn = [ud boolForKey: @"OracleAdaptorDebug"];
+}
+
- (EODelegateResponse) adaptorChannel: (id) theChannel
willInsertRow: (NSMutableDictionary *) theRow
forEntity: (EOEntity *) theEntity
@@ -56,7 +66,8 @@
NSArray *keys;
int i, c;
- NSLog(@"willInsertRow: %@ %@", [theRow description], [theEntity description]);
+ if (debugOn)
+ NSLog(@"willInsertRow: %@ %@", [theRow description], [theEntity description]);
s = AUTORELEASE([[NSMutableString alloc] init]);
@@ -101,7 +112,8 @@
NSArray *keys;
int i, c;
- NSLog(@"willUpdatetRow: %@ %@", [theRow description], [theQualifier description]);
+ if (debugOn)
+ NSLog(@"willUpdateRow: %@ %@", [theRow description], [theQualifier description]);
s = AUTORELEASE([[NSMutableString alloc] init]);
Index: sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m
===================================================================
--- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (révision 1605)
--- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (révision 1608)
+++ sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (copie de travail)
@@ -140,8 +140,12 @@
@ -1398,7 +1398,7 @@ Index: sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m
static char *iconv_wrapper(id self, char *_src, unsigned _srcLen,
Index: sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m
===================================================================
--- sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (révision 1605)
--- sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (révision 1608)
+++ sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (copie de travail)
@@ -19,6 +19,7 @@
02111-1307, USA.
@ -1410,7 +1410,7 @@ Index: sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m
Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h
===================================================================
--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (révision 1605)
--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (révision 1608)
+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (copie de travail)
@@ -19,6 +19,8 @@
02111-1307, USA.
@ -1432,7 +1432,7 @@ Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h
id<NSObject,SaxEntityResolver> entityResolver;
Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m
===================================================================
--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (révision 1605)
--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (révision 1608)
+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (copie de travail)
@@ -30,6 +30,12 @@
#include <libxml/HTMLparser.h>
@ -1492,7 +1492,7 @@ Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m
- (void)tearDownParser {
Index: sope-appserver/mod_ngobjweb/config.c
===================================================================
--- sope-appserver/mod_ngobjweb/config.c (révision 1605)
--- sope-appserver/mod_ngobjweb/config.c (révision 1608)
+++ sope-appserver/mod_ngobjweb/config.c (copie de travail)
@@ -21,7 +21,7 @@
@ -1503,21 +1503,9 @@ Index: sope-appserver/mod_ngobjweb/config.c
static char *_makeString(char *buf, char *str, int max) {
if (buf == NULL)
Index: sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c
===================================================================
--- sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (révision 1605)
+++ sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (copie de travail)
@@ -23,6 +23,7 @@
#include <unistd.h>
#include <string.h>
#include <stdio.h>
+#include "common.h"
#include "NGBufferedDescriptor.h"
// returns the number of bytes which where read from the buffer
Index: sope-appserver/mod_ngobjweb/GNUmakefile
===================================================================
--- sope-appserver/mod_ngobjweb/GNUmakefile (révision 1605)
--- sope-appserver/mod_ngobjweb/GNUmakefile (révision 1608)
+++ sope-appserver/mod_ngobjweb/GNUmakefile (copie de travail)
@@ -81,7 +81,7 @@
@ -1528,9 +1516,21 @@ Index: sope-appserver/mod_ngobjweb/GNUmakefile
LDFLAGS = $(APXS_LDFLAGS) $(APR_LDFLAGS) -shared -fPIC
Index: sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c
===================================================================
--- sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (révision 1608)
+++ sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (copie de travail)
@@ -23,6 +23,7 @@
#include <unistd.h>
#include <string.h>
#include <stdio.h>
+#include "common.h"
#include "NGBufferedDescriptor.h"
// returns the number of bytes which where read from the buffer
Index: sope-appserver/mod_ngobjweb/handler.c
===================================================================
--- sope-appserver/mod_ngobjweb/handler.c (révision 1605)
--- sope-appserver/mod_ngobjweb/handler.c (révision 1608)
+++ sope-appserver/mod_ngobjweb/handler.c (copie de travail)
@@ -267,7 +267,7 @@
const char *uri;
@ -1658,36 +1658,39 @@ Index: sope-appserver/mod_ngobjweb/handler.c
static void test(void) {
Index: sope-appserver/NGObjWeb/GNUmakefile.postamble
===================================================================
--- sope-appserver/NGObjWeb/GNUmakefile.postamble (révision 1605)
--- sope-appserver/NGObjWeb/GNUmakefile.postamble (révision 1608)
+++ sope-appserver/NGObjWeb/GNUmakefile.postamble (copie de travail)
@@ -23,14 +23,20 @@
# install makefiles
-after-install ::
+after-install :: $(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/Additional/ngobjweb.make
+
+ifneq ($(GNUSTEP_MAKE_VERSION),1.3.0)
+after-install :: $(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/woapp.make $(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/wobundle.make
- $(MKDIRS) $(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/Additional/
- $(INSTALL_DATA) ngobjweb.make $(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/Additional/ngobjweb.make
+after-install :: $(DESTDIR)/$(GNUSTEP_MAKEFILES)/Additional/ngobjweb.make
ifneq ($(GNUSTEP_MAKE_VERSION),1.3.0)
-after-install ::
+after-install :: $(DESTDIR)/$(GNUSTEP_MAKEFILES)/woapp.make $(DESTDIR)/$(GNUSTEP_MAKEFILES)/wobundle.make
+endif
+
+$(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/Additional/ngobjweb.make: ngobjweb.make
$(MKDIRS) $(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/Additional/
$(INSTALL_DATA) ngobjweb.make $(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/Additional/ngobjweb.make
-ifneq ($(GNUSTEP_MAKE_VERSION),1.3.0)
-after-install ::
+$(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/woapp.make: woapp-gs.make
$(INSTALL_DATA) woapp-gs.make \
$(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/woapp.make
+$(DESTDIR)/$(GNUSTEP_MAKEFILES)/Additional/ngobjweb.make: ngobjweb.make
+ $(MKDIRS) $(DESTDIR)/$(GNUSTEP_MAKEFILES)/Additional/
+ $(INSTALL_DATA) ngobjweb.make $(DESTDIR)/$(GNUSTEP_MAKEFILES)/Additional/ngobjweb.make
+
+$(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/wobundle.make: wobundle-gs.make
+$(DESTDIR)/$(GNUSTEP_MAKEFILES)/woapp.make: woapp-gs.make
$(INSTALL_DATA) woapp-gs.make \
- $(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/woapp.make
+ $(DESTDIR)/$(GNUSTEP_MAKEFILES)/woapp.make
+
+$(DESTDIR)/$(GNUSTEP_MAKEFILES)/wobundle.make: wobundle-gs.make
$(INSTALL_DATA) wobundle-gs.make \
$(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/wobundle.make
- $(INSTALL_ROOT_DIR)/$(GNUSTEP_MAKEFILES)/wobundle.make
-endif
+ $(DESTDIR)/$(GNUSTEP_MAKEFILES)/wobundle.make
Index: sope-appserver/NGObjWeb/WOContext.m
===================================================================
--- sope-appserver/NGObjWeb/WOContext.m (révision 1605)
--- sope-appserver/NGObjWeb/WOContext.m (révision 1608)
+++ sope-appserver/NGObjWeb/WOContext.m (copie de travail)
@@ -64,11 +64,13 @@
static BOOL testNSURLs = NO;
@ -1727,7 +1730,7 @@ Index: sope-appserver/NGObjWeb/WOContext.m
serverURL = [@"http://" stringByAppendingString:host];
Index: sope-appserver/NGObjWeb/DAVPropMap.plist
===================================================================
--- sope-appserver/NGObjWeb/DAVPropMap.plist (révision 1605)
--- sope-appserver/NGObjWeb/DAVPropMap.plist (révision 1608)
+++ sope-appserver/NGObjWeb/DAVPropMap.plist (copie de travail)
@@ -123,11 +123,14 @@
@ -1748,7 +1751,7 @@ Index: sope-appserver/NGObjWeb/DAVPropMap.plist
}
Index: sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m
===================================================================
--- sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (révision 1605)
--- sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (révision 1608)
+++ sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (copie de travail)
@@ -655,6 +655,7 @@
if (self->responses == nil)
@ -1760,7 +1763,7 @@ Index: sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m
case 'n':
Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m
===================================================================
--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (révision 1605)
--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (révision 1608)
+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (copie de travail)
@@ -216,6 +216,12 @@
assocCount++;
@ -1777,7 +1780,7 @@ Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m
Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
===================================================================
--- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (révision 1605)
--- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (révision 1608)
+++ sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (copie de travail)
@@ -41,6 +41,7 @@
WOAssociation *string;
@ -1810,7 +1813,7 @@ Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
return NO;
Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h
===================================================================
--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (révision 1605)
--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (révision 1608)
+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (copie de travail)
@@ -41,7 +41,8 @@
WOAssociation *pageName;
@ -1824,7 +1827,7 @@ Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h
/* 'ivar' associations */
Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m
===================================================================
--- sope-appserver/NGObjWeb/SoObjects/SoObject.m (révision 1605)
--- sope-appserver/NGObjWeb/SoObjects/SoObject.m (révision 1608)
+++ sope-appserver/NGObjWeb/SoObjects/SoObject.m (copie de travail)
@@ -39,22 +39,34 @@
static int debugLookup = -1;
@ -1975,7 +1978,7 @@ Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m
Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m
===================================================================
--- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (révision 1605)
--- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (révision 1608)
+++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (copie de travail)
@@ -31,6 +31,7 @@
#include <NGObjWeb/WOCookie.h>

2
Scripts/sogod-wrapper
View File

@ -46,6 +46,8 @@ elif [ -f $GNUSTEP_LOCAL_ROOT/Tools/sogod-0.9 ]; then
sogod="$GNUSTEP_LOCAL_ROOT/Tools/sogod-0.9"
elif [ -f $GNUSTEP_SYSTEM_ROOT/Tools/sogod-0.9 ]; then
sogod="$GNUSTEP_SYSTEM_ROOT/Tools/sogod-0.9"
elif [ -f $GNUSTEP_SYSTEM_ROOT/Tools/Admin/sogod-0.9 ]; then
sogod="$GNUSTEP_SYSTEM_ROOT/Tools/Admin/sogod-0.9"
else
echo "Can't find sogod-0.9"
exit 1

16
configure vendored
View File

@ -303,16 +303,16 @@ genConfigMake() {
else
cfgwrite "# configured for GNUstep install"
cfgwrite ""
cfgwrite "SOGO_SYSLIBDIR=\${DESTDIR}/\${GNUSTEP_LIBRARIES}"
cfgwrite "SOGO_LIBDIR=\${DESTDIR}/\${GNUSTEP_LIBRARY}/SOGo-\${SOGO_MAJOR_VERSION}.\${SOGO_MINOR_VERSION}"
cfgwrite "SOGO_SYSLIBDIR=\${GNUSTEP_LIBRARIES}"
cfgwrite "SOGO_LIBDIR=\${GNUSTEP_LIBRARY}/SOGo-\${SOGO_MAJOR_VERSION}.\${SOGO_MINOR_VERSION}"
cfgwrite "SOGO_TEMPLATESDIR=\${SOGO_LIBDIR}/Templates"
cfgwrite "SOGO_WEBSERVERRESOURCESDIR=\${SOGO_LIBDIR}/WebServerResources"
cfgwrite "SOGO_TOOLS=\${DESTDIR}/\${GNUSTEP_TOOLS}"
cfgwrite "SOGO_ADMIN_TOOLS=\${DESTDIR}/\${GNUSTEP_ADMIN_TOOLS}"
cfgwrite "SOPE_SAXMAPPINGS=\${DESTDIR}/\${GNUSTEP_LIBRARY}/SaxMappings"
cfgwrite "SOPE_SAXDRIVERS=\${DESTDIR}/\${GNUSTEP_LIBRARY}/SaxDrivers-\${SOPE_MAJOR_VERSION}.\${SOPE_MINOR_VERSION}"
cfgwrite "SOPE_WOXBUILDERS=\${DESTDIR}/\${GNUSTEP_LIBRARY}/WOxElemBuilders-\${SOPE_MAJOR_VERSION}.\${SOPE_MINOR_VERSION}"
cfgwrite "SOGO_TYPEMODELS=\${DESTDIR}/\${GNUSTEP_LIBRARY}/OCSTypeModels"
cfgwrite "SOGO_TOOLS=\${GNUSTEP_TOOLS}"
cfgwrite "SOGO_ADMIN_TOOLS=\${GNUSTEP_ADMIN_TOOLS}"
cfgwrite "SOPE_SAXMAPPINGS=\${GNUSTEP_LIBRARY}/SaxMappings"
cfgwrite "SOPE_SAXDRIVERS=\${GNUSTEP_LIBRARY}/SaxDrivers-\${SOPE_MAJOR_VERSION}.\${SOPE_MINOR_VERSION}"
cfgwrite "SOPE_WOXBUILDERS=\${GNUSTEP_LIBRARY}/WOxElemBuilders-\${SOPE_MAJOR_VERSION}.\${SOPE_MINOR_VERSION}"
cfgwrite "SOGO_TYPEMODELS=\${GNUSTEP_LIBRARY}/OCSTypeModels"
fi
if test $ARG_WITH_STRIP = 1; then