Merge branch 'ichthyo-proc' into gui

SConstruct

@@ -263,8 +263,12 @@ def configurePlatform(env):
     if not conf.CheckPkgConfig('cairomm-1.0', 0.6):
         problems.append('Unable to configure Cairo--, exiting.')
     
-    if not conf.CheckPkgConfig('gdl-1.0', '0.6.1'):
-        problems.append('Unable to configure the GNOME DevTool Library.')
+    verGDL = '2.27.1'
+    if not conf.CheckPkgConfig('gdl-lum', verGDL, alias='gdl'):
+        print 'Custom package "gdl-lum" not found. Trying official GDL release >=%s...' % verGDL
+        if not conf.CheckPkgConfig('gdl-1.0', verGDL, alias='gdl'):
+            problems.append('GNOME Docking Library not found. We either need a very recent GDL '
+                            'version (>=%s), or the custom package "gdl-lum".' % verGDL)
     
     if not conf.CheckPkgConfig('librsvg-2.0', '2.18.1'):
         problems.append('Need rsvg Library for rendering icons.')
@@ -351,7 +355,7 @@ def defineBuildTargets(env, artifacts):
     
     # the Lumiera GTK GUI
     envGtk = env.Clone()
-    envGtk.mergeConf(['gtkmm-2.4','cairomm-1.0','gdl-1.0','xv','xext','sm'])
+    envGtk.mergeConf(['gtkmm-2.4','cairomm-1.0','gdl','xv','xext','sm'])
     envGtk.Append(CPPDEFINES='LUMIERA_PLUGIN', LIBS=core)
     
     objgui  = srcSubtree(envGtk,'$SRCDIR/gui')

admin/scons/LumieraEnvironment.py

@@ -63,7 +63,7 @@ class LumieraEnvironment(Environment):
         return self
     
     
-    def addLibInfo (self, libID, minVersion=0):
+    def addLibInfo (self, libID, minVersion=0, alias=None):
         """ use pkg-config to create an Environment describing the lib.
             Don't add this defs to the current Environment, rather store
             them in the libInfo Dictionary. 
@@ -73,8 +73,10 @@ class LumieraEnvironment(Environment):
             print "Problems configuring the Library %s (>= %s)" % (libID,minVersion)
             return False
         
-        self.libInfo[libID] = libInfo = LumieraEnvironment() 
+        self.libInfo[libID] = libInfo = LumieraEnvironment()
         libInfo.ParseConfig ('pkg-config --cflags --libs '+ libID )
+        if alias:
+            self.libInfo[alias] = libInfo
         return libInfo
     
     def Glob (self, pattern):
@@ -107,9 +109,9 @@ class LumieraConfigContext(ConfigBase):
     def __init__(self, *args,**kw):
         ConfigBase.__init__(self,*args,**kw)
     
-    def CheckPkgConfig (self, libID, minVersion=0):
+    def CheckPkgConfig (self, libID, minVersion=0, alias=None):
         print "Checking for library configuration: %s " % libID
         # self.Message(self,"Checking for library configuration: %s " % libID)
-        return self.env.addLibInfo (libID, minVersion)
+        return self.env.addLibInfo (libID, minVersion, alias)
 
 

src/gui/panels/panel.cpp

@@ -24,7 +24,7 @@
 #include "../gtk-lumiera.hpp"
 #include "../workspace/panel-manager.hpp"
 #include "../workspace/workspace-window.hpp"
-#include <libgdl-1.0/gdl/gdl-dock-item-grip.h>
+#include <gdl/gdl-dock-item-grip.h>
 
 using namespace Gtk;
 

src/gui/panels/panel.hpp

@@ -28,7 +28,7 @@
 #define PANEL_HPP
 
 #include "../gtk-lumiera.hpp"
-#include <libgdl-1.0/gdl/gdl-dock-item.h>
+#include <gdl/gdl-dock-item.h>
 
 #include "../widgets/panel-bar.hpp"
 

src/gui/workspace/panel-manager.hpp

@@ -28,7 +28,7 @@
 #ifndef PANEL_MANAGER_HPP
 #define PANEL_MANAGER_HPP
 
-#include <libgdl-1.0/gdl/gdl.h>
+#include <gdl/gdl.h>
 #include <typeinfo>
 
 #include "../panels/panel.hpp"

src/gui/workspace/workspace-window.cpp

@@ -26,11 +26,11 @@
 #  include <libintl.h>
 #endif
 
-#include <libgdl-1.0/gdl/gdl-tools.h>
-#include <libgdl-1.0/gdl/gdl-dock.h>
-#include <libgdl-1.0/gdl/gdl-dock-item.h>
-#include <libgdl-1.0/gdl/gdl-dock-placeholder.h>
-#include <libgdl-1.0/gdl/gdl-dock-bar.h>
+#include <gdl/gdl-tools.h>
+#include <gdl/gdl-dock.h>
+#include <gdl/gdl-dock-bar.h>
+#include <gdl/gdl-dock-item.h>
+#include <gdl/gdl-dock-placeholder.h>
 
 #include "../gtk-lumiera.hpp"
 #include "workspace-window.hpp"

wiki/compatibility.html

@@ -747,7 +747,7 @@ config.macros.timeline.handler = function(place,macroName,params,wikifier,paramS
 }
 //}}}</pre>
 </div>
-<div title="BuildDependencies" modifier="Ichthyostega" modified="200902160555" created="200803261326" changecount="17">
+<div title="BuildDependencies" modifier="Ichthyostega" modified="200904192357" created="200803261326" changecount="18">
 <pre>! Programming Languages
 * C
 ** a C99 compatible compiler, some GCC extensions are used, most are optional.
@@ -785,19 +785,19 @@ config.macros.timeline.handler = function(place,macroName,params,wikifier,paramS
 * for the GUI: gtkmm-2.4 gdl-1.0 libglibmm-2.4 cairomm-1.0 xv
 ** libgtkmm-2.4-dev (&gt;=2.8)
 ** libcairomm-1.0-dev (&gt;=0.6.0)
-** libgdl-1-dev (&gt;=0.6.1)
+** libgdl-lum-dev or libgdl-1-dev (&gt;=2.27.1)
 *** libglade2-dev (&gt;=2.6)
-*** libbonoboui2-dev (&gt;=2.14.0)
 *** libxml2-dev (&gt;=2.6)
 ** libglibmm-2.4-dev (&gt;=2.16), requiring glib2.0 (&gt;=2.16) and gthread-2.0 (&gt;=2.12.4)
 ** libxv-dev ~~(1.0.2 is known to work)~~
 * for rendering the icons: librsvg-2.0 
 ** librsvg2-dev (&gt;= 2.18)
-//usually, newer versions are OK//
-
 
 //usually, newer versions are OK//
 
+! Special Library requirements
+We use the GNOME Docking Library (GDL) within the Lumiera GTK GUI. As we actively participate in GDL development, we depend on a much more recent version, than most distos provide. We maintain a custom debian package (and source tree of GDL) which builds a {{{libgdl-lum.so}}}, in order to avoid side effects on other software. You may grab the tree including the Debian source package structure from [[our git|http://git.lumiera.org/gitweb?p=gdl-package;a=shortlog;h=refs/heads/debLumiera]] and create a binary Debian (or Ubuntu) package. For non-Debian systems, you may use the same build tree just in the standard way (configure, make, make install) to install into {{{/usr/local/lib/libgdl-lum.so}}}. Alternatively you may of course always just use a recent snapshot of GDL and build and install it as usual &amp;mdash; but doing so may cause other software on your system to use this bleeding edge version of GDL too.
+
 </pre>
 </div>
 <div title="ColorPalette" modifier="CehTeh" modified="200803261254" created="200803261252" changecount="5">

wiki/index.html

@@ -780,7 +780,7 @@ config.macros.timeline.handler = function(place,macroName,params,wikifier,paramS
 }
 //}}}</pre>
 </div>
-<div title="BuildDependenceis" modifier="Ichthyostega" modified="200902160555" created="200708120103" tags="organization buildsys" changecount="20">
+<div title="BuildDependenceis" modifier="Ichthyostega" modified="200904192357" created="200708120103" tags="organization buildsys" changecount="22">
 <pre>for __Building__
 * gcc (4.1), glibc6 (2.3), libstdc++6 (4.1)
 * [[build system|BuildSystem]] dependencies: SCons (0.96.90), Python (2.4), pkg-config
@@ -797,9 +797,8 @@ config.macros.timeline.handler = function(place,macroName,params,wikifier,paramS
 * for the GUI: gtkmm-2.4 gdl-1.0 libglibmm-2.4 cairomm-1.0 xv
 ** libgtkmm-2.4-dev (&gt;=2.8)
 ** libcairomm-1.0-dev (&gt;=0.6.0)
-** libgdl-1-dev (&gt;=0.6.1)
+** libgdl-lum-dev or libgdl-1-dev (&gt;=2.27.1)
 *** libglade2-dev (&gt;=2.6)
-*** libbonoboui2-dev (&gt;=2.14.0)
 *** libxml2-dev (&gt;=2.6)
 ** libglibmm-2.4-dev (&gt;=2.16), requiring glib2.0 (&gt;=2.16) and gthread-2.0 (&gt;=2.12.4)
 ** libxv-dev (&gt;=1.0.2)
@@ -809,6 +808,9 @@ config.macros.timeline.handler = function(place,macroName,params,wikifier,paramS
 
 boost 1.35 works too.
 
+We use the GNOME Docking Library (GDL) within the Lumiera GTK GUI. As we actively participate in GDL development, we depend on a much more recent version, than most distos provide. We maintain a custom debian package (and source tree of GDL) which builds a {{{libgdl-lum.so}}}, in order to avoid side effects on other software. You may grab the tree including the Debian source package structure from [[our git|http://git.lumiera.org/gitweb?p=gdl-package;a=shortlog;h=refs/heads/debLumiera]] and create a binary Debian (or Ubuntu) package. For non-Debian systems, you may use the same build tree just in the standard way (configure, make, make install) to install into {{{/usr/local/lib/libgdl-lum.so}}}. Alternatively you may of course always just use a recent snapshot of GDL and build and install it as usual &amp;mdash; but doing so may cause other software on your system to use this bleeding edge version of GDL too.
+
+
 for __Running__</pre>
 </div>
 <div title="BuildSystem" modifier="Ichthyostega" modified="200708120101" created="200708051532" tags="organization buildsys" changecount="4">