Merge remote branch 'ichthyo/plouj_second-tp-attempt' into second-tp-attempt

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')

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):

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