[med-svn] r17561 - in trunk/packages/adun.app/trunk/debian: . patches
Yavor Doganov
yavor-guest at moszumanska.debian.org
Wed Jul 30 09:35:32 UTC 2014
Author: yavor-guest
Date: 2014-07-30 09:35:32 +0000 (Wed, 30 Jul 2014)
New Revision: 17561
Added:
trunk/packages/adun.app/trunk/debian/patches/enable-sql-extension.patch
Modified:
trunk/packages/adun.app/trunk/debian/README.Debian
trunk/packages/adun.app/trunk/debian/changelog
trunk/packages/adun.app/trunk/debian/control
trunk/packages/adun.app/trunk/debian/patches/series
Log:
enable-sql-extension.patch: New. Add libsqlclient-dev to Build-Depends.
Modified: trunk/packages/adun.app/trunk/debian/README.Debian
===================================================================
--- trunk/packages/adun.app/trunk/debian/README.Debian 2014-07-30 09:26:56 UTC (rev 17560)
+++ trunk/packages/adun.app/trunk/debian/README.Debian 2014-07-30 09:35:32 UTC (rev 17561)
@@ -38,14 +38,18 @@
might want to add this directory to your PATH or move/symlink the
binary.
-Extensions
-==========
+Built-in extensions
+===================
The scripting extension allows one to run custom SmallTalk scripts
(Tools->Script Manager from UL's menu). One test script is shipped
-with adun.app as demonstration. User scripts can be installed under
+with adun.app as demonstration. User scripts can be placed at
~/GNUstep/Library/Scripts/UL and will be found automatically when the
UL application is started. See /usr/share/doc/steptalk for details
about the StepTalk scripting environment.
- -- Yavor Doganov <yavor at gnu.org>, Tue, 29 Jul 2014 19:04:01 +0300
+The SQL backend extension enables Adun to use SQL databases for
+storage and retrieval of data. It is not well integrated yet so some
+functionality may be missing.
+
+ -- Yavor Doganov <yavor at gnu.org>, Wed, 30 Jul 2014 12:27:52 +0300
Modified: trunk/packages/adun.app/trunk/debian/changelog
===================================================================
--- trunk/packages/adun.app/trunk/debian/changelog 2014-07-30 09:26:56 UTC (rev 17560)
+++ trunk/packages/adun.app/trunk/debian/changelog 2014-07-30 09:35:32 UTC (rev 17561)
@@ -2,7 +2,8 @@
* debian/patches/gcc-warnings.patch: New, adapt to the new GNUstep API
and fix some important warnings (Closes: #749733).
- * debian/patches/enable-scripting-extension.patch: New.
+ * debian/patches/enable-scripting-extension.patch:
+ * debian/patches/enable-sql-extension.patch: New.
* debian/patches/series: Update.
* debian/rules: Include /usr/share/dpkg/buildflags.mk, enable hardening
build.
@@ -14,7 +15,8 @@
(override_dh_strip, override_dh_makeshlibs): New rules.
* debian/control (Section): Change to "science", more appropriate.
(Standards-Version): Bump to 3.9.5 (no changes needed).
- (Build-Depends): Add libsteptalk-dev for the scripting extension.
+ (Build-Depends): Add libsteptalk-dev and libsqlclient-dev for the
+ scripting and SQL extensions.
(Depends): Add steptalk; temporary solution until it is fixed.
(adun-core, adun.app-dbg): New packages (Closes: #671226). Amend
descriptions and package relationships accordingly.
@@ -24,7 +26,7 @@
* debian/adun-core.manpages: ...new files.
* debian/dirs:
* debian/README.source: Delete.
- * debian/README.Debian: Add info about the scripting extension.
+ * debian/README.Debian: Add info about the built-in extensions.
-- Yavor Doganov <yavor at gnu.org> Fri, 30 May 2014 21:27:17 +0300
Modified: trunk/packages/adun.app/trunk/debian/control
===================================================================
--- trunk/packages/adun.app/trunk/debian/control 2014-07-30 09:26:56 UTC (rev 17560)
+++ trunk/packages/adun.app/trunk/debian/control 2014-07-30 09:35:32 UTC (rev 17561)
@@ -8,6 +8,7 @@
gnustep-make,
libgnustep-gui-dev,
libsteptalk-dev,
+ libsqlclient-dev,
libgsl0-dev,
imagemagick
Standards-Version: 3.9.5
Added: trunk/packages/adun.app/trunk/debian/patches/enable-sql-extension.patch
===================================================================
--- trunk/packages/adun.app/trunk/debian/patches/enable-sql-extension.patch (rev 0)
+++ trunk/packages/adun.app/trunk/debian/patches/enable-sql-extension.patch 2014-07-30 09:35:32 UTC (rev 17561)
@@ -0,0 +1,146 @@
+Description: Enable the SQL backend extension.
+Author: Yavor Doganov <yavor at gnu.org>
+Forwarded: no
+Last-Update: 2014-07-30
+---
+
+--- adun.app-0.81.orig/UL/GNUmakefile
++++ adun.app-0.81/UL/GNUmakefile
+@@ -35,7 +35,8 @@
+ XMLLib \
+ ULFramework \
+ AdunServer \
+-Extensions/ULApplicationScripting
++Extensions/ULApplicationScripting \
++Extensions/ULSQLDatabaseBackend
+
+ #
+ # Resource files
+--- adun.app-0.81.orig/UL/Extensions/ULSQLDatabaseBackend/ULSQLDatabaseBackend.h
++++ adun.app-0.81/UL/Extensions/ULSQLDatabaseBackend/ULSQLDatabaseBackend.h
+@@ -31,8 +31,6 @@
+ #include <AdunKernel/AdunDataSet.h>
+ #include <AdunKernel/AdunSimulationData.h>
+ #include <ULFramework/ULIOManager.h>
+-#include <libpq-fe.h>
+-#include <libpq/libpq-fs.h>
+
+ /**
+ Represents a connection to a sql database as a given user. This object provides
+--- adun.app-0.81.orig/UL/ULFramework/ULDatabaseInterface.m
++++ adun.app-0.81/UL/ULFramework/ULDatabaseInterface.m
+@@ -40,34 +40,39 @@
+ }
+ }
+
+-- (BOOL) _isAvailableSQLDatabaseBackend
++- (BOOL) _loadSQLDatabaseBackend
+ {
+ NSBundle *sqlBackendBundle;
+-
+- //check if the AdunSQLDatabase bundle is available
+- sqlBackendBundle = [NSBundle bundleWithPath:
+- [NSHomeDirectory() stringByAppendingPathComponent:
+- @"GNUstep/Library/Bundles/ULSQLDatabaseBackend.bundle"]];
+- if(sqlBackendBundle == nil)
+- return NO;
+- else
+- return YES;
+-}
+-
+-- (void) _loadSQLDatabaseBackend
+-{
+- NSBundle *sqlBackendBundle;
+-
+- sqlBackendBundle = [NSBundle bundleWithPath:
+- [NSHomeDirectory() stringByAppendingPathComponent:
+- @"GNUstep/Library/Bundles/ULSQLDatabaseBackend.bundle"]];
++ NSArray *dirs;
++ NSString *path;
++ NSUInteger i;
+
++ //check if the AdunSQLDatabase bundle is available
++ dirs = NSSearchPathForDirectoriesInDomains (NSLibraryDirectory,
++ NSAllDomainsMask,
++ YES);
++ for (i = 0; i < [dirs count]; i++)
++ {
++ path = [dirs objectAtIndex: i];
++ sqlBackendBundle
++ = [NSBundle bundleWithPath:
++ [path stringByAppendingPathComponent:
++ @"Bundles/ULSQLDatabaseBackend.bundle"]];
++ if (sqlBackendBundle)
++ {
++ if((ULSQLDatabaseBackend = [sqlBackendBundle principalClass]))
++ {
++ NSDebugLLog(@"ULDatabaseInterface",
++ @"Found SQL backend bundle.\n");
++ return YES;
++ }
++ else
++ [NSException raise: NSInternalInconsistencyException
++ format: @"Specified plugin has no principal class"];
++ }
++ }
+
+- if((ULSQLDatabaseBackend = [sqlBackendBundle principalClass]))
+- NSDebugLLog(@"ULDatabaseInterface", @"Found SQL backend bundle.\n");
+- else
+- [NSException raise: NSInternalInconsistencyException
+- format: @"Specified plugin has no principal class"];
++ return NO;
+ }
+
+ - (void) _initBackends
+@@ -156,10 +161,9 @@
+ [availableClients addObject: [fileSystemBackend clientName]];
+ databaseInterface = self;
+
+- if([self _isAvailableSQLDatabaseBackend])
++ if([self _loadSQLDatabaseBackend])
+ {
+ NSWarnLog(@"SQLDatabase Bundle Available");
+- [self _loadSQLDatabaseBackend];
+ }
+ else
+ {
+--- adun.app-0.81.orig/UL/Extensions/ULSQLDatabaseBackend/GNUmakefile
++++ adun.app-0.81/UL/Extensions/ULSQLDatabaseBackend/GNUmakefile
+@@ -17,8 +17,7 @@
+ #
+ # Libraries
+ #
+-ULSQLDatabaseBackend_LIBRARIES_DEPEND_UPON = -lSQLClient -lAdunKernel -lULFramework
+-ULSQLDatabaseBackend_LDFLAGS = -lSQLClient -lAdunKernel -lULFramework
++ULSQLDatabaseBackend_BUNDLE_LIBS = -lSQLClient -lAdunKernel -lULFramework
+
+ #
+ # Resource files
+--- adun.app-0.81.orig/UL/Extensions/ULSQLDatabaseBackend/GNUmakefile.preamble
++++ adun.app-0.81/UL/Extensions/ULSQLDatabaseBackend/GNUmakefile.preamble
+@@ -15,8 +15,11 @@
+ ADDITIONAL_LDFLAGS +=
+
+ # Additional include directories the compiler should search
+-ADDITIONAL_INCLUDE_DIRS += -I$(HOME)/GNUstep/Library/Headers -I/usr/local/pgsql/include
++ADDITIONAL_INCLUDE_DIRS += -I$(ADUN_SOURCE_DIR) -I$(ADUN_SOURCE_DIR)/UL \
++ -I$(ADUN_SOURCE_DIR)/Kernel \
++ -I$(ADUN_SOURCE_DIR)/Kernel/AdunKernel/Headers
+
+ # Additional library directories the linker should search
+-ADDITIONAL_LIB_DIRS += -L$(HOME)/GNUstep/Library/Libraries
++ADDITIONAL_LIB_DIRS += -L$(ADUN_SOURCE_DIR)/UL/ULFramework/ULFramework.framework/Versions/Current \
++ -L$(ADUN_SOURCE_DIR)/Kernel/AdunKernel/AdunKernel.framework/Versions/Current
+
+--- adun.app-0.81.orig/UL/Extensions/ULSQLDatabaseBackend/ULSQLDatabaseBackend.m
++++ adun.app-0.81/UL/Extensions/ULSQLDatabaseBackend/ULSQLDatabaseBackend.m
+@@ -274,6 +274,8 @@
+ NSString* type, *schema;
+ id object;
+
++ object = [infoDict objectForKey: @"Object"];
++ schema = [infoDict objectForKey: @"Schema"];
+ type = NSStringFromClass([object class]);
+ dict = [self columnMapForClass: type];
+
Modified: trunk/packages/adun.app/trunk/debian/patches/series
===================================================================
--- trunk/packages/adun.app/trunk/debian/patches/series 2014-07-30 09:26:56 UTC (rev 17560)
+++ trunk/packages/adun.app/trunk/debian/patches/series 2014-07-30 09:35:32 UTC (rev 17561)
@@ -4,3 +4,4 @@
fix-implicit-pointer.patch
gcc-warnings.patch
enable-scripting-extension.patch
+enable-sql-extension.patch
More information about the debian-med-commit
mailing list