Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index f4e24bf29b6ccb9d2cf837d602c4ebb7d17bb6e2..5a07e1b33aec49b71850c3d4c66e19032abea440 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -176,11 +176,14 @@ import packagepython
 package = packagepython.Package (srcdir)
 version = packagepython.version_tuple_to_str (package.version)
 
-ENV = { 'PATH' : os.environ['PATH'] }
-for key in ['LD_LIBRARY_PATH', 'GUILE_LOAD_PATH', 'PKG_CONFIG_PATH', 'TEXMF']:
+ENV = { 'PYTHONPATH': '' }
+for key in ['GUILE_LOAD_PATH', 'LD_LIBRARY_PATH', 'PATH', 'PKG_CONFIG_PATH',
+            'PYTHONPATH', 'TEXMF']:
     if os.environ.has_key (key):
         ENV[key] = os.environ[key]
 
+ENV['PYTHONPATH'] = os.path.join (srcdir, 'python') + ':' + ENV['PYTHONPATH']
+
 env = Environment (
     ENV = ENV,
     BYTEORDER = sys.byteorder.upper (),
@@ -419,14 +422,13 @@ def configure (target, source, env):
 
     required = []
     test_program (required, 'bash', '2.0', 'Bash', 'bash')
-    test_program (required, 'gcc', '2.8', 'GNU C compiler', 'gcc')
-    test_program (required, 'g++', '3.0.5', 'GNU C++ compiler', 'g++')
-    test_program (required, 'guile-config', '1.6', 'GUILE development',
+    test_program (required, 'gcc', '4.0', 'GNU C compiler', 'gcc')
+    test_program (required, 'g++', '4.0.5', 'GNU C++ compiler', 'g++')
+    test_program (required, 'guile-config', '1.8', 'GUILE development',
             'libguile-dev or guile-devel')
     test_program (required, 'mf', '0.0', 'Metafont', 'tetex-bin')
-    test_program (required, 'mftrace', '1.1.9',
+    test_program (required, 'mftrace', '1.1.19',
               'mftrace (http://xs4all.nl/~hanwen/mftrace)', 'mftrace')
-    test_program (required, 'potrace', '0.0', 'Potrace', 'potrace')
     test_program (required, 'python', '2.1', 'Python (www.python.org)',
               'python')
     # Silly, and breaks with /bin/sh == dash
@@ -441,16 +443,13 @@ def configure (target, source, env):
               'fontforge')
     test_program (optional, 'flex', '0.0', 'Flex -- lexer generator',
               'flex')
-    test_program (optional, 'guile', '1.6', 'GUILE scheme', 'guile')
+    test_program (optional, 'guile', '1.8', 'GUILE scheme', 'guile')
     test_program (optional, 'gs', '8.15',
               'Ghostscript PostScript interpreter',
               'gs or gs-afpl or gs-esp or gs-gpl')
-    test_program (optional, 'mftrace', '1.1.19', 'Metafont tracing Type1',
-            'mftrace')
-    test_program (optional, 'makeinfo', '4.7', 'Makeinfo tool', 'texinfo')
+    test_program (optional, 'makeinfo', '4.8', 'Makeinfo tool', 'texinfo')
     test_program (optional, 'perl', '4.0',
               'Perl practical efficient readonly language', 'perl')
-    #test_program (optional, 'ps2pdf', '0.0', 'Ps2pdf', 'gs')
 
     def CheckYYCurrentBuffer (context):
         context.Message ('Checking for yy_current_buffer... ')
@@ -677,6 +676,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 (
@@ -692,22 +694,11 @@ 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,
     LILYPOND_BOOK_FORMAT = 'texi-html',
     MAKEINFO_FLAGS = '--css-include=$srcdir/Documentation/texinfo.css',
-    # PYTHONPATH = ['$absbuild/python/$out'],
-    TEXI2DVI_PAPERSIZE = '@afourpaper',
-    TEXI2DVI_FLAGS = [ '-t$TEXI2DVI_PAPERSIZE'],
-    DVIPS_PAPERSIZE = 'a4',
-    DVIPS_FLAGS = ['-t$DVIPS_PAPERSIZE',
-               '-u+lilypond.map',
-               '-u+ec-mftrace.map'],
-    PSPDF_FLAGS = ['-sPAPERSIZE=$DVIPS_PAPERSIZE'],
     )
 
 env.Append (CCFLAGS = ['-pipe', '-Wno-pmf-conversions'])
@@ -724,11 +715,6 @@ env.Append (LINKFLAGS = ['-Wl,--export-dynamic'])
 # FIXME: ParseConfig ignores -L flag?
 env.Append (LINKFLAGS = ['-L/usr/X11R6/lib'])
 
-if env['verbose']:
-    env['__verbose'] = ' --verbose'
-    env['set__x'] = 'set -x;'
-
-
 ## Explicit target and dependencies
 
 if 'clean' in COMMAND_LINE_TARGETS:
@@ -759,10 +745,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)
 
@@ -978,3 +960,4 @@ for d in subdirs:
             env.BuildDir (b, d, duplicate = 0)
         SConscript (os.path.join (b, 'SConscript'))
 
+env.Command ('tree', ['#/VERSION', '#/SConstruct'], symlink_tree)