gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Filesystem change

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@16565 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2003-04-28 02:29:49 +00:00
parent 6750d26fe9
commit 9ca631d7e0
34 changed files with 1712 additions and 2890 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
ChangeLog
View file

@ -1,3 +1,40 @@
2003-04-27 Adam Fedor <fedor@gnu.org>
* Updates for filesystem change.
* GNUmakefile (GNUSTEP_MAKEFILES): Remove
* Documentation/GNUmakefile, Examples/GNUmakefile,
NSTimeZones/GNUmakefile, SSL/GNUmakefile, SSL/configure.ac,
Source/DocMakefile, Source/GNUmakefile,
Source/Additions/GNUmakefile, Testing/GNUmakefile,
Tools/GNUmakefile: Idem.
* configure.ac: Replace $GNUSTEP_SYSTEM_ROOT/Makefiles with
$GNUSTEP_MAKEFILES. Replace Libraries with Library/Libraries.
Replace Headers with Library/Headers.
* Source/mframe/configure.ac: Idem.
* NSCharacterSets/GNUmakefile: Use resource-set.make.
* Resources/GNUmakefile: Idem.
* Resources/GNUmakefile.postamble: Remove before/after install cmds.
* Source/NSBundle (+pathForLibraryResource:ofType:inDirectory:):
New method.
(+pathForGNUstepResource:...): Depreciate.
* Source/Additions/GSXML.m: Use it to find DTDs.
* Source/GSLocale.m (GSLanguageFromLocale): Use +bundleForLibrary
to locate resources.
* Source/NSCharacterSet.m (+_bitmapForSet:number:): Idem.
* Source/NSUserDefaults.m (+standardUserDefaults): Idem.
* Source/Additions/Unicode.m (GSEncodingFromLocale): Idem.
* Source/NSTimeZone.m (_time_zone_path): New function.
(+systemTimeZone, +getAbbreviationFile, +getRegionsFile,
+getTimeZoneFile): Use it.
* Source/NSUser.m (NSSearchPathForDirectoriesInDomains): Change
libsDir to "Library/Libraries", docDir to "Library/Documentation".
* Source/Additions/GSCompatibility.[hm]: Change
+pathForGNUstepResource:... to +pathForLibraryResource:...
2003-04-27 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSUserDefaults.m: ([synchronize]) fix locking to permit

4
Documentation/GNUmakefile
View file

@ -23,8 +23,6 @@
# Install into the system root by default
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
include $(GNUSTEP_MAKEFILES)/common.make
@ -79,7 +77,7 @@ ANNOUNCE_DOC_INSTALL_DIR = Developer/Base/ReleaseNotes/$(VERSION)
# file using the make file ../Source/DocMakefile. If headers are added to the
# library, you need to modify that file to get the autogsdoc tool to use them.
#
REF_DOC_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Documentation/Developer
REF_DOC_INSTALL_DIR = $(GNUSTEP_DOCUMENTATION)/Developer
-include Makefile.preamble

2
Examples/GNUmakefile
View file

@ -25,8 +25,6 @@
# Install into the system root by default
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
include $(GNUSTEP_MAKEFILES)/common.make

2
GNUmakefile
View file

@ -36,8 +36,6 @@ PACKAGE_NEEDS_CONFIGURE = YES
CVS_MODULE_NAME = base
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
#
# Include local (new) configuration - this will prevent the old one
# (if any) from $(GNUSTEP_MAKEFILES)/Additional/base.make to be included

10
Headers/gnustep/base/NSBundle.h
View file

@ -300,7 +300,17 @@ GS_EXPORT NSString* NSLoadedClasses;
+ (NSString*) _gnustep_target_dir;
+ (NSString*) _gnustep_target_os;
+ (NSString*) _library_combo;
/** Find a resource in the "Library" directory */
+ (NSString*) pathForLibraryResource: (NSString*)name
ofType: (NSString*)ext
inDirectory: (NSString*)bundlePath;
/** Depreciated. Use +bundleForLibrary: instead. */
+ (NSBundle*) gnustepBundle;
/** Depreciated. Use +pathForLibraryResource:ofType:inDirectory:
or +bundleForLibrary: instead. */
+ (NSString*) pathForGNUstepResource: (NSString*)name
ofType: (NSString*)ext
inDirectory: (NSString*)bundlePath;

20
NSCharacterSets/GNUmakefile
View file

@ -23,15 +23,15 @@
# Install into the system root by default
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
include $(GNUSTEP_MAKEFILES)/common.make
include ../Version
include ../config.mak
charsetdir = $(GNUSTEP_RESOURCES)/NSCharacterSets
RESOURCE_SET_NAME = base-resources
base-resources_RESOURCE_FILES_INSTALL_DIR = gnustep-base/NSCharacterSets
base-resources_LANGUAGES =
base-resources_LOCALIZED_RESOURCE_FILES =
base-resources_RESOURCE_DIRS =
base-resources_RESOURCE_FILES = $(CHARSET_FILES)
CHARSET_FILES = \
alphanumericCharSet.dat \
@ -48,14 +48,8 @@ uppercaseLetterCharSet.dat \
whitespaceAndNlCharSet.dat \
whitespaceCharSet.dat
RCS_FILES = GNUmakefile Makefile.postamble
DIST_FILES = $(RCS_FILES) $(CHARSET_FILES) README.CharSet
INSTALL_FILES = $(CHARSET_FILES) README.CharSet
-include Makefile.preamble
# We don't actually build anything in this directory so
# just include the common makefile rules
include $(GNUSTEP_MAKEFILES)/rules.make
include $(GNUSTEP_MAKEFILES)/resource-set.make
-include Makefile.postamble

89
NSCharacterSets/Makefile.postamble
View file

@ -1,89 +0,0 @@
#
# Makefile.postamble
#
# Copyright (C) 1997 Free Software Foundation, Inc.
#
# Author: Scott Christley <scottc@net-community.com>
#
# 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.
#
# If you are interested in a warranty or support for this source code,
# contact Scott Christley at scottc@net-community.com
#
# You should have received a copy of the GNU Library General Public
# License along with this library; see the file COPYING.LIB.
# If not, write to the Free Software Foundation,
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# Makefile.postamble
#
# Project specific makefile rules
#
# Uncomment the targets you want.
# The double colons (::) are important, do not make them single colons
# otherwise the normal makefile rules will not be performed.
#
# Things to do before compiling
# before-all::
# Things to do after compiling
# after-all::
$(charsetdir):
$(MKDIRS) $(charsetdir)
# Things to do before installing
before-install:: $(charsetdir)
# Things to do after installing
after-install::
for file in $(INSTALL_FILES); do \
$(INSTALL_DATA) $$file $(charsetdir)/$$file ; \
done
# Things to do before uninstalling
# before-uninstall::
# Things to do after uninstalling
after-uninstall::
for file in $(INSTALL_FILES); do \
rm -f $(charsetdir)/$$file ; \
done
# Things to do before cleaning
# before-clean::
# Things to do after cleaning
# after-clean::
# Things to do before distcleaning
# before-distclean::
# Things to do after distcleaning
# after-distclean::
# Things to do before checking
# before-check::
# Things to do after checking
# after-check::
regenerate:
copy-dist: $(DIST_FILES)
mkdir ../snap/NSCharacterSets
for file in $(DIST_FILES); do \
ln $$file ../snap/NSCharacterSets/$$file ; \
done

4
NSTimeZones/GNUmakefile
View file

@ -23,15 +23,13 @@
# Install into the system root by default
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
include $(GNUSTEP_MAKEFILES)/common.make
include ../Version
include ../config.mak
resourcedir = $(GNUSTEP_RESOURCES)
resourcedir = $(GNUSTEP_RESOURCES)/gnustep-base
TIMEZONE_ARCHIVE = \
NSTimeZones.tar

8
NSTimeZones/Makefile.postamble
View file

@ -87,10 +87,4 @@ after-distclean::
# Things to do after checking
# after-check::
regenerate:
copy-dist: $(DIST_FILES)
mkdir ../snap/NSTimeZones
for file in $(DIST_FILES); do \
ln $$file ../snap/NSTimeZones/$$file ; \
done
regenerate:

18
Resources/GNUmakefile
View file

@ -23,17 +23,15 @@
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
include $(GNUSTEP_MAKEFILES)/common.make
resourcedir = $(GNUSTEP_RESOURCES)
languagedir = $(GNUSTEP_RESOURCES)/Languages
LANGUAGES = English German French Italian
LOCALIZED_RESOURCE_FILES = Localizable.strings
RESOURCE_SET_NAME = base-resources
base-resources_RESOURCE_FILES_INSTALL_DIR = gnustep-base
base-resources_LANGUAGES = English German French Italian
base-resources_LOCALIZED_RESOURCE_FILES = Localizable.strings
base-resources_RESOURCE_DIRS = Languages
base-resources_RESOURCE_FILES = $(LANGUAGE_INSTALL_FILES)
LANGUAGE_FILES = \
Languages/Dutch \
@ -50,9 +48,7 @@ LANGUAGE_INSTALL_FILES = $(LANGUAGE_FILES) Languages/Locale.aliases \
-include GNUmakefile.local
# We don't actually build anything in this directory so
# just include the common makefile rules
include $(GNUSTEP_MAKEFILES)/rules.make
include $(GNUSTEP_MAKEFILES)/resource-set.make
-include GNUmakefile.postamble

36
Resources/GNUmakefile.postamble
View file

@ -29,47 +29,17 @@
# Things to do after compiling
# after-all::
$(languagedir):
$(MKDIRS) $(languagedir)
# Things to do before installing
before-install:: $(languagedir)
# before-install::
# Things to do after installing
after-install::
for file in $(LANGUAGE_INSTALL_FILES); do \
$(INSTALL_DATA) $$file $(resourcedir)/$$file ; \
done
ifneq ($(strip $(LOCALIZED_RESOURCE_FILES)),)
@(echo "Copying localized resources into system..."; \
for l in $(LANGUAGES); do \
if [ ! -f $$l.lproj ]; then \
$(MKDIRS) $(resourcedir)/$$l.lproj; \
fi; \
for f in $(LOCALIZED_RESOURCE_FILES); do \
if [ -f $$l.lproj/$$f ]; then \
cp -r $$l.lproj/$$f $(resourcedir)/$$l.lproj; \
fi; \
done; \
done;)
endif
# after-install::
# Things to do before uninstalling
# before-uninstall::
# Things to do after uninstalling
after-uninstall::
for file in $(LANGUAGE_INSTALL_FILES); do \
rm -f $(resourcedir)/$$file ; \
done
-rmdir $(languagedir)
ifneq ($(strip $(LOCALIZED_RESOURCE_FILES)),)
@(for l in $(LANGUAGES); do \
if [ ! -f $$l.lproj ]; then \
rm -rf $(resourcedir)/$$l.lproj; \
fi; \
done;)
endif
# after-uninstall::
# Things to do before cleaning
# before-clean::

2
SSL/GNUmakefile
View file

@ -25,8 +25,6 @@
# Install into the system root by default
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
-include config.mak
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make

10
SSL/configure vendored
View file

@ -1210,7 +1210,7 @@ ac_config_headers="$ac_config_headers config.h"
# Use config.guess, config.sub and install-sh provided by gnustep-make
#--------------------------------------------------------------------
ac_aux_dir=
for ac_dir in $GNUSTEP_SYSTEM_ROOT/Makefiles $srcdir/$GNUSTEP_SYSTEM_ROOT/Makefiles; do
for ac_dir in $GNUSTEP_MAKEFILES $srcdir/$GNUSTEP_MAKEFILES; do
if test -f $ac_dir/install-sh; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install-sh -c"
@ -1226,8 +1226,8 @@ for ac_dir in $GNUSTEP_SYSTEM_ROOT/Makefiles $srcdir/$GNUSTEP_SYSTEM_ROOT/Makefi
fi
done
if test -z "$ac_aux_dir"; then
{ { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $GNUSTEP_SYSTEM_ROOT/Makefiles $srcdir/$GNUSTEP_SYSTEM_ROOT/Makefiles" >&5
echo "$as_me: error: cannot find install-sh or install.sh in $GNUSTEP_SYSTEM_ROOT/Makefiles $srcdir/$GNUSTEP_SYSTEM_ROOT/Makefiles" >&2;}
{ { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $GNUSTEP_MAKEFILES $srcdir/$GNUSTEP_MAKEFILES" >&5
echo "$as_me: error: cannot find install-sh or install.sh in $GNUSTEP_MAKEFILES $srcdir/$GNUSTEP_MAKEFILES" >&2;}
{ (exit 1); exit 1; }; }
fi
ac_config_guess="$SHELL $ac_aux_dir/config.guess"
@ -1243,8 +1243,8 @@ GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Headers
if test "$GNUSTEP_FLATTENED" = yes; then
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries
else
clean_target_os=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_os.sh $target_os`
clean_target_cpu=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_cpu.sh $target_cpu`
clean_target_os=`$GNUSTEP_MAKEFILES/clean_os.sh $target_os`
clean_target_cpu=`$GNUSTEP_MAKEFILES/clean_cpu.sh $target_cpu`
obj_dir=$clean_target_cpu/$clean_target_os
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries/$obj_dir
fi

6
SSL/configure.ac
View file

@ -35,7 +35,7 @@ AC_CONFIG_HEADER(config.h)
#--------------------------------------------------------------------
# Use config.guess, config.sub and install-sh provided by gnustep-make
#--------------------------------------------------------------------
AC_CONFIG_AUX_DIR($GNUSTEP_SYSTEM_ROOT/Makefiles)
AC_CONFIG_AUX_DIR($GNUSTEP_MAKEFILES)
#--------------------------------------------------------------------
# Miscellaneous flags
@ -45,8 +45,8 @@ GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Headers
if test "$GNUSTEP_FLATTENED" = yes; then
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries
else
clean_target_os=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_os.sh $target_os`
clean_target_cpu=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_cpu.sh $target_cpu`
clean_target_os=`$GNUSTEP_MAKEFILES/clean_os.sh $target_os`
clean_target_cpu=`$GNUSTEP_MAKEFILES/clean_cpu.sh $target_cpu`
obj_dir=$clean_target_cpu/$clean_target_os
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries/$obj_dir
fi

2
Source/Additions/GNUmakefile
View file

@ -22,8 +22,6 @@
# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
#
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../../base.make
include $(GNUSTEP_MAKEFILES)/common.make

2
Source/Additions/GSCompatibility.h
View file

@ -164,7 +164,7 @@ GS_EXPORT NSRecursiveLock *gnustep_global_lock;
@end
@interface NSBundle(GSCompatibility)
+ (NSString *) pathForGNUstepResource: (NSString *)name
+ (NSString *) pathForLibraryResource: (NSString *)name
ofType: (NSString *)ext
inDirectory: (NSString *)bundlePath;
@end

46
Source/Additions/GSCompatibility.m
View file

@ -437,40 +437,30 @@ selector ? sel_get_name(selector) : "(null)",
@implementation NSBundle(GSCompatibility)
// In NSBundle.m
+ (NSString *) pathForGNUstepResource: (NSString *)name
ofType: (NSString *)ext
inDirectory: (NSString *)bundlePath
+ (NSString *) pathForLibraryResource: (NSString *)name
ofType: (NSString *)ext
inDirectory: (NSString *)bundlePath
{
NSString *path = nil;
NSString *bundle_path = nil;
NSArray *paths;
NSBundle *bundle;
NSEnumerator *enumerator;
NSString *path = nil;
NSString *bundle_path = nil;
NSArray *paths;
NSBundle *bundle;
NSEnumerator *enumerator;
/* Gather up the paths */
// Originally, looks up in GSLibrariesDirectory, i.e. "Libraries"
paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory,
NSAllDomainsMask, YES);
/* Gather up the paths */
paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory,
NSAllDomainsMask, YES);
enumerator = [paths objectEnumerator];
while ((path == nil) && (bundle_path = [enumerator nextObject]))
enumerator = [paths objectEnumerator];
while ((path == nil) && (bundle_path = [enumerator nextObject]))
{
bundle = [self bundleWithPath: bundle_path];
path = [bundle pathForResource: name
ofType: ext
inDirectory: bundlePath];
bundle = [self bundleWithPath: bundle_path];
path = [bundle pathForResource: name
ofType: ext
inDirectory: bundlePath];
}
// New for OSX: looks in gnustep framework
if(path == nil){
if([bundlePath hasPrefix:@"Resources/"])
bundlePath = [bundlePath substringFromIndex:10];
path = [[NSBundle bundleForClass:[GCObject class]] pathForResource: name
ofType: ext
inDirectory: bundlePath];
}
return path;
return path;
}
@end

4
Source/Additions/GSXML.m
View file

@ -2280,7 +2280,7 @@ loadEntityFunction(const char *url, const char *eid, xmlParserCtxtPtr ctx)
range: r];
}
found = [NSBundle pathForGNUstepResource: name
found = [NSBundle pathForLibraryResource: name
ofType: @"dtd"
inDirectory: @"DTDs"];
if (found == nil)
@ -2303,7 +2303,7 @@ loadEntityFunction(const char *url, const char *eid, xmlParserCtxtPtr ctx)
inDirectory: @"DTDs"];
if (file == nil)
{
file = [NSBundle pathForGNUstepResource: local
file = [NSBundle pathForLibraryResource: local
ofType: @""
inDirectory: @"DTDs"];
}

8
Source/Additions/Unicode.m
View file

@ -481,11 +481,13 @@ GSEncodingFromLocale(const char *clocale)
else
{
/* Look up the locale in our table of encodings */
NSBundle *gbundle;
NSString *table;
table = [NSBundle pathForGNUstepResource: @"Locale"
ofType: @"encodings"
inDirectory: @"Resources/Languages"];
gbundle = [NSBundle bundleForLibrary: @"gnustep-base"];
table = [gbundle pathForResource: @"Locale"
ofType: @"encodings"
inDirectory: @"Languages"];
if (table != nil)
{
int count;

2
Source/DocMakefile
View file

@ -24,8 +24,6 @@
MAKEFILE_NAME = DocMakefile
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
include $(GNUSTEP_MAKEFILES)/common.make
DOCUMENT_NAME = Base BaseAdditions

7
Source/GNUmakefile
View file

@ -25,8 +25,6 @@
# Install into the system root by default
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
include $(GNUSTEP_MAKEFILES)/common.make
@ -125,6 +123,7 @@ GSLocale.h \
GSUnion.h \
GSIArray.h \
GSIMap.h \
objc-load.h \
preface.h
ifneq ($(OBJC_RUNTIME_LIB), gnu)
@ -321,9 +320,7 @@ NSUndoManager.h \
NSUserDefaults.h \
NSUtilities.h \
NSValue.h \
NSZone.h \
objc-load.h
NSZone.h
UNICODE_HEADERS = \
unicode/caseconv.h \

8
Source/GSLocale.m
View file

@ -235,13 +235,15 @@ GSLanguageFromLocale(NSString *locale)
{
NSString *language = nil;
NSString *aliases = nil;
NSBundle *gbundle;
if (locale == nil || [locale isEqual: @"C"] || [locale isEqual: @"POSIX"])
return @"English";
aliases = [NSBundle pathForGNUstepResource: @"Locale"
ofType: @"aliases"
inDirectory: @"Resources/Languages"];
gbundle = [NSBundle bundleForLibrary: @"gnustep-base"];
aliases = [gbundle pathForResource: @"Locale"
ofType: @"aliases"
inDirectory: @"Languages"];
if (aliases != nil)
{
NSDictionary *dict;

14
Source/NSBundle.m
View file

@ -1721,7 +1721,7 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
return _gnustep_bundle;
}
+ (NSString *) pathForGNUstepResource: (NSString *)name
+ (NSString *) pathForLibraryResource: (NSString *)name
ofType: (NSString *)ext
inDirectory: (NSString *)bundlePath
{
@ -1732,7 +1732,7 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
NSEnumerator *enumerator;
/* Gather up the paths */
paths = NSSearchPathForDirectoriesInDomains(GSLibrariesDirectory,
paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory,
NSAllDomainsMask, YES);
enumerator = [paths objectEnumerator];
@ -1747,6 +1747,16 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
return path;
}
+ (NSString *) pathForGNUstepResource: (NSString *)name
ofType: (NSString *)ext
inDirectory: (NSString *)bundlePath
{
NSLog(@"Warninig: Depreciated %@ called. Use +pathForLibraryResource:ofType:inDirectory: or +bundleForLibrary: instead",
NSStringFromSelector(_cmd));
return [self pathForLibraryResource: name ofType: ext
inDirectory: bundlePath];
}
+ (NSString*) _gnustep_target_cpu
{
return gnustep_target_cpu;

39
Source/NSCharacterSet.m
View file

@ -70,10 +70,8 @@ static NSLock* cache_lock = nil;
+ (NSCharacterSet*) _bitmapForSet: (NSString*)setname number: (int)number
{
NSCharacterSet *set;
NSArray *paths;
NSString *bundle_path, *set_path;
NSString *set_path;
NSBundle *bundle;
NSEnumerator *enumerator;
if (!cache_lock)
cache_lock = [NSLock new];
@ -84,27 +82,20 @@ static NSLock* cache_lock = nil;
{
NS_DURING
paths = NSSearchPathForDirectoriesInDomains(GSLibrariesDirectory,
NSAllDomainsMask, YES);
enumerator = [paths objectEnumerator];
while ((set == nil) && (bundle_path = [enumerator nextObject]))
{
bundle = [NSBundle bundleWithPath: bundle_path];
set_path = [bundle pathForResource: setname
ofType: @"dat"
inDirectory: NSCharacterSet_PATH];
if (set_path != nil)
{
NS_DURING
/* Load the character set file */
set = [self characterSetWithBitmapRepresentation:
[NSData dataWithContentsOfFile: set_path]];
NS_HANDLER
NSLog(@"Unable to read NSCharacterSet file %@", set_path);
set = nil;
NS_ENDHANDLER
}
bundle = [NSBundle bundleForLibrary: @"gnustep-base"];
set_path = [bundle pathForResource: setname
ofType: @"dat"
inDirectory: NSCharacterSet_PATH];
if (set_path != nil)
{
NS_DURING
/* Load the character set file */
set = [self characterSetWithBitmapRepresentation:
[NSData dataWithContentsOfFile: set_path]];
NS_HANDLER
NSLog(@"Unable to read NSCharacterSet file %@", set_path);
set = nil;
NS_ENDHANDLER
}
/* If we didn't load a set then raise an exception */

29
Source/NSTimeZone.m
View file

@ -198,6 +198,15 @@ decode (const void *ptr)
#endif /* defined(WORDS_BIGENDIAN) && SIZEOF_INT == 4 */
}
/* Return path to a TimeZone directory file */
static NSString *_time_zone_path(NSString *subpath)
{
NSBundle *gbundle;
gbundle = [NSBundle bundleForLibrary: @"gnustep-base"];
return [gbundle pathForResource: subpath
ofType: @""
inDirectory: TIME_ZONE_DIR];
}
/* Object enumerator for NSInternalAbbrevDict. */
@interface NSInternalAbbrevDictObjectEnumerator : NSEnumerator
@ -1107,11 +1116,7 @@ static NSMapTable *absolutes = 0;
/*
* Try to get timezone from LOCAL_TIME_FILE.
*/
NSString *f;
f = [NSBundle pathForGNUstepResource: LOCAL_TIME_FILE
ofType: @""
inDirectory: TIME_ZONE_DIR];
NSString *f = _time_zone_path(LOCAL_TIME_FILE);
if (f != nil)
{
localZoneString = [NSString stringWithContentsOfFile: f];
@ -1487,26 +1492,20 @@ static NSMapTable *absolutes = 0;
+ (NSString*) getAbbreviationFile
{
return [NSBundle pathForGNUstepResource: ABBREV_DICT
ofType: @""
inDirectory: TIME_ZONE_DIR];
return _time_zone_path (ABBREV_DICT);
}
+ (NSString*) getRegionsFile
{
return [NSBundle pathForGNUstepResource: REGIONS_FILE
ofType: @""
inDirectory: TIME_ZONE_DIR];
return _time_zone_path (REGIONS_FILE);
}
+ (NSString*) getTimeZoneFile: (NSString *)name
{
NSString *dir;
NSString *path;
dir = [NSString stringWithFormat: @"%@/%@", TIME_ZONE_DIR, ZONES_DIR];
path = [NSBundle pathForGNUstepResource: name ofType: @"" inDirectory: dir];
return path;
dir= _time_zone_path (ZONES_DIR);
return [dir stringByAppendingPathComponent: name];
}
@end

4
Source/NSUser.m
View file

@ -942,9 +942,9 @@ NSSearchPathForDirectoriesInDomains(NSSearchPathDirectory directoryKey,
NSString *demosDir = @"Demos";
NSString *devDir = @"Developer";
NSString *libraryDir = @"Library";
NSString *libsDir = @"Libraries";
NSString *libsDir = @"Library/Libraries";
NSString *toolsDir = @"Tools";
NSString *docDir = @"Documentation";
NSString *docDir = @"Library/Documentation";
NSMutableArray *paths = [NSMutableArray new];
NSString *path;
unsigned i;

8
Source/NSUserDefaults.m
View file

@ -421,9 +421,11 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */
{
NSString *path;
NSDictionary *dict;
path = [NSBundle pathForGNUstepResource: lang
ofType: nil
inDirectory: @"Resources/Languages"];
NSBundle *gbundle;
gbundle = [NSBundle bundleForLibrary: @"gnustep-base"];
path = [gbundle pathForResource: lang
ofType: nil
inDirectory: @"Languages"];
dict = nil;
if (path)
dict = [NSDictionary dictionaryWithContentsOfFile: path];

6
Source/mframe/configure vendored
View file

@ -1118,7 +1118,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Use config.guess, config.sub and install-sh provided by gnustep-make
#--------------------------------------------------------------------
ac_aux_dir=
for ac_dir in $GNUSTEP_SYSTEM_ROOT/Makefiles $srcdir/$GNUSTEP_SYSTEM_ROOT/Makefiles; do
for ac_dir in $GNUSTEP_MAKEFILES $srcdir/$GNUSTEP_MAKEFILES; do
if test -f $ac_dir/install-sh; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install-sh -c"
@ -1134,8 +1134,8 @@ for ac_dir in $GNUSTEP_SYSTEM_ROOT/Makefiles $srcdir/$GNUSTEP_SYSTEM_ROOT/Makefi
fi
done
if test -z "$ac_aux_dir"; then
{ { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $GNUSTEP_SYSTEM_ROOT/Makefiles $srcdir/$GNUSTEP_SYSTEM_ROOT/Makefiles" >&5
echo "$as_me: error: cannot find install-sh or install.sh in $GNUSTEP_SYSTEM_ROOT/Makefiles $srcdir/$GNUSTEP_SYSTEM_ROOT/Makefiles" >&2;}
{ { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $GNUSTEP_MAKEFILES $srcdir/$GNUSTEP_MAKEFILES" >&5
echo "$as_me: error: cannot find install-sh or install.sh in $GNUSTEP_MAKEFILES $srcdir/$GNUSTEP_MAKEFILES" >&2;}
{ (exit 1); exit 1; }; }
fi
ac_config_guess="$SHELL $ac_aux_dir/config.guess"

2
Source/mframe/configure.ac
View file

@ -26,7 +26,7 @@ AC_CONFIG_SRCDIR([mframe.head])
#--------------------------------------------------------------------
# Use config.guess, config.sub and install-sh provided by gnustep-make
#--------------------------------------------------------------------
AC_CONFIG_AUX_DIR($GNUSTEP_SYSTEM_ROOT/Makefiles)
AC_CONFIG_AUX_DIR($GNUSTEP_MAKEFILES)
#--------------------------------------------------------------------
# Determine the host, build, and target systems

2
Testing/GNUmakefile
View file

@ -25,8 +25,6 @@
# Install into the system root by default
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
include $(GNUSTEP_MAKEFILES)/common.make

6
Tools/GNUmakefile
View file

@ -23,8 +23,6 @@
# Install into the system root by default
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../base.make
include $(GNUSTEP_MAKEFILES)/common.make
@ -32,7 +30,7 @@ include ../Version
include ../config.mak
# DTDs to install
dtddir = $(GNUSTEP_RESOURCES)/DTDs
dtddir = $(GNUSTEP_LIBRARY)/DTDs
DTD_FILES = plist-0_9.dtd \
gsdoc-0_6_5.dtd \
gsdoc-0_6_6.dtd \
@ -40,7 +38,7 @@ DTD_FILES = plist-0_9.dtd \
gsdoc-1_0_0.dtd
# DocTemplates to install
doctemplatesdir = $(GNUSTEP_RESOURCES)/DocTemplates
doctemplatesdir = $(GNUSTEP_LIBRARY)/DocTemplates
DOCTEMPLATES_FILES = indextemplate.gsdoc AutoDocTemplate.gsdoc
# The application to be compiled

4147
configure vendored
View file

File diff suppressed because it is too large Load diff

14
configure.ac
View file

@ -37,7 +37,7 @@ fi
#--------------------------------------------------------------------
# Use config.guess, config.sub and install-sh provided by gnustep-make
#--------------------------------------------------------------------
AC_CONFIG_AUX_DIR($GNUSTEP_SYSTEM_ROOT/Makefiles)
AC_CONFIG_AUX_DIR($GNUSTEP_MAKEFILES)
#--------------------------------------------------------------------
# Use a .h file with #define's, instead of -D command-line switches
@ -105,14 +105,14 @@ fi
# Miscellaneous flags
#--------------------------------------------------------------------
# Set location of GNUstep dirs for later use
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Headers
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Library/Headers
if test "$GNUSTEP_FLATTENED" = yes; then
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Library/Libraries
else
clean_target_os=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_os.sh $target_os`
clean_target_cpu=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_cpu.sh $target_cpu`
clean_target_os=`$GNUSTEP_MAKEFILES/clean_os.sh $target_os`
clean_target_cpu=`$GNUSTEP_MAKEFILES/clean_cpu.sh $target_cpu`
obj_dir=$clean_target_cpu/$clean_target_os
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries/$obj_dir
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Library/Libraries/$obj_dir
fi
#
@ -186,7 +186,7 @@ AC_MSG_CHECKING(for objc threading flags)
#
# Get them from gnustep-make which contains the real code to get them
#
objc_threaded=`grep objc_threaded: $GNUSTEP_SYSTEM_ROOT/Makefiles/$obj_dir/config.make | sed -e 's/objc_threaded:=//'`
objc_threaded=`grep objc_threaded: $GNUSTEP_MAKEFILES/$obj_dir/config.make | sed -e 's/objc_threaded:=//'`
#
AC_MSG_RESULT($objc_threaded)

4
gnustep-base.script.spec.in
View file

@ -1,7 +1,7 @@
%post
if [ $1 = 1 ]; then
# if [ -z "$GNUSTEP_SYSTEM_ROOT" ]; then
# . %{gs_root}/Makefiles/GNUstep.sh
# . %{gs_root}/Library/Makefiles/GNUstep.sh
# fi
#==============================================================
@ -24,7 +24,7 @@ fi
%postun
if [ $1 = 0 ]; then
# if [ -z "$GNUSTEP_SYSTEM_ROOT" ]; then
# . %{gs_root}/Makefiles/GNUstep.sh
# . %{gs_root}/Library/Makefiles/GNUstep.sh
# fi
#=========================================