summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
b695260)
scrollkeeper-update message.
* scripts/lilypond-book.py (lilypond_binary): explicity add path to binary.
(TexiPaper.process_ly2dvi_block): idem for ly2dvi
* scripts/ly2dvi.py (lilypond_binary): explicity add path to binary.
2003-03-16 Han-Wen Nienhuys <hanwen@cs.uu.nl>
2003-03-16 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ * stepmake/stepmake/omf-targets.make (local-install): add
+ scrollkeeper-update message.
+
+ * scripts/lilypond-book.py (lilypond_binary): explicity add path to binary.
+ (TexiPaper.process_ly2dvi_block): idem for ly2dvi
+
+ * scripts/ly2dvi.py (lilypond_binary): explicity add path to binary.
+
* Documentation/user/converters.itely (Invoking midi2ly): add
track/channel notice.
* Documentation/user/converters.itely (Invoking midi2ly): add
track/channel notice.
pfa-fonts:
$(MAKE) MAKE_PFA_FILES=1 -C mf
pfa-fonts:
$(MAKE) MAKE_PFA_FILES=1 -C mf
-
-web-doc-install: web-doc top-web
+install-html-doc: web-doc top-web
$(INSTALL) -m 755 -d $(local_package_docdir)
tar -C $(local_package_docdir)/ -xzf $(outdir)/web.tar.gz
$(INSTALL) -m 755 -d $(local_package_docdir)
tar -C $(local_package_docdir)/ -xzf $(outdir)/web.tar.gz
# KPATHSEA=0: Hack for compiling without kpathsea -- not recommended
my_tfm_path = $(TFM_PATH) /tmp /tmp /tmp /tmp /tmp /tmp
# KPATHSEA=0: Hack for compiling without kpathsea -- not recommended
my_tfm_path = $(TFM_PATH) /tmp /tmp /tmp /tmp /tmp /tmp
local-install:
$(INSTALL) -d $(local_lilypond_datadir)
ifeq ($(KPATHSEA),0)
local-install:
$(INSTALL) -d $(local_lilypond_datadir)
ifeq ($(KPATHSEA),0)
cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT/etc/profile.d/lilypond.sh
cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT/etc/profile.d/lilypond.csh
cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT/etc/profile.d/lilypond.sh
cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT/etc/profile.d/lilypond.csh
-make prefix="$RPM_BUILD_ROOT%{_prefix}" web-doc-install
+make prefix="$RPM_BUILD_ROOT%{_prefix}" install-html-doc
make -C Documentation/user/ prefix="$RPM_BUILD_ROOT%{_prefix}" omf-install
make -C Documentation/user/ prefix="$RPM_BUILD_ROOT%{_prefix}" omf-install
DATE\
sharedstatedir\
GUILE\
DATE\
sharedstatedir\
GUILE\
date\
datadir\
lilypond_datadir\
date\
datadir\
lilypond_datadir\
sys.path.insert (0, os.path.join (datadir, 'python'))
sys.path.insert (0, os.path.join (datadir, 'python'))
# Customize these
if __name__ == '__main__':
import lilylib as ly
# Customize these
if __name__ == '__main__':
import lilylib as ly
include_path = [os.getcwd ()]
include_path = [os.getcwd ()]
-lilypond_cmd = 'lilypond'
-#lilypond_cmd = 'valgrind --suppressions=/home/hanwen/usr/src/guile-1.6.supp --num-callers=10 /home/hanwen/usr/src/lilypond/lily/out/lilypond'
+#lilypond_binary = 'valgrind --suppressions=/home/hanwen/usr/src/guile-1.6.supp --num-callers=10 /home/hanwen/usr/src/lilypond/lily/out/lilypond'
+
+lilypond_binary = os.path.join ('@bindir@', 'lilypond')
+
+# only use installed binary when we're installed too.
+if '@bindir@' == ('@' + 'bindir@') or not os.path.exists (lilypond_binary):
+ lilypond_binary = 'lilypond'
+
+
+
+ly2dvi_binary = os.path.join ('@bindir@', 'ly2dvi')
+
+# only use installed binary when we're installed too.
+if '@bindir@' == ('@' + 'bindir@') or not os.path.exists (lilypond_binary):
+ lilypond_binary = 'ly2dvi'
+
preview = base + ".png"
if changed or not os.path.isfile (preview):
preview = base + ".png"
if changed or not os.path.isfile (preview):
- ly.system ('ly2dvi --preview --postscript --verbose %s ' % base)
+
+ ly.system ('%s --preview --postscript --verbose %s ' % (ly2dvi_binary, base) )
ly.make_page_images (base)
ly.system ('gzip -9 - < %s.ps > %s.ps.gz' % (base, base))
ly.make_page_images (base)
ly.system ('gzip -9 - < %s.ps > %s.ps.gz' % (base, base))
lilyopts += ' --dep-prefix=' + g_outdir + '/'
lilyopts += ' --header=texidoc'
texfiles = string.join (tex)
lilyopts += ' --dep-prefix=' + g_outdir + '/'
lilyopts += ' --header=texidoc'
texfiles = string.join (tex)
- cmd = string.join ((lilypond_cmd, lilyopts, g_extra_opts,
+ cmd = string.join ((lilypond_binary, lilyopts, g_extra_opts,
texfiles))
ly.system (cmd, ignore_error = 0, progress_p = 1)
texfiles))
ly.system (cmd, ignore_error = 0, progress_p = 1)
latex_cmd = 'latex'
tex_extension = '.tex'
latex_cmd = 'latex'
tex_extension = '.tex'
-# Debugging support -- do we need this?
-lilypond_cmd = 'lilypond'
-#lilypond_cmd = 'valgrind --suppressions=%(home)s/usr/src/guile-1.6.supp --num-callers=10 %(home)s/usr/src/lilypond/lily/out/lilypond '% { 'home' : '/home/hanwen' }
+#lilypond_binary = 'valgrind --suppressions=%(home)s/usr/src/guile-1.6.supp --num-callers=10 %(home)s/usr/src/lilypond/lily/out/lilypond '% { 'home' : '/home/hanwen' }
+
+lilypond_binary = os.path.join ('@bindir@', 'lilypond')
+
+# only use installed binary when we're installed too.
+if '@bindir@' == ('@' + 'bindir@') or not os.path.exists (lilypond_binary):
+ lilypond_binary = 'lilypond'
layout_fields = ['dedication', 'title', 'subtitle', 'subsubtitle',
layout_fields = ['dedication', 'title', 'subtitle', 'subsubtitle',
if debug_p:
ly.print_environment ()
if debug_p:
ly.print_environment ()
- cmd = string.join ((lilypond_cmd,opts, fs))
+ cmd = string.join ((lilypond_binary, opts, fs))
status = ly.system (cmd, ignore_error = 1, progress_p = 1)
signal = 0x0f & status
exit_status = status >> 8
status = ly.system (cmd, ignore_error = 1, progress_p = 1)
signal = 0x0f & status
exit_status = status >> 8
pdftex_p = 1
tex_extension = '.pdftex'
elif o == '--warranty' or o == '-w':
pdftex_p = 1
tex_extension = '.pdftex'
elif o == '--warranty' or o == '-w':
- status = os.system ('lilypond -w')
+ status = os.system ('%s -w' % lilypond_binary)
if status:
ly.warranty ()
sys.exit (0)
if status:
ly.warranty ()
sys.exit (0)
+ else:
+ unimplemented_option () # signal programming error
# Don't convert input files to abspath, rather prepend '.' to include
# path.
# Don't convert input files to abspath, rather prepend '.' to include
# path.
omf-local-install: $(OMF_FILES)
$(foreach a, $(OMF_FILES), $(INSTALL) $(a) $(local_package_omfdir)/$(notdir $(a)) && ) true
omf-local-install: $(OMF_FILES)
$(foreach a, $(OMF_FILES), $(INSTALL) $(a) $(local_package_omfdir)/$(notdir $(a)) && ) true
+ @echo "Run scrollkeeper-update to register newly installed OMF files."
local-install: omf-local-install
local-install: omf-local-install