[ardour-dev] [PATCH]scons issues

[Alexis Deruelle]

[Sorry for the repost, my dumb ISP send html formated messages when using
the web based interface]

Hi,

While trying to forge ardour-2.0 rpm for Fedora Core 6, I encountered
the following glitches :

- clearlooks engine source files aren't part of the 'scons srctar' target
generated archive.

- templates files are not installed while doing a 'scons DESTDIR=...'
install.

Bellow patches against 1220.

Cheers,

--
Alexis

Index: templates/SConscript
===================================================================
--- templates/SConscript	(révision 1220)
+++ templates/SConscript	(copie de travail)
@@ -3,6 +3,7 @@
 import os
 import glob
 template_files = glob.glob('*.template.in')
+files = glob.glob('*.template')
 
 Import('env install_prefix subst_dict')
 
@@ -13,5 +14,5 @@
 
 Default(template_build)
 
-env.Alias('install', 
env.Install(os.path.join(install_prefix, 'share/ardour2/templates'), 
template_build))
+env.Alias('install', 
env.Install(os.path.join(install_prefix, 'share/ardour2/templates'), files))
 env.Alias('tarball', env.Distribute (env['DISTTREE'], [ 'SConscript' ] + 
template_build))

Index: libs/clearlooks/SConscript
===================================================================
--- libs/clearlooks/SConscript	(révision 1220)
+++ libs/clearlooks/SConscript	(copie de travail)
@@ -1,5 +1,15 @@
+# -*- python -*-
+
 import os.path
+import glob
 
+libclearlooks_files = [
+    'clearlooks_draw.c',
+    'clearlooks_rc_style.c',
+    'clearlooks_style.c',
+    'clearlooks_theme_main.c',
+    'support.c' ]
+
 Import ('env install_prefix')
 
 clearlooks = env.Copy()
@@ -7,13 +17,7 @@
 clearlooks.Replace(CCFLAGS = ' `pkg-config --cflags gtk+-2.0` ',
                    LINKFLAGS = ' `pkg-config --libs gtk+-2.0` ')
 
-libclearlooks = clearlooks.SharedLibrary('clearlooks', [
-    'clearlooks_draw.c',
-    'clearlooks_rc_style.c',
-    'clearlooks_style.c',
-    'clearlooks_theme_main.c',
-    'support.c'
-])
+libclearlooks = clearlooks.SharedLibrary('clearlooks', libclearlooks_files) 
 
 usable_libclearlooks = clearlooks.Install ('engines', libclearlooks)
 Default (usable_libclearlooks)
@@ -21,3 +25,9 @@
 env.Alias('install',
           env.Install(os.path.join(install_prefix,'lib/ardour2/engines'),
                       libclearlooks))
+
+env.Alias('tarball', env.Distribute (env['DISTTREE'],
+                                     [ 'SConscript', 'bits.c'] +
+                                    libclearlooks_files +
+                                    glob.glob('*.h')
+                                    ))