# HG changeset patch # User Jan Nieuwenhuizen # Date 1300402484 -3600 # Node ID d8f9478db85ecd4d207167bb45d821529a693394 # Parent 2c57f92179f270cd9d6133c1d449bb32339583b4 schikkers-list: --no-auto-compile on windows. Fixes startup. diff -r 2c57f92179f2 -r d8f9478db85e nsis/schikkers-list.nsi --- a/nsis/schikkers-list.nsi Thu Mar 17 21:59:08 2011 +0100 +++ b/nsis/schikkers-list.nsi Thu Mar 17 23:54:44 2011 +0100 @@ -337,16 +337,14 @@ ;;StrCmp $R0 "" 0 scm_auto_file WriteRegStr HKCR "Guile\shell" "" "open" # %1 is the GUILE command, so must be quoted bo the space - ;; WriteRegExpandStr HKCR "Guile\shell\open\command" "" '"$INSTDIR\usr\bin\guile-windows.exe" "%1" %2 %3 %4 %5 %6 %7 %8 %9' - WriteRegExpandStr HKCR "Guile\shell\open\command" "" '"$INSTDIR\usr\bin\guile-windows.exe" "%1" %2 %3 %4 %5 %6 %7 %8 %9' + WriteRegExpandStr HKCR "Guile\shell\open\command" "" '"$INSTDIR\usr\bin\guile-windows.exe" --no-auto-compile "%1" %2 %3 %4 %5 %6 %7 %8 %9' ;;scm_auto_file: ReadRegStr $R0 HKCR "scm_auto_file\shell\open\command" "" ;;StrCmp $R0 "" 0 scm_end WriteRegStr HKCR "scm_auto_file\shell" "" "open" # %1 is the GUILE command, so must be quoted bo the space - ;; WriteRegExpandStr HKCR "scm_auto_file\shell\open\command" "" '"$INSTDIR\usr\bin\guile-windows.exe" "%1" %2 %3 %4 %5 %6 %7 %8 %9' - WriteRegExpandStr HKCR "scm_auto_file\shell\open\command" "" '"$INSTDIR\usr\bin\guile-windows.exe" "%1" %2 %3 %4 %5 %6 %7 %8 %9' + WriteRegExpandStr HKCR "scm_auto_file\shell\open\command" "" '"$INSTDIR\usr\bin\guile-windows.exe" --no-auto-compile "%1" %2 %3 %4 %5 %6 %7 %8 %9' ;;scm_end: FunctionEnd @@ -356,11 +354,13 @@ Function postinstall_schikkers_list CopyFiles /silent "$INSTDIR\usr\share\lilypond\current\fonts\otf\Emmentaler-20.otf" "$WINDIR\Fonts\Emmentaler-20.otf" StrCpy $FONT_DIR "$WINDIR\Fonts" - !insertmacro InstallTTFFont "${ROOT}\usr\share\lilypond\current\fonts\otf\Emmentaler-20.otf" +;; !insertmacro InstallTTFFont "${ROOT}\usr\share\lilypond\current\fonts\ttf\Emmentaler-20.ttf" + !insertmacro InstallFONFont "${ROOT}\usr\share\lilypond\current\fonts\otf\Emmentaler-20.otf" "Emmentaler-20 (TrueType)" ClearErrors FunctionEnd Function un.install_schikkers_list_ttf +; !insertmacro RemoveFONFont "Emmentaler-20.otf" Delete "$WINDIR\Fonts\Emmentaler-20.otf" ClearErrors FunctionEnd