Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

diff --git a/.gitignore b/.gitignore
index 10f95a70a904dcb6d23c01f2b9a6c644a9ca9f2f..8f7ab1020a102025ea5de098ea51aaa07ac76fae 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,39 +1,41 @@
 config.hh
-config.make
-config.status
-config.status.lineno
-config.log
-*~
-GNUmakefile
-aclocal.m4
-autom4te.cache
-configure
-*.ps
-*.eps
-*.pdf
-TAGS
-tags
-.gdbinit
-?.*
-*.midi
-\#*
-lily-[0-9][0-9][0-9]*
-gcstat*.scm
+*-midi.ly
+*-systems.tex
+*-systems.texi
+*.afm
 *.aux
-*.svg
-*.pyc
+*.eps
 *.log
-.htaccess
-*.tfm
-*.afm
+*.midi
 *.orig
+*.pdf
+*.ps
+*.pyc
 *.rej
-*-systems.texi
-*-systems.tex
-*-midi.ly
-a.out
+*.svg
+*.tfm
+*~
 .dotest
+.gdbinit
+.htaccess
 /.sconf_temp
-out-scons
 /.sconsign.dblite
 /scons.cache
+?.*
+AUTHORS.txt
+GNUmakefile
+INSTALL.txt
+TAGS
+\#*
+a.out
+aclocal.m4
+autom4te.cache
+config.log
+config.make
+config.status
+config.status.lineno
+configure
+gcstat*.scm
+lily-[0-9][0-9][0-9]*
+out-scons
+tags
\ No newline at end of file

diff --git a/SConstruct b/SConstruct
index c32c5eb6b2d9f39d0b9e91df0bad64a4e3989715..7e86f13cb10f7e2d31815338f44b0d5f1d2e7e26 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -673,6 +673,9 @@ BUILD_ABC2LY = '${set__x}$PYTHON $srcdir/scripts/abc2ly.py'
 BUILD_LILYPOND = '$absbuild/lily/$out/lilypond ${__verbose}'
 BUILD_LILYPOND_BOOK = '$PYTHON $srcdir/scripts/lilypond-book.py ${__verbose}'
 
+if env['verbose'] and env['verbose'] != '0':
+    env['__verbose'] = ' --verbose'
+    env['set__x'] = 'set -x;'
 
 # post-option environment-update
 env.Append (
@@ -688,9 +691,6 @@ env.Append (
     libdir_package = libdir_package,
     libdir_package_version = libdir_package_version,
 
-    # global build verbosity switch
-    ## __verbose = ' --verbose',
-    
     LILYPOND = BUILD_LILYPOND,
     ABC2LY = BUILD_ABC2LY,
     LILYPOND_BOOK = BUILD_LILYPOND_BOOK,
@@ -712,12 +712,6 @@ env.Append (LINKFLAGS = ['-Wl,--export-dynamic'])
 # FIXME: ParseConfig ignores -L flag?
 env.Append (LINKFLAGS = ['-L/usr/X11R6/lib'])
 
-## UGH? 
-if env['verbose'] and env['verbose'] <> '0':
-    env['__verbose'] = ' --verbose'
-    env['set__x'] = 'set -x;'
-
-
 ## Explicit target and dependencies
 
 if 'clean' in COMMAND_LINE_TARGETS:
@@ -748,10 +742,6 @@ if 'realclean' in COMMAND_LINE_TARGETS:
         os.unlink (config_cache)
     Exit (s)
 
-def symlink_tree ():
-    print "BOE"
-    raise urg
-    
 # Declare SConscript phonies 
 env.Alias ('minimal', config_cache)
 
@@ -967,3 +957,4 @@ for d in subdirs:
             env.BuildDir (b, d, duplicate = 0)
         SConscript (os.path.join (b, 'SConscript'))
 
+env.Command ('tree', ['#/VERSION', '#/SConstruct'], symlink_tree)

diff --git a/buildscripts/builder.py b/buildscripts/builder.py
index b59962e76c4da4b8153ce7272e07a4fa9a18f235..f41b0dd05c48578f2c9e41811cef68c197482436 100644 (file)
--- a/buildscripts/builder.py
+++ b/buildscripts/builder.py
@@ -278,21 +278,6 @@ def at_copy (target, source, env):
 AT_COPY = Builder (action = at_copy, src_suffix = ['.in', '.py', '.sh',])
 env.Append (BUILDERS = {'AT_COPY': AT_COPY})
 
-def at_copy_ext (target, source, env):
-  n = str (source[0])
-  s = open (n).read ()
-  for i in atvars:
-      if env.has_key (i):
-          s = string.replace (s, '@%s@'% i, env[i])
-  # whugh
-  e = os.path.splitext (n)[1]
-  t = str (target[0]) + e
-  open (t, 'w').write (s)
-
-AT_COPY_EXT = Builder (action = at_copy_ext, src_suffix = ['.py', '.sh',])
-env.Append (BUILDERS = {'AT_COPY_EXT': AT_COPY_EXT})
-
-
 MO = Builder (action = 'msgfmt -o $TARGET $SOURCE',
        suffix = '.mo', src_suffix = '.po')
 env.Append (BUILDERS = {'MO': MO})