patch::: 1.3.40.jcn2

1.3.40.jcn2
===========

* buildscripts/make-cygwin-cross.sh: Made some small .zip package fixes.

* make/lilypond.spec.in: Made some bugfixes for _prefix.

diff --git a/CHANGES b/CHANGES
index cd79c758a522e237b3821a20267fb488d9854647..d51c494c416f7e3637a332734a066469f9aa1b39 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+1.3.40.jcn2
+===========
+
+* buildscripts/make-cygwin-cross.sh: Made some small .zip package fixes.
+
+* make/lilypond.spec.in: Made some bugfixes for _prefix.
+
 1.3.40.jcn1
 ===========
 

diff --git a/VERSION b/VERSION
index de3f1f468ccaa582c9511872ae03dde1fabd0bb3..876ccdab4ee9f1af9935dc953d4b25145b79b576 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=40
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=jcn2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/buildscripts/make-cygwin-cross.sh b/buildscripts/make-cygwin-cross.sh
index f4c8f46b70a47eca2405e4e64226e351fd1d0350..e6277959e02d6d9a73ae25534a28de24036da62b 100644 (file)
--- a/buildscripts/make-cygwin-cross.sh
+++ b/buildscripts/make-cygwin-cross.sh
@@ -42,8 +42,8 @@ NATIVE_PREFIX=$NATIVE_ROOT/usr
 
 # urg
 DEVEL=/home/fred
-WWW=$DEVEL/WWW/lilypond/gnu-windows
-#WWW=/tmp
+distdir=$DEVEL/WWW/lilypond/gnu-windows/lily-w32
+#distdir=/tmp
 
 SOURCE_PATH=$DEVEL/usr/src/releases:$DEVEL/usr/src/redhat/SRPMS
 
@@ -86,7 +86,6 @@ rpm-3.0.4
 lilypond-$lilypond_version
 "
 
-
 #######################
 # end of config section
 #######################
@@ -274,7 +273,9 @@ cat > $base_macros <<EOF
 %_srcrpmdir    %{native_prefix}/src/redhat/SRPMS
 %_rpmdir       %{native_prefix}/src/redhat/RPMS
 
-%DocDir                %{native_prefix}/doc
+#%DocDir               %{native_prefix}/doc
+%DocDir                /Cygnus/usr/doc
+%_defaultdocdir /Cygnus/usr/doc
 
 %cygwin_dll    %{native_prefix}/bin/cygwin1.dll
 
@@ -406,13 +407,15 @@ done
 
 cd $NATIVE_PREFIX/src/redhat/BUILD
 
-rm -f $WWW/$CYGWIN_DLL.gz
-cd $WWW && cp -f $PREFIX/bin/$CYGWIN_DLL . && gzip -f $CYGWIN_DLL
+rm -f $distdir/$CYGWIN_DLL.gz
+cd $distdir && cp -f $PREFIX/bin/$CYGWIN_DLL . && gzip -f $CYGWIN_DLL
+
+rm -f $distdir/rpm2cpio.gz
+cd $distdir && cp -f $PREFIX/bin/rpm2cpio . && gzip -f rpm2cpio
 
-rm -f $WWW/rpm2cpio.gz
-cd $WWW && cp -f $PREFIX/bin/rpm2cpio . && gzip -f rpm2cpio
 
-cat > $WWW/setup.sh <<EOF
+cat > $distdir/setup.sh <<EOF
+#!/bin/bash
 set -x
 ROOT=/Cygnus
 PREFIX=\$ROOT/usr
@@ -426,14 +429,14 @@ here=\`pwd\`
 cd \$ROOT/.. && (PATH=\$dll \$here/rpm2cpio \$here/rpm*.rpm ) | cpio -ivmd 
 PATH=\$dll rpm --root=\$ROOT --initdb
 cd \$here
-for i in redhat/RPMS/$ta/*.rpm; do
+for i in RPMS/$ta/*.rpm; do
        PATH=\$dll rpm -ivv --ignoreos --ignorearch --nodeps --force\
                  --dbpath \$ROOT/var/lib/rpm \
                  \$i
 done
 EOF
 
-cat > $WWW/setup.bat <<EOF
+cat > $distdir/setup.bat <<EOF
 bash setup.sh
 if errorlevel 0 goto exit
 @echo "setup.bat: can't find bash"
@@ -442,7 +445,8 @@ if errorlevel 0 goto exit
 :exit
 EOF
 
-cat > $WWW/lilypond.sh <<EOF
+cat > $distdir/lilypond.sh <<EOF
+#!/bin/bash
 ROOT=/Cygnus
 PREFIX=\$ROOT/usr
 # currently, the cygwin1.dll's conflict.
@@ -451,7 +455,8 @@ dll=\$ROOT/net-485
 PATH=\$dll \$ROOT/bin/lilypond \$*
 EOF
 
-cat > $WWW/midi2ly.sh <<EOF
+cat > $distdir/midi2ly.sh <<EOF
+#!/bin/bash
 ROOT=/Cygnus
 PREFIX=\$ROOT/usr
 # currently, the cygwin1.dll's conflict.
@@ -460,17 +465,25 @@ dll=\$ROOT/net-485
 PATH=\$dll \$ROOT/bin/midi2ly \$*
 EOF
 
-cat > $WWW/lilypond.bat <<EOF
+cat > $distdir/lilypond.bat <<EOF
 bash lilypond.sh %1 %2 %3 %4 %5 %6 %7 %8 %9
 EOF
 
-cat > $WWW/midi2ly.bat <<EOF
+cat > $distdir/midi2ly.bat <<EOF
 bash midi2ly.sh %1 %2 %3 %4 %5 %6 %7 %8 %9
 EOF
 
+distbase=`basename $distdir`
+cd $distdir
+rm -f RPMS
+ln -s ../redhat/RPMS .
+
+www=`dirname $distdir`
+cd $www
 for i in guile-1 rpm lilypond; do
-       rpm=`find_path $i*.rpm redhat/RPMS/$ta`
+       rpm=`find_path $i*.rpm $distbase/RPMS/$ta`
        dist_rpms="$dist_rpms $rpm"
 done
-rm -f $WWW/setup.zip
-cd $WWW && zip -r setup.zip *.gz $dist_rpms *.bat *.sh
+
+rm -f $www/setup.zip
+cd $www && zip setup.zip lily-w32 $distbase/* $dist_rpms

diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in
index d6d9077ec24f60ae52cf192c51d3b384fcc87bee..f7bee128c43e70dc6bea87edfae41edfd42cc4f2 100644 (file)
--- a/make/lilypond.spec.in
+++ b/make/lilypond.spec.in
@@ -50,9 +50,9 @@ strip lily/out/lilypond midi2ly/out/midi2ly
 make prefix="$RPM_BUILD_ROOT%{_prefix}" install
 # gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/* || true
 
-mkdir -p $RPM_BUILD_ROOT/etc/profile.d
-cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT/etc/profile.d/lilypond.sh
-cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT/etc/profile.d/lilypond.csh
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d
+cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.sh
+cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.csh
 
 # urg
 #%install documentation