lilypond-0.1.48

diff --git a/bin/lilypython.py b/bin/lilypython.py
index 6c4ad1ad701a3fa5760278683848eb994df42ed3..6f329a86146c8d5f71a0aa2f3bd9c1b6a67e9bee 100644 (file)
--- a/bin/lilypython.py
+++ b/bin/lilypython.py
@@ -110,8 +110,13 @@ class Lilydirs:
            print 'Please set LILYPOND_SOURCEDIR to the toplevel source, eg LILYPOND_SOURCEDIR=/home/foobar/lilypond-1.2.3/'
            sys.exit(1)
            
-       self.release_dir = self.topdir + '../releases/'
-       self.patch_dir = self.topdir + '../patches/'
+       try:
+           self.groupdir = os.environ['LILYPOND_GROUPDIR'] + '/'
+       except KeyError:
+           self.groupdir = self.topdir + '../'
+ 
+       self.release_dir = self.groupdir + '/releases/'
+       self.patch_dir = self.groupdir + '/patches/'
 
     def version_tuple(self):
         f = open (self.topdir + 'VERSION')

diff --git a/bin/make-patch.py b/bin/make-patch.py
index 72be6f4ec81b54f67cd0c6c2a8da5874de897f52..0f5ee3057dd588d794c50b7d8c60000863f15db9 100644 (file)
--- a/bin/make-patch.py
+++ b/bin/make-patch.py
@@ -74,7 +74,12 @@ def remove_automatic(dirnames):
 def makepatch(fv, tv, patfile_nm):
     import tempfile
     prev_cwd = os.getcwd();
-    os.chdir ('/tmp')
+    try:
+       os.mkdir ('/tmp/make-patch');
+    except:
+       pass
+       
+    os.chdir ('/tmp/make-patch');
     untar(released_tarball(fv))
     untar(released_tarball(tv))
     remove_automatic([dirname(fv), dirname(tv)])
@@ -93,7 +98,7 @@ def makepatch(fv, tv, patfile_nm):
     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')
+    os.chdir('/tmp/make-patch')
 
     sys.stderr.write('cleaning ... ')
     os.system('rm -fr %s %s' % (dirname(tv), dirname(fv)))

diff --git a/bin/mf-to-table.py b/bin/mf-to-table.py
index 927ccbbeb18a4b235a7f364ce4590f62500834ef..58c96c384bbe0eb211266adada5faec4c025c1b5 100644 (file)
--- a/bin/mf-to-table.py
+++ b/bin/mf-to-table.py
@@ -86,7 +86,12 @@ class Ly_file(Indentable_file):
        self.write('\"%s\"\t' % str)
 
     def print_f_dimen(self, f):
-       self.write( '%.2f\\pt\t' % f);
+       dimstr = '%.2f' % f
+
+       # try to mask rounding errors
+       if (dimstr == '-0.00'):
+               dimstr = '0.00'
+       self.write( dimstr  +'\\pt\t');
 
     def print_dimen(self, str):
        self.print_f_dimen(atof(str))

diff --git a/bin/release.py b/bin/release.py
index fa6a9c4035e770b62ae3600d54007c9998575c03..1ba3c6c87c687c3acf324056c553a39d2a62b3ac 100644 (file)
--- a/bin/release.py
+++ b/bin/release.py
@@ -19,12 +19,23 @@ 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')
+try:
+    os.rename('out/' + tarball(cur_ver), released_tarball(cur_ver))
+except posix.error:
+    os.system('cp out/' + tarball(cur_ver)  + ' ' + released_tarball(cur_ver))
+    os.unlink('out/' + tarball (cur_ver))
+    
+os.chdir(lilydirs.groupdir + '/test')
 os.system('pwd')
 os.system('rm ../test/*gz')
-os.link(released_tarball(cur_ver), tarball(cur_ver))
 
+#huh?
+#os.symlink(released_tarball(cur_ver), tarball(cur_ver))
+
+try:
+    os.link(released_tarball(cur_ver), tarball(cur_ver))
+except posix.error:
+    os.system('cp ' + released_tarball(cur_ver) + ' '+  tarball(cur_ver))
 
 # not a module, but a script (JCN)
 # makepatch.main()

diff --git a/make/Rules.make b/make/Rules.make
index 6062fbc2d3f5e9295766f049c6be79f056423aa7..c22e80abb82cae03d9e6112bc58d600cc7cc5b5e 100644 (file)
--- a/make/Rules.make
+++ b/make/Rules.make
@@ -53,4 +53,4 @@ $(outdir)/%: %.m4
 
 $(depth)/%.txt: check-doc-deps
        rm -f $@
-       ln `find ${depth}/Documentation -name $@|head -1` .
+       ln `find ${depth}/Documentation -name $@ -print|head -1 ` .

diff --git a/make/Targets.make b/make/Targets.make
index f72367cab94dadfd66b2430f97f6a80ee911c98e..9535aee6f1151d43d88b82b22f7538431c4d8c3e 100644 (file)
--- a/make/Targets.make
+++ b/make/Targets.make
@@ -129,7 +129,8 @@ doc:
 dist:
        -mkdir $(distdir)
        $(MAKE) localdist
-       chmod -Rf a+rX $(distdir)
+       chmod -R a+r $(distdir)
+       chmod  a+x `find $(distdir) -type d -print`
 
        (cd ./$(depth)/$(outdir); $(TAR) cf - $(DIST_NAME) | gzip -9 > $(DIST_NAME).tar.gz)
 

diff --git a/make/Toplevel.make.in b/make/Toplevel.make.in
index d000ef90130aaca5c98692290321ee3c92d87d9f..c90d0805a4d40df5ee6f0c1bd549237a0286cc48 100644 (file)
--- a/make/Toplevel.make.in
+++ b/make/Toplevel.make.in
@@ -53,12 +53,12 @@ localdist: configure
 
 INSTALL.txt: check-doc-deps check-mf-deps
        rm -f INSTALL.txt
-       ln `$(FIND) ./ -name INSTALL.txt|head -1` .
+       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'`; do \
+       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 )
@@ -74,4 +74,5 @@ Makefile: make/Toplevel.make.in
        echo '# WARNING WARNING WARNING WARNING' > $@
        echo '# do not edit! this is generated from make/Toplevel.make.in' >> $@
        cat $< >> $@
+       chmod -w $@