mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-30 00:11:26 +00:00
Use cvs export to make snapshots/dists. Minor patches.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@2742 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
1a9e7bade4
commit
5ad4c23b77
40 changed files with 5025 additions and 632 deletions
|
|
@ -201,6 +201,9 @@ AUTHORS: GNUmakefile
|
|||
$(DIST_FILES) >>AUTHORS; \
|
||||
done
|
||||
|
||||
regenerate: $(DIST_FILES)
|
||||
mv AUTHORS ..
|
||||
|
||||
copy-dist: $(DIST_FILES)
|
||||
mkdir ../snap/src
|
||||
mkdir ../snap/src/include
|
||||
|
|
|
|||
|
|
@ -1,167 +0,0 @@
|
|||
s/@configure_input@/ Generated from Makefile.in by configure.bat/
|
||||
s/@srcdir@/./
|
||||
s/@prefix@/$(MB_DEV)/
|
||||
s/@exec_prefix@/$(prefix)/
|
||||
s/libdir = $(exec_prefix)\/lib/libdir = $(exec_prefix)\\$(MB_LIB)/
|
||||
s/includedir = $(prefix)\/include/includedir = $(prefix)\\$(MB_H)\\$(MB_OS)/
|
||||
s/CC = @CC@ -pipe/CC = gcc -fgnu-runtime/
|
||||
s/@RANLIB@/touch/
|
||||
s/@INSTALL@/cp/
|
||||
s/@INSTALL_PROGRAM@/$(INSTALL)/
|
||||
s/@INSTALL_DATA@/$(INSTALL)/
|
||||
s/AR = ar/AR = lib/
|
||||
s/ARFLAGS = rc/ARFLAGS = /
|
||||
s/AROUT =/AROUT = -out:/
|
||||
s/@LN_S@/cp/
|
||||
s/@SHARED_LIBRARY@/libgnustep-base.dll/
|
||||
s/CFLAGS = -g -O -Wall -Wno-implicit/CFLAGS = -O -Wall -Wno-implicit/
|
||||
s/LEXFLAGS =/LEXFLAGS = -L/
|
||||
s/EXEEXT =/EXEEXT = .exe/
|
||||
s/OEXT = .o/OEXT = .obj/
|
||||
s/LIBEXT = .a/LIBEXT = .lib/
|
||||
s/@DEFS@/-D__MS_WIN32__\
|
||||
\
|
||||
##################################################################\
|
||||
#\
|
||||
# NT specifics\
|
||||
#\
|
||||
WIN32_GCC_INCLUDE = \
|
||||
INIT_FILE = gnustep_base_init_runtime\
|
||||
INIT_FILE_OBJ = $(INIT_FILE)$(OEXT)/
|
||||
s/@DYNAMIC_LINKER@/null/
|
||||
s/@NEXT_INCLUDES@//
|
||||
s/@HEADERS_INSTALL@/$(GNU_HEADERS) $(NEXTSTEP_HEADERS) $(GNUSTEP_HEADERS)/
|
||||
s/@OBJS_INSTALL@/$(GNU_OBJS) $(NEXTSTEP_OBJS) $(GNUSTEP_OBJS)/
|
||||
s/@LIBOBJECTS_SO@//
|
||||
/lex.pl.m: proplist.l proplist.tab.h/,/proplist.l > $@/c\
|
||||
lex.pl.m: proplist.l proplist.tab.h\
|
||||
touch lex.pl.m
|
||||
/lex.sf.m: stringsfile.l stringsfile.tab.h/,/stringsfile.l > $@/c\
|
||||
lex.sf.m: stringsfile.l stringsfile.tab.h\
|
||||
touch lex.sf.m
|
||||
/lib$(LIBRARY_NAME)$(LIBEXT):/,/$(RANLIB) lib$(LIBRARY_NAME)$(LIBEXT)/c\
|
||||
lib$(LIBRARY_NAME)$(LIBEXT): $(HEADERS_INSTALL) $(OBJS_INSTALL) $(INIT_FILE_OBJ)\
|
||||
$(AR) $(ARFLAGS) $(AROUT)lib1$(LIBEXT) $(GNU_OBJS)\
|
||||
$(AR) $(ARFLAGS) $(AROUT)lib2$(LIBEXT) $(NEXTSTEP_OBJS) $(INIT_FILE_OBJ)\
|
||||
$(AR) $(ARFLAGS) $(AROUT)lib3$(LIBEXT) $(GNUSTEP_OBJS)\
|
||||
$(AR) $(ARFLAGS) $(AROUT)lib$(LIBRARY_NAME)$(LIBEXT) \\\
|
||||
lib1$(LIBEXT) lib2$(LIBEXT) lib3$(LIBEXT)\
|
||||
rm lib1$(LIBEXT) lib2$(LIBEXT) lib3$(LIBEXT)
|
||||
/NSVALUE_MFILES =/c\
|
||||
NSVALUE_CLUSTER = 0 1 2 3 4 \
|
||||
NSVALUE_OFILES = \\\
|
||||
NSValue0$(OEXT) NSValue1$(OEXT) NSValue2$(OEXT) NSValue3$(OEXT) \\\
|
||||
NSValue4$(OEXT) \
|
||||
NSVALUE_MFILES = \\
|
||||
/NSNUMBER_MFILES =/c\
|
||||
NSNUMBER_CLUSTER = 0 1 2 3 4 5 6 7 8 9 10 11 12 \
|
||||
NSNUMBER_OFILES = \\\
|
||||
NSNumber0$(OEXT) NSNumber1$(OEXT) NSNumber2$(OEXT) \\\
|
||||
NSNumber3$(OEXT) NSNumber4$(OEXT) NSNumber5$(OEXT) \\\
|
||||
NSNumber6$(OEXT) NSNumber7$(OEXT) NSNumber8$(OEXT) \\\
|
||||
NSNumber9$(OEXT) NSNumber10$(OEXT) NSNumber11$(OEXT) \\\
|
||||
NSNumber12$(OEXT) \
|
||||
NSNUMBER_MFILES = \\
|
||||
/$(NSVALUE_MFILES) : NSCTemplateValue.m/,/cat $(srcdir)\/NSConcreteNumber/c\
|
||||
# Compilation of class clusters \
|
||||
$(NSVALUE_OFILES) : NSCTemplateValue.m \
|
||||
for %i in ( ${NSVALUE_CLUSTER} ) do \\\
|
||||
( cp NSCTemplateValue.m NSCTemplateValue%i.m & \\\
|
||||
$(CC) -c $(ALL_CPPFLAGS) $(DEFS) $(ALL_OBJCFLAGS) \\\
|
||||
-DTYPE_ORDER=%i NSCTemplateValue%i.m \\\
|
||||
-o NSValue%i$(OEXT) & \\\
|
||||
rm -f NSCTemplateValue%i.m ) \
|
||||
\
|
||||
$(NSNUMBER_OFILES) : NSConcreteNumber.m \
|
||||
for %i in ( ${NSNUMBER_CLUSTER} ) do \\\
|
||||
( cp NSConcreteNumber.m NSConcreteNumber%i.m & \\\
|
||||
$(CC) -c $(ALL_CPPFLAGS) $(DEFS) $(ALL_OBJCFLAGS) \\\
|
||||
-DTYPE_ORDER=%i -c NSConcreteNumber%i.m \\\
|
||||
-o NSNumber%i$(OEXT) & \\\
|
||||
rm -f NSConcreteNumber%i.m )
|
||||
/GNUSTEP_OBJS =/,/$(NSNUMBER_MFILES:.m=/c\
|
||||
GNUSTEP_OBJS = \\\
|
||||
$(GNUSTEP_MFILES:.m=$(OEXT)) \\\
|
||||
$(GNUSTEP_CFILES:.c=$(OEXT)) \\\
|
||||
$(NSVALUE_OFILES) $(NSNUMBER_OFILES)
|
||||
/installdirs:/,/$(includedir)\/Foundation/c\
|
||||
installdirs:\
|
||||
IF NOT EXIST $(includedir)\\gnustep mkdir $(includedir)\\gnustep\
|
||||
IF NOT EXIST $(includedir)\\gnustep\\base mkdir $(includedir)\\gnustep\\base\
|
||||
IF NOT EXIST $(includedir)\\objc mkdir $(includedir)\\objc
|
||||
/install: installdirs all/,/cd $(includedir)\/objc; rm -f README/c\
|
||||
$(INIT_FILE_OBJ): $(OBJS_INSTALL)\
|
||||
nm $(GNU_OBJS) | grep " __GLOBAL_" > tmpinit.c\
|
||||
nm $(GNUSTEP_OBJS) | grep " __GLOBAL_" >> tmpinit.c\
|
||||
nm $(NEXTSTEP_OBJS) | grep " __GLOBAL_" >> tmpinit.c\
|
||||
collect tmpinit.c $(INIT_FILE)\
|
||||
$(CC) -c $(ALL_CPPFLAGS) $(DEFS) $(ALL_OBJCFLAGS) $(INIT_FILE).c\
|
||||
rm tmpinit.c\
|
||||
\
|
||||
uninstall:\
|
||||
rm -f $(libdir)\/lib$(LIBRARY_NAME)$(LIBEXT)\
|
||||
rm -f $(libdir)\/lib$(LIBRARY_NAME)-dll$(LIBEXT)\
|
||||
rm -f $(prefix)\/$(MB_BIN)\/lib$(LIBRARY_NAME).dll\
|
||||
rm -rf $(includedir)\/gnustep/base\
|
||||
rm -rf $(includedir)\/Foundation\
|
||||
for %i in ( ${NEXTSTEP_HEADERS} ) do \\\
|
||||
rm -f $(includedir)/%i\
|
||||
\
|
||||
lib$(LIBRARY_NAME)-dll$(LIBEXT): $(HEADERS_INSTALL) $(OBJS_INSTALL) $(INIT_LIB_OBJ) lib$(LIBRARY_NAME).def\
|
||||
lib -machine:i386 -def:lib$(LIBRARY_NAME).def \\\
|
||||
lib$(LIBRARY_NAME)$(LIBEXT) \\\
|
||||
-out:lib$(LIBRARY_NAME)-dll$(LIBEXT)\
|
||||
\
|
||||
lib$(LIBRARY_NAME).dll: $(HEADERS_INSTALL) $(OBJS_INSTALL) $(INIT_LIB_OBJ) lib$(LIBRARY_NAME)-dll$(LIBEXT) win32-entry$(OEXT)\
|
||||
link -out:lib$(LIBRARY_NAME).dll $(DLLFLAGS) \\\
|
||||
lib$(LIBRARY_NAME)-dll.exp \\\
|
||||
lib$(LIBRARY_NAME)$(LIBEXT) \\\
|
||||
win32-entry$(OEXT) libgcc.lib libobjc-dll.lib \\\
|
||||
libcmt.lib oldnames.lib user32.lib kernel32.lib wsock32.lib \\\
|
||||
advapi32.lib\
|
||||
\
|
||||
lib$(LIBRARY_NAME).def: lib$(LIBRARY_NAME)$(LIBEXT)\
|
||||
nm libgnustep-base.lib | grep "g e" | grep ".text" | gawk "{print $$6}" | gawk "{print substr($$1,2,length($$1)-1)}" > libgnustep-base.lst\
|
||||
cat win32-def.top libgnustep-base.lst > libgnustep-base.def\
|
||||
rm libgnustep-base.lst\
|
||||
\
|
||||
win32-entry$(OEXT): win32-entry.c\
|
||||
$(CC) -c $(ALL_CPPFLAGS) $(DEFS) $(ALL_CFLAGS) -o $*$(OEXT) $<\
|
||||
\
|
||||
install: installdirs all\
|
||||
$(INSTALL_DATA) lib$(LIBRARY_NAME)$(LIBEXT) $(libdir)\
|
||||
$(INSTALL_DATA) lib$(LIBRARY_NAME)-dll$(LIBEXT) $(libdir)\
|
||||
$(INSTALL_DATA) lib$(LIBRARY_NAME).dll $(prefix)/$(MB_BIN)\
|
||||
$(INSTALL_DATA) $(srcdir)/gnustep/base/*.h $(includedir)/gnustep/base\
|
||||
$(INSTALL_DATA) $(srcdir)/objc/*.h $(includedir)/objc\
|
||||
$(INSTALL_DATA) include/config.h $(includedir)/gnustep/base/config.h\
|
||||
IF EXIST $(includedir)\\Foundation rm -rf $(includedir)/Foundation\
|
||||
cp -r $(includedir)/gnustep/base $(includedir)/Foundation
|
||||
/for file in $(NEXTSTEP_HEADERS); do/,/done/c\
|
||||
for %i in ( ${NEXTSTEP_HEADERS} ) do \\\
|
||||
rm -f $(includedir)/%i
|
||||
/gnustep\/base:/,/ln -s $(srcdir)\/include Foundation/c\
|
||||
gnustep/base: include\/preface.h FORCE\
|
||||
-rm -rf gnustep\
|
||||
-mkdir gnustep\
|
||||
-mkdir gnustep\\base\
|
||||
-cp -rf include/* gnustep/base\
|
||||
# This deletion is necessary, because the CVS repository contains\
|
||||
# an emtpy `Foundation' directory that used to hold the OpenStep headers.\
|
||||
Foundation: FORCE\
|
||||
-rm -rf Foundation\
|
||||
-mkdir Foundation\
|
||||
-cp -rf include/* Foundation
|
||||
/clean: mostlyclean/,/rm -f dynamic-load.h/c\
|
||||
clean: mostlyclean\
|
||||
rm -f lib$(LIBRARY_NAME)$(LIBEXT) lib$(LIBRARY_NAME).dll *${OEXT}\
|
||||
rm -f $(NSVALUE_MFILES) $(NSNUMBER_MFILES)\
|
||||
rm -f gnustep_base_init_runtime.*\
|
||||
rm -f libgnustep-base-dll.*\
|
||||
rm -f libgnustep-base.def\
|
||||
distclean: clean\
|
||||
rm -f Makefile\
|
||||
rm -f 0 1 2 3 4 5 6 7 8 9 10 11 12\
|
||||
rm -rf gnustep\
|
||||
rm -rf Foundation\
|
||||
rm -f dynamic-load.h
|
||||
|
|
@ -38,7 +38,6 @@
|
|||
#include <sys/param.h>
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
#endif /* WIN32 */
|
||||
|
||||
static NSLock *_hostCacheLock = nil;
|
||||
|
|
|
|||
|
|
@ -548,7 +548,7 @@ handle_printf_atsign (FILE *stream,
|
|||
unsigned int len = [d length];
|
||||
|
||||
if (d == nil) return nil;
|
||||
if(((test[0]==0xFF) && (test[1]==0xFE)) || ((test[1]==0xFF) && (test[0]==0xFE)))
|
||||
if(test && (((test[0]==0xFF) && (test[1]==0xFE)) || ((test[1]==0xFF) && (test[0]==0xFE))))
|
||||
enc = NSUnicodeStringEncoding;
|
||||
else
|
||||
enc = [NSString defaultCStringEncoding];
|
||||
|
|
|
|||
|
|
@ -116,6 +116,7 @@ static BOOL entered_multi_threaded_state;
|
|||
start-up, and for thread's created by calling
|
||||
objc_thread_detach() directly.) */
|
||||
t = [[NSThread alloc] init];
|
||||
objc_thread_set_data (t);
|
||||
return t;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@
|
|||
#include <errno.h>
|
||||
|
||||
#include <Foundation/NSUserDefaults.h>
|
||||
#include <Foundation/NSFileManager.h>
|
||||
#include <Foundation/NSPathUtilities.h>
|
||||
#include <Foundation/NSDictionary.h>
|
||||
#include <Foundation/NSArray.h>
|
||||
|
|
@ -505,11 +506,20 @@ static NSMutableString *processName = nil;
|
|||
return NO;
|
||||
|
||||
// Read the persistent data from the stored database
|
||||
newDict = [[NSMutableDictionary allocWithZone:[self zone]]
|
||||
initWithContentsOfFile:defaultsDatabase];
|
||||
if (!newDict)
|
||||
if ([[NSFileManager defaultManager] fileExistsAtPath: defaultsDatabase])
|
||||
newDict = [[NSMutableDictionary allocWithZone:[self zone]]
|
||||
initWithCapacity:1];
|
||||
initWithContentsOfFile:defaultsDatabase];
|
||||
else
|
||||
{
|
||||
NSLog(@"Creating defaults database file %@", defaultsDatabase);
|
||||
[[NSFileManager defaultManager] createFileAtPath: defaultsDatabase
|
||||
contents: nil
|
||||
attributes: nil];
|
||||
}
|
||||
|
||||
if (!newDict)
|
||||
newDict = [[NSMutableDictionary allocWithZone:[self zone]]
|
||||
initWithCapacity:1];
|
||||
|
||||
if (changedDomains)
|
||||
{ // Synchronize both dictionaries
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
#ifndef __WIN32__
|
||||
#include <unistd.h> /* for gethostname() */
|
||||
#include <sys/param.h> /* for MAXHOSTNAMELEN */
|
||||
#include <arpa/inet.h> /* for inet_ntoa() */
|
||||
#include <netinet/in.h> /* for inet_ntoa() */
|
||||
#include <fcntl.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/file.h>
|
||||
|
|
|
|||
|
|
@ -41,7 +41,6 @@
|
|||
#include <sys/param.h>
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
#endif /* WIN32 */
|
||||
|
||||
#include <sys/file.h>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue