mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-11 00:30:49 +00:00
r3591@goomba: andy | 2006-05-25 13:17:13 -0500
Additional changes to get rid of autogenerated files git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@22984 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Andrew Ruder
parent
95874a2626
commit
e14a66de2a
7 changed files with 114 additions and 41 deletions
10
ChangeLog
10
ChangeLog
|
|
@ -1,3 +1,13 @@
|
|||
2006-05-25 Andrew Ruder <andy@aeruder.net>
|
||||
* Source/NSConcreteNumberTemplate.m (from NSConcreteNumber.m):
|
||||
* Source/GSConcreteValueTemplate.m (from GSTemplateValue.m):
|
||||
* Source/GNUmakefile:
|
||||
* Source/Makefile.postamble:
|
||||
* Source/GSConcreteValue.m (added):
|
||||
* Source/NSConcreteNumber.m (added):
|
||||
Get rid of use of sed to generate concrete NSNumber/NSValue classes.
|
||||
Use preprocessor to get around generation of additional files.
|
||||
|
||||
2006-05-24 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Source/NSPredicate.m: Restore last changes with varargs rewrite
|
||||
|
|
|
|||
|
|
@ -133,6 +133,7 @@ GNU_HEADERS = $(ADD_HEADERS)
|
|||
BASE_MFILES = \
|
||||
GSArray.m \
|
||||
GSAttributedString.m \
|
||||
GSConcreteValue.m \
|
||||
GSCountedSet.m \
|
||||
GSDictionary.m \
|
||||
GSFormat.m \
|
||||
|
|
@ -156,6 +157,7 @@ NSClassDescription.m \
|
|||
NSCoder.m \
|
||||
NSCopyObject.m \
|
||||
NSCountedSet.m \
|
||||
NSConcreteNumber.m \
|
||||
NSConnection.m \
|
||||
NSData.m \
|
||||
NSDate.m \
|
||||
|
|
@ -248,17 +250,9 @@ GNU_MFILES += callframe.m
|
|||
BASE_MFILES += GSFFCallInvocation.m
|
||||
endif
|
||||
|
||||
NSVALUE_MFILES = \
|
||||
GSValue0.m GSValue1.m GSValue2.m GSValue3.m \
|
||||
GSValue4.m GSValue5.m
|
||||
NSNUMBER_MFILES = \
|
||||
NSNumber0.m NSNumber1.m NSNumber2.m NSNumber3.m \
|
||||
NSNumber4.m NSNumber5.m NSNumber6.m NSNumber7.m \
|
||||
NSNumber8.m NSNumber9.m NSNumber10.m NSNumber11.m \
|
||||
NSNumber12.m
|
||||
|
||||
BASE_OTHER_SRCFILES = \
|
||||
NSConcreteNumber.m \
|
||||
NSConcreteNumberTemplate.m \
|
||||
GSConcreteValueTemplate.m \
|
||||
GSTemplateValue.m \
|
||||
dld-load.h \
|
||||
hpux-load.h \
|
||||
|
|
@ -374,7 +368,7 @@ endif
|
|||
|
||||
# The Objective-C source files to be compiled
|
||||
libgnustep-base_OBJC_FILES = $(GNU_MFILES) \
|
||||
$(BASE_MFILES) $(NSVALUE_MFILES) $(NSNUMBER_MFILES)
|
||||
$(BASE_MFILES)
|
||||
libgnustep-base_C_FILES = $(GNU_CFILES)
|
||||
|
||||
# Extra DLL exports file
|
||||
|
|
|
|||
32
Source/GSConcreteValue.m
Normal file
32
Source/GSConcreteValue.m
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
#include "config.h"
|
||||
#include "Foundation/NSValue.h"
|
||||
#include "Foundation/NSString.h"
|
||||
#include "Foundation/NSException.h"
|
||||
#include "Foundation/NSCoder.h"
|
||||
#include "Foundation/NSObjCRuntime.h"
|
||||
#include "GNUstepBase/preface.h"
|
||||
|
||||
#define TYPE_ORDER 0
|
||||
#include "GSConcreteValueTemplate.m"
|
||||
#undef TYPE_ORDER
|
||||
|
||||
#define TYPE_ORDER 1
|
||||
#include "GSConcreteValueTemplate.m"
|
||||
#undef TYPE_ORDER
|
||||
|
||||
#define TYPE_ORDER 2
|
||||
#include "GSConcreteValueTemplate.m"
|
||||
#undef TYPE_ORDER
|
||||
|
||||
#define TYPE_ORDER 3
|
||||
#include "GSConcreteValueTemplate.m"
|
||||
#undef TYPE_ORDER
|
||||
|
||||
#define TYPE_ORDER 4
|
||||
#include "GSConcreteValueTemplate.m"
|
||||
#undef TYPE_ORDER
|
||||
|
||||
#define TYPE_ORDER 5
|
||||
#include "GSConcreteValueTemplate.m"
|
||||
#undef TYPE_ORDER
|
||||
|
||||
|
|
@ -22,14 +22,6 @@
|
|||
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include "Foundation/NSValue.h"
|
||||
#include "Foundation/NSString.h"
|
||||
#include "Foundation/NSException.h"
|
||||
#include "Foundation/NSCoder.h"
|
||||
#include "Foundation/NSObjCRuntime.h"
|
||||
#include "GNUstepBase/preface.h"
|
||||
|
||||
|
||||
/* This file should be run through a preprocessor with the macro TYPE_ORDER
|
||||
defined to a number from 0 to 4 corresponding to each value type */
|
||||
|
|
@ -265,3 +257,6 @@
|
|||
}
|
||||
|
||||
@end
|
||||
#undef GSTemplateValue
|
||||
#undef TYPE_METHOD
|
||||
#undef TYPE_NAME
|
||||
|
|
|
|||
|
|
@ -114,16 +114,6 @@ after-distclean::
|
|||
# Things to do after checking
|
||||
# after-check::
|
||||
|
||||
# Creation of NSValue and NSNumber concrete classes from templates
|
||||
$(NSVALUE_MFILES) : GSTemplateValue.m
|
||||
rm -f $@
|
||||
echo '#define TYPE_ORDER' `echo $@ | sed -e "s,[^0-9],,g"` >$@
|
||||
cat GSTemplateValue.m >> $@
|
||||
$(NSNUMBER_MFILES) : NSConcreteNumber.m
|
||||
rm -f $@
|
||||
echo '#define TYPE_ORDER' `echo $@ | sed -e "s,[^0-9],,g"` >$@
|
||||
cat NSConcreteNumber.m >> $@
|
||||
|
||||
$(GNUSTEP_OBJ_DIR)/objc-load${OEXT}: dynamic-load.h
|
||||
|
||||
dynamic-load.h: ../config.status
|
||||
|
|
|
|||
60
Source/NSConcreteNumber.m
Normal file
60
Source/NSConcreteNumber.m
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
#include "config.h"
|
||||
#include "GNUstepBase/preface.h"
|
||||
#include "GSConfig.h"
|
||||
#include "Foundation/NSObjCRuntime.h"
|
||||
#include "Foundation/NSString.h"
|
||||
#include "Foundation/NSException.h"
|
||||
#include "Foundation/NSCoder.h"
|
||||
#include "NSConcreteNumber.h"
|
||||
|
||||
#define TYPE_ORDER 0
|
||||
#include "NSConcreteNumberTemplate.m"
|
||||
#undef TYPE_ORDER
|
||||
|
||||
#define TYPE_ORDER 1
|
||||
#include "NSConcreteNumberTemplate.m"
|
||||
#undef TYPE_ORDER
|
||||
|
||||
#define TYPE_ORDER 2
|
||||
#include "NSConcreteNumberTemplate.m"
|
||||
#undef TYPE_ORDER
|
||||
|
||||
#define TYPE_ORDER 3
|
||||
#include "NSConcreteNumberTemplate.m"
|
||||
#undef TYPE_ORDER
|
||||
|
||||
#define TYPE_ORDER 4
|
||||
#include "NSConcreteNumberTemplate.m"
|
||||
#undef TYPE_ORDER
|
||||
|
||||
#define TYPE_ORDER 5
|
||||
#include "NSConcreteNumberTemplate.m"
|
||||
#undef TYPE_ORDER
|
||||
|
||||
#define TYPE_ORDER 6
|
||||
#include "NSConcreteNumberTemplate.m"
|
||||
#undef TYPE_ORDER
|
||||
|
||||
#define TYPE_ORDER 7
|
||||
#include "NSConcreteNumberTemplate.m"
|
||||
#undef TYPE_ORDER
|
||||
|
||||
#define TYPE_ORDER 8
|
||||
#include "NSConcreteNumberTemplate.m"
|
||||
#undef TYPE_ORDER
|
||||
|
||||
#define TYPE_ORDER 9
|
||||
#include "NSConcreteNumberTemplate.m"
|
||||
#undef TYPE_ORDER
|
||||
|
||||
#define TYPE_ORDER 10
|
||||
#include "NSConcreteNumberTemplate.m"
|
||||
#undef TYPE_ORDER
|
||||
|
||||
#define TYPE_ORDER 11
|
||||
#include "NSConcreteNumberTemplate.m"
|
||||
#undef TYPE_ORDER
|
||||
|
||||
#define TYPE_ORDER 12
|
||||
#include "NSConcreteNumberTemplate.m"
|
||||
#undef TYPE_ORDER
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
# line 1 "NSConcreteNumber.m" /* So gdb knows which file we are in */
|
||||
# line 1 "NSConcreteNumberTemplate.m" /* So gdb knows which file we are in */
|
||||
/* NSConcreteNumber - Object encapsulation of numbers
|
||||
|
||||
Copyright (C) 1993, 1994, 1996, 2000 Free Software Foundation, Inc.
|
||||
|
|
@ -25,17 +25,6 @@
|
|||
Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include "GNUstepBase/preface.h"
|
||||
#include "GSConfig.h"
|
||||
#include "Foundation/NSObjCRuntime.h"
|
||||
#include "Foundation/NSString.h"
|
||||
#include "Foundation/NSException.h"
|
||||
#include "Foundation/NSCoder.h"
|
||||
#include "Foundation/NSPortCoder.h"
|
||||
#include "Foundation/NSCoder.h"
|
||||
#include "NSConcreteNumber.h"
|
||||
|
||||
/* This file should be run through a preprocessor with the macro TYPE_ORDER
|
||||
defined to a number from 0 to 12 corresponding to each number type */
|
||||
#if TYPE_ORDER == 0
|
||||
|
|
@ -618,3 +607,6 @@
|
|||
|
||||
@end
|
||||
|
||||
#undef TYPE_TYPE
|
||||
#undef NumberTemplate
|
||||
#undef PT
|
||||
|
|
|
|||
Loading…
Reference in a new issue