+
+pl 57
+ - verneukeratificering van JCN code.
+ - lots of updates on our own makefile system.
+ - junked automake & documented it
+ - put rods into Spring_spacer too. Much cleaner
+ - bf: weird spacings (enge floats)
+ - bf: too many constraints added.
+ - smarter constraint check
+ - bf: table16 fontsize.
+
+ - 56.jcn1's empiric computer science.
+ - debian patches (AF)
+ - solaris/irix patches (AO)
+
+
+pl 56.jcn4
+ - reintruduced slope in bug [c8 c16 c16] in favour of stemlen bug...
+ - staff-side: accent half line higher
+ - reincluded silly los-toros latex file
+ - bf's: bezier.cc,bow.cc, mat.hh: rotate
+ - bf: bezier slur: handle broken slurs
+ - bf: beam
+ - dehairifications of bezier.cc
+
+pl 56.jcn3
+ - bf's: offset multiply, matrix rotate
+ - dropped los-toros latex file
+
+pl 56.jcn2
+ - even nicer excentric slurs;
+ - input/slur-bug.ly
+ - los-toros with barnumbers ;-)
+ - nice version of height-ajust bezier slurs (see sleur.ly --test)
+ - bf's beam:
+ * slope in[c8 c16 c16];
+ * allow no INTER position for normal quantising
+
+pl 56.jcn1
+ - bezier curves with raaklijnen
+
+pl 56.ag1
+ - `Makefile.am.wild's now should work correctly with VPATH (AG)
+
+************
+
pl 56
- more dutch vocabulary
- Barnumber FAQ added
--- /dev/null
+#!@PYTHON@
+
+import sys
+import os
+
+lilypath =''
+try:
+ lilypath = os.environ['LILYPOND_SOURCEDIR'] + '/'
+except KeyError:
+ print 'Please set LILYPOND_SOURCEDIR to the toplevel source, eg LILYPOND_SOURCEDIR=/home/foobar/lilypond-1.2.3/'
+ sys.exit(1)
+
+lilypath = lilypath + '/bin/'
+sys.path.append(lilypath)
+
+
+from lilypython import *
+import getopt
+import pipes
+
+
+mp_version = '0.3'
+
+class Options:
+ def __init__(self):
+ self.to_version = lilydirs.version_tuple()
+ self.from_version = prev_version(self.to_version)
+
+options = Options()
+
+
+def help():
+ sys.stdout.write(
+ 'Generate a patch to go to this version.\n'
+ ' --from=FROM, -f FROM old is FROM\n'
+ ' --to=TO, -t TO to version TO\n'
+
+ )
+
+
+
+def untar(fn):
+ # os.system('pwd');
+ sys.stderr.write('untarring ' + fn)
+# can't seem to fix errors:
+# gzip: stdout: Broken pipe
+# tar: Child returned status 1
+# os.system ('tar xzf ' + fn)
+# sys.stderr.write('\n')
+# ugh, even this does not work, but one error message less :-)
+ os.system ('gzip --quiet -dc ' + fn + '| tar xf - ')
+# so print soothing message:
+ sys.stderr.write('make-patch:ugh: Please ignore error: gzip: stdout: Broken pipe\n');
+ sys.stderr.flush()
+
+
+header = 'Generated by make-patch, old = %s, new = %s\n\
+\n\
+usage \n\
+\n\
+ cd lilypond-source-dir; patch -E -p0 < %s\n\
+\n\
+Patches do not contain automatically generated files, \n\
+i.e. you should rerun configure\n\n'
+
+pats = ['*.lsm', 'configure', '*.txt', 'lilypond.spec']
+def remove_automatic(dirnames):
+ files = []
+ files = files + multiple_find(pats, dirnames)
+
+ for f in files:
+ os.remove(f)
+
+def makepatch(fv, tv, patfile_nm):
+ import tempfile
+ prev_cwd = os.getcwd();
+ os.chdir ('/tmp')
+ untar(released_tarball(fv))
+ untar(released_tarball(tv))
+ remove_automatic([dirname(fv), dirname(tv)])
+
+ os.chdir(dirname(tv))
+
+ if not patfile_nm:
+ patfile_nm = '../patch-%s' % version_tuple_to_str(tv)
+
+ f = open(patfile_nm, 'w')
+ f.write(header %\
+ (version_tuple_to_str(fv), version_tuple_to_str(tv), \
+ os.path.basename(patfile_nm)))
+ f.close()
+
+ sys.stderr.write('diffing to %s... ' % patfile_nm)
+ os.system('diff -urN ../%s . >> %s' % (dirname(fv), patfile_nm))
+ #os.system('gzip -9f %s' % patfile_nm)
+ os.chdir('/tmp')
+
+ sys.stderr.write('cleaning ... ')
+ os.system('rm -fr %s %s' % (dirname(tv), dirname(fv)))
+ sys.stderr.write('\n')
+ os.chdir(prev_cwd)
+
+def main():
+ sys.stderr.write('This is make-patch version %s\n' % mp_version)
+ (cl_options, files) = getopt.getopt(sys.argv[1:],
+ 'hf:o:t:', ['output=', 'help', 'from=', 'to='])
+ outfn = ''
+ for opt in cl_options:
+ o = opt[0]
+ a = opt[1]
+ if o == '--from' or o == '-f':
+ options.from_version = version_str_to_tuple(a)
+ elif o == '--to' or o == '-t':
+ options.to_version = version_str_to_tuple(a)
+ elif o== '--help' or o == '-h':
+ help()
+ return 0;
+ elif o == '--output' or o == '-o':
+ outfn = os.path.join(os.getcwd(), a)
+ else:
+ raise getopt.error
+
+ if not outfn:
+ pn = 'patch-%s' % version_tuple_to_str(options.to_version)
+ outfn = os.path.join(os.getcwd(), pn)
+
+ makepatch(options.from_version, options.to_version, outfn)
+
+if __name__ == '__main__':
+ main()
--- /dev/null
+#!@PYTHON@
+
+import sys
+import os
+
+lilypath =''
+try:
+ lilypath = os.environ['LILYPOND_SOURCEDIR'] + '/'
+except KeyError:
+ print 'Please set LILYPOND_SOURCEDIR to the toplevel source, eg LILYPOND_SOURCEDIR=/home/foobar/lilypond-1.2.3/'
+ sys.exit(1)
+
+lilypath = lilypath + '/bin/'
+sys.path.append(lilypath)
+
+from lilypython import *
+
+os.chdir(lilydirs.topdir)
+os.system('make dist')
+cur_ver = lilydirs.version_tuple()
+print tarball(cur_ver)
+os.rename('out/' + tarball(cur_ver), released_tarball(cur_ver))
+os.chdir('../test')
+os.system('pwd')
+os.system('rm ../test/*gz')
+os.link(released_tarball(cur_ver), tarball(cur_ver))
+
+
+# not a module, but a script (JCN)
+# makepatch.main()
+
+# Module wherefore aren't thou Script
+# A Rose by any other name would be as blonde. --HWN
+
+os.system('python ' + lilydirs.topdir + '/bin/make-patch.py');
+
+pn = 'patch-%s' % version_tuple_to_str(cur_ver)
+os.system('gzip -9 ' + pn)
+pn = pn + '.gz'
+rel_pn = lilydirs.release_dir + '../patches/' + pn;
+
+os.rename(pn, rel_pn);
+os.link(rel_pn, pn);
+
+os.system('tar cf updeet *gz')
# -*-Makefile-*-
-# @configure_input@
########################################################
# project LilyPond -- the musical typesetter
# title top level makefile for LilyPond
# identify module:
#
NAME = lilypond
+SUBDIRS = bin flower lib lily mf mi2mu debian\
+ Documentation init input tex make mutopia
include VERSION
-include ./$(depth)/make/Version.make
-
-# generic variables:
-#
-include ./$(depth)/make/Variables.make
#
# descent order into subdirectories:
#
-SUBDIRS = bin flower lib lily mf mi2mu debian\
- Documentation init input tex make mutopia
-#
# list of distribution files:
#
-SCRIPTS = configure configure.in install-sh aclocal.m4
+SCRIPTS = configure configure.in aclocal.m4
README_FILES = BUGS DEDICATION ANNOUNCE-0.1 ANNOUNCE \
COPYING ONEWS NEWS README TODO \
INSTALL.txt AUTHORS.txt PATCHES.txt
-EXTRA_DISTFILES = .dstreamrc mudela-mode.el VERSION $(README_FILES) $(SCRIPTS) $(SYMLINKS)
+EXTRA_DISTFILES = config.make.in config.hh.in .dstreamrc mudela-mode.el VERSION $(README_FILES) $(SCRIPTS)
# do not dist ./Makefile (is copied from make/Toplevel.make)
-DISTFILES:=$(EXTRA_DISTFILES)# Makefile $(ALL_SOURCES)
+DISTFILES:=$(EXTRA_DISTFILES)
#
# generic targets and rules:
#
+include ./$(depth)/make/Version.make
+include ./$(depth)/make/Variables.make
include ./$(depth)/make/Targets.make
include ./$(depth)/make/Rules.make
-#
localdist: configure
-INSTALL.txt: check-doc-deps check-mf-deps
- rm -f INSTALL.txt
- ln `$(FIND) ./ -name INSTALL.txt -print |head -1` .
-
-# all machine generated junk resides in out/
-distclean:
- set -e; for i in `find . -type d -name 'out' -print`; do \
- rm -f $$i/* $$i/.build; done
- rm -rf *-build-dir
- ( cd flower && rm -f config.cache config.status config.log )
- rm -f Makefile config.cache config.status config.log
-
-
-
-localclean:
- rm -f core config.cache config.log config.status
- rm -f $(outdir)/*.{class,html,gif}
+local-distclean:
+ rm -f config.hh config.make Makefile config.cache config.status config.log
Makefile: make/Toplevel.make.in
+ chmod +w $@
echo '# WARNING WARNING WARNING WARNING' > $@
echo '# do not edit! this is generated from make/Toplevel.make.in' >> $@
cat $< >> $@
projects / lilypond.git / commitdiff