gnustep/libs-gdl2
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gdl2.git synced 2025-02-16 00:11:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Makefile.postamble (after-distclean::): Remove generated

Browse source 
GNUmakefile.
	* gdl2.make.in (ADDITIONAL_NATIVE_LIBS): Don't force
	linking of any GDL2 libraries just to get the version.
	[API Change].
	* variable-processing.make: Remove file (functionality
	is now supplied by -make).
	
	* EOInterface/GNUmakefile, EOAccess/EOModelGroup.m,
	EOAccess/GNUmakefile, EOControl/GNUmakefile,
	DBModeler/GNUmakefile, Tools/GNUmakefile,
	GDL2Palette/GNUmakefile, EOModeler/GNUmakefile,
	EOAdaptors/SQLiteAdaptor/LoginPanel/GNUmakefile,
	EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile:
	Remove reference to variable-processing.make.

	* EOControl/EOGenericRecord.m
	([-_infoForInstanceVariableNamed:stringName:retType:retSize:retOffset:]):
	Use marker that matches underlying type signedness.
	([-_getValueForKey:selector:type:size:offset:],
	[-_setValueForKey:selector:type:size:offset:]):
	Match 'offset' with underlying type signedness and update
	marker.
	([-storedValueForKey:],[-takeStoredValue:forKey:],
	[-takeValue:forKey:]): Update signedness of offset to avoid
	compiler warnings.
	* EOControl/EOClassDescription.m
	([NSObject-validateValue:forKey:]): Correct signedness of 'buf'.
	* EOControl/EOPrivate.m (GDL2_PrivateInit): Fix assignemnt of
	GDL2_EOEditingContext_recordObjectGlobalIDIMP.
	
	* EOAccess/EOModelGroup.m
	([EOObjectStoreCoordinator-modelGroup]): Correct method
	signature to avoid compiler warnings.

	* DBModeler/EntityView.m ([-mouseDown:]): Match class
	with return type of initializer method to avoid
	compiler warnings and unnecessary cast.

	* EOAdaptors/SQLiteAdaptor/SQLite3Channel.m (newNumberValue):
	Change type of 'data' to match usage.
	([-fetchRowWithZone:]): Cast return type of sqlite3_column_text
	to match expected usage to avoid compiler warnings.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@25545 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Ayers 2007-10-31 05:32:46 +00:00
parent 9720ac993d
commit a80e4facb5
19 changed files with 66 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
ChangeLog
View file

@ -1,4 +1,50 @@
2005-08-17 David Ayers <d.ayers@inode.at>
2005-10-31 David Ayers <ayers@fsfe.org>
* Makefile.postamble (after-distclean::): Remove generated
GNUmakefile.
* gdl2.make.in (ADDITIONAL_NATIVE_LIBS): Don't force
linking of any GDL2 libraries just to get the version.
[API Change].
* variable-processing.make: Remove file (functionality
is now supplied by -make).
* EOInterface/GNUmakefile, EOAccess/EOModelGroup.m,
EOAccess/GNUmakefile, EOControl/GNUmakefile,
DBModeler/GNUmakefile, Tools/GNUmakefile,
GDL2Palette/GNUmakefile, EOModeler/GNUmakefile,
EOAdaptors/SQLiteAdaptor/LoginPanel/GNUmakefile,
EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile:
Remove reference to variable-processing.make.
* EOControl/EOGenericRecord.m
([-_infoForInstanceVariableNamed:stringName:retType:retSize:retOffset:]):
Use marker that matches underlying type signedness.
([-_getValueForKey:selector:type:size:offset:],
[-_setValueForKey:selector:type:size:offset:]):
Match 'offset' with underlying type signedness and update
marker.
([-storedValueForKey:],[-takeStoredValue:forKey:],
[-takeValue:forKey:]): Update signedness of offset to avoid
compiler warnings.
* EOControl/EOClassDescription.m
([NSObject-validateValue:forKey:]): Correct signedness of 'buf'.
* EOControl/EOPrivate.m (GDL2_PrivateInit): Fix assignemnt of
GDL2_EOEditingContext_recordObjectGlobalIDIMP.
* EOAccess/EOModelGroup.m
([EOObjectStoreCoordinator-modelGroup]): Correct method
signature to avoid compiler warnings.
* DBModeler/EntityView.m ([-mouseDown:]): Match class
with return type of initializer method to avoid
compiler warnings and unnecessary cast.
* EOAdaptors/SQLiteAdaptor/SQLite3Channel.m (newNumberValue):
Change type of 'data' to match usage.
([-fetchRowWithZone:]): Cast return type of sqlite3_column_text
to match expected usage to avoid compiler warnings.
2005-08-17 David Ayers <ayers@fsfe.org>
* COPYING.LIB: Update to LGPL 3.
* DB2Modeler/COPYING: Update to GPL 3.

2
DBModeler/EntityView.m
View file

@ -165,7 +165,7 @@
// allow clicking on title to move it..
if (NSMouseInRect(pt, NSMakeRect(0, 0, _frame.size.width, _titleRect.size.height), YES))
{
DiagramView *dv = [self superview];
NSView *dv = [self superview];
float in, up;
pt = [dv convertPoint:pt fromView:self];
up = pt.y - _frame.origin.y ;

1
DBModeler/GNUmakefile
View file

@ -73,5 +73,4 @@ $(APP_NAME)_OBJC_FILES = \
EntityView.m \
DiagramEditor.m
include ../variable-processing.make
include $(GNUSTEP_MAKEFILES)/application.make

2
EOAccess/EOModelGroup.m
View file

@ -424,7 +424,7 @@ of the mainBundle, and all bundles and frameworks loaded into the app.
@implementation EOObjectStoreCoordinator (EOModelGroup)
- (id)modelGroup
- (EOModelGroup *)modelGroup
{
//Seems OK
EOModelGroup *modelGroup;

1
EOAccess/GNUmakefile
View file

@ -106,7 +106,6 @@ EOAccess_AGSDOC_FLAGS = \
-include Makefile.preamble
include ../variable-processing.make
-include GNUmakefile.local

1
EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile
View file

@ -51,7 +51,6 @@ LoginPanel_COPY_INTO_DIR = ../PostgreSQLEOAdaptor.framework/Resources
include ../config.mak
-include Makefile.preamble
include ../../../variable-processing.make
include ../../../common.make
-include GNUmakefile.local

1
EOAdaptors/SQLiteAdaptor/LoginPanel/GNUmakefile
View file

@ -46,7 +46,6 @@ endif
LoginPanel_COPY_INTO_DIR=../SQLite3EOAdaptor.framework/Resources
-include ../config.mak
-include Makefile.preamable
include ../../../variable-processing.make
include ../../../common.make
-include GNUmakefile.local
include $(GNUSTEP_MAKEFILES)/bundle.make

11
EOAdaptors/SQLiteAdaptor/SQLite3Channel.m
View file

@ -1,4 +1,3 @@
/*
SQLite3Channel.m
@ -41,7 +40,7 @@
@implementation SQLite3Channel
static id newNumberValue(const unsigned char *data, EOAttribute *attrib)
static id newNumberValue(const char *data, EOAttribute *attrib)
{
id ret = nil;
char t = '\0';
@ -319,8 +318,8 @@ static id newNumberValue(const unsigned char *data, EOAttribute *attrib)
{
case EOAdaptorNumberType:
{
const unsigned char *text;
text = sqlite3_column_text(_currentStmt, i);
const char *text;
text = (const char*)sqlite3_column_text(_currentStmt, i);
values[i] = newNumberValue(text, attr);
}
break;
@ -337,8 +336,8 @@ static id newNumberValue(const unsigned char *data, EOAttribute *attrib)
break;
case EOAdaptorDateType:
{
const unsigned char *text;
text = sqlite3_column_text(_currentStmt, i);
const char *text;
text = (const char *)sqlite3_column_text(_currentStmt, i);
if (text)
{
NSString *tmp = [[NSString alloc] initWithCString:text];

2
EOControl/EOClassDescription.m
View file

@ -962,7 +962,7 @@ fromInsertionInEditingContext: (EOEditingContext *)editingContext
{
SEL validateSelector;
unsigned length = [key length];
unsigned char buf[length + 10];
char buf[length + 10];
strcpy(buf, "validate");
[key getCString: &buf[8]];

18
EOControl/EOGenericRecord.m
View file

@ -246,7 +246,7 @@ static const char _c_id[2] = { _C_ID, 0 };
if (size)
*size = sizeof(id);
if (offset)
*offset = UINT_MAX; //Special Marker
*offset = INT_MAX; //Special Marker
ok = YES;
@ -266,7 +266,7 @@ static const char _c_id[2] = { _C_ID, 0 };
selector: (SEL)sel
type: (const char*)type
size: (unsigned)size
offset: (unsigned)offset
offset: (int)offset
{
id value = nil;
@ -275,7 +275,7 @@ static const char _c_id[2] = { _C_ID, 0 };
@"Super InstanceVar named %@: sel=%@ type=%s size=%u offset=%u",
aKey,NSStringFromSelector(sel),type,size,offset);
if (offset == UINT_MAX)
if (offset == INT_MAX)
{
value = EOMKKD_objectForKeyWithImpPtr(dictionary,NULL,aKey);
@ -300,14 +300,14 @@ static const char _c_id[2] = { _C_ID, 0 };
selector: (SEL)sel
type: (const char*)type
size: (unsigned)size
offset: (unsigned)offset
offset: (int)offset
{
EOFLOGObjectFnStartCond(@"EOGenericRecordKVC");
EOFLOGObjectLevelArgs(@"EOGenericRecordKVC",
@"Super InstanceVar named %@: offset=%u",
aKey, offset);
if (offset == UINT_MAX)
if (offset == INT_MAX)
{
if (anObject)
EOMKKD_setObjectForKeyWithImpPtr(dictionary,NULL,anObject,aKey);
@ -429,7 +429,7 @@ inline BOOL infoForInstanceVariableWithImpPtr(id object,GDL2IMP_BOOL* impPtr,
SEL sel = 0;
const char *type = NULL;
unsigned size = 0;
unsigned off = 0;
int off = 0;
id value = nil;
Class selfClass=[self class];
@ -583,7 +583,7 @@ inline BOOL infoForInstanceVariableWithImpPtr(id object,GDL2IMP_BOOL* impPtr,
SEL sel = NULL;
const char *type = NULL;
unsigned size = 0;
unsigned off = 0;
int off = 0;
Class selfClass=[self class];
EOFLOGObjectFnStartCond(@"EOGenericRecordKVC");
@ -767,7 +767,7 @@ inline BOOL infoForInstanceVariableWithImpPtr(id object,GDL2IMP_BOOL* impPtr,
SEL sel;
const char *type;
unsigned size;
unsigned off=0;
int off=0;
EOFLOGObjectFnStartCond(@"EOGenericRecordKVC");
EOFLOGObjectLevelArgs(@"EOGenericRecordKVC", @"anObject=%@", anObject);
@ -897,7 +897,7 @@ inline BOOL infoForInstanceVariableWithImpPtr(id object,GDL2IMP_BOOL* impPtr,
SEL sel = 0;
const char *type = NULL;
unsigned size;
unsigned off = 0;
int off = 0;
id value = nil;
EOFLOGObjectFnStartCond(@"EOGenericRecordKVC");

2
EOControl/EOPrivate.m
View file

@ -176,7 +176,7 @@ void GDL2_PrivateInit()
GDL2_MKKD_indexForKeyIMP=(GDL2IMP_UINT)[GDL2_MKKDClass instanceMethodForSelector:@selector(indexForKey:)];
GDL2_EOMKKDInitializer_indexForKeyIMP=(GDL2IMP_UINT)[GDL2_EOMKKDInitializerClass instanceMethodForSelector:@selector(indexForKey:)];
GDL2_EOEditingContext_recordObjectGlobalIDIMP==[GDL2_EOEditingContextClass instanceMethodForSelector:@selector(recordObject:globalID:)];
GDL2_EOEditingContext_recordObjectGlobalIDIMP=[GDL2_EOEditingContextClass instanceMethodForSelector:@selector(recordObject:globalID:)];
GDL2_EOEditingContext_objectForGlobalIDIMP=[GDL2_EOEditingContextClass instanceMethodForSelector:@selector(objectForGlobalID:)];
GDL2_EOEditingContext_globalIDForObjectIMP=[GDL2_EOEditingContextClass instanceMethodForSelector:@selector(globalIDForObject:)];

1
EOControl/GNUmakefile
View file

@ -119,7 +119,6 @@ EOControl_AGSDOC_FLAGS = \
$(GDL2_AGSDOC_FLAGS)
-include Makefile.preamble
include ../variable-processing.make
-include GNUmakefile.local
include $(GNUSTEP_MAKEFILES)/native-library.make

1
EOInterface/GNUmakefile
View file

@ -94,7 +94,6 @@ EOInterface_AGSDOC_FLAGS = \
-include Makefile.preamble
include ../variable-processing.make
-include GNUmakefile.local
include $(GNUSTEP_MAKEFILES)/native-library.make

1
EOModeler/GNUmakefile
View file

@ -60,7 +60,6 @@ EOModelerEditor.h \
EODefines.h
-include Makefile.preamble
include ../variable-processing.make
-include GNUmakefile.local

1
GDL2Palette/GNUmakefile
View file

@ -50,7 +50,6 @@ GDL2_OBJC_FILES= \
KeyWrapper.m \
DisplayGroupInspector.m
include ../variable-processing.make
PALETTE_LIBS=$(ADDITIONAL_OBJC_LIBS)
include $(GNUSTEP_MAKEFILES)/palette.make

1
Makefile.postamble
View file

@ -73,6 +73,7 @@ after-uninstall::
# Things to do after distcleaning
after-distclean::
rm -rf GNUmakefile
rm -rf config.cache config.log config.status
rm -rf config.h gdl2.make config.make
rm -rf autom4te.cache

1
Tools/GNUmakefile
View file

@ -77,7 +77,6 @@ eoutil_HEADER_FILES =
-include Makefile.preamble
include ../variable-processing.make
-include GNUmakefile.local

3
gdl2.make.in
View file

@ -40,7 +40,4 @@ GDL2_SUBMINOR_VERSION = @SUBMINOR_VERSION@
# Additional flags to pass to the preprocessor
AUXILIARY_CPPFLAGS += -DGDL2=1
# Additional libraries for the linker
ADDITIONAL_NATIVE_LIBS+=EOControl EOAccess
endif

16
variable-processing.make
View file

@ -1,16 +0,0 @@
#
# Heres a way to compile/link against a framework/library before the library is
# installed.
#
# It depends upon the source layout of GDL2 where the directories are the same
# name as the framework name, for the -F flag to work.
#
# this is only comparable to the -L flags of a normal library, -I flags
# for this are redundant so just use typical ADDITONAL_INCLUDE_DIRS.
#
ifeq ($(FOUNDATION_LIB), apple)
ADDITIONAL_LIB_DIRS += $(foreach libdir,$(ADDITIONAL_NATIVE_LIB_DIRS),-F$(libdir))
else
ADDITIONAL_LIB_DIRS += $(foreach libdir,$(ADDITIONAL_NATIVE_LIB_DIRS),-L$(libdir)/$(GNUSTEP_OBJ_DIR))
endif