From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sat, 31 Jan 2004 20:34:06 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.1.23~140
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bc1e862dc311f6beebae0c56a618f87fdcfb6a4c;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index 0b8359b132..3d8296a63e 100644
--- 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 0e8add8ed7..fae792513c 100644
--- 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 861668412c..299cfe46f8 100644
--- 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 3bab957802..49954d4f5f 100644
--- 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 1506b3d9f2..a2ce0cb9e6 100644
--- 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
 }