added ability to build with gstep-make

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1040 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sopex/GNUmakefile b/sopex/GNUmakefile
new file mode 100644 (file)
index 0000000..cf69f41
--- /dev/null
+++ b/sopex/GNUmakefile
@@ -0,0 +1,15 @@
+# GNUstep makefile
+
+ifeq ($(FOUNDATION_LIB),apple)
+ifeq ($(frameworks),yes)
+
+-include ../config.make
+include $(GNUSTEP_MAKEFILES)/common.make
+
+SUBPROJECTS += \
+       SOPEX
+
+include $(GNUSTEP_MAKEFILES)/aggregate.make
+
+endif
+endif

diff --git a/sopex/SOPEX/ChangeLog b/sopex/SOPEX/ChangeLog
index 5ca833c03db22261d32e0cc6591a72536d85bf23..40679768f7e67453dd2375d77d8183959ed74de5 100644 (file)
--- a/sopex/SOPEX/ChangeLog
+++ b/sopex/SOPEX/ChangeLog
@@ -1,3 +1,24 @@
+2005-08-16  Helge Hess  <helge.hess@opengroupware.org>
+
+       * v2.0.3
+
+       * added framework GNUmakefile
+
+       * SOPEXWebConnection.h: added missing NSMutableDictionary prototype
+
+       * SOPEXSheetRunner.m: include required AppKit.h
+
+       * SOPEXSheetRunner.h: added missing NSWindow prototype
+
+       * SOPEXContentValidator.m: added missing prototypes, include NSError.h
+         for NSLocalizedDescriptionKey
+
+       * SOPEXConsoleEventFormatter.m: fixed a gcc 4.0 warning
+
+       * SOPEXAppController.m: include NGObjWeb.h for missing symbols
+
+       * SOPEXConsole.h: added NGLogEvent class forward declaration
+
 2005-01-04  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * SOPEXAppController.m: changed default handling in -prepareForLaunch

diff --git a/sopex/SOPEX/GNUmakefile b/sopex/SOPEX/GNUmakefile
new file mode 100644 (file)
index 0000000..ff6843e
--- /dev/null
+++ b/sopex/SOPEX/GNUmakefile
@@ -0,0 +1,78 @@
+# GNUstep makefile
+
+-include ../../config.make
+include $(GNUSTEP_MAKEFILES)/common.make
+include ./Version
+
+FRAMEWORK_NAME = SOPEX
+
+SOPEX_HEADER_FILES += \
+       SOPEX.h                         \
+       SOPEXAppController.h            \
+       SOPEXAuthPanel.h                \
+       SOPEXBrowserController.h        \
+       SOPEXBrowserWindow.h            \
+       SOPEXConsole.h                  \
+       SOPEXConstants.h                \
+       SOPEXContentValidator.h         \
+       SOPEXDocument.h                 \
+       SOPEXMain.h                     \
+       SOPEXRangeUtilities.h           \
+       SOPEXSheetRunner.h              \
+       SOPEXStatisticsController.h     \
+       SOPEXTextView.h                 \
+       SOPEXToolbarController.h        \
+       SOPEXWODocument.h               \
+       SOPEXWOXDocument.h              \
+       SOPEXWebConnection.h            \
+       SOPEXWebMetaParser.h            \
+
+SOPEX_OBJC_FILES += \
+       SOPEXAppController.m            \
+       SOPEXAuthPanel.m                \
+       SOPEXBrowserController.m        \
+       SOPEXBrowserWindow.m            \
+       SOPEXConsole.m                  \
+       SOPEXConsoleAppender.m          \
+       SOPEXConsoleEventFormatter.m    \
+       SOPEXConstants.m                \
+       SOPEXContentValidator.m         \
+       SOPEXDocument.m                 \
+       SOPEXMain.m                     \
+       SOPEXRangeUtilities.m           \
+       SOPEXSheetRunner.m              \
+       SOPEXStatisticsController.m     \
+       SOPEXTextView.m                 \
+       SOPEXToolbarController.m        \
+       SOPEXWODocument.m               \
+       SOPEXWOXDocument.m              \
+       SOPEXWebConnection.m            \
+       SOPEXWebMetaParser.m            \
+       \
+       WebView+Ext.m                   \
+       NSBundle+Ext.m                  \
+       NSString+Ext.m                  \
+
+SOPEX_LANGUAGES += \
+       English
+
+SOPEX_LOCALIZED_RESOURCE_FILES += \
+       InfoPlist.strings               \
+       Localizable.strings             \
+       SOPEXBrowserController.nib      \
+       SOPEXConsole.nib                \
+       SOPEXConsole.toolbar            \
+       SOPEXStatisticsNatLang.plist    \
+       SOPEXStats.nib                  \
+       SOPEXWebUI.toolbar
+
+SOPEX_RESOURCE_FILES += \
+       Clean.tiff      \
+       Info.plist      \
+       Lori.icns       \
+       Reload.tiff     \
+       version.plist
+
+-include GNUmakefile.preamble
+include $(GNUSTEP_MAKEFILES)/framework.make
+-include GNUmakefile.postamble

diff --git a/sopex/SOPEX/GNUmakefile.preamble b/sopex/SOPEX/GNUmakefile.preamble
new file mode 100644 (file)
index 0000000..874f80f
--- /dev/null
+++ b/sopex/SOPEX/GNUmakefile.preamble
@@ -0,0 +1,27 @@
+# compilation settings
+
+SOPE_ROOT=../..
+
+SOPEX_LIBRARIES_DEPEND_UPON += \
+       -framework WebKit       \
+       -framework AppKit       \
+       -framework NGObjWeb     \
+       -framework NGMime       \
+       -framework NGStreams -framework NGExtensions -framework EOControl \
+       -framework XmlRpc -framework DOM -framework SaxObjC
+
+
+# library/framework search pathes
+
+DEP_DIRS = \
+       $(SOPE_ROOT)/sope-appserver/NGObjWeb    \
+       $(SOPE_ROOT)/sope-mime                  \
+       $(SOPE_ROOT)/sope-core/NGStreams        \
+       $(SOPE_ROOT)/sope-core/NGExtensions     \
+       $(SOPE_ROOT)/sope-core/EOControl        \
+       $(SOPE_ROOT)/sope-xml/DOM               \
+       $(SOPE_ROOT)/sope-xml/XmlRpc            \
+       $(SOPE_ROOT)/sope-xml/SaxObjC
+
+ADDITIONAL_LIB_DIRS += \
+       $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))

diff --git a/sopex/SOPEX/NSBundle+Ext.m b/sopex/SOPEX/NSBundle+Ext.m
index 7bdb6bc33b90c246a222177e88e971aaf24fc3cb..aa4145106c5276605c94778880d233eb67e9403c 100644 (file)
--- a/sopex/SOPEX/NSBundle+Ext.m
+++ b/sopex/SOPEX/NSBundle+Ext.m
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2004 Marcus Mueller <znek@mulle-kybernetik.com>
+ Copyright (C) 2004-2005 Marcus Mueller <znek@mulle-kybernetik.com>
 
  This file is part of OGo
 
@@ -18,7 +18,6 @@
  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
  02111-1307, USA.
  */
-// $Id: NSBundle+Ext.m,v 1.1 2004/05/02 16:27:46 znek Exp $
 //  Created by znek on Sun May 02 2004.
 
 

diff --git a/sopex/SOPEX/SOPEXAppController.m b/sopex/SOPEX/SOPEXAppController.m
index 7e4f24a55845e19cb29813ee1b15bc8f72a43bab..9e4c4f9f1f04e02699205d44f2583080302268fa 100644 (file)
--- a/sopex/SOPEX/SOPEXAppController.m
+++ b/sopex/SOPEX/SOPEXAppController.m
@@ -27,7 +27,7 @@
 #import "SOPEXConstants.h"
 #import "SOPEXWebConnection.h"
 #import "SOPEXBrowserController.h"
-
+#import <NGObjWeb/NGObjWeb.h>
 
 #define DNC [NSNotificationCenter defaultCenter]
 #define UD [NSUserDefaults standardUserDefaults]

diff --git a/sopex/SOPEX/SOPEXConsole.h b/sopex/SOPEX/SOPEXConsole.h
index 8cc188bb287f46a4ac49a507d7e83f61cb5d771e..371162ce7c8616c3b052aaccaf32198698493347 100644 (file)
--- a/sopex/SOPEX/SOPEXConsole.h
+++ b/sopex/SOPEX/SOPEXConsole.h
@@ -24,6 +24,7 @@
 
 #import <AppKit/AppKit.h>
 
+@class NGLogEvent;
 @class SOPEXToolbarController;
 
 @interface SOPEXConsole : NSObject

diff --git a/sopex/SOPEX/SOPEXConsoleEventFormatter.m b/sopex/SOPEX/SOPEXConsoleEventFormatter.m
index 123c714ca643d0d4f59d9ccc5e93066c987c6dcf..2e4f5ca59a9cb7896e9ab314022a8280eddb9b9c 100644 (file)
--- a/sopex/SOPEX/SOPEXConsoleEventFormatter.m
+++ b/sopex/SOPEX/SOPEXConsoleEventFormatter.m
@@ -32,7 +32,7 @@
 
 @implementation SOPEXConsoleEventFormatter
 
-static __inline__ unsigned char * levelPrefixForEvent(NGLogEvent *_event) {
+static __inline__ char * levelPrefixForEvent(NGLogEvent *_event) {
   switch ([_event level]) {
     case NGLogLevelWarn:  return "[WARN ] ";
     case NGLogLevelError: return "[ERROR] ";

diff --git a/sopex/SOPEX/SOPEXContentValidator.m b/sopex/SOPEX/SOPEXContentValidator.m
index 21f9166ef7a72f9138793f24b0e823c7c4b848f0..a5c0a1ccf57792eae7b0e880ed3b59aaf2fe81ed 100644 (file)
--- a/sopex/SOPEX/SOPEXContentValidator.m
+++ b/sopex/SOPEX/SOPEXContentValidator.m
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2004 Marcus Mueller <znek@mulle-kybernetik.com>
+ Copyright (C) 2004-2005 Marcus Mueller <znek@mulle-kybernetik.com>
 
  This file is part of OGo
 
@@ -24,6 +24,7 @@
 
 #import "SOPEXContentValidator.h"
 #import <NGObjWeb/NGObjWeb.h>
+#import <Foundation/NSError.h>
 
 
 NSString *SOPEXDocumentValidationErrorDomain = @"SOPEXDocumentValidationErrorDomain";
@@ -37,6 +38,11 @@ NSString *SOPEXDocumentValidationErrorDomain = @"SOPEXDocumentValidationErrorDom
 @end
 
 
+@interface NSObject(UsedNGObjWebPrivates)
+- (id)initWithHandler:(id)_handler;
+@end
+
+
 @implementation SOPEXContentValidator
 
 
@@ -131,15 +137,12 @@ NSString *SOPEXDocumentValidationErrorDomain = @"SOPEXDocumentValidationErrorDom
     else
         data = content;
     
-    NS_DURING
-        
-        parser = [[parserClass alloc] initWithHandler:self];
-        [parser performSelector:selector withObject:data];
-        
+    NS_DURING {
+      *(&parser) = [[parserClass alloc] initWithHandler:self];
+      [parser performSelector:selector withObject:data];
+    }
     NS_HANDLER
-        
-        [self->errors addObject:[localException reason]];
-        
+      [self->errors addObject:[localException reason]];
     NS_ENDHANDLER;
     
     [parser release];

diff --git a/sopex/SOPEX/SOPEXRangeUtilities.m b/sopex/SOPEX/SOPEXRangeUtilities.m
index 3f82d8cef39daf95b136efe027570b8464e1559f..5a1138dc3681258af25b6628eadf28a0016d605b 100644 (file)
--- a/sopex/SOPEX/SOPEXRangeUtilities.m
+++ b/sopex/SOPEX/SOPEXRangeUtilities.m
@@ -93,11 +93,12 @@ NSRange SOPEX_findOpenTagForRangeInString(NSRange range, NSString *string)
         unichar charToLeft;
         
         charToLeft = [string characterAtIndex:--left];
-        if(!SOPEX_isValidTagNameCharacter(charToLeft))
+        if (!SOPEX_isValidTagNameCharacter(charToLeft)) {
             if(charToLeft == '<')
                 found = YES;
             else
                 break;
+       }
     }
     if(!found)
         return NSMakeRange(NSNotFound, 0);

diff --git a/sopex/SOPEX/SOPEXSheetRunner.h b/sopex/SOPEX/SOPEXSheetRunner.h
index 14ba2a69e40a321b856042f6d9e4d124faca2e40..800a9832bea09c8b460580db288f771850edc081 100644 (file)
--- a/sopex/SOPEX/SOPEXSheetRunner.h
+++ b/sopex/SOPEX/SOPEXSheetRunner.h
@@ -18,7 +18,6 @@
  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
  02111-1307, USA.
  */
-// $Id: SOPEXSheetRunner.h,v 1.1 2004/04/01 19:04:36 znek Exp $
 //  Created by znek on Mon Mar 29 2004.
 
 #ifndef        __SOPEX_SOPEXSheetRunner_H_
@@ -26,6 +25,7 @@
 
 #import <Foundation/NSObject.h>
 
+@class NSWindow;
 
 @interface SOPEXSheetRunner : NSObject
 {

diff --git a/sopex/SOPEX/SOPEXSheetRunner.m b/sopex/SOPEX/SOPEXSheetRunner.m
index b62389d544a44c795d39614f9f5cadfb325b4c49..e6e68e6ed8275b4b765ac8341d6abd551237337a 100644 (file)
--- a/sopex/SOPEX/SOPEXSheetRunner.m
+++ b/sopex/SOPEX/SOPEXSheetRunner.m
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2004 Marcus Mueller <znek@mulle-kybernetik.com>
+ Copyright (C) 2004-2005 Marcus Mueller <znek@mulle-kybernetik.com>
 
  This file is part of OGo
 
@@ -18,12 +18,11 @@
  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
  02111-1307, USA.
  */
-// $Id: SOPEXSheetRunner.m,v 1.2 2004/05/02 16:27:46 znek Exp $
 //  Created by znek on Mon Mar 29 2004.
 
 
 #import "SOPEXSheetRunner.h"
-
+#import <AppKit/AppKit.h>
 
 @interface SOPEXSheetRunner (PrivateAPI)
 + (id)defaultRunner;

diff --git a/sopex/SOPEX/SOPEXStatisticsController.m b/sopex/SOPEX/SOPEXStatisticsController.m
index 31c5c56afe09d210911b24df2bd60d2ccc4fc287..685bd83ccb6b42ec444a512c3ada9d08fcaf89ab 100644 (file)
--- a/sopex/SOPEX/SOPEXStatisticsController.m
+++ b/sopex/SOPEX/SOPEXStatisticsController.m
@@ -296,11 +296,12 @@
 
 - (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
 {
-    if([item isKindOfClass:[NSString class]])
+    if([item isKindOfClass:[NSString class]]) {
         if([[tableColumn identifier] isEqualToString:@"name"])
             return item;
         else
             return nil;
+    }
     return [item objectForKey:[tableColumn identifier]];
 }
 

diff --git a/sopex/SOPEX/SOPEXWebConnection.h b/sopex/SOPEX/SOPEXWebConnection.h
index 0a3b58afb90a0f4abde24585b6fcac36a3e1bec9..9d4a84fb0ae476ca32d0e3023b4ac98abdd85045 100644 (file)
--- a/sopex/SOPEX/SOPEXWebConnection.h
+++ b/sopex/SOPEX/SOPEXWebConnection.h
@@ -1,11 +1,10 @@
-// $Id: SOPEXWebConnection.h,v 1.3 2004/05/02 16:27:46 znek Exp $
 
 #ifndef __SOPEX_SOPEXWebConnection_H__
 #define __SOPEX_SOPEXWebConnection_H__
 
 #import <Foundation/NSObject.h>
 
-@class NSURL, NSString, NSData, NSBundle;
+@class NSURL, NSString, NSData, NSBundle, NSMutableDictionary;
 @class NSURLResponse;
 
 @interface SOPEXWebConnection : NSObject 

diff --git a/sopex/SOPEX/Version b/sopex/SOPEX/Version
index 2aa782b82dc19d834b48a024f38e7a67fb8c20d8..4ebde3212f6a348e73a9b070eb2f0f4bb24b385a 100644 (file)
--- a/sopex/SOPEX/Version
+++ b/sopex/SOPEX/Version
@@ -1,4 +1,3 @@
-# $Id: Version,v 1.10 2004/06/05 21:49:26 znek Exp $
 #
 # This file is included by library makefiles to set the version information 
 # of the executable.
@@ -8,7 +7,7 @@
 
 MAJOR_VERSION=2
 MINOR_VERSION=0
-SUBMINOR_VERSION=2
+SUBMINOR_VERSION=3
 
 # v2.0.0 requires NGObjWeb v4.5.95
 # v1.0.7 requires NGObjWeb v4.2.341