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

Install SSL.bundle into versioned library directory so that you can have multiple gnustep-base installed, each with its own SSL bundle

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24889 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
nicola 2007-03-17 16:56:23 +00:00
parent 54cbf54ba7
commit 5ac27fa477
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2007-03-17 Nicola Pero <nicola.pero@meta-innovation.com>
* SSL/GNUmakefile: Install the SSL bundle in the versioned
gnustep-base resource directory.
* Source/NSFileHandle.m ([+sslClass]): Load the SSL bundle from
the versioned gnustep-base resource directory.
2007-03-17 Nicola Pero <nicola.pero@meta-innovation.com> 2007-03-17 Nicola Pero <nicola.pero@meta-innovation.com>
* Source/Makefile.postamble (before-uninstall): Remove GSConfig.h. * Source/Makefile.postamble (before-uninstall): Remove GSConfig.h.

5
SSL/GNUmakefile
View file

@ -52,6 +52,11 @@ ifeq ($(HAVE_OPENSSL), yes)
# The bundles to be compiled # The bundles to be compiled
BUNDLE_NAME=SSL BUNDLE_NAME=SSL
# Interface version changes with each minor release
include ../Version
libgnustep-base_INTERFACE_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
SSL_INSTALL_DIR = $(GNUSTEP_LIBRARY)/Libraries/gnustep-base/Versions/$(libgnustep-base_INTERFACE_VERSION)/Resources/
# Additional search directories for linking # Additional search directories for linking
SSL_LIB_DIRS += -L$(GNUSTEP_OBJ_DIR) SSL_LIB_DIRS += -L$(GNUSTEP_OBJ_DIR)

7
Source/NSFileHandle.m
View file

@ -710,13 +710,12 @@ NSString * const NSFileHandleOperationException
{ {
if (NSFileHandle_ssl_class == 0) if (NSFileHandle_ssl_class == 0)
{ {
NSBundle *bundle;
NSString *path; NSString *path;
NSBundle *bundle;
path = [NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, path = [[NSBundle bundleForClass: [NSObject class]] bundlePath];
NSAllDomainsMask, NO) lastObject];
path = [path stringByAppendingPathComponent: @"Bundles"];
path = [path stringByAppendingPathComponent: @"SSL.bundle"]; path = [path stringByAppendingPathComponent: @"SSL.bundle"];
bundle = [NSBundle bundleWithPath: path]; bundle = [NSBundle bundleWithPath: path];
NSFileHandle_ssl_class = [bundle principalClass]; NSFileHandle_ssl_class = [bundle principalClass];
if (NSFileHandle_ssl_class == 0 && bundle != nil) if (NSFileHandle_ssl_class == 0 && bundle != nil)