CVSROOT: /cvsroot/lilypond
Module name: installers
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/06/19 00:35:50
Modified files:
macos : ChangeLog README buildmac.py lilypond.sh
macos/INFO : fontconfig.info
macos/LilyPad : ChangeLog LilyPond.py lilycall.py
Added files:
macos : lilypond-script-wrapper.sh
Removed files:
macos : lilypond-book.sh
Log message:
* lilycall.py (Call.set_gui_options): new function. Don't munge
paths for non GUI calls.
* README: update instructions.
* lilypond-script-wrapper.sh (prefix): use it.
* lilypond.sh (INSTALLDIR): option --print-appdir
* script-wrapper.sh: move lilypond-book.sh
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/macos/lilypond-script-wrapper.sh?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/macos/ChangeLog.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/macos/README.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/macos/buildmac.py.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/macos/lilypond.sh.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/macos/INFO/fontconfig.info.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/macos/LilyPad/ChangeLog.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/macos/LilyPad/LilyPond.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/macos/LilyPad/lilycall.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: installers/macos/ChangeLog
diff -u installers/macos/ChangeLog:1.30 installers/macos/ChangeLog:1.31
--- installers/macos/ChangeLog:1.30 Wed Jun 15 10:40:42 2005
+++ installers/macos/ChangeLog Sun Jun 19 00:35:49 2005
@@ -1,3 +1,20 @@
+2005-06-19 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * README: update instructions.
+
+ * lilypond-script-wrapper.sh (prefix): use it.
+
+ * lilypond.sh (INSTALLDIR): option --print-appdir
+
+ * script-wrapper.sh: move lilypond-book.sh
+
+2005-06-17 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * buildmac.py (build_lilypond): purge fc-cache.
+
+ * INFO/fontconfig.info: remove /System/Library/Fonts from paths.
+ add again.
+
2005-06-15 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* VERSION (build_number): new file.
Index: installers/macos/INFO/fontconfig.info
diff -u installers/macos/INFO/fontconfig.info:1.4
installers/macos/INFO/fontconfig.info:1.5
--- installers/macos/INFO/fontconfig.info:1.4 Wed Jun 8 13:12:08 2005
+++ installers/macos/INFO/fontconfig.info Sun Jun 19 00:35:49 2005
@@ -1,8 +1,7 @@
{
'Source': '/sw/src/fontconfig-2.2.3.tar.gz',
'Patch': '/sw/fink/dists/unstable/main/finkinfo/x11/fontconfig2-dev.patch',
-# 'CompileScript' : '''./configure --prefix=%(prefix)s && make''',
- 'CompileScript' : '''./configure --prefix=%(prefix)s
--with-add-fonts=/Library/Fonts,/System/Library/Fonts && make''',
+ 'CompileScript' : '''./configure --prefix=%(prefix)s
--with-add-fonts=/Library/Fonts,/System/Library/Fonts, && make''',
'InstallScript' : '''make DESTDIR=/ install''',
}
Index: installers/macos/LilyPad/ChangeLog
diff -u installers/macos/LilyPad/ChangeLog:1.8
installers/macos/LilyPad/ChangeLog:1.9
--- installers/macos/LilyPad/ChangeLog:1.8 Sat Jun 18 11:35:17 2005
+++ installers/macos/LilyPad/ChangeLog Sun Jun 19 00:35:50 2005
@@ -1,3 +1,8 @@
+2005-06-19 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * lilycall.py (Call.set_gui_options): new function. Don't munge
+ paths for non GUI calls.
+
2005-06-18 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* lilycall.py (Call.open_pdfs): remove stray p.
Index: installers/macos/LilyPad/LilyPond.py
diff -u installers/macos/LilyPad/LilyPond.py:1.10
installers/macos/LilyPad/LilyPond.py:1.11
--- installers/macos/LilyPad/LilyPond.py:1.10 Sat Jun 18 11:35:17 2005
+++ installers/macos/LilyPad/LilyPond.py Sun Jun 19 00:35:50 2005
@@ -163,7 +163,7 @@
appdir = NSBundle.mainBundle().bundlePath()
call = lilycall.Call (appdir, [self.fileName()])
- call.reroute_output = 1
+ call.set_gui_options ()
self.createProcessLog ()
wc = self.processLogWindowController
if call.need_fc_update:
Index: installers/macos/LilyPad/lilycall.py
diff -u installers/macos/LilyPad/lilycall.py:1.3
installers/macos/LilyPad/lilycall.py:1.4
--- installers/macos/LilyPad/lilycall.py:1.3 Sat Jun 18 11:35:17 2005
+++ installers/macos/LilyPad/lilycall.py Sun Jun 19 00:35:50 2005
@@ -103,11 +103,8 @@
return env
-def get_command_line (appdir, args):
- binary = appdir + '/Contents/Resources/bin/lilypond'
- new_args = [binary,
- '-ddelete-intermediate-files']
-
+def get_gui_command_line (appdir, args):
+ new_args = ['-ddelete-intermediate-files']
cwd = os.getcwd ()
for a in args:
@@ -153,14 +150,21 @@
self.check_app_dir (appdir)
self.appdir = appdir
self.env = get_env (appdir + '/Contents/Resources')
- self.args = get_command_line (appdir, args)
- self.executable = self.args[0]
- self.args[0] = os.path.split (self.args[0])[1]
- self.cwd = get_dest_dir (self.args[1:])
+ self.executable = appdir + '/Contents/Resources/bin/lilypond'
+ self.args = [self.executable] + args
+ self.cwd = '.'
+
self.need_fc_update = check_fontconfig (appdir)
set_pango_paths (appdir);
self.reroute_output = False
+ def set_gui_options (self):
+ self.args = ([self.args[0]]
+ + get_gui_command_line (self.appdir,
self.args[1:]))
+
+ self.cwd = get_dest_dir (self.args[1:])
+ self.reroute_output = 1
+
def print_env (self):
for (k,v) in self.env.items ():
print 'export %s="%s"' % (k,v)
@@ -173,9 +177,11 @@
err = subprocess.STDOUT
if debug:
- print self.__dict__
+ self.print_env ()
print 'args: ', args
print 'executable: ', executable
+
+ self.args[0] = os.path.split (self.args[0])[1]
process = subprocess.Popen (args,
executable = executable,
cwd = self.cwd,
@@ -223,9 +229,6 @@
call = Call(appdir_dir, argv)
- if debug:
- call.print_env ()
-
if call.error_string:
sys.stderr.write (call.error_string)
sys.exit (2)
Index: installers/macos/README
diff -u installers/macos/README:1.3 installers/macos/README:1.4
--- installers/macos/README:1.3 Tue Jun 14 18:14:50 2005
+++ installers/macos/README Sun Jun 19 00:35:49 2005
@@ -21,26 +21,24 @@
USAGE (TERMINAL)
================
-Put the lilypond.sh and lilypond-book.sh scripts somewhere in your
-path, eg.
+Put the lilypond.sh script somewhere in your path, eg.
cp lilypond.sh /usr/local/bin/lilypond
- cp lilypond-book.sh /usr/local/bin/lilypond-book
-If you didn't install LilyPond.app in /Applications/ then edit both,
-customizing the INSTALLDIR variable.
+Edit it to customize the INSTALLDIR variable, if you didn't put
+LilyPond.app in /Applications.
+For the other scripts, like abc2ly, convert-ly, etc., copy the
+lilypond-script-wrapper.sh script, and link to it, eg.
-UTILITIES
-=========
-
-Utilities like convert-ly and lilypond-book, are also included in the
-package. They can be run from the command line as
-
- /Applications/LilyPond.app/Contents/Resources/bin/SCRIPT
+ cp lilypond-script-wrapper.sh /usr/local/bin/
-where SCRIPT may be convert-ly, abc2ly, lilypond-book, etc.
+ ln -s lilypond-script-wrapper.sh /usr/local/bin/abc2ly
+ ln -s lilypond-script-wrapper.sh /usr/local/bin/etf2ly
+ ln -s lilypond-script-wrapper.sh /usr/local/bin/lilypond-book
+ ln -s lilypond-script-wrapper.sh /usr/local/bin/midi2ly
+ ln -s lilypond-script-wrapper.sh /usr/local/bin/convert-ly
Index: installers/macos/buildmac.py
diff -u installers/macos/buildmac.py:1.36 installers/macos/buildmac.py:1.37
--- installers/macos/buildmac.py:1.36 Thu Jun 16 14:27:02 2005
+++ installers/macos/buildmac.py Sun Jun 19 00:35:49 2005
@@ -34,7 +34,7 @@
image_dir = '%s/image/Applications/' % (builddir)
wrapdest = '%s/%s' % (image_dir, bundle_name)
wrapdir = wrapdest + '.app'
-build_number = 3
+build_number = 7
# eval (open (topdir + '/VERSION').read())
packages = [
@@ -224,12 +224,13 @@
lilypond_version))
+ type1dir = lp_prefix + '/share/lilypond/current/fonts/type1'
for f in ['/sw/share/ghostscript/fonts/c059*pfb',
'/usr/X11R6/lib/X11/fonts/Type1/l0480[13]*pfa']:
- system ('cp %s %s/ ' %
- (f,
- lp_prefix + '/share/lilypond/current/fonts/type1'))
-
+ system ('cp %s %s/ ' % (f, type1dir))
+
+ os.unlink (type1dir + '/fonts.cache-1' )
+ system ('fc-cache %s' % type1dir)
remove_build_symlink ()
@@ -314,7 +315,7 @@
% (builddir, wrapdir))
def zip_bundle ():
- files = ['lilypond.sh', 'lilypond-book.sh',
+ files = ['lilypond.sh', 'lilypond-script-wrapper.sh',
'README']
for f in files:
global_vars['f'] = f
Index: installers/macos/lilypond.sh
diff -u installers/macos/lilypond.sh:1.5 installers/macos/lilypond.sh:1.6
--- installers/macos/lilypond.sh:1.5 Tue Jun 14 17:42:02 2005
+++ installers/macos/lilypond.sh Sun Jun 19 00:35:49 2005
@@ -12,6 +12,12 @@
## uncomment to get some debugging info, and leave .ps files
# export LILYPOND_WRAPPER_DEBUG=1
+if [ "$1" == "--print-appdir" ]; then
+ print "$INSTALLDIR/LilyPond.app/"
+ exit 0
+fi
+
+
# where to put the output
export LILYPOND_DESTDIR=`pwd`
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
