From: fred <fred>
Date: Sun, 24 Mar 2002 20:06:38 +0000 (+0000)
Subject: lilypond-0.1.48
X-Git-Tag: release/1.5.59~3387
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e6c466f0dca86d45acbe7edd39239100958c9f3e;p=lilypond.git

lilypond-0.1.48
---

diff --git a/bin/lilypython.py b/bin/lilypython.py
index 6c4ad1ad70..6f329a8614 100644
--- 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 72be6f4ec8..0f5ee3057d 100644
--- 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 927ccbbeb1..58c96c384b 100644
--- 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 fa6a9c4035..1ba3c6c87c 100644
--- 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 6062fbc2d3..c22e80abb8 100644
--- 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 f72367cab9..9535aee6f1 100644
--- 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 d000ef9013..c90d0805a4 100644
--- 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 $@