From 8b311d9c9f1c099dce1d708227b5a97921df89b4 Mon Sep 17 00:00:00 2001 From: rfm Date: Thu, 17 Jul 2014 08:51:33 +0000 Subject: [PATCH] patch by Yavor for versioned bundles git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/sqlclient/trunk@37999 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 8 ++++++++ GNUmakefile | 4 ++-- GNUmakefile.preamble | 2 +- SQLClient.m | 3 ++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a9afde4..cd3238b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2014-07-17 Yavor Doganov + + Install bundles in a versioned directory. + * GNUmakefile (BUNDLE_INSTALL_DIR): Append the interface version. + * GNUmakefile.preamble (ADDITIONAL_CPPFLAGS): Define. + * SQLClient.m (-_configure:): Load bundles from the versioned + directory. + 2014-07-11 Yavor Doganov * GNUmakefile (SQLClient_LIBRARIES_DEPEND_UPON): Add $(FND_LIBS) diff --git a/GNUmakefile b/GNUmakefile index 70576f7..f546815 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -21,7 +21,7 @@ include $(GNUSTEP_MAKEFILES)/common.make -include config.make PACKAGE_NAME = SQLClient -PACKAGE_VERSION = 1.8.0 +PACKAGE_VERSION = 1.8.1 CVS_MODULE_NAME = gnustep/dev-libs/SQLClient CVS_TAG_NAME = SQLClient SVN_BASE_URL=svn+ssh://svn.gna.org/svn/gnustep/libs @@ -49,7 +49,7 @@ SQLClient_HEADER_FILES_INSTALL_DIR = SQLClient BUNDLE_NAME= -BUNDLE_INSTALL_DIR=$(GNUSTEP_BUNDLES)/SQLClient +BUNDLE_INSTALL_DIR=$(GNUSTEP_BUNDLES)/SQLClient$(SQLClient_INTERFACE_VERSION) # In some systems and situations the dynamic linker needs to haved the # SQLClient, gnustep-base, and objc libraries explicityly linked into diff --git a/GNUmakefile.preamble b/GNUmakefile.preamble index 324b2a6..4354b51 100644 --- a/GNUmakefile.preamble +++ b/GNUmakefile.preamble @@ -12,7 +12,7 @@ # # Additional flags to pass to the preprocessor -# ADDITIONAL_CPPFLAGS += +ADDITIONAL_CPPFLAGS += -DSOVERSION=\"$(SQLClient_INTERFACE_VERSION)\" # Additional flags to pass to the Objective-C compiler # ADDITIONAL_OBJCFLAGS += diff --git a/SQLClient.m b/SQLClient.m index ce0a847..40d8301 100644 --- a/SQLClient.m +++ b/SQLClient.m @@ -2096,7 +2096,8 @@ static unsigned int maxConnections = 8; { path = [paths objectAtIndex: count]; path = [path stringByAppendingPathComponent: @"Bundles"]; - path = [path stringByAppendingPathComponent: @"SQLClient"]; + path = [path stringByAppendingPathComponent: + @"SQLClient"SOVERSION""]; path = [path stringByAppendingPathComponent: s]; path = [path stringByAppendingPathExtension: @"bundle"]; bundle = [NSBundle bundleWithPath: path];