* cygwin/changelog:

[lilypond.git] / cygwin / mknetrel

diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index 6dd829d46bf8dc6f0715ab5bb315af4de9789b55..36255076cd80051577fa4790e8a8d1dc6904aeec 100644 (file)
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -1,16 +1,16 @@
 # -*- shell-script -*-
 
-# stable LilyPond releases: lilypond-1.4
-# archive=ftp://lilypond.org/pub/LilyPond/v1.4
+# stable LilyPond releases: lilypond-1.6
+# archive=ftp://lilypond.org/pub/LilyPond/v1.6
 
-# LilyPond development: lilypond-1.5
-# archive=ftp://lilypond.org/pub/LilyPond/v1.5
+# 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.5/lilypond-1.5.68.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,8 +21,6 @@ cat >/dev/null <<EOC
 
 EOC
 
-
-BUILD=1
 # sover=14
 
 patch=$mknetrel_root/patch
@@ -30,6 +28,7 @@ if iscygwin; then
     true
 else    
     uploads=$here/uploads/$base && mkdir -p $uploads
+    [ "$ABI" = "1.5" ] && uploads=$here/uploads-development/$base && mkdir -p $uploads
     tarstem=$uploads/$package
 fi
 
@@ -145,6 +144,8 @@ doc_name () {
 lib_split () {
     mkdir -p ./$prefix/bin || exit 1
     mv $inst/$prefix/bin/*.dll ./$prefix/bin
+    mkdir -p ./$prefix/lib || exit 1
+    mv $inst/$prefix/lib/*.la ./$prefix/lib
     mkdir -p ./$prefix/share || exit 1
     mv $inst/$prefix/share/$base ./$prefix/share
     true
@@ -152,11 +153,9 @@ lib_split () {
    
 devel_split () {
     mkdir -p ./$prefix/bin || exit 1
-    mv $inst/$prefix/bin/guile-* ./$prefix/bin
     mv $inst/$prefix/include ./$prefix/include
     mkdir -p ./$prefix/lib || exit 1
     mv $inst/$prefix/lib/*.a ./$prefix/lib
-    mv $inst/$prefix/lib/*.la ./$prefix/lib
     mkdir -p ./$prefix/share || exit 1
     mv $inst/$prefix/share/aclocal ./$prefix/share
     true
@@ -248,8 +247,7 @@ needdevoflags () {
     return 1
 }
 
-# do I have a broken setup, do the Guile developers not know how to
-# write configure.in and Makefile.am, or are automake/libtool broken?
+
 preconfig () { # aka libtool_woes ()
 
     # Add to mknetrel?
@@ -259,26 +257,27 @@ preconfig () { # aka libtool_woes ()
 
     cd $build || exit 1
 
-    GUILE=1.5.6
+    GUILE=1.6.0
     cat > guile-config <<EOF
-#/bin/sh
+#!/bin/sh
 [ "\$1" == "--version" ] && echo "guile-config - Guile version $GUILE"
-[ "\$1" == "compile" ] && echo "-I$PREFIX/include"
-[ "\$1" == "link" ] && echo "-L$PREFIX/lib -lguile"
+[ "\$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  
 }
 
 postconfig () {
     # Configure for build, for generating doc
     rm -f config.cache
     (PATH="$old_path" \
-       PATH="$HOME/usr/pkg/guile-1.5.6/bin:$PATH" \
+       PATH="$HOME/usr/pkg/guile-1.6.0/bin:$PATH" \
        CFLAGS="-O2 -g" \
        $src/configure --prefix=/usr --enable-config=for-build)
 }
@@ -296,16 +295,24 @@ prebuild () {
     cd $src && ln -s GNUmakefile.in GNUmakefile
 
     cd $build || exit 1
-    PATH=/bin:/usr/bin:$PATH make conf=for-build all doc html-doc
+    #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
 
-    addmakeflags LDFLAGS="$cygwin_prefix/bin/libpython2.2.dll" " " 'target=i686-pc-cygwin'
+    mkdir -p mf/out
+    cp -pv mf/out-for-build/* mf/out
+    
+    addmakeflags MAKE_PFA_FILES=1 ' ' LDFLAGS="$cygwin_prefix/bin/libpython2.2.dll" ' ' 'target=i686-pc-cygwin'
 }
 
 preinstall () {
-    addmakeflags LDFLAGS="$cygwin_prefix/bin/libpython2.2.dll" " " 'target=i686-pc-cygwin'
+    cd $build || exit 1
+    cp -v scripts/out-for-build/midi2ly.1 scripts/out
+    cp -v lily/out-for-build/lilypond.1 lily/out
+    
+    addmakeflags MAKE_PFA_FILES=1 ' ' LDFLAGS="$cygwin_prefix/bin/libpython2.2.dll" ' ' 'target=i686-pc-cygwin'
 }
 
 postinstall () {
@@ -313,7 +320,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 docdir=$inst-doc/$docdir web-install
 
 
     ## copy READMEs etc
@@ -327,10 +335,14 @@ postinstall () {
     ## Cygwin readmes
     cygwin=cygwin
     cd $src || exit 1
-    install -m644 $cygwin/README $inst/$docdir/README.Cygwin
+    #install -m644 $cygwin/README $inst/$docdir/README.Cygwin
     install -m644 $cygwin/changelog $inst/$docdir/changelog.Cygwin
     install -d -m755 $inst/$prefix/doc/Cygwin
-    install -m644 $cygwin/README $inst/$prefix/doc/Cygwin/$package.README
+    #install -m644 $cygwin/README $inst/$prefix/doc/Cygwin/$package.README
+
+    cd $build || exit 1
+    install -m644 $cygwin/out/README $inst/$docdir/README.Cygwin
+    install -m644 $cygwin/out/README $inst/$prefix/doc/Cygwin/$package.README
 
     ## copy examples
     cd $src || exit 1