Header reorganizsateion - Please refer to ChangeLog

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@17407 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,172 @@
+2003-07-31  David Ayers  <d.ayers@inode.at>
+
+	* Created tag 'pre-header-reorg-20030731'.
+
+	* Headers/Additions/GNUstepBase: New directory.
+	* Headers/Additions/GNUstepBase/unicode: Ditto.
+	* Headers/Foundation: Ditto.
+	* Headers/gnustep/base: Obsoleted.
+	* Headers/gnustep/unicode: Ditto.
+
+	* Headers/Additions/GNUstepBase/DistributedObjects.h: Moved here
+	from Headers/gnustep/base.
+	* Headers/Additions/GNUstepBase/GCObject.h: Ditto.
+	* Headers/Additions/GNUstepBase/GNUstep.h: Ditto.
+	* Headers/Additions/GNUstepBase/GSCategories.h: Ditto.
+	* Headers/Additions/GNUstepBase/GSConfig.h.in: Ditto.
+	* Headers/Additions/GNUstepBase/GSFileHandle.h: Ditto.
+	* Headers/Additions/GNUstepBase/GSIArray.h: Ditto.
+	* Headers/Additions/GNUstepBase/GSIMap.h: Ditto.
+	* Headers/Additions/GNUstepBase/GSLocale.h: Ditto.
+	* Headers/Additions/GNUstepBase/GSMime.h: Ditto.
+	* Headers/Additions/GNUstepBase/GSObjCRuntime.h: Ditto.
+	* Headers/Additions/GNUstepBase/GSUnion.h: Ditto.
+	* Headers/Additions/GNUstepBase/GSXML.h: Ditto.
+	* Headers/Additions/GNUstepBase/Unicode.h: Ditto.
+	* Headers/Additions/GNUstepBase/behavior.h: Ditto.
+	* Headers/Additions/GNUstepBase/config.h.in: Ditto.
+	* Headers/Additions/GNUstepBase/objc-gnu2next.h: Ditto.
+	* Headers/Additions/GNUstepBase/preface.h.in: Ditto.
+	* Headers/Additions/GNUstepBase/thr-mach.h: Ditto.
+	* Headers/Additions/GNUstepBase/.cvsignore: Ditto.
+
+	* Headers/Additions/GNUstepBase/unicode/caseconv.h: Moved here
+	from Headers/gnustep/unicode.
+	* Headers/Additions/GNUstepBase/unicode/cop.h: Ditto.
+	* Headers/Additions/GNUstepBase/unicode/cyrillic.h: Ditto.
+	* Headers/Additions/GNUstepBase/unicode/decomp.h: Ditto.
+	* Headers/Additions/GNUstepBase/unicode/gsm0338.h: Ditto.
+	* Headers/Additions/GNUstepBase/unicode/latin2.h: Ditto.
+	* Headers/Additions/GNUstepBase/unicode/latin9.h: Ditto.
+	* Headers/Additions/GNUstepBase/unicode/nextstep.h: Ditto.
+	* Headers/Additions/GNUstepBase/unicode/thai.h: Ditto.
+
+	* Headers/Foundation/Foundation.h: Moved here from
+	Headers/gnustep/base.
+	* Headers/Foundation/NSArchiver.h: Ditto.
+	* Headers/Foundation/NSArray.h: Ditto.
+	* Headers/Foundation/NSAttributedString.h: Ditto.
+	* Headers/Foundation/NSAutoreleasePool.h: Ditto.
+	* Headers/Foundation/NSBitmapCharSet.h: Ditto.
+	* Headers/Foundation/NSBundle.h: Ditto.
+	* Headers/Foundation/NSByteOrder.h: Ditto.
+	* Headers/Foundation/NSCalendarDate.h: Ditto.
+	* Headers/Foundation/NSCharacterSet.h: Ditto.
+	* Headers/Foundation/NSClassDescription.h: Ditto.
+	* Headers/Foundation/NSCoder.h: Ditto.
+	* Headers/Foundation/NSConcreteNumber.h: Ditto.
+	* Headers/Foundation/NSConnection.h: Ditto.
+	* Headers/Foundation/NSData.h: Ditto.
+	* Headers/Foundation/NSDate.h: Ditto.
+	* Headers/Foundation/NSDateFormatter.h: Ditto.
+	* Headers/Foundation/NSDebug.h: Ditto.
+	* Headers/Foundation/NSDecimal.h: Ditto.
+	* Headers/Foundation/NSDecimalNumber.h: Ditto.
+	* Headers/Foundation/NSDictionary.h: Ditto.
+	* Headers/Foundation/NSDistantObject.h: Ditto.
+	* Headers/Foundation/NSDistributedLock.h: Ditto.
+	* Headers/Foundation/NSDistributedNotificationCenter.h: Ditto.
+	* Headers/Foundation/NSEnumerator.h: Ditto.
+	* Headers/Foundation/NSException.h: Ditto.
+	* Headers/Foundation/NSFileHandle.h: Ditto.
+	* Headers/Foundation/NSFileManager.h: Ditto.
+	* Headers/Foundation/NSFormatter.h: Ditto.
+	* Headers/Foundation/NSGeometry.h: Ditto.
+	* Headers/Foundation/NSHashTable.h: Ditto.
+	* Headers/Foundation/NSHost.h: Ditto.
+	* Headers/Foundation/NSInvocation.h: Ditto.
+	* Headers/Foundation/NSKeyValueCoding.h: Ditto.
+	* Headers/Foundation/NSLock.h: Ditto.
+	* Headers/Foundation/NSMapTable.h: Ditto.
+	* Headers/Foundation/NSMethodSignature.h: Ditto.
+	* Headers/Foundation/NSNotification.h: Ditto.
+	* Headers/Foundation/NSNotificationQueue.h: Ditto.
+	* Headers/Foundation/NSNull.h: Ditto.
+	* Headers/Foundation/NSNumberFormatter.h: Ditto.
+	* Headers/Foundation/NSObjCRuntime.h: Ditto.
+	* Headers/Foundation/NSObject.h: Ditto.
+	* Headers/Foundation/NSPathUtilities.h: Ditto.
+	* Headers/Foundation/NSPort.h: Ditto.
+	* Headers/Foundation/NSPortCoder.h: Ditto.
+	* Headers/Foundation/NSPortMessage.h: Ditto.
+	* Headers/Foundation/NSPortNameServer.h: Ditto.
+	* Headers/Foundation/NSProcessInfo.h: Ditto.
+	* Headers/Foundation/NSProtocolChecker.h: Ditto.
+	* Headers/Foundation/NSProxy.h: Ditto.
+	* Headers/Foundation/NSRange.h: Ditto.
+	* Headers/Foundation/NSRunLoop.h: Ditto.
+	* Headers/Foundation/NSScanner.h: Ditto.
+	* Headers/Foundation/NSSerialization.h: Ditto.
+	* Headers/Foundation/NSSet.h: Ditto.
+	* Headers/Foundation/NSString.h: Ditto.
+	* Headers/Foundation/NSTask.h: Ditto.
+	* Headers/Foundation/NSThread.h: Ditto.
+	* Headers/Foundation/NSTimeZone.h: Ditto.
+	* Headers/Foundation/NSTimer.h: Ditto.
+	* Headers/Foundation/NSURL.h: Ditto.
+	* Headers/Foundation/NSURLHandle.h: Ditto.
+	* Headers/Foundation/NSUndoManager.h: Ditto.
+	* Headers/Foundation/NSUserDefaults.h: Ditto.
+	* Headers/Foundation/NSUtilities.h: Ditto.
+	* Headers/Foundation/NSValue.h: Ditto.
+	* Headers/Foundation/NSZone.h: Ditto.
+	
+	* Soruce/GSFormat.h: Ditto.
+	* Source/GSInvocation.h: Moved here from Headers/gnustep/base.
+	* Source/objc-load.h: Ditto.
+
+	* configure.ac: Update to new header structure.
+	* configure: Regenerated.
+	* Makefile.postamble: Remove handling of header-links and update
+	to new header structure.
+
+	* Source/GNUmakefile: Update to new header structure.  
+	Always install GSFileHandle.h, GSLocal.h, GSUnion.h, GSIArray.h,
+	GSIMap.h, preface.h as public headers.  
+	Do not install DistributedObjects.h, objc-load.h and thr-mach.h.
+	Install GSMime.h and GSXML.h in GNUstepBase instead of Foundation.
+	Include CompatibilityHeaders.make makefile fragement.
+
+	* Source/Makefile.preamble: Update to new header structure.
+	Split HEADER_DIR into HEADER_DIR_BASE and HEADER_DIR_FND.
+
+	* Source/Makefile.postamble: Update to new header structure.
+	Do not install mframe.h.
+	Update for HEADER_DIR split.
+	
+	* Source/CompatibilityHeaders.make: New file which installs dummy
+	headers in the place of the old headers, warning about obsoleting
+	the old location and includeing the header from its new location.
+
+	* Source/Additions/Makefile.preamble: Update to new header
+	structure.  Only add -I../../Headers for *-gnu-*.
+	
+	* Source/*.[hm]: Update includes for new header structure.
+	* Source/Additions/*.m: Ditto.
+	* Source/mframe/mframe.head: Ditto.
+	* Source/.cvsignore: Ignore config.h.
+
+	* Testing/Makefile.preamble: Update to new header structure.  Only
+	add -I../../Headers for *-gnu-*.
+	* Testing/*.[hm]: Update includes for new header structure.
+
+	* Tools/Makefile.preamble: Update to new header structure.  Only
+	add -I../../Headers for *-gnu-*.
+	* Tools/*.[hm]: Update includes for new header structure.
+
+	* Tools/make_strings/GNUmakefile.preamble: Update to new header
+	structure.  Only add -I../../Headers for *-gnu-*.
+	
+	* Source/DocMakefile: Update to new header structure.
+
+	* SSL/Makefile.preamble: Update to new header structure.
+	* SSL/GSSSLHandle.m: Ditto.
+
+	* Examples/Makefile.preamble: Use -I../Headers only with *-gnu-*.
+
+	* Headers/gnustep/base/UnixFileHandle.h: Removed.
+	* Headers/gnustep/base/WindowsFileHandle.h: Ditto.
+	
 2003-07-30  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Tools/gdomap.c: Some security fixes and tweaks.

Examples/Makefile.preamble

@@ -45,7 +45,9 @@ ADDITIONAL_OBJCFLAGS =
 ADDITIONAL_CFLAGS = 
 
 # Additional include directories the compiler should search
-ADDITIONAL_INCLUDE_DIRS = -I../Headers
+ifeq ($(FOUNDATION_LIB),gnu)
+  ADDITIONAL_INCLUDE_DIRS = -I../Headers
+endif
 
 # Additional LDFLAGS to pass to the linker
 ADDITIONAL_LDFLAGS = 

Headers/Additions/GNUstepBase/.cvsignore

@@ -0,0 +1 @@
+config.h GSConfig.h preface.h

Headers/Additions/GNUstepBase/DistributedObjects.h

@@ -26,7 +26,12 @@
 
 /*
  *	For internal use by the GNUstep base library.
- *
+ *	This file should not be installed.  The only reason why it is
+ *	located here, is to allow target specific headers (like mframe.h), 
+ *	which are located according to dis/enabled-flattened,
+ *	may include this file via standard "GNUstepBase/DistributedObjects.h"
+ *	and won't require an extra -I flag.
+ *	
  *	Classes should implement [-classForPortCoder] to return the class
  *	that should be sent over the wire.
  *

Headers/Additions/GNUstepBase/GSIArray.h

@@ -126,7 +126,7 @@
 /*
  *	Generate the union typedef
  */
-#include <base/GSUnion.h>
+#include <GNUstepBase/GSUnion.h>
 
 struct	_GSIArray {
   GSIArrayItem	*ptr;

Headers/Additions/GNUstepBase/GSIMap.h

@@ -130,7 +130,7 @@
 /*
  *	Generate the union typedef
  */
-#include <base/GSUnion.h>
+#include <GNUstepBase/GSUnion.h>
 
 
 #if (GSI_MAP_KTYPES) & GSUNION_OBJ
@@ -179,7 +179,7 @@
 /*
  *	Generate the union typedef
  */
-#include <base/GSUnion.h>
+#include <GNUstepBase/GSUnion.h>
 
 #if (GSI_MAP_VTYPES) & GSUNION_OBJ
 #define GSI_MAP_CLEAR_VAL(node)  node->value.obj = nil

Headers/Additions/GNUstepBase/GSObjCRuntime.h

@@ -111,7 +111,7 @@ GS_EXPORT void
 GSObjCSetValue(NSObject *self, NSString *key, id val, SEL sel,
 	       const char *type, unsigned size, int offset);
 
-#include <gnustep/base/objc-gnu2next.h>
+#include <GNUstepBase/objc-gnu2next.h>
 
 /*
  * This section includes runtime functions

Headers/Additions/GNUstepBase/config.h.in

@@ -1,4 +1,4 @@
-/* Headers/gnustep/base/config.h.in.  Generated from configure.ac by autoheader.  */
+/* Headers/Additions/GNUstepBase/config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Define if nested functions are broken on this compiler */
 #undef BROKEN_NESTED_FUNCTIONS

Headers/Additions/GNUstepBase/preface.h

@@ -0,0 +1,168 @@
+/* General purpose definitions for the GNU Objective-C Library.
+   Copyright (C) 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
+
+   Written by:  Andrew Kachites McCallum <mccallum@gnu.ai.mit.edu>
+   Created: May 1993
+
+   This file is part of the GNUstep Base Library.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
+*/ 
+
+#ifndef __preface_h_OBJECTS_INCLUDE
+#define __preface_h_OBJECTS_INCLUDE
+
+#include <stdlib.h>
+#include <stdarg.h>
+#include <GNUstepBase/objc-gnu2next.h>
+
+#if     defined(__WIN32__) || defined(_WIN32) || defined(__MS_WIN32__)
+#ifndef __WIN32__
+#define __WIN32__
+#endif
+#endif
+
+#ifdef __MINGW32__
+#ifndef __MINGW__
+#define __MINGW__
+#endif
+#ifndef __WIN32__
+#define __WIN32__
+#endif
+#endif
+
+#if defined(__WIN32__)
+#include <windows.h>
+#define GNUSTEP_BASE_SOCKET_MESSAGE (WM_USER + 1)
+#endif
+
+#if NeXT_RUNTIME
+ #include <objc/objc.h>
+ #include <objc/objc-class.h>
+ #include <objc/objc-runtime.h>
+ #ifndef _C_ATOM
+  #define _C_ATOM '%'
+ #endif
+ #define _F_CONST    0x01
+ #define _F_IN       0x01
+ #define _F_OUT      0x02
+ #define _F_INOUT    0x03
+ #define _F_BYCOPY   0x04
+ #define _F_ONEWAY   0x08
+ #define _C_CONST    'r'
+ #define _C_IN       'n'
+ #define _C_INOUT    'N'
+ #define _C_OUT      'o'
+ #define _C_BYCOPY   'O'
+ #define _C_ONEWAY   'V'
+#else				/* GNU Objective C Runtime */
+ #include <objc/objc.h>
+ #include <objc/objc-api.h>
+ #include <objc/encoding.h>
+ #include <objc/sarray.h>
+ /* #include <objc/objc-list.h> */
+#endif
+
+/*
+ * Hack for older compiler versions that don't have all defines
+ * needed in  objc-api.h
+ */
+#ifndef	_C_LNG_LNG
+#define	_C_LNG_LNG	'q'
+#endif
+#ifndef	_C_ULNG_LNG
+#define	_C_ULNG_LNG	'Q'
+#endif
+
+#ifndef __WIN32__
+#include <sys/param.h> /* Hack to get rid of warning in GNU libc 2.0.3. */
+#endif
+
+/* The following group of lines maintained by the gstep-base configure */
+#define GNUSTEP_BASE_VERSION            1.7.2
+#define GNUSTEP_BASE_MAJOR_VERSION      1
+#define GNUSTEP_BASE_MINOR_VERSION      7
+#define GNUSTEP_BASE_SUBMINOR_VERSION   2
+#define GNUSTEP_BASE_GCC_VERSION        2.8.0
+
+#if 0
+extern const char o_version[];
+extern const char o_gcc_version[];
+#if NeXT_cc
+extern const char o_NeXT_cc_version[];
+#endif
+#endif
+
+#define OBJC_MALLOC(VAR, TYPE, NUM) \
+   ((VAR) = (TYPE *) objc_malloc ((unsigned)(NUM)*sizeof(TYPE))) 
+#define OBJC_VALLOC(VAR, TYPE, NUM) \
+   ((VAR) = (TYPE *) objc_valloc ((unsigned)(NUM)*sizeof(TYPE))) 
+#define OBJC_ATOMIC_MALLOC(VAR, TYPE, NUM) \
+   ((VAR) = (TYPE *) objc_atomic_malloc ((unsigned)(NUM)*sizeof(TYPE))) 
+#define OBJC_REALLOC(VAR, TYPE, NUM) \
+   ((VAR) = (TYPE *) objc_realloc ((VAR), (unsigned)(NUM)*sizeof(TYPE)))
+#define OBJC_CALLOC(VAR, TYPE, NUM) \
+   ((VAR) = (TYPE *) objc_calloc ((unsigned)(NUM), sizeof(TYPE)))
+#define OBJC_FREE(PTR) objc_free (PTR)
+
+#ifndef MAX
+#define MAX(a,b) \
+       ({typeof(a) _MAX_a = (a); typeof(b) _MAX_b = (b);  \
+         _MAX_a > _MAX_b ? _MAX_a : _MAX_b; })
+#endif
+
+#ifndef MIN
+#define MIN(a,b) \
+       ({typeof(a) _MIN_a = (a); typeof(b) _MIN_b = (b);  \
+         _MIN_a < _MIN_b ? _MIN_a : _MIN_b; })
+#endif
+
+#ifndef ABS
+#define ABS(a) \
+       ({typeof(a) _ABS_a = (a); \
+         _ABS_a < 0 ? -_ABS_a : _ABS_a; })
+#endif
+
+#ifndef STRINGIFY
+#define STRINGIFY(s) XSTRINGIFY(s)
+#define XSTRINGIFY(s) #s
+#endif
+
+#ifndef OBJC_STRINGIFY
+#define OBJC_STRINGIFY(s) OBJC_XSTRINGIFY(s)
+#define OBJC_XSTRINGIFY(s) @#s
+#endif
+
+#ifndef PTR2LONG
+#define PTR2LONG(P) (((char*)(P))-(char*)0)
+#endif
+#ifndef LONG2PTR
+#define LONG2PTR(L) (((char*)0)+(L))
+#endif
+
+#if VSPRINTF_RETURNS_LENGTH 
+#define VSPRINTF_LENGTH(VSPF_CALL) (VSPF_CALL)
+#else
+#define VSPRINTF_LENGTH(VSPF_CALL) strlen((VSPF_CALL))
+#endif /* VSPRINTF_RETURNS_LENGTH */
+
+#if VASPRINTF_RETURNS_LENGTH 
+#define VASPRINTF_LENGTH(VASPF_CALL) (VASPF_CALL)
+#else
+#define VASPRINTF_LENGTH(VASPF_CALL) strlen((VASPF_CALL))
+#endif /* VSPRINTF_RETURNS_LENGTH */
+
+
+#endif /* __preface_h_OBJECTS_INCLUDE */

Headers/Additions/GNUstepBase/preface.h.in

@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 #include <stdarg.h>
-#include <base/objc-gnu2next.h>
+#include <GNUstepBase/objc-gnu2next.h>
 
 #if     defined(__WIN32__) || defined(_WIN32) || defined(__MS_WIN32__)
 #ifndef __WIN32__

Headers/Additions/GNUstepBase/thr-mach.h

@@ -38,7 +38,7 @@ Boston, MA 02111-1307, USA.  */
 #ifndef __thread_INCLUDE_GNU
 #define __thread_INCLUDE_GNU
 
-#include "objc/objc.h"
+#include <objc/objc.h>
 
 /*************************************************************************
  *  Universal static variables:

Headers/Foundation/NSLock.h

@@ -33,7 +33,7 @@
 
 #include <Foundation/NSObject.h>
 #ifdef NeXT_RUNTIME
-#include <base/thr-mach.h>
+#include <GNUstepBase/thr-mach.h>
 #endif
 
 /*

Headers/Foundation/NSObjCRuntime.h

@@ -28,7 +28,7 @@
 #ifndef __NSObjCRuntime_h_GNUSTEP_BASE_INCLUDE
 #define __NSObjCRuntime_h_GNUSTEP_BASE_INCLUDE
 
-#include <gnustep/base/GSObjCRuntime.h>
+#include <GNUstepBase/GSObjCRuntime.h>
 
 GS_EXPORT NSString	*NSStringFromSelector(SEL aSelector);
 GS_EXPORT SEL		NSSelectorFromString(NSString *aSelectorName);

Headers/Foundation/NSObject.h

@@ -36,7 +36,7 @@
 #endif
 
 #include <Foundation/NSObjCRuntime.h>
-#include <base/preface.h>
+#include <GNUstepBase/preface.h>
 #include <GSConfig.h>
 #include <objc/objc.h>
 #include <objc/Protocol.h>

Headers/Foundation/NSThread.h

@@ -26,7 +26,7 @@
 #define __NSThread_h_GNUSTEP_BASE_INCLUDE
 
 #ifdef NeXT_RUNTIME
-#include <base/thr-mach.h>
+#include <GNUstepBase/thr-mach.h>
 #endif
 #include <Foundation/NSDictionary.h>
 #include <Foundation/NSDate.h>