X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=SConstruct;h=f3067fd56f0a80bc87a11df3f50d9bab8c840020;hb=ffe9abeff111a8342ab82e6f203aa405336e010b;hp=5b14fc2eb14ae9367838ab0665e056dd06c0dc2f;hpb=2ed0044bc7425734a1e44356b9afd68d46bb72e7;p=lilypond.git diff --git a/SConstruct b/SConstruct index 5b14fc2eb1..f3067fd56f 100644 --- a/SConstruct +++ b/SConstruct @@ -367,6 +367,8 @@ def configure (target, source, env): cpppath = [] if env.has_key ('CPPPATH'): cpppath = env['CPPPATH'] + + ## FIXME: linkage, check for libguile.h and scm_boot_guile #this could happen after flower... env.ParseConfig ('guile-config compile') @@ -674,7 +676,8 @@ def symlink_tree (target, source, env): ('mf', 'share/lilypond/fonts/tfm'), ('mf', 'share/lilypond/fonts/type1'), ('#tex', 'share/lilypond/tex/source'), - ('mf', 'share/lilypond/tex/generate'), + ('tex', 'share/lilypond/tex/tex-out'), + ('mf', 'share/lilypond/tex/mf-out'), ('#ly', 'share/lilypond/ly'), ('#scm', 'share/lilypond/scm'), ('#ps', 'share/lilypond/ps'), @@ -741,7 +744,7 @@ txt_files = map (lambda x: x + '.txt', readme_files) # # speeds up build by +- 5% # -if 0: +if not env['fast']: foo = map (lambda x: env.TXT (x + '.txt', os.path.join ('Documentation/topdocs', x)), readme_files) @@ -771,39 +774,41 @@ if 0: env.Alias ('release', patch) #### web -web_base = os.path.join (outdir, 'web') -web_ball = web_base + '.tar.gz' -env['footify'] = 'MAILADDRESS=bug-lilypond@gnu.org $PYTHON stepmake/bin/add-html-footer.py --name=lilypond --version=$TOPLEVEL_VERSION' -web_ext = ['.html', '.ly', '.midi', '.pdf', '.png', '.ps.gz', '.txt',] -web_path = '-path "*/$out/*"' + string.join (web_ext, ' -or -path "*/$out/*"') -env['web_path'] = web_path -web_list = os.path.join (outdir, 'weblist') -# compatible make heritits -# fixme: generate in $outdir is cwd/builddir -env.Command (web_list, - ## this is correct, but takes > 5min if you have a peder :-) - ##'doc', - '#/VERSION', - ['$PYTHON buildscripts/mutopia-index.py -o examples.html ./', - 'cd $absbuild && $footify $$(find . -name "*.html" -print)', - 'cd $absbuild && rm -f $$(find . -name "*.html~" -print)', - 'cd $absbuild && find Documentation input $web_path \ - > $TARGET', - '''echo '' > $absbuild/index.html''', - '''echo 'Redirecting to the documentation index...' >> $absbuild/index.html''', - 'cd $absbuild && ls *.html >> $TARGET',]) -env.Command (web_ball, web_list, - ['cat $SOURCE | tar -C $absbuild -czf $TARGET -T -',]) -#env.Alias ('web', web_ball) -www_base = os.path.join (outdir, 'www') -www_ball = www_base + '.tar.gz' -env.Command (www_ball, web_ball, - ['rm -rf $out/tmp', - 'mkdir -p $absbuild/$out/tmp', - 'tar -C $absbuild/$out/tmp -xzf $SOURCE', - 'cd $absbuild/$out/tmp && for i in $$(find . -name "$out"); do mv $$i $$(dirname $$i)/out-www; done', - 'tar -C $absbuild/$out/tmp -czf $TARGET .']) -env.Alias ('web', www_ball) +if not env['fast']: + web_base = os.path.join (outdir, 'web') + web_ball = web_base + '.tar.gz' + env['footify'] = 'MAILADDRESS=bug-lilypond@gnu.org $PYTHON stepmake/bin/add-html-footer.py --name=lilypond --version=$TOPLEVEL_VERSION' + web_ext = ['.html', '.ly', '.midi', '.pdf', '.png', '.ps.gz', '.txt',] + web_path = '-path "*/$out/*"' + string.join (web_ext, ' -or -path "*/$out/*"') + env['web_path'] = web_path + web_list = os.path.join (outdir, 'weblist') + # compatible make heritits + # fixme: generate in $outdir is cwd/builddir + env.Command (web_list, + ## this is correct, but takes > 5min if you have a peder :-) + ##'doc', + '#/VERSION', + ['$PYTHON buildscripts/mutopia-index.py -o examples.html ./', + 'cd $absbuild && $footify $$(find . -name "*.html" -print)', + 'cd $absbuild && rm -f $$(find . -name "*.html~" -print)', + 'cd $absbuild && find Documentation input $web_path \ + > $TARGET', + '''echo '' > $absbuild/index.html''', + '''echo 'Redirecting to the documentation index...' >> $absbuild/index.html''', + 'cd $absbuild && ls *.html >> $TARGET',]) + env.Command (web_ball, web_list, + ['cat $SOURCE | tar -C $absbuild -czf $TARGET -T -',]) + #env.Alias ('web', web_ball) + www_base = os.path.join (outdir, 'www') + www_ball = www_base + '.tar.gz' + env.Command (www_ball, web_ball, + ['rm -rf $out/tmp', + 'mkdir -p $absbuild/$out/tmp', + 'tar -C $absbuild/$out/tmp -xzf $SOURCE', + 'cd $absbuild/$out/tmp && for i in $$(find . -name "$out"); ' + + ' do mv $$i $$(dirname $$i)/out-www; done', + 'tar -C $absbuild/$out/tmp -czf $TARGET .']) + env.Alias ('web', www_ball) #### tags env.Append (