ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Michael Ploujnikov 2010-01-15 17:13:07 -05:00
commit 41cd0b5188
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
SConstruct
View file

@ -33,7 +33,7 @@ TESTDIR = 'tests'
ICONDIR = 'icons' ICONDIR = 'icons'
VERSION = '0.1+pre.01' VERSION = '0.1+pre.01'
TOOLDIR = './admin/scons' TOOLDIR = './admin/scons'
SVGRENDERER = 'admin/render-icon' SCRIPTDIR = './admin'
#-----------------------------------Configuration #-----------------------------------Configuration
# NOTE: scons -h for help. # NOTE: scons -h for help.
@ -47,6 +47,7 @@ import os
import sys import sys
sys.path.append(TOOLDIR) sys.path.append(TOOLDIR)
sys.path.append(SCRIPTDIR)
from Buildhelper import * from Buildhelper import *
from LumieraEnvironment import * from LumieraEnvironment import *
@ -84,7 +85,7 @@ def setupBasicEnvironment():
, CCFLAGS='-Wall -Wextra ' , CCFLAGS='-Wall -Wextra '
, CFLAGS='-std=gnu99' , CFLAGS='-std=gnu99'
) )
RegisterIcon_Builder(env,SVGRENDERER) RegisterIcon_Builder(env)
handleNoBugSwitches(env) handleNoBugSwitches(env)
env.Append(CPPDEFINES = '_GNU_SOURCE') env.Append(CPPDEFINES = '_GNU_SOURCE')

0
admin/render-icon.py → admin/render_icon.py
View file

5
admin/scons/Buildhelper.py
View file

@ -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. """ Registers Custom Builders for generating and installing Icons.
Additionally you need to build the tool (rsvg-convert.c) Additionally you need to build the tool (rsvg-convert.c)
used to generate png from the svg source using librsvg. 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") renderer.rsvgPath = env.subst("$BINDIR/rsvg-convert")
def invokeRenderer(target, source, env): def invokeRenderer(target, source, env):

2
icons/Makefile.am
View file

@ -18,7 +18,7 @@
svgdir = $(top_srcdir)/icons/svg svgdir = $(top_srcdir)/icons/svg
prerendereddir = $(top_srcdir)/icons/prerendered prerendereddir = $(top_srcdir)/icons/prerendered
icondir = $(top_builddir) icondir = $(top_builddir)
iconcommand = python $(top_srcdir)/admin/render-icon.py iconcommand = python $(top_srcdir)/admin/render_icon.py
16x16 = $(icondir)/16x16 16x16 = $(icondir)/16x16
22x22 = $(icondir)/22x22 22x22 = $(icondir)/22x22