]> git.donarmstrong.com Git - lilypond.git/commitdiff
patch::: 1.3.52.jcn1
authorJan Nieuwenhuizen <janneke@gnu.org>
Sat, 20 May 2000 12:59:53 +0000 (14:59 +0200)
committerJan Nieuwenhuizen <janneke@gnu.org>
Sat, 20 May 2000 12:59:53 +0000 (14:59 +0200)
1.3.52.jcn1
===========

* Added toplevel doc target, to support building doc with --srcdir

* Removed cygwin build stuff; updated versions at:

      http://appel.dyndns.org/lilypond/gnu-windows/cross

1.3.52
======

CHANGES
VERSION
buildscripts/make-cygwin-cross-tar.sh
buildscripts/make-cygwin-cross.sh
make/toplevel.make.in

diff --git a/CHANGES b/CHANGES
index e18d51f04854412e928c8cf936fed5376914ae5a..5948934b2711acda38eca310cb807f85f497995f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,15 @@
+1.3.52.jcn1
+===========
+
+* Added toplevel doc target, to support building doc with --srcdir
+
+* Removed cygwin build stuff; updated versions at:
+
+      http://appel.dyndns.org/lilypond/gnu-windows/cross
+
+1.3.52
+======
+
 * Bugfix in smob handling.  Delete the C-part of freed smobs. Be
 honest about amount of allocation and deletion, so GUILE doesn't
 overestimate the amount of memory.
diff --git a/VERSION b/VERSION
index ea5b0890e494f1bdb16daaefaa9cc4b248768a58..44743cb935b2195d319aa245b0a78ae21e2b8454 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=52
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
index fd5e13b6d28dfbc9666cc0e68b53931aa4ff018e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
@@ -1,436 +0,0 @@
-#!@BASH@
-# make-cygwin-cross
-#
-# Build and install cross-development tools for cygwin package 
-# (binutils, compiler, flex, bison).
-# Using this cross-development enviroment, build and install
-# native cygwin packages (guile, lilypond).
-#
-# Besides being a handy script for me, currently this mainly serves
-# as documentation for cross-building lilypond.
-#
-# To use this script, you need
-#
-#  * all development tools to build a native LilyPond, see INSTALL.txt
-#
-#  * pre-release cygnus sources (and a binary) from:
-#
-#      ftp://sourceware.cygnus.com/pub/cygwin/private/cygwin-net-485/
-#
-#          binutils/binutils-19990818-1-src.tar.gz
-#          bison/bison-src.tar.gz
-#          cygwin/cygwin-20000301.tar.gz
-#          flex/flex-src.tar.gz
-#          gcc/gcc-2.95.2-1-src.tar.gz
-#
-#      ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/runtime/
-#
-#          bin-crtdll-2000-02-03.tar.gz  (mingw only)
-#
-#  * rx-1.5.tar.gz
-#
-#  * guile-1.3.4.tar.gz
-#
-#  * lilypond-1.3.38.jcn1.tar.gz
-#
-#  * lots of disk space, ca 353MB
-#
-# Not yet needed:
-#
-#  * db-2.7.7.tar.gz
-#
-#  * rpm-3.0.4.tar.gz 
-#
-
-################
-# config section
-################
-
-target=cygwin
-#target=mingw
-
-if [ $target = cygwin ]; then
-       ROOT=/usr/src/cygwin-net-485
-       TARGET_ARCH=i686-pc-cygwin
-else
-       ROOT=/usr/src/mingw-net-485
-       TARGET_ARCH=i386-pc-mingw32
-fi
-PREFIX=$ROOT/usr
-NATIVE_PREFIX=/Cygnus/usr
-
-# urg
-DEVEL=/home/fred
-WWW=$DEVEL/WWW/lilypond/gnu-windows
-#WWW=/tmp
-
-CYGWIN_SOURCE=$DEVEL/sourceware.cygnus.com/pub/cygwin/private/cygwin-net-485
-MINGW_SOURCE=$DEVEL/ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/runtime
-SOURCE_PATH=$DEVEL/usr/src/releases:$DEVEL/usr/src/patches:$DEVEL/usr/src/lilypond/Documentation/ntweb:$MINGW_SOURCE:/usr/src/redhat/SOURCES
-
-HOST=`uname -m`-gnu-`uname -s | tr '[A-Z]' '[a-z]'`
-
-cygwin_binary=cygwin-20000301.tar.gz
-mingw_binary=bin-crtdll-2000-02-03.tar.gz
-
-#CYGWIN_DLL=cygwin1-net-485.dll
-CYGWIN_DLL=cygwin1.dll
-MINWG_DLL=mingwc10-net-485.dll
-
-
-################
-# cross packages
-################
-
-cross_packages="
-binutils-19990818
-gcc-2.95.2
-flex
-bison
-"
-
-not_yet_needed="
-cygwin-2000301
-"
-
-cross_configure='--prefix=$PREFIX --target=$TARGET_ARCH'
-gcc_make='LANGUAGES="c++"'
-cygwin_make='-k || true'
-
-#################
-# native packages
-#################
-
-# Typically, we install native packages under
-#
-#   /Cygnus/usr/package-x.y.z
-#
-# so that's how we configure them.
-#
-native_configure='--target=$TARGET_ARCH --build=$TARGET_ARCH --host=$HOST --oldincludedir=$PREFIX/include --prefix=$NATIVE_PREFIX/$package --program-suffix='
-native_config_site='$PREFIX/share/native-config.site'
-
-rx_install='prefix=$PREFIX'
-
-db_patch='db-2.7.7-cygwin.patch'
-db_configure='urg'
-db_install='prefix=$PREFIX'
-rpm_patch='rpm-3.0.4-cygwin.patch'
-rpm_install='prefix=$PREFIX'
-
-guile_patch='guile-1.3.4-gnu-windows.patch'
-if [ $target = mingw ]; then
-       guile_patch1='guile-1.3.4-mingw.patch'
-       guile_cflags='-I $PREFIX/$TARGET_ARCH/include -I $PREFIX/i686-pc-cygwin/include'
-fi
-guile_ldflags='-L$PREFIX/lib $PREFIX/bin/$CYGWIN_DLL'
-guile_make='oldincludedir=$PREFIX/include'
-
-# We need to get guile properly installed for cross-development, ie
-# at our prefix: $PREFIX.  When packaging, the prefix we configured
-# for, will be used.
-#
-guile_install='prefix=$PREFIX'
-
-lilypond_version=@TOPLEVEL_VERSION@
-if [ $target = mingw ]; then
-       lilypond_cflags='-I $PREFIX/$TARGET_ARCH/include -I $PREFIX/i686-pc-cygwin/include'
-fi
-lilypond_ldflags='-L$PREFIX/lib -lguile $PREFIX/bin/$CYGWIN_DLL'
-lilypond_configure='--enable-tex-tfmdir=/texmf/fonts/tfm/public/cm'
-## URG, help2man: doesn't know about cross-compilation.
-#lilypond_make='-k || make -k || true'
-lilypond_patch=lilypond-manpages.patch
-# Don't install lilypond
-lilypond_install='--just-print'
-lilypond_before_zip='cp -pr $PREFIX/src/$package/input $install_prefix \; cp -p \`find $PREFIX/src/$package -type f -maxdepth 1\` $install_prefix'
-
-native_packages="
-guile-1.3.4
-lilypond-$lilypond_version
-"
-
-not_yet_needed="
-rx-1.5
-db-2.7.7
-rpm-3.0.4
-"
-
-#######################
-# end of config section
-#######################
-
-cygwin_dirs=`/bin/ls -d1 $CYGWIN_SOURCE/*`
-cygwin_source_path=`echo $CYGWIN_SOURCE $cygwin_dirs`
-source_path=`echo $SOURCE_PATH:$cygwin_source_path | sed 's/:/ /g'`
-
-###########
-# functions
-###########
-
-untar ()
-{(
-       set -x
-       tarball=$1
-       dest_dir=$2
-
-       first_dir=`tar tzf $tarball | head -1`
-       src_dir=`dirname $first_dir`
-
-       if [ "$src_dir" = "src" -o "$src_dir" = "./src" \
-         -o "$src_dir" = "." ]; then
-               src_dir=$first_dir
-       fi
-
-       tar xzf $tarball
-
-       if [ "$src_dir" != "$dest_dir" -a "$src_dir" != "$dest_dir/" ]; then
-               mv $src_dir $dest_dir
-               rm -rf ./$first_dir
-       fi
-)
-}
-
-expand ()
-{(
-
-       set -
-       string=`eval echo $\`eval echo "${1}${2}"\``
-       eval echo $string
-)
-}
-
-find_path ()
-{(
-       set -
-       expr=$1
-       found=
-       for i in $source_path; do
-               found=`/bin/ls -d1 $i/$expr 2>/dev/null | head -1`
-               if [ -e "$found" ]; then
-                       break
-               fi
-       done
-       echo $found
-)
-}
-
-fix_extension ()
-{
-       file=$1
-       ext=$2
-       expr="$3"
-       base=`basename $file $ext`
-       if [ $base$ext != $i ]; then
-               type="`file $file`"
-               if expr "$type" : "$expr"; then
-                       mv -f $file $base$ext
-               fi
-       fi
-}
-
-build ()
-{(
-       package=$1
-       set -
-       if [ -d $package ]; then
-               echo "$package: directory exists"
-               echo "$package: skipping"
-               exit 0
-       fi
-
-        name=`echo $package | sed 's/-.*//'`
-        name_cflags=`expand $name _cflags`
-        name_ldflags=`expand $name _ldflags`
-        name_configure=`expand $name _configure`
-        type_config_site=`expand $type _config_site`
-        type_configure=`expand $type _configure`
-        name_make=`expand $name _make`
-        name_before_install="`expand $name _before_install`"
-        name_install=`expand $name _install`
-
-       found=`find_path $package*src.tar.gz`
-       if [ "$found" = "" ]; then
-               found=`find_path $package.tar.gz`
-       fi
-       if [ "$found" = "" ]; then
-               found=`find_path $name*tar.gz`
-       fi
-       if [ "$found" = "" ]; then
-               echo "$package: no such tarball"
-               exit 1
-       fi
-       
-       untar $found $package
-       patch=`expand $name _patch`
-       count=0
-       while [ "x$patch" != "x" ]; do
-               (
-               cd $package
-               set -x
-               found=`find_path $patch`
-               if [ "$found" = "" ]; then
-                       echo "$patch: no such file"
-                       exit 1
-               fi
-               patch -p1 -E < $found
-               )
-               count=`expr $count + 1`
-               patch=`expand $name _patch$count`
-       done
-       mkdir $type-$package
-       cd $type-$package
-
-       rm -f config.cache
-       CONFIG_SITE="$type_config_site" CFLAGS="$name_cflags" LDFLAGS="$name_ldflags" ../$package/configure $type_configure $name_configure || exit 1
-       make $name_make || exit 1
-       `eval $name_before_install` || exit 1
-       make install $name_install || exit 1
-)
-}
-
-## urg, let's hope Cygnus uses rpm for packaging its next release
-pack ()
-{(
-       set -
-       package=$1
-
-       zip=$WWW/$package.zip
-       if [ -e $zip ]; then
-               echo "$zip: package exists"
-               echo "$zip: skipping"
-               exit 0
-       fi
-
-        name=`echo $package | sed 's/-.*//'`
-        name_pack_install=`expand $name _pack_install`
-       install_root=/tmp/$package-install
-       install_prefix=$install_root/$NATIVE_PREFIX/$package
-       name_before_zip=`expand $name _before_zip`
-
-       set -x
-       rm -rf $install_root
-       mkdir -p $install_prefix
-
-       cd $PREFIX/src/$type-$package || exit 1
-       make install prefix=$install_prefix $name_pack_install
-
-        ## duh, rename executables,
-       ## for people that use a dumb shell instead of bash
-       cd $install_prefix/bin &&
-       for i in `/bin/ls -d1 *`; do
-               fix_extension $i .exe '.*Windows.*\(executable\).*'
-               fix_extension $i .py '.*\(python\).*'
-       done
-
-        rm -f $zip
-       `eval $name_before_zip` || exit 1
-        cd $install_root && zip -ry $zip .$NATIVE_PREFIX
-)
-}
-##################
-# end of functions
-##################
-
-#
-# setup
-#
-
-set -x
-mkdir -p $ROOT
-if [ ! -d $PREFIX ]; then
-       cd $ROOT
-       found=`find_path $cygwin_binary`
-       if [ "$found" = "" ]; then
-               echo "$cygwin_binary: no such tarball"
-               exit 1
-       fi
-       tar xzf $found
-       # urg, bug in gcc's cross-make configuration
-       mkdir -p $PREFIX/lib/gcc-lib/$TARGET_ARCH/2.95.2
-
-       cd $PREFIX
-
-       # urg, bug in gcc's cross-make configuration
-       rm -f include
-       ln -s $PREFIX/$TARGET_ARCH/include .
-else
-       echo "$PREFIX: already exists"
-       echo "$cygwin_binary: skipping"
-fi
-
-# mingw
-if [ ! -d $PREFIX/$TARGET_ARCH ]; then
-       cd $PREFIX
-       found=`find_path $mingw_binary`
-       if [ "$found" = "" ]; then
-               echo "$mingw_binary: no such tarball"
-               exit 1
-       fi
-       tar xzf $found
-
-       mkdir -p $PREFIX/lib/gcc-lib/$TARGET_ARCH/2.95.2
-       rm -f include
-       mkdir -p $PREFIX/i386-mingw32/include
-       ln -s $PREFIX/i386-mingw32 $TARGET_ARCH
-       ln -s $PREFIX/$TARGET_ARCH/include .
-fi
-
-if [ ! -e $NATIVE_PREFIX ]; then
-       ln -s $ROOT /Cygnus || exit 1
-fi
-
-mkdir -p $PREFIX/src
-cd $PREFIX/src
-PATH=$PATH:$PREFIX/bin
-
-type=cross
-for i in $cross_packages; do
-       if build $i; then
-               true
-       else
-               echo "$i: build failed"
-               exit 1
-       fi
-done
-
-# urg, bug in binutil's cross-make install
-ln -f $PREFIX/bin/$TARGET_ARCH-objdump $PREFIX/$TARGET_ARCH/bin/objdump
-
-# urg, bug in gcc's cross-make install
-mv $PREFIX/bin/cygwin1.dll $PREFIX/bin/$CYGWIN_DLL
-mv $PREFIX/bin/mingwc10.dll $PREFIX/bin/$MINGW_DLL
-ln -f $PREFIX/bin/$TARGET_ARCH-gcc $PREFIX/$TARGET_ARCH/bin/cc 
-ln -f $PREFIX/bin/$TARGET_ARCH-c++ $PREFIX/$TARGET_ARCH/bin/c++
-ln -f $PREFIX/bin/$TARGET_ARCH-g++ $PREFIX/$TARGET_ARCH/bin/g++
-
-PATH=$PREFIX/$TARGET_ARCH/bin:$PREFIX/bin:$PATH 
-
-mkdir -p $PREFIX/src
-cd $PREFIX/src
-
-ncs=`eval echo $native_config_site`
-rm -f $ncs
-mkdir -p `dirname $ncs`
-cat > $ncs <<EOF
-ac_cv_sizeof_int=4
-ac_cv_sizeof_long=4
-ac_cv_sys_restartable_syscalls=yes
-ac_cv_sprintf_count=yes
-ac_cv_spinlocks=no
-db_cv_sprintf_count=yes
-db_cv_spinlocks=no
-EOF
-
-set -x
-type=native
-for i in $native_packages; do
-       if build $i; then
-               pack $i
-               continue
-       fi
-       exit 1
-done
-
-rm -f $WWW/$CYGWIN_DLL.zip
-cd $PREFIX/bin && zip $WWW/$CYGWIN_DLL.zip $CYGWIN_DLL
index fa6a47f450d0208b6f961491d88f2a1b032cade1..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
@@ -1,696 +0,0 @@
-#!@BASH@
-# make-cygwin-cross
-#
-# Build and install cross-development tools for cygwin package 
-# (binutils, compiler, flex, bison).
-# Using this cross-development enviroment, build and install
-# native cygwin packages (guile, lilypond).
-#
-# Besides being a handy script for me, currently this mainly serves
-# as documentation for cross-building lilypond.
-#
-# To use this script, you need
-#
-#  * all development tools to build a native LilyPond, see INSTALL.txt
-#
-#  * RPM distribution of the cygwin pre-release sources, from:
-#
-#      http://appel.dyndns.org/lilypond/gnu-windows/redhat/SRPMS/
-#
-#    The tarballs were fetched from:
-#
-#      ftp://sourceware.cygnus.com/pub/cygwin/private/cygwin-net-485/
-#
-
-################
-# config section
-################
-
-TARGET_OS=cygwin
-#TARGET_OS=mingw32
-
-if [ $TARGET_OS = cygwin ]; then
-       ROOT=/usr/src/cygwin-net-485
-       TARGET_ARCH=i686
-       TARGET_VENDOR=pc
-else
-       ROOT=/usr/src/mingw-net-485
-       TARGET_ARCH=i386
-       TARGET_VENDOR=pc
-fi
-TARGET_PLATFORM=$TARGET_ARCH-$TARGET_VENDOR-$TARGET_OS
-
-ARCH=`uname -m`
-OS=`uname -s | tr '[A-Z]' '[a-z]'`
-VENDOR=gnu
-PLATFORM=$ARCH-$VENDOR-$OS
-
-#CROSS_TARGET_PLATFORM=$ARCH-x-$TARGET_PLATFORM
-CROSS_TARGET_PLATFORM=$PLATFORM-x-$TARGET_PLATFORM
-cto=$OS-x-cygwin
-tp=i686-cygwin
-
-PREFIX=$ROOT/usr
-NATIVE_ROOT=/Cygnus
-NATIVE_PREFIX=$NATIVE_ROOT/usr
-CROSS_ROOT=$NATIVE_ROOT/$cto
-CROSS_PREFIX=$CROSS_ROOT/usr
-
-# urg
-DEVEL=/home/fred
-distdir=$DEVEL/WWW/lilypond/gnu-windows/lily-w32
-#distdir=/tmp
-
-CYGWIN_SOURCE=$DEVEL/sourceware.cygnus.com/pub/cygwin/private/cygwin-net-485
-cygwin_dirs=`/bin/ls -d1 $CYGWIN_SOURCE/*`
-cygwin_source_path=`echo $CYGWIN_SOURCE $cygwin_dirs | sed s'/\$/:/g'`
-SOURCE_PATH=$DEVEL/usr/src/releases:$DEVEL/usr/src/redhat/SRPMS:$cygwin_source_path
-
-cygwin_binary=cygwin-20000301.tar.gz
-mingw_binary=bin-crtdll-2000-02-03.tar.gz
-
-#CYGWIN_DLL=cygwin1-net-485.dll
-CYGWIN_DLL=cygwin1.dll
-MINWG_DLL=mingwc10-net-485.dll
-
-
-################
-# cross packages
-################
-
-cross_rpm="
-binutils-19990818
-gcc-2.95.2
-bison
-flex
-"
-
-# binutils installs ok, but forgets these two
-binutils_after_rpm='
-cd $CROSS_PREFIX/$TARGET_PLATFORM/bin \;
-ln -f ../../bin/$TARGET_PLATFORM-objdump objdump \;
-ln -f ../../bin/$TARGET_PLATFORM-objcopy objcopy \;
-mv -f ld ld-in-path-breaks-libtool
-'
-# burp.  gcc doesn't install any of these
-gcc_after_rpm='
-cd $CROSS_PREFIX/$TARGET_PLATFORM/bin \;
-ln -f ../../bin/$TARGET_PLATFORM-gcc cc \;
-ln -f ../../bin/$TARGET_PLATFORM-gcc gcc \;
-ln -f ../../bin/$TARGET_PLATFORM-c++ c++ \;
-ln -f ../../bin/$TARGET_PLATFORM-g++ g++
-'
-
-guile_after_rpm='cp -f $NATIVE_PREFIX/bin/*guile-config $CROSS_PREFIX/$TARGET_PLATFORM/bin'
-
-lilypond_version=@TOPLEVEL_VERSION@
-
-native_rpm="
-rx-1.5
-zlib-1.1.3
-db-2.7.7
-guile-1.3.4
-bash-2.03
-rpm-3.0.4
-lilypond-$lilypond_version
-"
-
-#######################
-# end of config section
-#######################
-
-###########
-# functions
-###########
-
-expand ()
-{(
-
-       set -
-       string=`eval echo $\`eval echo "${1}${2}"\``
-       eval echo $string
-)
-}
-
-find_path ()
-{(
-       set -
-       expr=$1
-       source_path=${2:-$SOURCE_PATH}
-       path_list=`echo $source_path | sed 's/:/ /g'`
-
-       found=
-       for i in $path_list; do
-               found=`/bin/ls -d1 $i/$expr 2>/dev/null | head -1`
-               if [ "$found" != "" ] && [ -e $found ]; then
-                       break
-               fi
-       done
-       echo $found
-)
-}
-
-build ()
-{(
-       package=$1
-        name=`echo $package | sed 's/-.*//'`
-
-       if [ $type = "cross" ]; then
-               target_platform=$CROSS_TARGET_PLATFORM
-               a=$cto
-       else
-               target_platform=$TARGET_PLATFORM
-               a=$tp
-       fi
-
-       ##rpm_package=`find_path $name*.rpm "$topdir/RPMS/$cto:$topdir/RPMS/$tp"`
-       rpm_package=`find_path $package*.rpm "$topdir/RPMS/$cto:$topdir/RPMS/$tp"`
-       if [ "$rpm_package" != "" ]; then
-               echo "$rpm_package: package exists"
-               #echo "$rpm_package: refreshing installation only"
-               echo "$rpm_package: just updating rpm database"
-               rpm -ivv --justdb --ignoreos --ignorearch --nodeps --force\
-                       --dbpath $NATIVE_ROOT/var/lib/rpm \
-                       $topdir/RPMS/$a/$name*.rpm
-               exit 0
-       fi
-
-       cd $topdir
-       found=`find_path $package*src.rpm`
-       if [ "$found" != "" ]; then
-               rpm --root $NATIVE_ROOT -ivv $found || exit 1
-               rpm --target=$target_platform -ba SPECS/$name*.spec || exit 1
-       else
-               tarball=`/bin/ls -d1 SOURCES/$package*tar.gz 2>/dev/null | head -1`
-               if [ "$name.spec" != "" ] && [ "$tarball" != "" ]; then
-                       rpm --target=$target_platform -ba SPECS/$name.spec || exit 1
-               else
-                       found=`find_path $package*tar.gz`
-                       if [ "$found" != "" ]; then
-                               rpm --target=$target_platform -ta $found || exit 1
-                       else
-                               echo "$package: no such rpm or tarball"
-                               exit 1
-                       fi
-               fi
-       fi
-       name=`echo $package | sed 's/-.*//'`
-
-       rpm -ivv --ignoreos --ignorearch --nodeps --force\
-               --dbpath $NATIVE_ROOT/var/lib/rpm \
-               $topdir/RPMS/$a/$name*.rpm
-       #urg
-        name_after_rpm="`expand $name _after_rpm`"
-       `eval $name_after_rpm` || exit 1
-)
-}
-
-##################
-# end of functions
-##################
-
-#######
-# setup
-#######
-
-set -x
-mkdir -p $ROOT
-if [ ! -d $PREFIX/bin ]; then
-       mkdir -p $PREFIX
-       cd $PREFIX
-
-       ## is this still necessary?
-       mkdir -p include lib
-       mkdir -p $TARGET_PLATFORM
-       cd $TARGET_PLATFORM && ln -s ../include .
-
-       mkdir -p $CROSS_PREFIX/$TARGET_PLATFORM
-       cd $CROSS_PREFIX/$TARGET_PLATFORM
-       ln -s $NATIVE_PREFIX/{include,lib} .
-       #ln -s $NATIVE_PREFIX/{include,lib} .
-       #ln -s $NATIVE_PREFIX/include .
-       #ln -s $CROSS_PREFIX/bin .
-       
-       cd $ROOT
-       found=`find_path $cygwin_binary`
-       if [ "$found" = "" ]; then
-               echo "$cygwin_binary: no such tarball"
-               exit 1
-       fi
-       tar xzf $found
-       # urg, bug in gcc's cross-make configuration
-       mkdir -p $PREFIX/lib/gcc-lib/$TARGET_PLATFORM/2.95.2
-       mkdir -p $CROSS_PREFIX/lib/gcc-lib/$TARGET_PLATFORM/2.95.2
-else
-       echo "$PREFIX: already exists"
-       echo "$cygwin_binary: skipping"
-fi
-
-# mingw
-if [ ! -d $PREFIX/$TARGET_PLATFORM ]; then
-       cd $PREFIX
-       found=`find_path $mingw_binary`
-       if [ "$found" = "" ]; then
-               echo "$mingw_binary: no such tarball"
-               exit 1
-       fi
-       tar xzf $found
-
-       mkdir -p $PREFIX/lib/gcc-lib/$TARGET_PLATFORM/2.95.2
-       rm -f include
-       mkdir -p $PREFIX/i386-mingw32/include
-       ln -s $PREFIX/i386-mingw32 $TARGET_PLATFORM
-       ln -s $PREFIX/$TARGET_PLATFORM/include .
-fi
-
-rm -f $NATIVE_ROOT
-if [ ! -e $NATIVE_ROOT ]; then
-       ln -s $ROOT $NATIVE_ROOT || exit 1
-fi
-
-#mv $PREFIX/bin/cygwin1.dll $PREFIX/bin/$CYGWIN_DLL
-#mv $PREFIX/bin/mingwc10.dll $PREFIX/bin/$MINGW_DLL
-
-mkdir -p $ROOT/var/redhat
-mkdir -p $PREFIX/src/redhat
-
-native_config_site='$PREFIX/share/native-config.site'
-
-ncs=`eval echo $native_config_site`
-rm -f $ncs
-mkdir -p `dirname $ncs`
-cat > $ncs <<EOF
-ac_cv_c_bigendian=no
-ac_cv_sizeof_char_p=4
-ac_cv_sizeof_int=4
-ac_cv_sizeof_long=4
-ac_cv_sizeof_float=4
-ac_cv_sizeof_double=8
-ac_cv_sys_restartable_syscalls=no
-ac_cv_sprintf_count=yes
-ac_cv_spinlocks=no
-db_cv_sprintf_count=yes
-db_cv_spinlocks=no
-ac_cv_func_getpgrp_void=yes
-ac_cv_func_setvbuf_reversed=no
-ac_cv_lib_intl=no
-# urg, lots of stuff goes wrong when configuring bash??
-ac_cv_exeext=.exe
-ac_cv_header_libintl_h=no
-ac_cv_header_termcap_h=no
-ac_cv_func_mkfifo=yes
-bash_cv_dup2_broken=no
-bash_cv_opendir_not_robust=no
-bash_cv_pgrp_pipe=no
-bash_cv_printf_declared=yes
-bash_cv_sbrk_declared=yes
-bash_cv_signal_vintage=posix
-bash_cv_speed_t_in_sys_types=no
-bash_cv_struct_timeval=yes
-bash_cv_struct_winsize_header=ioctl_h
-bash_cv_sys_errlist=yes
-bash_cv_sys_named_pipes=missing
-bash_cv_func_strcoll_broken=no
-bash_cv_must_reinstall_sighandlers=no
-bash_cv_getcwd_calls_popen=no
-bash_cv_func_sigsetjmp=missing
-bash_cv_job_control_missing=present
-bash_cv_sys_restartable_syscalls=no
-bash_cv_getenv_redef=yes
-bash_cv_sys_siglist=no
-bash_cv_type_rlimit=long
-bash_cv_ulimit_maxfds=no
-bash_cv_decl_under_sys_siglist=no
-bash_cv_under_sys_siglist=no
-EOF
-
-#URG, stupid RPM
-rpm_ct=$ARCH-$TARGET_OS
-cross_rpm_dir=$CROSS_PREFIX/lib/rpm/$rpm_ct
-cross_rpm_link=/usr/lib/rpm/$rpm_ct
-mkdir -p $cross_rpm_dir
-rm -f $cross_rpm_link
-ln -s $cross_rpm_dir $cross_rpm_link
-
-native_rpm_dir=$NATIVE_PREFIX/lib/rpm/$tp
-native_rpm_link=/usr/lib/rpm/$tp
-mkdir -p $native_rpm_dir
-rm -f $native_rpm_link
-ln -s $native_rpm_dir $native_rpm_link
-
-cross_macros=$cross_rpm_dir/macros
-native_macros=$native_rpm_dir/macros
-
-base_macros=$NATIVE_PREFIX/lib/rpm/base-macros
-rm -f $base_macros
-cat > $base_macros <<EOF
-%native_prefix /Cygnus/usr
-
-%_topdir       %{native_prefix}/src/redhat
-%_sourcedir    %{native_prefix}/src/redhat/SOURCES
-%_builddir     %{native_prefix}/src/redhat/BUILD
-%_srcrpmdir    %{native_prefix}/src/redhat/SRPMS
-%_rpmdir       %{native_prefix}/src/redhat/RPMS
-
-#%DocDir               %{native_prefix}/doc
-%DocDir                /Cygnus/usr/doc
-%_docdir       /Cygnus/usr/doc
-%_defaultdocdir /Cygnus/usr/doc
-
-%cygwin_dll    %{native_prefix}/bin/cygwin1.dll
-
-%__install     /bin/install
-
-%cflags                %{optflags}
-%cppflags      %{nil}
-
-%sourcedir     .
-EOF
-
-cp -f $base_macros $cross_macros
-cat >> $cross_macros <<EOF
-
-%cross_prefix  /Cygnus/$cto/usr
-%root          /Cygnus/$cto
-%_rootbindir    /Cygnus/$cto/bin
-#_usr           /Cygnus/$cto/usr
-%_prefix       /Cygnus/$cto/usr
-%prefix                /Cygnus/$cto/usr
-
-%_rpmfilename  $cto/%%{NAME}-%%{VERSION}-%%{RELEASE}.$cto.rpm
-
-%config_site   %{nil}
-
-%cppflags      %{nil}
-%cflags                %{nil}
-%ldflags       %{nil}
-%_target_platform $TARGET_PLATFORM
-
-#% configure   \
-#  %{?__libtoolize:[ -f configure.in ] \&\& %{__libtoolize} --copy --force}; \
-%configure     \
-  CPPFLAGS="%{cppflags}" CFLAGS="%{cflags}" LDFLAGS="%{ldflags}" CONFIG_SITE=%{config_site} \
-  %{sourcedir}/configure \
-  --host=%{_host} --target=%{_target_platform} --prefix=%{cross_prefix} -v
-EOF
-
-cp -f $base_macros $native_macros
-cat >> $native_macros <<EOF
-
-%root          /Cygnus
-%_rootbindir    /Cygnus/bin
-#_usr           /Cygnus/usr
-%_prefix       /Cygnus/usr
-%prefix                /Cygnus/usr
-
-%config_site   %{_prefix}/share/native-config.site
-# won't work: scripts and stuff are .exe too
-#%program_suffix .exe
-%program_suffix %{nil}
-
-#%_arch                i686-cygwin
-#%_vendor      pc
-#%_os          cygwin
-
-%_rpmfilename  %%{ARCH}-$TARGET_OS/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}-$TARGET_OS.rpm
-
-%__find_provides       %{native_prefix}/lib/rpm/cygwin.prov
-%__find_requires       %{native_prefix}/lib/rpm/cygwin.req
-%__fix_suffixes                %{native_prefix}/bin/fix-suffixes
-%fix_suffixes  %{__fix_suffixes} \$RPM_BUILD_ROOT%{_rootbindir}/* \$RPM_BUILD_ROOT%{native_prefix}/bin/*
-
-%cppflags      -I%{native_prefix}/include
-%cflags                %{optflags} %{cppflags}
-%ldflags       -L%{native_prefix}/lib %{cygwin_dll}
-
-#%configure    \
-#  %{?__libtoolize:[ -f configure.in ] \&\& %{__libtoolize} --copy --force}; \
-
-%configure     \
-  CPPFLAGS="%{cppflags}" CFLAGS="%{cflags}" LDFLAGS="%{ldflags}" CONFIG_SITE=%{config_site} \
-  %{sourcedir}/configure --host=%{_host} --target=%{_target_platform} \
-  --prefix=%{native_prefix} --program-prefix=
-#  --prefix=%{native_prefix} --program-suffix=%{program_suffix}
-EOF
-
-rm -f $NATIVE_PREFIX/lib/rpm/cygwin.prov
-cat > $NATIVE_PREFIX/lib/rpm/cygwin.prov <<EOF
-#!/bin/sh
-while read f ; do
-       f=\`echo \$f | tr '[:upper:]' '[:lower:]'\`
-       case \$f in
-       *.dll)  basename \$f
-               ;;
-       esac
-done | sort -u
-EOF
-chmod 755 $NATIVE_PREFIX/lib/rpm/cygwin.prov
-
-rm -f $NATIVE_PREFIX/lib/rpm/cygwin.req
-cat > $NATIVE_PREFIX/lib/rpm/cygwin.req <<EOF
-#!/bin/sh
-
-while read f ; do
-       case \$f in
-       *.dll|*.exe)    objdump -p \$f | grep "DLL Name:" | cut -f3 -d" " | tr '[:upper:]' '[:lower:]'
-                       ;;
-       esac
-done | sort -u
-
-EOF
-chmod 755 $NATIVE_PREFIX/lib/rpm/cygwin.req
-
-rm -f $NATIVE_PREFIX/bin/fix-suffixes
-cat > $NATIVE_PREFIX/bin/fix-suffixes <<EOF
-#!/bin/sh
-## duh, rename executables,
-## for people that use a dumb shell instead of bash
-
-
-if [ \$# -le 0 ]; then
-       echo "Usage: fix-suffixes [FILE]..."
-       exit 2
-fi
-
-fix_extension ()
-{
-        path=\$1
-        ext=\$2
-        expr="\$3"
-       dir=\`dirname \$path\`
-        file=\`basename \$path\`
-        base=\`basename \$file \$ext\`
-        if [ \$base\$ext != \$file ]; then
-                type="\`file \$path\`"
-                if expr "\$type" : "\$expr"; then
-                        mv -f \$path \$dir/\$base\$ext
-                fi
-        fi
-}
-
-for i in \`/bin/ls -d1 \$*\`; do
-       fix_extension \$i .exe '.*Windows.*\(executable\).*'
-       fix_extension \$i .py '.*\(python\).*'
-done
-
-EOF
-chmod 755 $NATIVE_PREFIX/bin/fix-suffixes
-set -x
-type=rpm
-rm -rf $NATIVE_ROOT/var/lib/rpm
-mkdir -p $NATIVE_ROOT/var/lib/rpm
-rpm --root $NATIVE_ROOT --initdb
-
-topdir=$NATIVE_PREFIX/src/redhat
-mkdir -p $topdir/{BUILD,RPMS/{$tp,$cto},SOURCES,SPECS,SRPMS}
-
-##############
-# end of setup
-##############
-
-OLDPATH=$PATH
-# building x-gcc requires to have x-ar in path
-# x-gcc will find $prefix/x/bin/as by itself
-PATH=$CROSS_PREFIX/bin:$PATH
-
-mkdir -p $PREFIX/src
-cd $PREFIX/src
-type=cross
-for i in $cross_rpm; do
-       if build $i; then
-               true
-       else
-               echo "$i: rpm build failed"
-               exit 1
-       fi
-done
-
-PATH=$CROSS_PREFIX/$TARGET_PLATFORM/bin:$PATH
-
-cd $PREFIX/src
-type=native
-for i in $native_rpm; do
-       if build $i; then
-               true
-       else
-               echo "$i: rpm build failed"
-               exit 1
-       fi
-done
-
-##############
-# Distribution
-##############
-
-PATH=$OLDPATH
-
-mkdir -p $distdir
-
-cat > $distdir/setup.sh <<EOF
-#!/bin/bash
-set -x
-ROOT=/Cygnus
-PREFIX=\$ROOT/usr
-# gunzip rpm.gz || exit 1
-#dll=\$ROOT/net-485
-#mkdir -p \$dll
-#gzip -dc cygwin.dll.gz > \$dll/cygwin1.dll
-## this won't work: must be done outside of cygwin
-#old_dll=\`which cygwin1.dll\`
-#mv -f \$old_dll \$old_dll.orig\$\$
-#gunzip cygwin1.dll.gz
-#cp -f cygwin1.dll \$old_dll
-echo > rpmrc
-# mkdir -p \$ROOT/var/lib
-# mkdir -p \$ROOT/bin
-rem # touch \$ROOT/bin/rpm \$ROOT/bin/rpm.exe
-echo > \$ROOT/bin/rpm; echo > \$ROOT/bin/rpm.exe
-./rpm --root \$ROOT --rcfile rpmrc --initdb
-./rpm --root \$ROOT --rcfile rpmrc --nodeps --ignorearch --ignoreos -Uhv \\
-       RPMS/$tp/rpm-*.$tp.rpm \\
-       RPMS/$tp/*.$tp.rpm
-done
-EOF
-
-cat > $distdir/setup.bat <<EOF
-del dll olddll
-rem # old_dll=\`which cygwin1.dll\`
-rem # urg, should dist bash too, then we don't need usertools!
-rem # but this gets ugly, we could really use:
-rem # 
-rem #     cp, cygpath, gunzip, mv, mkdir, touch
-rem #  
-rem # ie, fileutils, gzip, (cygpath?)
-rem #  
-rem #  cp -f \`which bash\` /bin;
-rem #   mkdir -p /bin;
-rem #  cp -f bash /bin/bash.exe;
-rem #  cp -f /bin/bash /bin/sh.exe;
-mkdir \\bin
-copy bash \\bin\\bash.exe
-copy bash \\bin\\sh.exe
-mkdir \\Cygnus
-mkdir \\Cygnus\\bin
-mkdir \\Cygnus\\var
-mkdir \\Cygnus\\var\\lib
-bash -c '
-       dll=\`type -p cygwin1.dll\`;
-       wdll=\`./cygpath -w \$dll\`;
-       wdll=\${wdll:-\\Cygnus\\bin};
-       echo cygwin1.dll \$wdll > newdll; echo \$wdll \$wdll.orig\$\$ > olddll'
-if not errorlevel 0 goto nobash
-rem # mv -f \$old_dll \$old_dll.orig\$\$
-rem # gunzip cygwin1.dll.gz
-rem # cp -f cygwin1.dll \$old_dll
-copy < olddll 
-copy < newdll 
-bash setup.sh
-if not errorlevel 0 goto nobash
-attrib +s \\Cygnus\\usr\\share\\lilypond\\cmtfm
-goto :exit
-:nobash
-@echo "setup.bat: can't find bash"
-rem # @echo "setup.bat: please install usertools from"
-rem # @echo "setup.bat: http://sourceware.cygnus.com/cygwin/"
-:exit
-EOF
-
-cat > $distdir/lilypond.sh <<EOF
-#!/bin/bash
-ROOT=/Cygnus
-PREFIX=\$ROOT/usr
-\$ROOT/bin/lilypond \$*
-EOF
-
-cat > $distdir/midi2ly.sh <<EOF
-#!/bin/bash
-ROOT=/Cygnus
-PREFIX=\$ROOT/usr
-\$ROOT/bin/midi2ly \$*
-EOF
-
-cat > $distdir/lilypond.bat <<EOF
-bash lilypond.sh %1 %2 %3 %4 %5 %6 %7 %8 %9
-EOF
-
-cat > $distdir/midi2ly.bat <<EOF
-bash midi2ly.sh %1 %2 %3 %4 %5 %6 %7 %8 %9
-EOF
-
-cd $distdir
-rm -f $CYGWIN_DLL.gz
-cp -f $PREFIX/bin/$CYGWIN_DLL .
-rm -f rpm.gz
-cp -f `/bin/ls -d1 $ROOT/bin/rpm* |head -1` rpm
-
-rm -f bash.gz
-cp -f `/bin/ls -d1 $ROOT/bin/bash* |head -1` bash
-
-rm -f cygpath.gz
-cp -f `/bin/ls -d1 $PREFIX/bin/cygpath* |head -1` cygpath
-
-distbase=`basename $distdir`
-rm -f RPMS
-ln -s ../redhat/RPMS .
-
-www=`dirname $distdir`
-cd $www
-for i in bash-2 guile-1 rpm-3 lilypond-$lilypond_version; do
-       rpm=`find_path $i*.rpm $distbase/RPMS/$tp`
-       dist_rpms="$dist_rpms $rpm"
-done
-
-rm -f $www/setup*.zip
-cd $www && zip setup-lilypond-$lilypond_version.zip lily-w32 $distbase/* $dist_rpms
-
-# make small zip dist available
-#
-zipdir=$www/zip
-mkdir -p $zipdir
-
-rm -f $zipdir/$CYGWIN_DLL.zip
-cd $ROOT/bin && zip $zipdir/$CYGWIN_DLL.zip $CYGWIN_DLL
-
-for i in bash-2 guile-1 rpm-3 lilypond-$lilypond_version; do
-       found=`find_path $i*.rpm $distdir/RPMS/$tp`
-       if [ "$found" = "" ]; then
-               echo "$i: no such .rpm"
-       else
-               base=`basename $found`
-               package=`echo $base | sed "s/\.$tp.rpm//"`
-               dir=/tmp/$i-rpm2zip
-               rm -rf $dir
-               mkdir -p $dir
-               cd $dir || exit 1
-               rpm2cpio $found | cpio -id
-               zip -ry $zipdir/$package.zip .
-               rm -rf $dir
-       fi
-done
-
-cd $distdir
-gzip -f $CYGWIN_DLL
-gzip -f rpm
-gzip -f bash
-gzip -f cygpath
-
index 08713d005906dd61caad0112be877a83b35e6dc2..5b9e2b90bd13aa8a2b64416174e628b0a4b17bdd 100644 (file)
@@ -31,7 +31,8 @@ website: fonts htmldoc examples doc++
 fonts:
        $(MAKE) -C $(depth)/mf 
 
-
+doc:
+       $(MAKE) -C Documentation
 
 htmldoc: 
        $(MAKE) out='www' local-WWW