cygwin update

diff --git a/cygwin/changelog b/cygwin/changelog
index 69c69fb66b9013af638e80c1bd72279deb2a70d5..a71473ee9edf6cdbae0c224cefa82f51e6972382 100644 (file)
--- a/cygwin/changelog
+++ b/cygwin/changelog
@@ -1,3 +1,15 @@
+lilypond (1.6.11-2) unstable; urgency=low
+
+  * Build for 1.3 abi.
+
+ -- Jan Nieuwenhuizen <janneke@gnu.org>  Sun, 27 Jul 2003 22:39:57 +0200
+
+lilypond (1.6.11-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jan Nieuwenhuizen <janneke@gnu.org>  Thu, 17 Jul 2003 19:13:15 +0200
+
 lilypond (1.6.5-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/cygwin/lilypond-doc.hint b/cygwin/lilypond-doc.hint
index dbe40b211f63e3c7a9d40d1346aaa3c7c1a84f97..abab339b9331778a40dee5456790023cf7ee7452 100644 (file)
--- a/cygwin/lilypond-doc.hint
+++ b/cygwin/lilypond-doc.hint
@@ -1,4 +1,6 @@
 sdesc: "LilyPond documentation."
+test: 1.7.29-11
+curr: 1.6.11-1
 category: Doc
 ldesc: "LilyPond Documentation in HTML, PS, PDF and DVI formats.  This
 package contains the HTML, PostScript PDF and DVI documentation for

diff --git a/cygwin/lilypond.hint b/cygwin/lilypond.hint
index 7d83518fd863fc135a506b4117d19a734943c1ef..d887f79a4326ab11d1d0f867f6274ecb17b675b7 100644 (file)
--- a/cygwin/lilypond.hint
+++ b/cygwin/lilypond.hint
@@ -1,6 +1,8 @@
 sdesc: "A program for printing sheet music"
+test: 1.7.29-11
+curr: 1.6.11-1
 category: Publishing
-requires: bash cygwin fileutils findutils ghostscript libguile12 libiconv2 libintl2 libkpathsea3 python tetex-bin tetex-tiny
+requires: bash cygwin fileutils findutils ghostscript libguile12abi13 libguile12 libiconv2 libintl2 libkpathsea3 libkpathsea3abi13 python tetex-bin tetex-tiny
 #requires: tetex-bin, tetex-tiny | tetex-base
 #suggests: emacs gsview lilypond-doc rxvt tetex-x11 XFree86-serv
 ldesc: "A program for printing sheet music.

diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index 5968d5ac4f6b49698dc43c9350cfe3605c8fb920..8b3aaaf08ea870536840af7133bf51e110a33c8b 100644 (file)
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -6,11 +6,11 @@
 # LilyPond development: lilypond-1.7
 # archive=ftp://lilypond.org/pub/LilyPond/v1.7
 
-# Guile specific mknetrel overrides
+# LilyPond mknetrel overrides
 # To use this, do something like:
 cat >/dev/null <<EOC
 
-   wget -P/var/tmp ftp://lilypond.org/pub/LilyPond/v1.6/lilypond-1.6.8.tar.gz
+   wget -P/var/tmp ftp://lilypond.org/pub/LilyPond/v1.7/lilypond-1.7.29.tar.gz
    rm -rf /home/netrel/src/lilypond-*
    mkdir -p /home/netrel/src && cd /home/netrel/src
    ## TODO: look at pimport
@@ -21,16 +21,14 @@ cat >/dev/null <<EOC
 
 EOC
 
-
-BUILD=1
 # sover=14
 
 patch=$mknetrel_root/patch
 if iscygwin; then
     true
-else    
-    uploads=$here/uploads/$base && mkdir -p $uploads
-    ##uploads=$here/uploads-development/$base && mkdir -p $uploads
+else 
+    uploads=$here/uploads/$base && mkdir -p $uploads/
+    [ "$ABI" = "1.5" ] && uploads=$here/uploads-development/$base && mkdir -p $uploads/
     tarstem=$uploads/$package
 fi
 
@@ -156,6 +154,7 @@ devel_split () {
     mv $inst/$prefix/include ./$prefix/include
     mkdir -p ./$prefix/lib || exit 1
     mv $inst/$prefix/lib/*.a ./$prefix/lib
+    mkdir -p ./$prefix/lib || exit 1
     mv $inst/$prefix/lib/*.la ./$prefix/lib
     mkdir -p ./$prefix/share || exit 1
     mv $inst/$prefix/share/aclocal ./$prefix/share
@@ -258,28 +257,35 @@ preconfig () { # aka libtool_woes ()
 
     cd $build || exit 1
 
-    GUILE=1.6.0
+    GUILE=1.6.4
     cat > guile-config <<EOF
-#!/bin/sh
 [ "\$1" == "--version" ] && echo "guile-config - Guile version $GUILE"
 [ "\$1" == "compile" ] && echo "-I$cygwin_prefix/include"
 [ "\$1" == "link" ] && echo "-L$cygwin_prefix/lib -lguile"
 exit 0
 EOF
-
     chmod 755 guile-config
     PATH=$(pwd):$PATH
 
     ##opt='-O2 -g' LDFLAGS='"$cygwin_prefix/bin/libpython2.2.dll"
-    rm -f config.cache  
+    rm -f config.cache
 }
 
 postconfig () {
     # Configure for build, for generating doc
     rm -f config.cache
+    export HOST_CC=gcc
+    export HOST_CXX=g++
+    if [ "$ABI" != "1.5" ]; then
+       HOST_CC=gcc-2.95
+       HOST_CXX=g++-2.95
+       (cd $src && ln -s GNUmakefile.in GNUmakefile)
+    fi
     (PATH="$old_path" \
        PATH="$HOME/usr/pkg/guile-1.6.0/bin:$PATH" \
        CFLAGS="-O2 -g" \
+       CC=$HOST_CC \
+       CXX=$HOST_CXX \
        $src/configure --prefix=/usr --enable-config=for-build)
 }
 
@@ -292,13 +298,8 @@ prebuild () {
     # Build for build, generating doc
     cd $build || exit 1
     
-    # ugh, footify fix
-    cd $src && ln -s GNUmakefile.in GNUmakefile
-
-    cd $build || exit 1
-    # Ugh.  Fixed in 1.6.8CVS and 1.7.13CVS.
-    # PATH=/bin:/usr/bin:$PATH make DO_O_DEP="echo NO DEPS;" conf=for-build all doc html-doc || exit 1
-    PATH=/bin:/usr/bin:$PATH make conf=for-build all doc html-doc || exit 1
+    #PATH=/bin:/usr/bin:$PATH make conf=for-build all doc html-doc || exit 1
+    PATH=/bin:/usr/bin:$PATH make conf=for-build all doc web || exit 1
     for i in $(find . -path "out-for-build/*.1"); do
        cp -pv $i $(dirname $(dirname $i))/$(basename $i)
     done
@@ -322,7 +323,8 @@ postinstall () {
     cd $build || exit 1
     docdir=$prefix/share/doc/$base-$ver
     
-    make conf=for-build docdir=$inst-doc/$docdir install-html-doc
+    #make conf=for-build docdir=$inst-doc/$docdir install-html-doc
+    make conf=for-build webdir=$inst-doc/$docdir web-install
 
 
     ## copy READMEs etc