From 217d17107d9082aff464ffe0f9ba4a5cf6a0c910 Mon Sep 17 00:00:00 2001 From: Michael Ploujnikov Date: Thu, 14 Jan 2010 20:57:45 -0500 Subject: [PATCH 1/3] Use a fully qualified name for PlacementMO in PlacementIndex This seems to satisfy g++ 4.4.2, which otherwise complains like this: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In file included from ../src/proc/mobject/session/session-impl.hpp:53, from ../src/proc/mobject/session/sess-manager-impl.hpp:28, from ../src/proc/mobject/session/sess-manager-impl.cpp:41: ../src/proc/mobject/session/placement-index.hpp:163: error: declaration of ‘typedef class mobject::Placement mobject::session::PlacementIndex::PlacementMO’ ../src/proc/mobject/placement.hpp:244: error: changes meaning of ‘PlacementMO’ from ‘typedef class mobject::Placement mobject::PlacementMO’ --- src/proc/mobject/session/placement-index.cpp | 2 +- src/proc/mobject/session/placement-index.hpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/proc/mobject/session/placement-index.cpp b/src/proc/mobject/session/placement-index.cpp index f55e6fc3a..036fff3f4 100644 --- a/src/proc/mobject/session/placement-index.cpp +++ b/src/proc/mobject/session/placement-index.cpp @@ -95,7 +95,7 @@ namespace session { /* some type shorthands */ - typedef PlacementIndex::PlacementMO PlacementMO; + typedef mobject::PlacementMO PlacementMO; typedef PlacementIndex::PRef PRef; typedef PlacementIndex::ID ID; diff --git a/src/proc/mobject/session/placement-index.hpp b/src/proc/mobject/session/placement-index.hpp index a8df50b2a..2da6540b0 100644 --- a/src/proc/mobject/session/placement-index.hpp +++ b/src/proc/mobject/session/placement-index.hpp @@ -160,7 +160,6 @@ namespace session { public: - typedef Placement PlacementMO; typedef PlacementRef PRef; typedef PlacementMO::ID const& ID; From d11c57adb8109f083066db18e4b59a27eea9a3d2 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Fri, 15 Jan 2010 03:27:09 +0100 Subject: [PATCH 2/3] python-2.6 fix: loading the icon_rener.py script (Ticket #222) --- SConstruct | 5 +++-- admin/{render-icon.py => render_icon.py} | 0 admin/scons/Buildhelper.py | 5 +++-- icons/Makefile.am | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) rename admin/{render-icon.py => render_icon.py} (100%) diff --git a/SConstruct b/SConstruct index 1f1673f6c..c40c90ce2 100644 --- a/SConstruct +++ b/SConstruct @@ -33,7 +33,7 @@ TESTDIR = 'tests' ICONDIR = 'icons' VERSION = '0.1+pre.01' TOOLDIR = './admin/scons' -SVGRENDERER = 'admin/render-icon' +SCRIPTDIR = './admin' #-----------------------------------Configuration # NOTE: scons -h for help. @@ -47,6 +47,7 @@ import os import sys sys.path.append(TOOLDIR) +sys.path.append(SCRIPTDIR) from Buildhelper import * from LumieraEnvironment import * @@ -84,7 +85,7 @@ def setupBasicEnvironment(): , CCFLAGS='-Wall -Wextra ' , CFLAGS='-std=gnu99' ) - RegisterIcon_Builder(env,SVGRENDERER) + RegisterIcon_Builder(env) handleNoBugSwitches(env) env.Append(CPPDEFINES = '_GNU_SOURCE') diff --git a/admin/render-icon.py b/admin/render_icon.py similarity index 100% rename from admin/render-icon.py rename to admin/render_icon.py diff --git a/admin/scons/Buildhelper.py b/admin/scons/Buildhelper.py index 159dc4721..f8e349a5e 100644 --- a/admin/scons/Buildhelper.py +++ b/admin/scons/Buildhelper.py @@ -196,12 +196,13 @@ def checkCommandOption(env, optID, val=None, cmdName=None): -def RegisterIcon_Builder(env, renderer): +def RegisterIcon_Builder(env): """ Registers Custom Builders for generating and installing Icons. Additionally you need to build the tool (rsvg-convert.c) used to generate png from the svg source using librsvg. """ - renderer = __import__(renderer) # load python script for invoking the render + + import render_icon as renderer # load Joel's python script for invoking the rsvg-convert (SVG render) renderer.rsvgPath = env.subst("$BINDIR/rsvg-convert") def invokeRenderer(target, source, env): diff --git a/icons/Makefile.am b/icons/Makefile.am index 97d817ab4..ce0990f26 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -18,7 +18,7 @@ svgdir = $(top_srcdir)/icons/svg prerendereddir = $(top_srcdir)/icons/prerendered icondir = $(top_builddir) -iconcommand = python $(top_srcdir)/admin/render-icon.py +iconcommand = python $(top_srcdir)/admin/render_icon.py 16x16 = $(icondir)/16x16 22x22 = $(icondir)/22x22 From 9f76cbf3e9e2676252f162a37098df94ebe2207b Mon Sep 17 00:00:00 2001 From: Michael Ploujnikov Date: Sat, 16 Jan 2010 18:42:07 -0500 Subject: [PATCH 3/3] scons: propagate PKG_CONFIG_PATH when checking for library fix pkg-config problem with on Fedora12, when nobug using a lib installed in non-standard paths --- admin/scons/LumieraEnvironment.py | 1 + 1 file changed, 1 insertion(+) diff --git a/admin/scons/LumieraEnvironment.py b/admin/scons/LumieraEnvironment.py index 44b76ed07..21b2a6c09 100644 --- a/admin/scons/LumieraEnvironment.py +++ b/admin/scons/LumieraEnvironment.py @@ -74,6 +74,7 @@ class LumieraEnvironment(Environment): return False self.libInfo[libID] = libInfo = LumieraEnvironment() + libInfo["ENV"]["PKG_CONFIG_PATH"] = os.environ.get("PKG_CONFIG_PATH") libInfo.ParseConfig ('pkg-config --cflags --libs '+ libID ) if alias: self.libInfo[alias] = libInfo