CVSROOT:        /cvsroot/lilypond
Module name:    installers
Branch:         
Changes by:     Jan Nieuwenhuizen <[EMAIL PROTECTED]>   05/07/20 21:05:13

Modified files:
        windows/nsis   : lilypond.nsi.in 
        windows/extra  : lilypond 
        windows        : TODO GNUmakefile ChangeLog 

Log message:
        * GNUmakefile: Remove cruft from upgrade.
        
        * nsis/lilypond.nsi.in: Invoke lilypond-windows -dgui.  On
        dos-based Windows, always use console lilypond.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/nsis/lilypond.nsi.in.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/extra/lilypond.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/TODO.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/GNUmakefile.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/windows/ChangeLog.diff?tr1=1.27&tr2=1.28&r1=text&r2=text

Patches:
Index: installers/windows/ChangeLog
diff -u installers/windows/ChangeLog:1.27 installers/windows/ChangeLog:1.28
--- installers/windows/ChangeLog:1.27   Mon Jun 27 12:37:20 2005
+++ installers/windows/ChangeLog        Wed Jul 20 21:05:13 2005
@@ -1,3 +1,15 @@
+2005-07-20  Jan Nieuwenhuizen  <[EMAIL PROTECTED]>
+
+       * GNUmakefile: Remove cruft from upgrade.
+
+       * nsis/lilypond.nsi.in: Invoke lilypond-windows -dgui.  On
+       dos-based Windows, always use console lilypond.
+
+2005-07-19  Jan Nieuwenhuizen  <[EMAIL PROTECTED]>
+
+       * extra/lilypond (postbuild): Also build lilypond-console
+       executable without -mwindows.
+
 2005-06-27  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
 
        * lilypond-py2exe.py (Module): new file. Setup for py2exe.
Index: installers/windows/GNUmakefile
diff -u installers/windows/GNUmakefile:1.18 installers/windows/GNUmakefile:1.19
--- installers/windows/GNUmakefile:1.18 Sun Jun 12 14:40:37 2005
+++ installers/windows/GNUmakefile      Wed Jul 20 21:05:13 2005
@@ -7,7 +7,8 @@
 nsis-packages = guile gs gs-ncsb lilypad lilypond
 
 # Keeping lilypad and gs-ncsb in there, for first time upgraders
-nsis-packages-upgrade = lilypond lilypad gs-ncsb guile libguile16
+#nsis-packages-upgrade = lilypond lilypad gs-ncsb guile libguile16
+nsis-packages-upgrade = lilypond
 
 packages =\
  mingw\
Index: installers/windows/TODO
diff -u installers/windows/TODO:1.6 installers/windows/TODO:1.7
--- installers/windows/TODO:1.6 Thu Jun  9 09:11:38 2005
+++ installers/windows/TODO     Wed Jul 20 21:05:13 2005
@@ -17,7 +17,10 @@
 
 This is not a LilyPond problem, it is bug in Windows.  There is no
 easy automatic workaround, it needs user intervention, so it seems.
+
+95, 98:
 Edit the Windows config.sys file and reboot
+    SHELL=C:\COMMAND.COM /E:4096 /U:250 /P
 
     http://support.microsoft.com/kb/q230205/
 
Index: installers/windows/extra/lilypond
diff -u installers/windows/extra/lilypond:1.11 
installers/windows/extra/lilypond:1.12
--- installers/windows/extra/lilypond:1.11      Mon Jun 27 08:48:00 2005
+++ installers/windows/extra/lilypond   Wed Jul 20 21:05:13 2005
@@ -50,12 +50,6 @@
            $src/configure --prefix=$prefix --enable-config=for-build)
     fi
 
-    if [ "$cygwin" == "mingw" ]; then
-       cp /usr/include/FlexLexer.h .
-       mkdir python2.3
-       cp /usr/include/python2.3/Python.h python2.3
-    fi
-
     GUILE=$($cygwin_prefix/bin/guile-config --version 2>&1 | awk '{print $NF}')
     cat > $target-guile-config <<EOF
 [ "\$1" == "--version" ] && echo "$target-guile-config - Guile version $GUILE"
@@ -76,6 +70,28 @@
         ## debugging
        ##opt='-g'
     fi
+    
+    if [ "$cygwin" == "mingw" ]; then
+       cp /usr/include/FlexLexer.h .
+       mkdir python2.3
+       cp /usr/include/python2.3/Python.h python2.3
+
+       CXX="$(echo $build_cxx | sed 's/ -mwindows//')" \
+           CXX_FOR_TARGET="${build_cxx}" \
+           CC="${build_cc}" \
+           CC_FOR_TARGET="${build_cc}" \
+           GCC_FOR_TARGET="${build_cc}" \
+           RANLIB="${build_ranlib}" \
+           RANLIB_FOR_TARGET="${build_ranlib}" \
+           DLLWRAP="${build_dllwrap}" \
+           AR="${build_ar}" NM="${build_nm}" \
+           LD=$(${build_cc} -print-prog-name=ld) \
+           $src/configure --enable-config=console $CONFIGOPTS
+
+       rm -f config.cache
+        iscygwin || crosscache
+    fi
+
     :
 }
 
@@ -84,8 +100,12 @@
 
     # shortcircuit python for mingw
     if [ "$cygwin" == "mingw" ]; then
-       mkdir -p python/out
+       #sed -e s/-mwindows// < config.make > config-console.make
+       #cp config.hh config-console.hh
+
+       mkdir -p python/out python/out-console
        touch python/out/midi.lo python/out/midi.so python/out/midi.dll
+       touch python/out-console/midi.lo python/out-console/midi.so 
python/out-console/midi.dll
     fi
 
     # cross-compiling: build for build-host, generate doc
@@ -104,14 +124,28 @@
            CXX=$HOST_CXX \
            LDFLAGS="" \
            eval make conf=for-build $args) || exit 1
-       
-       mkdir -p mf/out
-       cp -pv mf/out-for-build/* mf/out
 
+       # fake mf and texi
+        mkdir -p mf/out
+       cp -pv mf/out-for-build/* mf/out
        mkdir -p Documentation/user/out
        cp -pv Documentation/user/out-for-build/*{tely,texi} 
Documentation/user/out
     fi
 
+    if [ "$cygwin" == "mingw" ]; then
+       # fake mf and texi
+        mkdir -p mf/out-console
+       cp -pv mf/out-for-build/* mf/out-console
+       mkdir -p Documentation/user/out-console
+       cp -pv Documentation/user/out-for-build/*{tely,texi} 
Documentation/user/out-console
+       # fake manual pages, only works without --enable-config
+       mkdir -p scripts/out-console
+       cp scripts/out-for-build/*.1 scripts/out-console
+       mkdir -p lily/out-console
+       cp lily/out-for-build/*.1 lily/out-console
+       make conf=console || exit 1
+    fi
+
     addmakeflags "target=$target" ' '
     if [ -f "$cygwin_prefix/bin/libpython2.4.dll" ]; then
        addmakeflags LDFLAGS="$cygwin_prefix/bin/libpython2.4.dll" ' '
@@ -132,6 +166,8 @@
 postinstall () {
     if [ "$cygwin" == "mingw" ]; then
        cp $inst/usr/share/lilypond/$v/python/* $inst/usr/bin
+       install -m755 $build/lily/out/lilypond $inst/usr/bin/lilypond-windows
+       install -m755 $build/lily/out-console/lilypond $inst/usr/bin/
     fi
     
     extras_postinstall
@@ -188,7 +224,6 @@
 }
 
 extra_split () {
-    mkdir -p 
     # should be in devel...
     mkdir -p ./$prefix/share/lilypond/$v
     for i in make python tex vim; do
Index: installers/windows/nsis/lilypond.nsi.in
diff -u installers/windows/nsis/lilypond.nsi.in:1.12 
installers/windows/nsis/lilypond.nsi.in:1.13
--- installers/windows/nsis/lilypond.nsi.in:1.12        Sat Jun 11 08:11:51 2005
+++ installers/windows/nsis/lilypond.nsi.in     Wed Jul 20 21:05:13 2005
@@ -108,6 +108,8 @@
 
 uninstall:
        Delete $INSTDIR\usr\bin\lilypond.exe
+       Delete $INSTDIR\usr\bin\lilypond-windows.exe
+       Delete $INSTDIR\usr\bin\lilypond-windows-orig.exe
        RMDir /r $INSTDIR\usr\share\lilypond
        RMDir /r $INSTDIR\usr\share\doc\lilypond-*
        Delete $INSTDIR\etc\setup\lilypond.lst.gz
@@ -278,8 +280,8 @@
        ;; Start menu
        CreateDirectory "$SMPROGRAMS\LilyPond"
        CreateShortCut "$SMPROGRAMS\LilyPond\LilyPond.lnk" \
-               "$INSTDIR\usr\bin\lilypond.exe" "" \
-               "$INSTDIR\usr\bin\lilypond.exe" 0 SW_SHOWMINIMIZED
+               "$INSTDIR\usr\bin\lilypond-windows.exe" "-dgui" \
+               "$INSTDIR\usr\bin\lilypond-windows.exe" 0 SW_SHOWMINIMIZED
        CreateShortCut "$SMPROGRAMS\LilyPond\LilyPond Tutorial.lnk" \
                "http://lilypond.org/tutorial"; "" \
                "firefox.exe" 0
@@ -288,10 +290,10 @@
                "firefox.exe" 0
        CreateShortCut "$SMPROGRAMS\LilyPond\Music in Mutopia.lnk" \
                "http://www.mutopiaproject.org"; "" \
-               "$INSTDIR\usr\bin\lilypond.exe" 1
+               "$INSTDIR\usr\bin\lilypond-windows.exe" 1
        CreateShortCut "$SMPROGRAMS\LilyPond\Examples.lnk" \
                
"$INSTDIR\usr\share\doc\lilypond-${LILYPOND_VERSION}-${LILYPOND_BUILD}\input" 
"" \
-               "$INSTDIR\usr\bin\lilypond.exe" 1
+               "$INSTDIR\usr\bin\lilypond-windows.exe" 1
        CreateShortCut "$SMPROGRAMS\LilyPond\Upgrade (if available).lnk" \
                
"http://lilypond.org/mingw/upgrade/upgrade-from-${LILYPOND_VERSION}-${LILYPOND_BUILD}.exe";
 "" \
                "firefox.exe" 0
@@ -300,8 +302,8 @@
 
        ;; Desktop
        CreateShortCut "$DESKTOP\LilyPond.lnk" \
-               "$INSTDIR\usr\bin\lilypond.exe" "" \
-               "$INSTDIR\usr\bin\lilypond.exe" 0 SW_SHOWMINIMIZED
+               "$INSTDIR\usr\bin\lilypond-windows.exe" "-dgui" \
+               "$INSTDIR\usr\bin\lilypond-windows.exe" 0 SW_SHOWMINIMIZED
 FunctionEnd
 
 Function registry_installer
@@ -319,7 +321,8 @@
 
 ;;ly_icon:
        WriteRegStr HKCR "LilyPond" "DefaultIcon" ""
-       WriteRegStr HKCR "LilyPond\DefaultIcon" "" 
"$INSTDIR\usr\bin\lilypond.exe,1"
+       WriteRegStr HKCR "LilyPond\DefaultIcon" "" \
+                   "$INSTDIR\usr\bin\lilypond-windows.exe,1"
 
 ;;ly_open:
        ReadRegStr $R0 HKCR "LilyPond\shell\open\command" ""
@@ -339,7 +342,8 @@
        ;;StrCmp $R0 "" 0 ly_auto_file
        WriteRegStr HKCR "LilyPond\shell" "" "generate"
        WriteRegStr HKCR "LilyPond\shell\generate" "" "&Generate PDF ..."
-       WriteRegExpandStr HKCR "LilyPond\shell\generate\command" "" 
'"$INSTDIR\usr\bin\lilypond.exe" "%1"'
+       WriteRegExpandStr HKCR "LilyPond\shell\generate\command" "" \
+                         '"$INSTDIR\usr\bin\lilypond-windows.exe" -dgui "%1"'
 
 ;; what's the difference between ly_auto_file and shell/open/command?
 ;;ly_auto_file:
@@ -387,6 +391,17 @@
 !endif
        StrCpy $0 "$INSTDIR\usr\bin\variables.sh"
        ${SubstituteAtVariables} "$0.in" "$0"
+
+       # use console version for gui too
+       StrCpy $0 "$INSTDIR\usr\bin\lilypond"
+       ClearErrors
+       ReadRegStr $R0 HKLM \
+               "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
+       IfErrors dos exit
+dos:
+       CopyFiles /silent "$0-windows.exe" "$0-windows-orig.exe"
+       CopyFiles /silent "$0.exe" "$0-windows.exe"
+exit:  
 FunctionEnd
 
 Function postinstall_gs


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

Reply via email to