*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 0b8359b1320a366b04a34c6671759397a8100e30..3d8296a63ef1a20bf23b1f72af8597e3c8dc7868 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-01-31  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * cygwin/: Forward port.
+
        * lily/note-collision.cc (check_meshing_chords): Do not remove
        dots (from down head) when merging similar heads (thanks Matthias
        Kilian).  Simplify merge_possible tests and other cleanups

diff --git a/cygwin/README.in b/cygwin/README.in
index 0e8add8ed7beb0c94ba85426c4e814b1e51d811b..fae792513c9681470a0aca8957cfccc77a66aadf 100644 (file)
--- a/cygwin/README.in
+++ b/cygwin/README.in
@@ -23,9 +23,7 @@ Suggested:
   ghostscript-x11
   rxvt
   tetex-x11
-  and, in anticipation of a PostScript viewer for Cygwin, a native
-  Windows PostScript viewer such as GSView from
-  http://www.cs.wisc.edu/~ghost
+  gv
 
 Build requirements:
   cygwin-1.5.2 or newer

diff --git a/cygwin/lily-wins.py b/cygwin/lily-wins.py
index 861668412cf0a9b81cf8e7d675bc06fd2faa128d..299cfe46f8674fea421f259bf0eda3bd9cac3d21 100644 (file)
--- a/cygwin/lily-wins.py
+++ b/cygwin/lily-wins.py
@@ -78,8 +78,12 @@ if not pdfview:
        pdfview = 'xpdf'
 
 os.chdir (dir)
-system ('/usr/bin/lilypond %s > %s.log 2>&1' % (escape_shell (base),
-                                               escape_shell (stem)))
+if os.path.exists ('/usr/bin/ly2dvi'):
+       system ('/usr/bin/ly2dvi -p %s > %s.log 2>&1' % (escape_shell (base),
+                                                        escape_shell (stem)))
+else:
+       system ('/usr/bin/lilypond %s > %s.log 2>&1' % (escape_shell (base),
+                                                       escape_shell (stem)))
 if not os.path.exists ('%(stem)s.pdf' % vars ()):
        # message box?
        sys.stderr.write ('pdf output not found\n')

diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index 3bab9578029a9564c472831f42c5e97ee0f6b35d..49954d4f5f73bbfd5eff1c47e85e18a8d3a8f3e5 100644 (file)
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -123,7 +123,7 @@ preinstall () {
 #    else
     if iscygwin; then
        #EXTRAINSTALLARGS="web-install target=i686-pc-cygwin"
-       addmakeflags web-install
+       addmakeflags webdir="$inst-doc/$packagedocdir" ' ' web-install
     fi
 }
 
@@ -142,12 +142,11 @@ postinstall () {
     cd $src || exit 1
     install -d -m755 $inst/$packagedocdir
 
-    ## Generic READMEs -- too crude!
-    ## find . -maxdepth 1 -type f -exec install -m644 \{\} \
-    ##   $inst/$packagedocdir \;
-    
-    install -m644 AUTHORS.txt COPYING ChangeLog DEDICATION INSTALL.txt \
-       NEWS.txt README.txt THANKS VERSION $inst/$packagedocdir
+    install -m644  COPYING ChangeLog DEDICATION THANKS VERSION $inst/$packagedocdir
+
+    # txt files reside elsewhere
+    cd $build/Documentation/topdocs/out
+    install -m644 AUTHORS.txt INSTALL.txt NEWS.txt README.txt $inst/$packagedocdir
 
     ## Cygwin readmes
     cygwin=cygwin
@@ -162,7 +161,9 @@ postinstall () {
     ## copy examples
     cd $src || exit 1
     cp -prv input $inst/$packagedocdir
+       cd $inst/$packagedocdir
+       rm -rf $(find -name 'CVS')
 
-    cd $inst-doc/$packagedocdir &&
-    ln -s $(find html/Documentation -name '*.ps.gz') .
+    #cd $inst-doc/$packagedocdir &&
+    #ln -s $(find html/Documentation -name '*.ps.gz') .
 }

diff --git a/cygwin/mknetrel.split b/cygwin/mknetrel.split
index 1506b3d9f23425f68edb635d645438ea127c4245..a2ce0cb9e61e4a66dece02608697746c9ea411ef 100644 (file)
--- a/cygwin/mknetrel.split
+++ b/cygwin/mknetrel.split
@@ -44,7 +44,7 @@ devel_split () {
 
 doc_split () {
     mkdir -p ./$docprefix || exit 1
-    mv $inst/$infodir ./$infodir
+    #mv $inst/$infodir ./$infodir
     true
 }