mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-31 16:50:58 +00:00
* configure.ac: Standardize order of flags and libs
Check for proper defs in tzfile.h. Add sub-configure options so they are listed in help. Add generic include/lib flags option. * config.mak.in: Add load flags variable * base.make.in: Idem. * SSL/configure.ac: Add generic include/lib flags option. * Version: Add numeric value for runtime versioning. * Souce/GNUmakeifle: Add resource set install * Source/Makefile.postamble (Info-gnustep.plist): New target. * Testing/nsbundle.m: Additional tests. * Source/NSTimeZone.m: Check for proper tzfile defs (Fixes #10724). git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@20261 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
0bf0a5d5e4
commit
c1f9bd362f
15 changed files with 1376 additions and 566 deletions
|
@ -368,11 +368,21 @@ libgnustep-base_HEADER_FILES_INSTALL_DIR = /Foundation
|
|||
|
||||
libgnustep-base_HEADER_FILES = $(FOUNDATION_HEADERS)
|
||||
|
||||
# Resources
|
||||
RESOURCE_SET_NAME = libbase-resources
|
||||
libbase-resources_RESOURCE_FILES_INSTALL_DIR = Library/Libraries/Resources/gnustep-base
|
||||
libbase-resources_LANGUAGES =
|
||||
libbase-resources_LOCALIZED_RESOURCE_FILES =
|
||||
libbase-resources_RESOURCE_DIRS =
|
||||
libbase-resources_RESOURCE_FILES = Info-gnustep.plist
|
||||
|
||||
|
||||
-include Makefile.preamble
|
||||
|
||||
-include GNUmakefile.local
|
||||
|
||||
include $(GNUSTEP_MAKEFILES)/library.make
|
||||
include $(GNUSTEP_MAKEFILES)/resource-set.make
|
||||
|
||||
-include Makefile.postamble
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
before-all:: $(GENERATED_HFILES)
|
||||
|
||||
# Things to do after compiling
|
||||
# after-all::
|
||||
after-all:: Info-gnustep.plist
|
||||
|
||||
# Things to do before installing
|
||||
# before-install::
|
||||
|
@ -171,3 +171,14 @@ libgnustep-base.def: $(OBJ_FILES_TO_LINK)
|
|||
cat _tmp.def | grep "_class_name_" >> $@
|
||||
rm -rf _tmp.def
|
||||
|
||||
#
|
||||
# Make an Info.plist since libraries don't have these normally
|
||||
#
|
||||
Info-gnustep.plist:
|
||||
$(ECHO_CREATING)(echo "{"; \
|
||||
echo " NSExecutable = \"gnustep-base\";"; \
|
||||
echo " NSPrincipalClass = \"NSObject\";"; \
|
||||
echo " GSBundleShortVersionString = \"$(VERSION)\";"; \
|
||||
echo " GSBundleVersion = $(VERSION_NUMBER);"; \
|
||||
echo "}") > $@$(END_ECHO)
|
||||
|
||||
|
|
|
@ -108,7 +108,7 @@
|
|||
#include "GNUstepBase/GSCategories.h"
|
||||
#include "GSConfig.h"
|
||||
|
||||
#ifdef HAVE_TZFILE_H
|
||||
#ifdef HAVE_TZHEAD
|
||||
#include <tzfile.h>
|
||||
#else
|
||||
#define NOID
|
||||
|
@ -1226,7 +1226,7 @@ static NSMapTable *absolutes = 0;
|
|||
/* Get the zone name from the localtime file, assuming the file
|
||||
is a symlink to the time zone. Getting the actual data (which
|
||||
is easier) doesn't help, since we won't know the name itself. */
|
||||
#if defined(HAVE_TZFILE_H) && defined(TZDEFAULT)
|
||||
#if defined(HAVE_TZHEAD) && defined(TZDEFAULT)
|
||||
tzdir = RETAIN([NSString stringWithCString: TZDIR]);
|
||||
localZoneString = [NSString stringWithCString: TZDEFAULT];
|
||||
localZoneString = [localZoneString stringByResolvingSymlinksInPath];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue