From: Jan Nieuwenhuizen Date: Tue, 11 Oct 2005 18:05:52 +0000 (+0000) Subject: * cygwin/postinstall-lilypond.sh: Remove cruft. X-Git-Tag: release/2.6.5~15 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=64ab4a9500e1f3ea19b61f472f4d8af2b9912ccc;p=lilypond.git * cygwin/postinstall-lilypond.sh: Remove cruft. * cygwin/postremove-lilypond.sh: Remove. * cygwin/GNUmakefile (default): Remove postremove rules. --- diff --git a/ChangeLog b/ChangeLog index d4b8f5aacb..d73042d239 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-10-11 Jan Nieuwenhuizen + + * cygwin/postinstall-lilypond.sh: Remove cruft. + + * cygwin/postremove-lilypond.sh: Remove. + + * cygwin/GNUmakefile (default): Remove postremove rules. + 2005-10-11 Han-Wen Nienhuys * lily/hara-kiri-group-spanner.cc (consider_suicide): backport: diff --git a/cygwin/GNUmakefile b/cygwin/GNUmakefile index 60a27e095c..37b0652488 100644 --- a/cygwin/GNUmakefile +++ b/cygwin/GNUmakefile @@ -18,14 +18,11 @@ include $(stepdir)/executable-targets.make POSTINSTALLS=$(wildcard postinstall*.sh) OUT_POSTINSTALLS=$(POSTINSTALLS:%=$(outdir)/%) -POSTREMOVES=$(wildcard postremove*.sh) -OUT_POSTREMOVES=$(POSTREMOVES:%=$(outdir)/%) - $(outdir)/%.sh: %.sh $(config_make) cat $< | sed $(sed-atvariables) > $@ chmod 755 $@ -default: $(OUT_POSTINSTALLS) $(OUT_POSTREMOVES) $(OUTIN_FILES) +default: $(OUT_POSTINSTALLS) $(OUTIN_FILES) INSTALLATION_OUT_SUFFIXES=1 @@ -34,8 +31,5 @@ etc=$(patsubst %/, %, $(dir $(prefix)))/etc INSTALLATION_DIR=$(etc)/postinstall INSTALLATION_FILES=$(OUT_POSTINSTALLS) -INSTALLATION_OUT_DIR1=$(etc)/postremove -INSTALLATION_OUT_FILES1=$(OUT_POSTREMOVES) - endif diff --git a/cygwin/postinstall-lilypond.sh b/cygwin/postinstall-lilypond.sh index b7b4b50947..c56894e874 100644 --- a/cygwin/postinstall-lilypond.sh +++ b/cygwin/postinstall-lilypond.sh @@ -16,16 +16,6 @@ regtool add '/root/LilyPond/shell' regtool add '/root/LilyPond/shell/open' regtool add '/root/LilyPond/shell/open/command' -# old ideas - discarded for now -# regtool set '/root/LilyPond/shell/open/command/' $ROOT'\bin\python /usr/bin/lily-wins %1' -# invoking python directly does not work -# regtool set '/root/LilyPond/shell/open/command/' $ROOT'\bin\run-lily-wins.bat %1' -# we now use generated run-lily-wins.bat in / -# regtool set '/root/LilyPond/shell/open/command/' $ROOT'\run-lily-wins.bat %1' -# the direct bash route: - -# TODO: should 'open' run LilyPond? -# should 'open' also start PDF viewer? regtool set '/root/LilyPond/shell/open/command/' $ROOT'\bin\bash.exe --login -c '"'"'/usr/bin/lily-wins "%1"'"'" regtool add '/root/LilyPond/shell/edit' regtool set '/root/LilyPond/shell/edit/' '&Edit source in Notepad ...' @@ -34,26 +24,4 @@ regtool set '/root/LilyPond/shell/edit/command/' '%SystemRoot%\system32\notepad. regtool add '/root/LilyPond/shell/generate' regtool set '/root/LilyPond/shell/generate/' '&Generate PDF ...' regtool add '/root/LilyPond/shell/generate/command' -# regtool set '/root/LilyPond/shell/generate/command/' $ROOT'\bin\python /usr/bin/lily-wins %1' regtool set '/root/LilyPond/shell/generate/command/' $ROOT'\bin\bash.exe --login -c '"'"'/usr/bin/lily-wins "%1"'"'" - -# static run-lily-wins.bat, does not work. -# @echo off -# rem run-lily-wins.bat - Invoke /usr/bin/lily-wins from explorer -# rem cd %~dp0% -# rem bash.exe --login -c "/usr/bin/lily-wins '%1%'" -# rem only works in Windows NT -# rem %~dp0~bin\bash.exe --login -c "/usr/bin/lily-wins '%1%'" - -# generate run-lily-wins.bat - not necessary: direct bash route -# how to handle \r\n endings? text/bin mode? -#cat > /run-lily-wins.bat <