bindir = os.path.join (prefix, 'bin')
sharedir = os.path.join (prefix, 'share')
libdir = os.path.join (prefix, 'lib')
+libdir_package = os.path.join (libdir, package.name)
+lidbir_package_version = os.path.join (libdir_package, version)
localedir = os.path.join (sharedir, 'locale')
sharedir_doc_package = os.path.join (sharedir, 'doc', package.name)
sharedir_package = os.path.join (sharedir, package.name)
def CheckYYCurrentBuffer (context):
context.Message ('Checking for yy_current_buffer... ')
- ret = conf.TryLink ("""using namespace std;
+ ret = conf.TryCompile ("""using namespace std;
#include <FlexLexer.h>
class yy_flex_lexer: public yyFlexLexer
{
PSPDF_FLAGS = ['-sPAPERSIZE=$DVIPS_PAPERSIZE'],
)
+env.Append (CCFLAGS = ['-pipe', '-Wno-pmf-conversions'])
if env['debugging']:
- env.Append (CCFLAGS = ['-g', '-pipe'])
+ env.Append (CCFLAGS = ['-g'])
if env['optimising']:
env.Append (CCFLAGS = '-O2')
env.Append (CXXFLAGS = ['-DSTRING_UTILS_INLINED'])
# ugr,huh?
env.Append (LINKFLAGS = ['-Wl,--export-dynamic'])
+# FIXME: ParseConfig ignores -L flag?
+env.Append (LINKFLAGS = ['-L/usr/X11R6/lib'])
if env['verbose']:
env['__verbose'] = ' --verbose'
# FIXME: move to lily/SConscript?
LIBPATH = [os.path.join (absbuild, 'flower', env['out']),
- os.path.join (absbuild, 'kpath-guile', env['out']),
- os.path.join (absbuild, 'ttftool', env['out']),],
+ os.path.join (absbuild, 'kpath-guile', env['out']),],
CPPPATH = [outdir, ],
- LILYPOND_PATH = ['.', '$srcdir/input',
+ LILYPOND_PATH = ['.',
+ '$srcdir/input',
'$srcdir/input/regression',
'$srcdir/input/test',
'$srcdir/input/tutorial',
% vars ())
os.chdir (srcdir)
-if env['debugging']:
+if 1: #env['debugging']:
stamp = os.path.join (run_prefix, 'stamp')
env.Command (stamp, ['#/SConstruct', '#/VERSION'],
[symlink_tree, 'touch $TARGET'])
return line[0] == '/' and line[-2] == '/'
def cvs_dirs (dir):
- ENTRIES = os.path.join (dir, 'CVS/Entries')
- if not os.path.exists (ENTRIES):
+ entries = os.path.join (dir, 'CVS/Entries')
+ if not os.path.exists (entries):
return []
- entries = open (ENTRIES).readlines ()
+ entries = open (entries).readlines ()
dir_entries = filter (cvs_entry_is_dir, entries)
dirs = map (lambda x: os.path.join (dir, x[2:x[2:].index ('/')+3]),
dir_entries)
return dirs + map (cvs_dirs, dirs)
def cvs_files (dir):
- ENTRIES = os.path.join (dir, 'CVS/Entries')
- entries = open (ENTRIES).readlines ()
+ entries = os.path.join (dir, 'CVS/Entries')
+ if not os.path.exists (entries):
+ return []
+ entries = open (entries).readlines ()
file_entries = filter (cvs_entry_is_file, entries)
files = map (lambda x: x[1:x[1:].index ('/')+1], file_entries)
return map (lambda x: os.path.join (dir, x), files)
and 'web' not in COMMAND_LINE_TARGETS\
and 'install' not in COMMAND_LINE_TARGETS\
and 'clean' not in COMMAND_LINE_TARGETS:
- subdirs = ['lily', 'lily/include',
- 'flower', 'flower/include',
+ subdirs = ['lily',
+ 'flower',
'kpath-guile',
- 'ttftool',
'mf',
+ 'python',
]
if os.path.isdir ('%(srcdir)s/CVS' % vars ()):