From: fred Date: Sun, 24 Mar 2002 20:10:38 +0000 (+0000) Subject: lilypond-0.1.59 X-Git-Tag: release/1.5.59~3160 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=75580d48b1d9fb14762bd851ec2e66b86a34078a;p=lilypond.git lilypond-0.1.59 --- diff --git a/bin/make-website.py b/bin/make-website.py index c6034aa822..ccff8df603 100644 --- a/bin/make-website.py +++ b/bin/make-website.py @@ -43,7 +43,7 @@ depth = '' makewebsite_id = ""; id_str = "make-website 0.9"; tar = "tar"; -make = "make -f Makefile"; +make = "make -f Makefile outdir=out-www"; mailaddress = "unknown" fullname = "unknown" footstr = "" @@ -94,98 +94,12 @@ def my_system(cmds): base="lilypond/"; -examples=["twinkle-pop", - "praeludium-fuga-E", - "cadenza", - "twinkle", - "collisions", - "font16", - "font20", - #"scales", - "rhythm", - "coriolan", - "multi"] - -mutopia_examples = [ "wtk1-fugue2", - "standje", - "preludes-1", - "preludes-2", - - "wtk1-prelude1", - "gallina", - "scsii-menuetto"] - def gen_html(): print 'generating HTML' my_system (["make -f Makefile -kC .. html"]); -def gen_examples(inputs): - print 'generating examples:\n' - outputs = [] - for i in inputs: - try: - located = multiple_find ([i + '.ly'], include_path) [0] - except IndexError: - print 'continuing dazed & confused (%s) ' % i - continue - outputs.append (located) - if not file_exist_b(i + '.dvi'): - my_system (['ly2dvi %s' % located]) - if not file_exist_b(i + '.ly.txt'): - os.link (located, i + ".ly.txt") - list = map(lambda x: 'out/%s.ps.gz out/%s.gif' % (x,x), inputs) - my_system (['make -C .. ' + join(' ', list)]) - - return outputs - -def gen_list(inputs, filename): - print "generating HTML list %s\n" % filename; - list = open(filename, 'w') - list.write ('Rendered Examples\n' - 'These example files are taken from the LilyPond distribution.\n' - 'LilyPond currently only outputs TeX and MIDI. The pictures and\n' - 'PostScript files were generated using TeX, Ghostscript and some\n' - 'graphics tools. The papersize used for these examples is A4. The GIF\n' - 'files have been scaled to eliminate aliasing.\n'); - - for ex in inputs: - print '%s, ' % ex - header = read_mudela_header(ex + '.ly.txt') - - def read_dict(s, default, h =header): - try: - ret = h[s] - except KeyError: - ret = default - return ret - head = read_dict('title', ex) - composer = read_dict('composer', '') - desc = read_dict('description', '') - list.write('
') - list.write('

example file: %s

' % head); - if composer <> '': - list.write('

%s

\n' % composer) - if desc <> '': - list.write('%s

' % desc) - list.write ('

"); - - list.write( ""); - list.close() texstuff = ["mudela"] @@ -204,13 +118,7 @@ def gen_manuals(): my_system (['make -C .. ' + todo]) -def file_exist_b(name): - try: - f = open(name) - except IOError: - return 0 - f.close () - return 1 + def copy_files(): print "copying files\n" diff --git a/make/Variables.make b/make/Variables.make index 2918aa5a33..60a2205ab9 100644 --- a/make/Variables.make +++ b/make/Variables.make @@ -5,7 +5,7 @@ # abstract # # do not change this file for site-wide extensions; please use -# make/$(OUTDIR_NAME)/Site.make; +# make/$(outdir)/Site.make; # # Any change in files in this directory (make/) would be distributed, if # you do make dist @@ -19,32 +19,41 @@ include $(depth)/make/Toplevel_version.make -ifeq (0,${MAKELEVEL}) - # Don't try to outsmart us, you puny computer! -MAKE:=$(MAKE) --no-builtin-rules +ifeq (0,${MAKELEVEL}) + MAKE:=$(MAKE) --no-builtin-rules endif -ifndef OUTDIR_NAME -OUTDIR_NAME=out + +ifndef config +configuration=config +else +configuration=config-$(config) endif +include $(depth)/$(configuration).make + # directory names: buildprefix=$(depth) -outdir=$(OUTDIR_NAME) + +ifdef CONFIGSUFFIX +outdir=out-$(CONFIGSUFFIX) +else +outdir=out +endif # derived names lily_bindir = $(depth)/bin distdir = $(depth)/$(outdir)/$(DIST_NAME) depdir = $(outdir) -flowerout = $(buildprefix)/flower/$(OUTDIR_NAME) -libout = $(buildprefix)/lib/$(OUTDIR_NAME) -lilyout = $(buildprefix)/lily/$(OUTDIR_NAME) -mi2muout = $(buildprefix)/mi2mu/$(OUTDIR_NAME) -makeout = $(buildprefix)/make/$(OUTDIR_NAME) -docout = $(buildprefix)/Documentation/$(OUTDIR_NAME) -binout = $(buildprefix)/bin/$(OUTDIR_NAME) +flowerout = $(buildprefix)/flower/$(outdir) +libout = $(buildprefix)/lib/$(outdir) +lilyout = $(buildprefix)/lily/$(outdir) +mi2muout = $(buildprefix)/mi2mu/$(outdir) +makeout = $(buildprefix)/make/$(outdir) +docout = $(buildprefix)/Documentation/$(outdir) +binout = $(buildprefix)/bin/$(outdir) doc-dir = $(depth)/Documentation flower-dir = $(depth)/flower @@ -59,11 +68,10 @@ include-flower = $(depth)/flower/include rpm-sources = ${HOME}/rpms/SOURCES # -ifndef configuration -configuration=config -endif +configheader=$(outdir)/config.hh + + -include $(depth)/$(configuration).make # user settings: # @@ -145,12 +153,12 @@ CFLAGS = $(ICFLAGS) $(DEFINES) $(INCLUDES) $(USER_CFLAGS) $(EXTRA_CFLAGS) # -pipe makes it go faster, but is not supported on all platforms. # EXTRA_CXXFLAGS= -fno-rtti -fno-exceptions -Wall -W -Wmissing-prototypes -Wmissing-declarations -Wconversion -EXTRA_CXXFLAGS= -Wall -W -Wmissing-prototypes -Wmissing-declarations -Wconversion +EXTRA_CXXFLAGS= -Wall -Winline -W -Wmissing-prototypes -Wmissing-declarations -Wconversion CXXFLAGS = $(CFLAGS) $(USER_CXXFLAGS) $(EXTRA_CXXFLAGS) $(MODULE_CXXFLAGS) -INCLUDES = -I$(depth) -Iinclude -I$(outdir) -I$(include-lib) -I$(libout) -I$(include-flower) -I$(flowerout) +INCLUDES = -Iinclude -I$(outdir) -I$(include-lib) -I$(libout) -I$(include-flower) -I$(flowerout) CXX_OUTPUT_OPTION = $< -o $@ -LDFLAGS = $(ILDFLAGS) $(USER_LDFLAGS) $(EXTRA_LDFLAGS) $(MODULE_LDFLAGS) -L$(depth)/lib/$(OUTDIR_NAME) -L$(depth)/flower/$(OUTDIR_NAME) +LDFLAGS = $(ILDFLAGS) $(USER_LDFLAGS) $(EXTRA_LDFLAGS) $(MODULE_LDFLAGS) -L$(depth)/lib/$(outdir) -L$(depth)/flower/$(outdir) LOADLIBES = $(EXTRA_LIBES) $(MODULE_LIBES) -lstdc++ # need lg++ for win32, really! #