gnustep/libs-sqlclient
0
0
Fork 0
mirror of https://github.com/gnustep/libs-sqlclient.git synced 2025-02-19 10:00:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

patch by Yavor for versioned bundles

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/sqlclient/trunk@37999 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2014-07-17 08:51:33 +00:00
parent eeaf12eefe
commit 8b311d9c9f
4 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2014-07-17 Yavor Doganov <yavor@gnu.org>
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 <yavor@gnu.org> 2014-07-11 Yavor Doganov <yavor@gnu.org>
* GNUmakefile (SQLClient_LIBRARIES_DEPEND_UPON): Add $(FND_LIBS) * GNUmakefile (SQLClient_LIBRARIES_DEPEND_UPON): Add $(FND_LIBS)

4
GNUmakefile
View file

@ -21,7 +21,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
-include config.make -include config.make
PACKAGE_NAME = SQLClient PACKAGE_NAME = SQLClient
PACKAGE_VERSION = 1.8.0 PACKAGE_VERSION = 1.8.1
CVS_MODULE_NAME = gnustep/dev-libs/SQLClient CVS_MODULE_NAME = gnustep/dev-libs/SQLClient
CVS_TAG_NAME = SQLClient CVS_TAG_NAME = SQLClient
SVN_BASE_URL=svn+ssh://svn.gna.org/svn/gnustep/libs SVN_BASE_URL=svn+ssh://svn.gna.org/svn/gnustep/libs
@ -49,7 +49,7 @@ SQLClient_HEADER_FILES_INSTALL_DIR = SQLClient
BUNDLE_NAME= 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 # In some systems and situations the dynamic linker needs to haved the
# SQLClient, gnustep-base, and objc libraries explicityly linked into # SQLClient, gnustep-base, and objc libraries explicityly linked into

2
GNUmakefile.preamble
View file

@ -12,7 +12,7 @@
# #
# Additional flags to pass to the preprocessor # 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 flags to pass to the Objective-C compiler
# ADDITIONAL_OBJCFLAGS += # ADDITIONAL_OBJCFLAGS +=

3
SQLClient.m
View file

@ -2096,7 +2096,8 @@ static unsigned int maxConnections = 8;
{ {
path = [paths objectAtIndex: count]; path = [paths objectAtIndex: count];
path = [path stringByAppendingPathComponent: @"Bundles"]; path = [path stringByAppendingPathComponent: @"Bundles"];
path = [path stringByAppendingPathComponent: @"SQLClient"]; path = [path stringByAppendingPathComponent:
@"SQLClient"SOVERSION""];
path = [path stringByAppendingPathComponent: s]; path = [path stringByAppendingPathComponent: s];
path = [path stringByAppendingPathExtension: @"bundle"]; path = [path stringByAppendingPathExtension: @"bundle"];
bundle = [NSBundle bundleWithPath: path]; bundle = [NSBundle bundleWithPath: path];