patch::: 1.3.42.jcn1

1.3.42.jcn1
===========

* Windows distribution: faked symlink for cmtfm.  Setup.zip should now be
standalone; ie, no need for Cygnus' usertools anymore.

* break-align-engraver.cc (acknowledge_element): Added missing axes
property to edge element.

diff --git a/CHANGES b/CHANGES
index 32c873871198950ccd50115aa17b7aff8edd8207..d0def5bedf322c1e7f9e264178ecefe1659a322e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+1.3.42.jcn1
+===========
+
+* Windows distribution: faked symlink for cmtfm.  Setup.zip should now be
+standalone; ie, no need for Cygnus' usertools anymore.
+
+* break-align-engraver.cc (acknowledge_element): Added missing axes
+property to edge element.
 
 1.3.41.jcn3
 ===========

diff --git a/VERSION b/VERSION
index 11e6788b01bf45d7b5ada6baa796e5814327c9a9..8422b559e5961f273c9ed40cca24c2f6d4c15333 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=42
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # 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 73a1a40990cdcacf1a7c26996bbace2978c5ec30..1c21c94fe59b0972d19ed21d8ea33894585f2cda 100644 (file)
--- a/buildscripts/make-cygwin-cross.sh
+++ b/buildscripts/make-cygwin-cross.sh
@@ -163,7 +163,8 @@ build ()
                a=$tp
        fi
 
-       rpm_package=`find_path $name*.rpm "$topdir/RPMS/$cto:$topdir/RPMS/$tp"`
+       ##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"
@@ -550,7 +551,7 @@ cat > $distdir/setup.sh <<EOF
 set -x
 ROOT=/Cygnus
 PREFIX=\$ROOT/usr
-gunzip rpm.gz || exit 1
+# gunzip rpm.gz || exit 1
 #dll=\$ROOT/net-485
 #mkdir -p \$dll
 #gzip -dc cygwin.dll.gz > \$dll/cygwin1.dll
@@ -560,8 +561,8 @@ gunzip rpm.gz || exit 1
 #gunzip cygwin1.dll.gz
 #cp -f cygwin1.dll \$old_dll
 echo > rpmrc
-mkdir -p \$ROOT/var/lib
-mkdir -p \$ROOT/bin
+# 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
@@ -575,11 +576,25 @@ 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;
-bash -c 'mkdir -p /bin;
-       cp -f bash /bin/bash.exe;
-       cp -f /bin/bash /bin/sh.exe;
-       dll=\`which cygwin1.dll\`;
+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\`;
        echo cygwin1.dll \$wdll > newdll; echo \$wdll \$wdll.orig\$\$ > olddll'
 if not errorlevel 0 goto nobash
@@ -622,7 +637,7 @@ EOF
 
 cd $distdir
 rm -f $CYGWIN_DLL.gz
-cp -f $PREFIX/bin/$CYGWIN_DLL
+cp -f $PREFIX/bin/$CYGWIN_DLL .
 rm -f rpm.gz
 cp -f `/bin/ls -d1 $ROOT/bin/rpm* |head -1` rpm
 
@@ -630,7 +645,7 @@ rm -f bash.gz
 cp -f `/bin/ls -d1 $ROOT/bin/bash* |head -1` bash
 
 rm -f cygpath.gz
-cp -f `/bin/ls -d1 $ROOT/bin/cygpath* |head -1` cygpath
+cp -f `/bin/ls -d1 $PREFIX/bin/cygpath* |head -1` cygpath
 
 distbase=`basename $distdir`
 rm -f RPMS
@@ -638,7 +653,7 @@ ln -s ../redhat/RPMS .
 
 www=`dirname $distdir`
 cd $www
-for i in bash-2 guile-1 rpm-3 lilypond; do
+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
@@ -654,7 +669,7 @@ 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; do
+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"
@@ -677,6 +692,3 @@ gzip -f rpm
 gzip -f bash
 gzip -f cygpath
 
-
-
-

diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index 24900b3f8132b9e9c37e9b7a2b29500f3923aee6..56d708ba511cf47a0d3c4c9b8c5c75904c773454 100644 (file)
--- a/lily/break-align-engraver.cc
+++ b/lily/break-align-engraver.cc
@@ -104,6 +104,7 @@ Break_align_engraver::acknowledge_element (Score_element_info inf)
          SCM edge_sym =   ly_symbol2scm ("Left_edge_item");
          edge->set_elt_property ("break-align-symbol", edge_sym);
 
+         Axis_group_interface (edge).set_axes (X_AXIS,X_AXIS);
          /*
            If the element is empty, it will be ignored in the break
            alignment stuff.

diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in
index 1c4f427152172dfbaba2134b497198b3094ad0e9..bea597ab762bcb550723b5d7b889e1bae01758b0 100644 (file)
--- a/make/lilypond.spec.in
+++ b/make/lilypond.spec.in
@@ -67,6 +67,10 @@ mkdir -p out/examples/
 tar -cf - input/  | tar -C out/examples/ -xf- || true
 
 %ifos cygwin
+# urg, this symlink doesn't come through on cygwin
+# this is the way symlinks work over there, let's fake one
+rm -f $RPM_BUILD_ROOT%{_prefix}/share/lilypond/cmtfm
+echo '!<symlink>c:\\texmf\\fonts\\tfm\\public\\cm' > $RPM_BUILD_ROOT%{_prefix}/share/lilypond/cmtfm
 %{fix_suffixes}
 %endif