Author: rfm
Date: Thu Jul 17 10:51:33 2014
New Revision: 37999
URL: http://svn.gna.org/viewcvs/gnustep?rev=37999&view=rev
Log:
patch by Yavor for versioned bundles
Modified:
libs/sqlclient/trunk/ChangeLog
libs/sqlclient/trunk/GNUmakefile
libs/sqlclient/trunk/GNUmakefile.preamble
libs/sqlclient/trunk/SQLClient.m
Modified: libs/sqlclient/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/sqlclient/trunk/ChangeLog?rev=37999&r1=37998&r2=37999&view=diff
==============================================================================
--- libs/sqlclient/trunk/ChangeLog (original)
+++ libs/sqlclient/trunk/ChangeLog Thu Jul 17 10:51:33 2014
@@ -1,3 +1,11 @@
+2014-07-17 Yavor Doganov <[email protected]>
+
+ 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 <[email protected]>
* GNUmakefile (SQLClient_LIBRARIES_DEPEND_UPON): Add $(FND_LIBS)
Modified: libs/sqlclient/trunk/GNUmakefile
URL:
http://svn.gna.org/viewcvs/gnustep/libs/sqlclient/trunk/GNUmakefile?rev=37999&r1=37998&r2=37999&view=diff
==============================================================================
--- libs/sqlclient/trunk/GNUmakefile (original)
+++ libs/sqlclient/trunk/GNUmakefile Thu Jul 17 10:51:33 2014
@@ -21,7 +21,7 @@
-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 @@
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
Modified: libs/sqlclient/trunk/GNUmakefile.preamble
URL:
http://svn.gna.org/viewcvs/gnustep/libs/sqlclient/trunk/GNUmakefile.preamble?rev=37999&r1=37998&r2=37999&view=diff
==============================================================================
--- libs/sqlclient/trunk/GNUmakefile.preamble (original)
+++ libs/sqlclient/trunk/GNUmakefile.preamble Thu Jul 17 10:51:33 2014
@@ -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 +=
Modified: libs/sqlclient/trunk/SQLClient.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/sqlclient/trunk/SQLClient.m?rev=37999&r1=37998&r2=37999&view=diff
==============================================================================
--- libs/sqlclient/trunk/SQLClient.m (original)
+++ libs/sqlclient/trunk/SQLClient.m Thu Jul 17 10:51:33 2014
@@ -2096,7 +2096,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];
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
