From 1db2a4733997e3937eb77f4fe48addd229206424 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Fri, 15 Jan 2010 03:27:09 +0100
Subject: [PATCH] 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