From 96505f9df73dbec6d19ceb78dbd8d3bb141137fe Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 11 Jul 2004 23:46:59 +0000 Subject: [PATCH] *** empty log message *** --- Documentation/SConscript | 21 ++------------------- Documentation/user/SConscript | 3 +-- SConstruct | 10 ++++++---- flower/SConscript | 4 ++-- input/SConscript | 7 ++----- lily/SConscript | 4 ++-- ly/SConscript | 5 ++--- mf/GNUmakefile | 4 ++-- mf/SConscript | 10 +++++----- mf/{cmr.enc => cmr.enc.in} | 0 scm/SConscript | 5 ++--- 11 files changed, 26 insertions(+), 47 deletions(-) rename mf/{cmr.enc => cmr.enc.in} (100%) diff --git a/Documentation/SConscript b/Documentation/SConscript index 2d43c4fd23..bfecb74ac8 100644 --- a/Documentation/SConscript +++ b/Documentation/SConscript @@ -3,30 +3,13 @@ import glob import os +Import ('env') here = os.getcwd () reldir = str (Dir ('.').srcnode ()) os.chdir (reldir) sources = ['index.html.in', 'texinfo.css'] os.chdir (here) - -Import ('env') - -#SConscript (os.path.join (b, 'SConscript')) - -# build = env['build'] -# out = env['out'] - -# subdirs = ['user',] -# for d in subdirs: -# b = os.path.join (build, d, out) -# # Support clean sourctree build (srcdir build) -# # and outdir build. -# # TODO: figure out SConscript (dir, builddir, duplicate)) feature -# if (build and build != '.') \ -# or (out and out != '.'): -# env.BuildDir (b, d, duplicate=0) -# SConscript (os.path.join (b, 'SConscript')) -#SConscript (os.path.join ('user', 'SConscript')) +outdir = os.path.join (env['build'], reldir, env['out']) #testing all_sources = ['SConscript',] + sources diff --git a/Documentation/user/SConscript b/Documentation/user/SConscript index d83f978cd7..a3b04b2194 100644 --- a/Documentation/user/SConscript +++ b/Documentation/user/SConscript @@ -5,14 +5,13 @@ import os import re import sys +Import ('env') here = os.getcwd () reldir = str (Dir ('.').srcnode ()) os.chdir (reldir) sources = glob.glob ('*.tely') pngs = glob.glob ('*.png') os.chdir (here) - -Import ('env') outdir = os.path.join (env['build'], reldir, env['out']) def verbose_opt (env, opt): diff --git a/SConstruct b/SConstruct index c4495795bc..b26a428d8a 100644 --- a/SConstruct +++ b/SConstruct @@ -281,18 +281,20 @@ if env['gui']: env = conf.Finish () +##Import ('env') here = os.getcwd () reldir = str (Dir ('.').srcnode ()) os.chdir (reldir) srcdir = os.getcwd () os.chdir (here) -env['srcdir'] = srcdir +##outdir = os.path.join (env['build'], reldir, env['out']) +outdir = os.path.join (env['build'], env['out']) +env['srcdir'] = srcdir build = env['build'] out = env['out'] -##reldir = str (Dir ('.').srcnode ()) -reldir = os.getcwd () -outdir = os.path.join (env['build'], reldir, env['out']) + + if not os.path.exists (outdir): os.mkdir (outdir) diff --git a/flower/SConscript b/flower/SConscript index 121ad45917..08730ef0e3 100644 --- a/flower/SConscript +++ b/flower/SConscript @@ -3,17 +3,17 @@ import glob import os +Import ('env') here = os.getcwd () reldir = str (Dir ('.').srcnode ()) os.chdir (reldir) sources = glob.glob ('*.cc') includes = glob.glob ('include/*.hh') os.chdir (here) +outdir = os.path.join (env['build'], reldir, env['out']) name = 'flower' -Import ('env') e = env.Copy () -outdir = os.path.join (env['build'], reldir, env['out']) e.Append (CPPPATH = [outdir, 'include']) if env['static']: e.Library (name, sources) diff --git a/input/SConscript b/input/SConscript index db73109641..dbfffa230f 100644 --- a/input/SConscript +++ b/input/SConscript @@ -3,17 +3,14 @@ import glob import os +Import ('env') here = os.getcwd () reldir = str (Dir ('.').srcnode ()) os.chdir (reldir) sources = glob.glob ('*.ly') abc_sources = glob.glob ('*.abc') os.chdir (here) - -Import ('env') -#outdir = os.path.join (env['build'], reldir, env['out']) - -# examples = simple simple-song les-nereides puer-fragment wilhelmus paddy +outdir = os.path.join (env['build'], reldir, env['out']) stems = map (lambda x: os.path.splitext (x)[0], sources) abc_stems = map (lambda x: os.path.splitext (x)[0], abc_sources) diff --git a/lily/SConscript b/lily/SConscript index c5bde0c080..1179f18069 100644 --- a/lily/SConscript +++ b/lily/SConscript @@ -3,16 +3,17 @@ import glob import os +Import ('env') here = os.getcwd () reldir = str (Dir ('.').srcnode ()) os.chdir (reldir) sources = glob.glob ('*.cc') + ['parser.yy', 'lexer.ll'] includes = glob.glob ('include/*.hh') os.chdir (here) +outdir = os.path.join (env['build'], reldir, env['out']) name = 'lyparser' -Import ('env') e = env.Copy () #let's do this after the split @@ -26,7 +27,6 @@ e = env.Copy () #e.Object ('pangofc-afm-decoder.o', 'foo-pangofc-afm-deocder.o') e.Append (YACCFLAGS = '-d') -outdir = os.path.join (env['build'], reldir, env['out']) e.Append (CPPPATH = [outdir, '#/lily/include', '#/flower/include']) e.Depends ('lexer.cc', 'parser.cc') e.Depends ('my-lily-lexer.o', 'parser.cc') diff --git a/ly/SConscript b/ly/SConscript index 9ad8fa1793..871ab3207b 100644 --- a/ly/SConscript +++ b/ly/SConscript @@ -3,15 +3,14 @@ import glob import os +Import ('env') here = os.getcwd () reldir = str (Dir ('.').srcnode ()) os.chdir (reldir) sources = glob.glob ('*.ly') os.chdir (here) - -Import ('env') -e = env.Copy () outdir = os.path.join (env['build'], reldir, env['out']) + lydir = os.path.join (env['sharedir_package_version'], 'ly') env.Install (lydir, sources) env.Alias ('install', lydir) diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 1e35e0ca9f..3d4bcbd243 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -6,7 +6,7 @@ include $(depth)/make/stepmake.make AF_FILES = $(wildcard *.af) -EXTRA_DIST_FILES += README feta.tex cmr.enc +EXTRA_DIST_FILES += README feta.tex cmr.enc.in # We don't use $(MF_FILES), because there's more .mf cruft here FETA_MF_FILES = $(wildcard feta[0-9]*.mf)\ @@ -207,5 +207,5 @@ $(SAUTER_FONTS:%=$(outdir)/%.bla): $(outdir)/%.pfa: $(outdir)/%.bla $(MFTRACE) -I $(outdir)/ --pfa --simplify --keep-trying $(notdir $(basename $@)) && mv $(notdir $@) $(outdir)/ -$(outdir)/%.enc: %.enc +$(outdir)/%.enc.in: %.enc cp $< $@ diff --git a/mf/SConscript b/mf/SConscript index 12ab4d5754..f3deeb151f 100644 --- a/mf/SConscript +++ b/mf/SConscript @@ -5,10 +5,13 @@ import os import string import sys +Import ('env') here = os.getcwd () reldir = str (Dir ('.').srcnode ()) os.chdir (reldir) sources = glob.glob ('*.mf') +outdir = os.path.join (env['build'], reldir, env['out']) + #mf_sources = reduce (+, mf_sources = reduce (lambda x, y: x + y, map (glob.glob, @@ -19,7 +22,6 @@ mf_sources = reduce (lambda x, y: x + y, 'parmesan[0-9]*.mf',))) os.chdir (here) -Import ('env') #mf_sources = ('feta16.mf',) #mf_sources = ('feta-braces-a.mf',) font_stems = map (lambda x: os.path.splitext (x)[0], mf_sources) @@ -43,10 +45,8 @@ env.Alias ('install', afmdir) env.Alias ('install', pfadir) map (lambda x: env.Alias ('fonts', x), t + a + p) -outcmr = os.path.join (env['absbuild'], reldir, env['out'], 'cmr.enc') -env.Command (outcmr, os.path.join (reldir, 'cmr.enc'), 'cp $SOURCE $TARGET') -env.Alias ('fonts', outcmr) -env.Alias ('mf', 'fonts') +env.Command ('cmr.enc', 'cmr.enc.in', 'cp $SOURCE $TARGET') +env.Alias ('fonts', 'cmr.enc') #testing all_sources = ['SConscript',] + sources diff --git a/mf/cmr.enc b/mf/cmr.enc.in similarity index 100% rename from mf/cmr.enc rename to mf/cmr.enc.in diff --git a/scm/SConscript b/scm/SConscript index db12e43bfa..3cb4dd0a09 100644 --- a/scm/SConscript +++ b/scm/SConscript @@ -3,15 +3,14 @@ import glob import os +Import ('env') here = os.getcwd () reldir = str (Dir ('.').srcnode ()) os.chdir (reldir) sources = glob.glob ('*.scm') os.chdir (here) - -Import ('env') -e = env.Copy () outdir = os.path.join (env['build'], reldir, env['out']) + scmdir = os.path.join (env['sharedir_package_version'], 'scm') env.Install (scmdir, sources) env.Alias ('install', scmdir) -- 2.39.5