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

diff --git a/sope-gdl1/GDLAccess/ChangeLog b/sope-gdl1/GDLAccess/ChangeLog
index 4adfba7b97cc63e2c216ffee0bd81c48a54f5aa4..1e39cfd6b41348934ddb8644e046c4fc5cd5e400 100644 (file)
--- a/sope-gdl1/GDLAccess/ChangeLog
+++ b/sope-gdl1/GDLAccess/ChangeLog
@@ -1,3 +1,11 @@
+2004-08-21  Helge Hess  <helge.hess@opengroupware.org>
+
+       * v1.0.33
+
+       * removed GDLExtensions
+
+       * moved headers files from EOAccess subdirectory to main directory
+
 2004-08-20  Helge Hess  <helge.hess@opengroupware.org>
 
        * moved from ThirdParty to SOPE/sope-gdl1 (v1.0.32)

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOAccess.h b/sope-gdl1/GDLAccess/EOAccess.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOAccess.h
rename to sope-gdl1/GDLAccess/EOAccess.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOAdaptor.h b/sope-gdl1/GDLAccess/EOAdaptor.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOAdaptor.h
rename to sope-gdl1/GDLAccess/EOAdaptor.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOAdaptorChannel+Attributes.h b/sope-gdl1/GDLAccess/EOAdaptorChannel+Attributes.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOAdaptorChannel+Attributes.h
rename to sope-gdl1/GDLAccess/EOAdaptorChannel+Attributes.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOAdaptorChannel.h b/sope-gdl1/GDLAccess/EOAdaptorChannel.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOAdaptorChannel.h
rename to sope-gdl1/GDLAccess/EOAdaptorChannel.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOAdaptorContext.h b/sope-gdl1/GDLAccess/EOAdaptorContext.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOAdaptorContext.h
rename to sope-gdl1/GDLAccess/EOAdaptorContext.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOAdaptorDataSource.h b/sope-gdl1/GDLAccess/EOAdaptorDataSource.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOAdaptorDataSource.h
rename to sope-gdl1/GDLAccess/EOAdaptorDataSource.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOAdaptorGlobalID.h b/sope-gdl1/GDLAccess/EOAdaptorGlobalID.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOAdaptorGlobalID.h
rename to sope-gdl1/GDLAccess/EOAdaptorGlobalID.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOAdaptorOperation.h b/sope-gdl1/GDLAccess/EOAdaptorOperation.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOAdaptorOperation.h
rename to sope-gdl1/GDLAccess/EOAdaptorOperation.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOArrayProxy.h b/sope-gdl1/GDLAccess/EOArrayProxy.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOArrayProxy.h
rename to sope-gdl1/GDLAccess/EOArrayProxy.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOAttribute.h b/sope-gdl1/GDLAccess/EOAttribute.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOAttribute.h
rename to sope-gdl1/GDLAccess/EOAttribute.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOAttributeOrdering.h b/sope-gdl1/GDLAccess/EOAttributeOrdering.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOAttributeOrdering.h
rename to sope-gdl1/GDLAccess/EOAttributeOrdering.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOCustomValues.h b/sope-gdl1/GDLAccess/EOCustomValues.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOCustomValues.h
rename to sope-gdl1/GDLAccess/EOCustomValues.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EODatabase.h b/sope-gdl1/GDLAccess/EODatabase.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EODatabase.h
rename to sope-gdl1/GDLAccess/EODatabase.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EODatabaseChannel.h b/sope-gdl1/GDLAccess/EODatabaseChannel.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EODatabaseChannel.h
rename to sope-gdl1/GDLAccess/EODatabaseChannel.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EODatabaseContext.h b/sope-gdl1/GDLAccess/EODatabaseContext.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EODatabaseContext.h
rename to sope-gdl1/GDLAccess/EODatabaseContext.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EODatabaseFault.h b/sope-gdl1/GDLAccess/EODatabaseFault.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EODatabaseFault.h
rename to sope-gdl1/GDLAccess/EODatabaseFault.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EODatabaseFaultResolver.h b/sope-gdl1/GDLAccess/EODatabaseFaultResolver.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EODatabaseFaultResolver.h
rename to sope-gdl1/GDLAccess/EODatabaseFaultResolver.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EODelegateResponse.h b/sope-gdl1/GDLAccess/EODelegateResponse.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EODelegateResponse.h
rename to sope-gdl1/GDLAccess/EODelegateResponse.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOEntity+Factory.h b/sope-gdl1/GDLAccess/EOEntity+Factory.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOEntity+Factory.h
rename to sope-gdl1/GDLAccess/EOEntity+Factory.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOEntity.h b/sope-gdl1/GDLAccess/EOEntity.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOEntity.h
rename to sope-gdl1/GDLAccess/EOEntity.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOExpressionArray.h b/sope-gdl1/GDLAccess/EOExpressionArray.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOExpressionArray.h
rename to sope-gdl1/GDLAccess/EOExpressionArray.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOFExceptions.h b/sope-gdl1/GDLAccess/EOFExceptions.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOFExceptions.h
rename to sope-gdl1/GDLAccess/EOFExceptions.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOFault.h b/sope-gdl1/GDLAccess/EOFault.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOFault.h
rename to sope-gdl1/GDLAccess/EOFault.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOFaultHandler.h b/sope-gdl1/GDLAccess/EOFaultHandler.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOFaultHandler.h
rename to sope-gdl1/GDLAccess/EOFaultHandler.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOGenericRecord.h b/sope-gdl1/GDLAccess/EOGenericRecord.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOGenericRecord.h
rename to sope-gdl1/GDLAccess/EOGenericRecord.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOJoinTypes.h b/sope-gdl1/GDLAccess/EOJoinTypes.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOJoinTypes.h
rename to sope-gdl1/GDLAccess/EOJoinTypes.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOKeySortOrdering.h b/sope-gdl1/GDLAccess/EOKeySortOrdering.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOKeySortOrdering.h
rename to sope-gdl1/GDLAccess/EOKeySortOrdering.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOModel.h b/sope-gdl1/GDLAccess/EOModel.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOModel.h
rename to sope-gdl1/GDLAccess/EOModel.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOModelGroup.h b/sope-gdl1/GDLAccess/EOModelGroup.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOModelGroup.h
rename to sope-gdl1/GDLAccess/EOModelGroup.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EONull.h b/sope-gdl1/GDLAccess/EONull.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EONull.h
rename to sope-gdl1/GDLAccess/EONull.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOObjectUniquer.h b/sope-gdl1/GDLAccess/EOObjectUniquer.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOObjectUniquer.h
rename to sope-gdl1/GDLAccess/EOObjectUniquer.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOPrimaryKeyDictionary.h b/sope-gdl1/GDLAccess/EOPrimaryKeyDictionary.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOPrimaryKeyDictionary.h
rename to sope-gdl1/GDLAccess/EOPrimaryKeyDictionary.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOQualifierScanner.h b/sope-gdl1/GDLAccess/EOQualifierScanner.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOQualifierScanner.h
rename to sope-gdl1/GDLAccess/EOQualifierScanner.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOQuotedExpression.h b/sope-gdl1/GDLAccess/EOQuotedExpression.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOQuotedExpression.h
rename to sope-gdl1/GDLAccess/EOQuotedExpression.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EORecordDictionary.h b/sope-gdl1/GDLAccess/EORecordDictionary.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EORecordDictionary.h
rename to sope-gdl1/GDLAccess/EORecordDictionary.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EORelationship.h b/sope-gdl1/GDLAccess/EORelationship.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EORelationship.h
rename to sope-gdl1/GDLAccess/EORelationship.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOSQLExpression.h b/sope-gdl1/GDLAccess/EOSQLExpression.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOSQLExpression.h
rename to sope-gdl1/GDLAccess/EOSQLExpression.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/EOSQLQualifier.h b/sope-gdl1/GDLAccess/EOSQLQualifier.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/EOSQLQualifier.h
rename to sope-gdl1/GDLAccess/EOSQLQualifier.h

diff --git a/sope-gdl1/GDLAccess/EOAccess/GDLAccess.h b/sope-gdl1/GDLAccess/GDLAccess.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/GDLAccess.h
rename to sope-gdl1/GDLAccess/GDLAccess.h

diff --git a/sope-gdl1/GDLAccess/GDLExtensions/ChangeLog b/sope-gdl1/GDLAccess/GDLExtensions/ChangeLog
deleted file mode 100644 (file)
index 05bae17..0000000
--- a/sope-gdl1/GDLAccess/GDLExtensions/ChangeLog
+++ /dev/null
@@ -1,44 +0,0 @@
-2004-06-28  Helge Hess  <helge.hess@opengroupware.org>
-
-       * GNUmakefile.preamble: fixed link pathes (v4.2.28)
-
-2002-08-15  Helge Hess  <helge.hess@skyrix.com>
-
-       * GNUmakefile: fixed Version imports (now v4.2.3)
-
-Mon Apr  2 22:02:05 2001  Helge Hess  <helge.hess@skyrix.com>
-
-       * GDLExtensions.m: fixed linking problem
-
-Tue Feb 29 19:06:44 2000  Helge Hess  <helge.hess@mdlink.de>
-
-       * MOF3 import
-
-Mon Apr 26 14:00:01 1999  Helge Hess  <helge@trex.mdlink.de>
-
-       * added kit class GDLExtensions
-
-       * use #include instead of #import
-
-Mon Dec 21 19:02:16 1998  Helge Hess  <helge@trex.mdlink.de>
-
-       * NSObject+EONullInit.m: added -stringValue to EONull
-
-Mon Dec 21 16:19:18 1998  Helge Hess  <helge@trex.mdlink.de>
-
-       * EOGenericRecord+KeyValueCoding2.m: updated for new EOGenericRecord
-         classes (which uses NSMapTable instead of a dictionary).
-
-Fri Dec 11 16:48:10 1998  Helge Hess  <helge@trex.mdlink.de>
-
-       * NSObject+EONullInit.m: added method '-isNull' to EONull, NSObject
-
-Fri Nov 27 19:55:21 1998  Helge Hess  <helge@trex.mdlink.de>
-
-       * added PB.project
-
-Fri Nov 27 19:55:12 1998  Helge Hess  <helge@trex.mdlink.de>
-
-       * created ChangeLog
-       
-

diff --git a/sope-gdl1/GDLAccess/GDLExtensions/EOEntity+Factory.h b/sope-gdl1/GDLAccess/GDLExtensions/EOEntity+Factory.h
deleted file mode 100644 (file)
index 193faa6..0000000
--- a/sope-gdl1/GDLAccess/GDLExtensions/EOEntity+Factory.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id: EOEntity+Factory.h 1 2004-08-20 10:38:46Z znek $
-
-#ifndef __GDLExtensions_EOEntity_Factory_P_H__
-#define __GDLExtensions_EOEntity_Factory_P_H__
-
-#include <EOAccess/EOEntity+Factory.h>
-
-#endif /* __GDLExtensions_EOEntity_Factory_H__ */

diff --git a/sope-gdl1/GDLAccess/GDLExtensions/GDLExtensions.h b/sope-gdl1/GDLAccess/GDLExtensions/GDLExtensions.h
deleted file mode 100644 (file)
index 63eb7aa..0000000
--- a/sope-gdl1/GDLAccess/GDLExtensions/GDLExtensions.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id: GDLExtensions.h 1 2004-08-20 10:38:46Z znek $
-
-#ifndef __GDLExtensions_H__
-#define __GDLExtensions_H__
-
-#if NeXT_Foundation_LIBRARY || COCOA_Foundation_LIBRARY
-#  include <GDLAccess/EOEntity+Factory.h>
-#  include <GDLAccess/NSObject+EONullInit.h>
-#else
-#  include <GDLExtensions/EOEntity+Factory.h>
-#  include <GDLExtensions/NSObject+EONullInit.h>
-#endif
-
-// kit class
-
-@interface GDLExtensions : NSObject
-@end
-
-#define LINK_GDLExtensions 
-
-#endif /* __GDLExtensions_H__ */

diff --git a/sope-gdl1/GDLAccess/GDLExtensions/GDLExtensions.m b/sope-gdl1/GDLAccess/GDLExtensions/GDLExtensions.m
deleted file mode 100644 (file)
index c40ff42..0000000
--- a/sope-gdl1/GDLAccess/GDLExtensions/GDLExtensions.m
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id: GDLExtensions.m 1 2004-08-20 10:38:46Z znek $
-
-#include "GDLExtensions.h"
-
-@implementation GDLExtensions
-
-- (void)_staticLinkClasses {
-}
-
-- (void)_staticLinkModules {
-}
-
-@end

diff --git a/sope-gdl1/GDLAccess/GDLExtensions/GNUmakefile b/sope-gdl1/GDLAccess/GDLExtensions/GNUmakefile
deleted file mode 100644 (file)
index c025379..0000000
--- a/sope-gdl1/GDLAccess/GDLExtensions/GNUmakefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: GNUmakefile 1 2004-08-20 10:38:46Z znek $
-
-SKYROOT=../..
-
-include $(GNUSTEP_MAKEFILES)/common.make
-include $(SKYROOT)/Version
--include ../Version
--include ./Version
-
-LIBRARY_NAME = libGDLExtensions
-
-libGDLExtensions_HEADER_FILES = \
-       GDLExtensions.h \
-       EOEntity+Factory.h      \
-       NSObject+EONullInit.h   \
-
-libGDLExtensions_OBJC_FILES = GDLExtensions.m
-
-libGDLExtensions_HEADER_FILES_DIR         = .
-libGDLExtensions_HEADER_FILES_INSTALL_DIR = /GDLExtensions
-libGDLExtensions_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
-
--include GNUmakefile.preamble
-include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/library.make
--include GNUmakefile.postamble

diff --git a/sope-gdl1/GDLAccess/GDLExtensions/GNUmakefile.preamble b/sope-gdl1/GDLAccess/GDLExtensions/GNUmakefile.preamble
deleted file mode 100644 (file)
index e1f7543..0000000
--- a/sope-gdl1/GDLAccess/GDLExtensions/GNUmakefile.preamble
+++ /dev/null
@@ -1,16 +0,0 @@
-# $Id: GNUmakefile.preamble 1 2004-08-20 10:38:46Z znek $
-
-libGDLExtensions_INCLUDE_DIRS += \
-       -I.. -I../GDLAccess -I../..
-
-ADDITIONAL_LIB_DIRS += \
-       -L../$(GNUSTEP_OBJ_DIR)                 \
-       -L../../../../SOPE/skyrix-core/EOControl/$(GNUSTEP_OBJ_DIR)
-
-libGDLExtensions_LIBRARIES_DEPEND_UPON += \
-       -lGDLAccess     \
-       -lEOControl
-
-ifeq ($(GNUSTEP_TARGET_OS),mingw32)
-libGDLExtensions_LIBRARIES_DEPEND_UPON += -lobjc
-endif

diff --git a/sope-gdl1/GDLAccess/GDLExtensions/NSObject+EONullInit.h b/sope-gdl1/GDLAccess/GDLExtensions/NSObject+EONullInit.h
deleted file mode 100644 (file)
index 894e6be..0000000
--- a/sope-gdl1/GDLAccess/GDLExtensions/NSObject+EONullInit.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id: NSObject+EONullInit.h 1 2004-08-20 10:38:46Z znek $
-
-#ifndef __GDLExtensions_NSObject_EONull_P_H__
-#define __GDLExtensions_NSObject_EONull_P_H__
-
-#include <EOAccess/NSObject+EONullInit.h>
-
-#endif /* __GDLExtensions_NSObject_EONull_H__ */

diff --git a/sope-gdl1/GDLAccess/GDLExtensions/common.h b/sope-gdl1/GDLAccess/GDLExtensions/common.h
deleted file mode 100644 (file)
index 0938f70..0000000
--- a/sope-gdl1/GDLAccess/GDLExtensions/common.h
+++ /dev/null
@@ -1,10 +0,0 @@
-// $Id: common.h 1 2004-08-20 10:38:46Z znek $
-
-// common include files
-
-#import <Foundation/Foundation.h>
-#import <EOAccess/EOAccess.h>
-
-#if NeXT_Foundation_LIBRARY
-#  import <extensions/NSObjectMacros.h>
-#endif

diff --git a/sope-gdl1/GDLAccess/GDLExtensions/libGDLExtensions.def b/sope-gdl1/GDLAccess/GDLExtensions/libGDLExtensions.def
deleted file mode 100644 (file)
index 875da0a..0000000
--- a/sope-gdl1/GDLAccess/GDLExtensions/libGDLExtensions.def
+++ /dev/null
@@ -1,2 +0,0 @@
-EXPORTS
-       __objc_class_name_GDLExtensions;

diff --git a/sope-gdl1/GDLAccess/EOAccess/NSObject+EONullInit.h b/sope-gdl1/GDLAccess/NSObject+EONullInit.h
similarity index 100%
rename from sope-gdl1/GDLAccess/EOAccess/NSObject+EONullInit.h
rename to sope-gdl1/GDLAccess/NSObject+EONullInit.h

diff --git a/sope-gdl1/GDLAccess/Version b/sope-gdl1/GDLAccess/Version
index 92391da2f428988bd5b26313abd5bcdf2e0fec5d..2544f203c4a6e1ede870f1bf1aeb6a044c712a66 100644 (file)
--- a/sope-gdl1/GDLAccess/Version
+++ b/sope-gdl1/GDLAccess/Version
@@ -1,3 +1,3 @@
 # $Id: Version 1 2004-08-20 10:38:46Z znek $
 
-SUBMINOR_VERSION:=32
+SUBMINOR_VERSION:=33