CVSROOT:        /cvsroot/lilypond
Module name:    installers
Branch:         
Changes by:     Han-Wen Nienhuys <[EMAIL PROTECTED]>    05/10/07 12:01:46

Modified files:
        windows        : ChangeLog README 
        windows/bin    : mknetrel 
        windows/nsis   : lilypond.nsi.in 

Log message:
        (AM_MAKEFLAGS): deal with different File versions.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/ChangeLog.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/README.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/bin/mknetrel.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/nsis/lilypond.nsi.in.diff?tr1=1.13&tr2=1.14&r1=text&r2=text

Patches:
Index: installers/windows/ChangeLog
diff -u installers/windows/ChangeLog:1.39 installers/windows/ChangeLog:1.40
--- installers/windows/ChangeLog:1.39   Sun Oct  2 09:35:15 2005
+++ installers/windows/ChangeLog        Fri Oct  7 12:01:45 2005
@@ -1,4 +1,10 @@
+2005-10-07  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
+
+       * bin/mknetrel (AM_MAKEFLAGS): deal with different File versions. 
+
 2005-10-02  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
+
+       * nsis/lilypond.nsi.in (silent): remove logset
 
        * README (http): add note about upgrading
 
Index: installers/windows/README
diff -u installers/windows/README:1.6 installers/windows/README:1.7
--- installers/windows/README:1.6       Sun Oct  2 09:35:16 2005
+++ installers/windows/README   Fri Oct  7 12:01:45 2005
@@ -76,8 +76,10 @@
 
 UPGRADING
 
-To compile newer lilypond  release
+To compile newer lilypond release
 
+       rm ~/.min-apt .min-apt
+       make upset
        rm -rf mingw/uploads/lilypond     # remove cached build results
        rm -rf src/lilypond*              # remove old source packages 
        tar -C src ~/lily/out/lilypond-X.tar.gz
Index: installers/windows/bin/mknetrel
diff -u installers/windows/bin/mknetrel:1.2 installers/windows/bin/mknetrel:1.3
--- installers/windows/bin/mknetrel:1.2 Thu May 19 00:21:50 2005
+++ installers/windows/bin/mknetrel     Fri Oct  7 12:01:45 2005
@@ -373,7 +373,8 @@
            *.a) ;;
            *bin/\*) ;;
            *\*) ;;
-           *) a=`file $f | fgrep "MS Windows PE"`
+
+           *) a=`file $f | egrep '(MS Windows PE|PE executable.*Windows)'`
               [ -n "$a" ] && mv $f $f.exe
               ;;
        esac
Index: installers/windows/nsis/lilypond.nsi.in
diff -u installers/windows/nsis/lilypond.nsi.in:1.13 
installers/windows/nsis/lilypond.nsi.in:1.14
--- installers/windows/nsis/lilypond.nsi.in:1.13        Wed Jul 20 21:05:13 2005
+++ installers/windows/nsis/lilypond.nsi.in     Fri Oct  7 12:01:46 2005
@@ -96,7 +96,7 @@
 Section "LilyPond (required)"
        ;; In silent mode (invoke as: setup.exe /S), generate an install log.
        ifSilent 0 silent
-       Logset on
+;;     Logset on
 silent:
 
 !ifdef UPGRADE
@@ -212,7 +212,7 @@
 !ifndef UPGRADE
 Section "Uninstall"
        ifSilent 0 silent
-       Logset on
+;;     Logset on
 silent:
        DeleteRegKey HKLM SOFTWARE\LilyPond
        DeleteRegKey HKLM "${UNINSTALL}"


_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

Reply via email to