From: Adam Spiers Date: Tue, 29 Jan 2013 22:53:48 +0000 (+0000) Subject: Merge branch 'tie-grace-fix' into staging X-Git-Tag: release/2.17.12-1~20 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4c027ac238950c80e80f2a18632ca1c3a795eb3a;hp=f0fec10de9806000860febabccb9d9e66a4abf9b;p=lilypond.git Merge branch 'tie-grace-fix' into staging --- diff --git a/Documentation/contributor/build-notes.itexi b/Documentation/contributor/build-notes.itexi index e00cfc7e7e..b8dff79c1f 100644 --- a/Documentation/contributor/build-notes.itexi +++ b/Documentation/contributor/build-notes.itexi @@ -15,7 +15,6 @@ chapter.} * Doc build:: * Website build:: * Building an Ubuntu distro:: -* Building GUB:: @end menu @@ -1511,68 +1510,3 @@ Test iso by installing in VM and repeating steps above for getting source files and building lp and docs. @end enumerate - -@node Building GUB -@section Building GUB - -GUB - the Grand Unified Builder - is used to build the release -versions of LilyPond. For background information, see -@ref{Grand Unified Builder (GUB)}. The simplest way to set up a -GUB build environment is to use a virtual machine with LilyDev -(@ref{LilyDev}). Follow the instructions on that page to set this -up. Make sure that your virtual machine has enough disk space - -a GUB installation takes over 30 GBytes of disk space, and if you -allocate too little, it will fail during the setting up stage and -you will have to start again. 64 GBytes should be sufficient. - -While GUB is being built, any interruptions are likely to make it -almost impossible to restart. If at all possible, leave the build -to continue uniterrupted. - -Download GUB and start the set up: - -@example -git clone git://github.com/gperciva/gub/gub.git -cd gub -make bootstrap -@end example - -This downloads and installs a number of packages. You may find -some fail during download and you will need to download them -manually. For example, the perl archive. If this happens, -download it from -@uref{http://www.cpan.org/src/5.0/perl-5.10.0.tar.gz}, saving the -archive to @file{gub/downloads/perl/}. Continue the set up with: - -@example -make bootstrap -@end example - -Once this has completed successfully, you can build the LilyPond -release package. However, this uses an archived version of the -regression tests, so it is better to download this first. -Download the test output from lilypond.org: - -@smallexample -@uref{http://lilypond.org/download/binaries/test-output/lilypond-2.15.33-1.test-output.tar.bz2} -@end smallexample - -Copy the tarball into @file{gub/regtests/}, and tell the build -system that you have done this: - -@example -touch regtests/ignore -@end example - -Now start the GUB build: - -@example -make lilypond -@end example - -That's it. This will build LilyPond from current master. To build -the current unstable release, run: - -@example -make LILYPOND_BRANCH=release/unstable lilypond -@end example diff --git a/Documentation/contributor/release-work.itexi b/Documentation/contributor/release-work.itexi index 26a8223584..9120e6529f 100644 --- a/Documentation/contributor/release-work.itexi +++ b/Documentation/contributor/release-work.itexi @@ -7,6 +7,7 @@ * Minor release checklist:: * Major release checklist:: * Release extra notes:: +* Notes on builds with GUB:: @end menu @@ -74,18 +75,28 @@ A @qq{minor release} means an update of @code{y} in @code{2.x.y}. @enumerate @item -Switch to the release branch, get changes, prep release -announcement. This requires a clean index and work tree. If the -checkout displays modified files, you might want to run @code{git reset ---hard} before continuing. +Using any system with git pull access (not necessarily the GUB +build machine), use the commands below to switch to the release +branch, get changes and prepare the release +announcement. This requires a system which has the release/unstable +branch. If you get a warning saying you are in @code{detached HEAD} +state, then you should create a release/unstable branch with +@code{git checkout release/unstable}. + +Check the environment variables are set as in +@ref{Environment variables}. + +You need to ensure you have a clean index and work tree. If the +checkout displays modified files, you might want to run +@code{git reset --hard} before continuing. @example git fetch -git checkout origin/release/unstable -git merge origin +git checkout release/unstable +git merge origin/master make -C $LILYPOND_BUILD_DIR po-replace mv $LILYPOND_BUILD_DIR/po/lilypond.pot po/ -vi Documentation/web/news-front.itexi Documentation/web/news.itexi +gedit Documentation/web/news-front.itexi Documentation/web/news.itexi @end example @item @@ -537,5 +548,159 @@ delete stuff you didn't want to upload from the server. @end enumerate +@node Notes on builds with GUB +@section Notes on builds with GUB + +@subsubheading Building GUB + +GUB - the Grand Unified Builder - is used to build the release +versions of LilyPond. For background information, see +@ref{Grand Unified Builder (GUB)}. The simplest way to set up a +GUB build environment is to use a virtual machine with LilyDev +(@ref{LilyDev}). Follow the instructions on that page to set this +up. Make sure that your virtual machine has enough disk space - +a GUB installation takes over 30 GBytes of disk space, and if you +allocate too little, it will fail during the setting up stage and +you will have to start again. 64 GBytes should be sufficient. + +While GUB is being built, any interruptions are likely to make it +almost impossible to restart. If at all possible, leave the build +to continue uninterrupted. + +Download GUB and start the set up: + +@example +git clone git://github.com/gperciva/gub/gub.git +cd gub +make bootstrap +@end example + +This will take a very long time, even on a very fast computer. +You will need to be patient. It's also liable to fail - it +downloads a number of tools, and some will have moved and others +won't respond to the network. For example, the perl archive. +If this happens, download it from +@uref{http://www.cpan.org/src/5.0/perl-5.10.0.tar.gz}, saving the +archive to @file{gub/downloads/perl/}. Continue the set up with: + +@example +make bootstrap +@end example + +Once this has completed successfully, you can build the LilyPond +release package. However, this uses an archived version of the +regression tests, so it is better to download this first. +Download the test output from lilypond.org (you will need to +replace @code{2.15.33-1} with the latest build): + +@smallexample +@uref{http://lilypond.org/download/binaries/test-output/lilypond-2.15.33-1.test-output.tar.bz2} +@end smallexample + +Copy the tarball into @file{gub/regtests/}, and tell the build +system that you have done this: + +@example +touch regtests/ignore +@end example + +Now start the GUB build: +@example +make lilypond +@end example + +That's it. This will build LilyPond from current master. To build +the current unstable release, run: + +@example +make LILYPOND_BRANCH=release/unstable lilypond +@end example + +The first time you do this, it will take a very long time. + +Assuming the build has gone well, it can be uploaded using: + +@example +make lilypond-upload + LILYPOND_BRANCH=release/unstable + LILYPOND_REPO_URL=git://git.sv.gnu.org/lilypond.git +@end example + +@subsubheading Output files + +GUB builds the files it needs into the directory +@code{gub/target/}. As a general rule, these don't need to be +touched unless there is a problem building GUB (see below). +The files to be uploaded are in @code{gub/uploads/}. Once the +build has completed successfully, there should be 8 +installation files and 3 archives, totalling about 600MB. +There are also 4 directories: + +@example +gub/signatures +gub/localdoc +gub/webdoc +gub/webtest +@end example + +@code{signatures} contains files that are used to track whether +some of the archives have already been built. Don't touch +these. + +@code{localdoc} probably contains local copies of the +documentation. + +@code{webdoc} contains the documentation to be uploaded. + +@code{webtest} contains the regtest comparison, which should +be checked before upload, and is also uploaded for subsequent +checking. + +The total upload is about 700 MB in total, and on an ADSL +connection will take about 4 hours to upload. + +@subsubheading Subsequent builds + +In principle, building the next release of LilyPond requires +no action other then following the instructions in +@ref{Minor release checklist}. Because much of the +infrastructure has already been built, it will take much less +time - about an hour on a fast computer. + +Continuing to build LilyPond without any other +archiving/deletion of previous builds is likely to be successful, +but will take up a fair amount of disk space (around 2GB per +build) which may be a problem with a Virtual Machine. It's +therefore recommended to move (not copy) @code{gub/uploads} to +another machine/disk after each build, if space is at a premium. + +However, if a significant change has been made to the LilyPond +source (e.g. added source files) the build may fail if tried on +top of a previous build. If this happens, be sure to +move/delete @code{gub/uploads} and all mentions of LilyPond +in @code{gub/target}. The latter can be achieved with this +command: + +@example +rm -rf target/*/*/*lilypond* +@end example +Be @emph{very} careful with this command. Typing it wrongly +could wipe your disk completely. + +@subsubheading Updating the web site + +The @code{make lilypond-upload} command updates the documentation +on the LilyPond web site. However, it does @emph{not} update +any part of the site that is not part of the documentation - for +example, the front page (@code{index.html}). The website is +updated by 2 cron jobs running on the web server. One of these +pulls git master to the web server, and the other makes the +website with the standard @code{make website} command. They run +hourly, 30 minutes apart. So - to update the front page of the +website, it's necessary to update @code{VERSION} and +@code{news-front.itexi} in master and then wait for the cron +jobs to run. (N.B. - this is done by pushing the changes to +staging and letting patchy do its checks before it pushes to +master). diff --git a/Documentation/web/introduction.itexi b/Documentation/web/introduction.itexi index afce3d3bb5..035b8840ae 100644 --- a/Documentation/web/introduction.itexi +++ b/Documentation/web/introduction.itexi @@ -1202,8 +1202,14 @@ using the extensions available at: @itemize @item -@uref{http://www.canorus.org,Canorus}, a score editor, can also export to -LilyPond, but is still beta-software. Testers are welcome, though. +@uref{http://www.jezra.net/projects/bwwtolily,bwwtolily} attempts to +convert a @code{.bww} or @code{.bmw} file to LilyPond. While not all of +the embellishments may get converted properly (this is especially true +with piobaireachd), the program will list them. + +@item +@uref{http://www.canorus.org,Canorus}, a score editor, can also export +to LilyPond, but is still beta-software. Testers are welcome, though. @item @uref{http://enc2ly.sourceforge.net/en/,Enc2ly} is a GNU/Linux program @@ -1211,42 +1217,41 @@ which converts an @uref{http://www.gvox.com/,Encore} music score into a LilyPond one. @item -@uref{https://github.com/hanwen/go-enc2ly,go-enc2ly} is a Go tool that converts -@uref{http://www.gvox.com/,Encore} files to LilyPond. It was created using -Felipe Castro's research and reverse engineering by tweaking existing .enc files -and loading them using the 4.55 demo version. +@uref{https://github.com/hanwen/go-enc2ly,go-enc2ly} is a Go tool that +converts @uref{http://www.gvox.com/,Encore} files to LilyPond. It was +created using Felipe Castro's research and reverse engineering by +tweaking existing .enc files and loading them using the 4.55 demo +version. @item -@uref{http://www.musescore.org,MuseScore}, a score editor, has incomplete -LilyPond export but is being actively developed. +@uref{http://www.musescore.org,MuseScore}, a score editor, has +incomplete LilyPond export but is being actively developed. @item -@uref{http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml,NtEd}, a -score editor based on the @uref{http://www.cairographics.org,Cairo} library, -has experimental support for exporting to LilyPond. +@uref{http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml,NtEd}, +a score editor based on the @uref{http://www.cairographics.org,Cairo} +library, it has experimental support for exporting to LilyPond. @item -@uref{http://www.holmessoft.co.uk/homepage/software/NWC2LY/index.htm,NW2LY} is -a C# program which converts a -@c @uref{http://www.noteworthysoftware.com/,NoteWorthy} -NoteWorthy composer song into LilyPond. +@uref{http://www.holmessoft.co.uk/homepage/software/NWC2LY/index.htm,NW2LY} +is a C# program which converts a NoteWorthy composer song into LilyPond. @item -@uref{https://github.com/ciconia/ripple/blob/master/README.markdown,Ripple} is -a program that helps create scores and parts, including a mode for mixing -different musical works together in a single score or part. +@uref{https://github.com/ciconia/ripple/blob/master/README.markdown,Ripple} +is a program that helps create scores and parts, including a mode for +mixing different musical works together in a single score or part. @item -@uref{http://www.rosegardenmusic.com,Rosegarden}, an audio and MIDI sequencer, -which also has a score editor for single-staff editing. +@uref{http://www.rosegardenmusic.com,Rosegarden}, an audio and MIDI +sequencer, which also has a score editor for single-staff editing. @item -@uref{https://launchpad.net/rumor/,Rumor}, a realtime monophonic MIDI to -LilyPond converter. +@uref{https://launchpad.net/rumor/,Rumor}, a realtime monophonic +MIDI-to-LilyPond converter. @item -@uref{http://www.tuxguitar.com.ar/,TuxGuitar}, a multitrack tablature editor -and player, includes a score viewer and can export to LilyPond. +@uref{http://www.tuxguitar.com.ar/,TuxGuitar}, a multitrack tablature +editor and player, includes a score viewer and can export to LilyPond. @end itemize @@ -1256,18 +1261,19 @@ and player, includes a score viewer and can export to LilyPond. @item @uref{http://www.projectabjad.org/,Abjad}, a -@uref{http://www.python.org/,Python} API for Formalized Score -Control designed to help composers build up complex pieces of -LilyPond notation in an iterative and incremental way. +@uref{http://www.python.org/,Python} API for Formalized Score Control +designed to help composers build up complex pieces of LilyPond notation +in an iterative and incremental way. @item -@uref{http://common-lisp.net/project/fomus/,FOMUS}, a LISP library -to generate music notation from computer music software -environments. +@uref{http://common-lisp.net/project/fomus/,FOMUS}, (FOrmat MUSic) is a +music notation tool for computer music composers. It is written in the +Lisp programming language, and has been tested in a variety of +interpreters. A C++ port is also available. @item -@uref{http://strasheela.sourceforge.net,Strasheela}, an -environment built on top of the +@uref{http://strasheela.sourceforge.net/strasheela/doc/index.html,Strasheela}, +an environment built on top of the @uref{http://www.mozart-oz.org/, Mozart/Oz} constraint programming language. @@ -1282,12 +1288,12 @@ language. @item @uref{http://lilykde.googlecode.com/,LilyKDE} has been replaced by -@uref{http://www.frescobaldi.org/,Frescobaldi}, and exists as -LilyKDE3 for KDE 3.5 and lilypond-KDE4 for KDE 4.1 only. +@uref{http://www.frescobaldi.org/,Frescobaldi}, and exists as LilyKDE3 +for KDE 3.5 and lilypond-KDE4 for KDE 4.1 only. @item @uref{http://noteedit.berlios.de,NoteEdit}, which imported -@uref{http://www.musicxml.com/xml.html,MusicXML}, has been forked +@uref{http://www.makemusic.com/musicxml,MusicXML}, has been forked into @uref{http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml,NtEd} and @uref{http://canorus.org,Canorus}. diff --git a/aclocal.m4 b/aclocal.m4 index 0dcd5bd870..4d5710ba9e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,5 +1,5 @@ dnl aclocal.m4 -*-shell-script-*- -dnl StepMake subroutines for configure.in +dnl StepMake subroutines for configure.ac ### mostly interal macros @@ -140,7 +140,7 @@ AC_DEFUN(STEPMAKE_CHECK_VERSION_UNSUPPORTED, [ fi ]) -### Macros to build configure.in +### Macros to build configure.ac AC_DEFUN(STEPMAKE_BIBTEX2HTML, [ diff --git a/autogen.sh b/autogen.sh index 9d21f79936..46dd22f98b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -7,7 +7,7 @@ case $1 in --noconf*) NOCONFIGURE=true;; esac -for i in $srcdir/configure.in #`find $srcdir -name configure.in -print` +for i in $srcdir/configure.ac #`find $srcdir -name configure.ac -print` do dir=`dirname $i` echo processing $dir diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000000..2ae2f6cbb9 --- /dev/null +++ b/configure.ac @@ -0,0 +1,282 @@ +dnl configure.ac -*-shell-script-*- +dnl Process this file with autoconf to produce a configure script. + +AC_PREREQ(2.60) + +# Bootstrap the init process. +AC_INIT + +# Bootstrap StepMake configure +AC_CONFIG_AUX_DIR([config]) + +STEPMAKE_INIT + +# List a file that identifies your package. +AC_CONFIG_SRCDIR([lily/main.cc]) + +# Move to aclocal.m4? +AC_CONFIG_HEADERS([$CONFIGFILE.hh:config.hh.in]) + +# Uncomment the configuration options your package needs. + +DOCUMENTATION=yes +AC_ARG_ENABLE(documentation, + [AS_HELP_STRING([--enable-documentation], + [build Documentation. Default: on])], + [DOCUMENTATION=$enableval]) +AC_SUBST(DOCUMENTATION) + +AC_ARG_WITH(ncsb-dir, + [AS_HELP_STRING([--with-ncsb-dir=DIR], + [location of Century Schoolbook fonts.])], + [NCSB_DIR=$withval], + [NCSB_DIR=""]) + +reloc_b=no +AC_ARG_ENABLE(relocation, + [AS_HELP_STRING([--enable-relocation], + [compile with dynamic relocation. Default: off])], + [reloc_b=$enableval]) + +rpath_b=no +AC_ARG_ENABLE(rpath, + [AS_HELP_STRING([--enable-rpath], + [hardcode runtime library path. Default: off])], + [rpath_b=$enableval]) + +LINK_GXX_STATICALLY=no +AC_ARG_ENABLE(static-gxx, + [AS_HELP_STRING([--enable-static-gxx], + [link libstdc++.a statically. Default: off])], + [LINK_GXX_STATICALLY=$enableval]) +AC_SUBST(LINK_GXX_STATICALLY) + +# must come before any header checks +STEPMAKE_COMPILE + +AC_CHECK_PROG(FCLIST, fc-list, fc-list) +AC_MSG_CHECKING([New Century Schoolbook PFB files]) +AC_SUBST(NCSB_SOURCE_FILES) +AC_SUBST(NCSB_DIR) +UNCHECKED_NCSB_SOURCE_FILES="" +if test "$NCSB_DIR" != "" ; then + for f in c059013l c059016l c059033l c059036l; do + if test ! -f "$NCSB_DIR/$f.pfb"; then + STEPMAKE_WARN($NCSB_DIR does not contain $f.pfb.) + else + UNCHECKED_NCSB_SOURCE_FILES="$NCSB_DIR/$f.pfb $UNCHECKED_NCSB_SOURCE_FILES" + fi + done +else + if test "$FCLIST" != ""; then + for style in Roman Italic "Bold Italic" Bold; do + NCSB_FILE=`$FCLIST "Century Schoolbook L:style=$style:foundry=urw:fontformat=Type 1" file \ + | head -n 1` + NCSB_FILE=`echo $NCSB_FILE | sed 's/\(:.*\)$//g'` + NCSB_FILE=`$PYTHON "$srcdir/scripts/auxiliar/readlink.py" $NCSB_FILE` + UNCHECKED_NCSB_SOURCE_FILES="$NCSB_FILE $UNCHECKED_NCSB_SOURCE_FILES" + done + NCSB_DIR=`AS_DIRNAME($NCSB_FILE)` + else + AC_MSG_RESULT(not found) + echo "Can't find Century Schoolbook files. Install FontConfig's fc-list," + echo "or use --with-ncsb-dir" + STEPMAKE_ADD_ENTRY(REQUIRED,International New Century Schoolbook fonts) + fi +fi +NCSB_SOURCE_FILES="" +for f in $UNCHECKED_NCSB_SOURCE_FILES; do + if test "`grep Cyrillic "$f"`" = ""; then + STEPMAKE_WARN($f does not have Cyrillic characters.) + STEPMAKE_ADD_ENTRY(REQUIRED,International New Century Schoolbook fonts) + else + NCSB_SOURCE_FILES="$f $NCSB_SOURCE_FILES" + fi +done +AC_MSG_RESULT($NCSB_SOURCE_FILES) + +AC_LANG([C++]) + +STEPMAKE_PYTHON(REQUIRED, 2.4) +# this checks if we have GNU C by compiling a program with +# __GNUC__, but that macro now unofficially means "the compiler +# supports the GNU C extensions" -- the intel C compiler and clang +# both support __GNUC__! +STEPMAKE_GCC_OR_CLANG(REQUIRED, 3.4) + +STEPMAKE_CXX(REQUIRED) +STEPMAKE_GXX_OR_CLANG(REQUIRED, 3.4) +STEPMAKE_GXXCODEGENBUG +STEPMAKE_CXXTEMPLATE +STEPMAKE_STL_DATA_METHOD +STEPMAKE_LIB(REQUIRED) +STEPMAKE_DLOPEN +# Do not use bison 1.50 and 1.75. +# 1.29 is required fr %locations, but I'm not sure it's enough --ns +STEPMAKE_BISON(OPTIONAL, 1.29) +STEPMAKE_FLEX(REQUIRED) +STEPMAKE_FLEXLEXER(REQUIRED) +STEPMAKE_FLEXLEXER_LOCATION +STEPMAKE_LOCALE +STEPMAKE_GETTEXT +STEPMAKE_MSGFMT(REQUIRED) +STEPMAKE_TEXMF(REQUIRED) +STEPMAKE_TEXMF_DIRS +STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.2) + +# check for 3 typedefs added in Guile 1.9 +save_CXXFLAGS="$CXXFLAGS" +CXXFLAGS="$GUILE_CFLAGS $CXXFLAGS" +AC_CHECK_TYPES([scm_t_hash_fold_fn, scm_t_hash_handle_fn], + [AC_DEFINE(HAVE_GUILE_HASH_FUNC)], [], + [#include ]) +AC_CHECK_TYPES([scm_t_subr], + [AC_DEFINE(HAVE_GUILE_SUBR_TYPE)], [], + [#include ]) +CXXFLAGS="$save_CXXFLAGS" + +## Check for usable cxxabi +save_LIBS="$LIBS" +LIBS="$LIBS $CXXABI_LIBS" +AC_MSG_CHECKING(for usable C++ demangler) +AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], + [abi::__cxa_demangle ("", 0, 0, 0)])], + [AC_DEFINE(HAVE_CXA_DEMANGLE) + AC_MSG_RESULT(yes)],[ + LIBS="$LIBS -lsupc++" + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], + [abi::__cxa_demangle ("", 0, 0, 0)])], + [AC_DEFINE(HAVE_CXA_DEMANGLE) + AC_MSG_RESULT([yes, using -lsupc++]) + CXXABI_LIBS="$CXXABI_LIBS -lsupc++"], + [AC_MSG_RESULT([no, use c++filt -t for manual demangling])])]) +LIBS="$save_LIBS" +AC_SUBST(CXXABI_LIBS) + +## check rational bugfix. +save_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$GUILE_CFLAGS $CPPFLAGS" +AC_MSG_CHECKING(GUILE rational bugfix) +AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include +#ifdef SCM_FRACTION_REDUCED_BIT +#error +#endif +]])],[AC_MSG_RESULT(ok)],[REQUIRED="$REQUIRED GUILE-with-rational-bugfix" +AC_MSG_RESULT(Must have patched GUILE rational support. See INSTALL.txt)]) +CPPFLAGS="$save_CPPFLAGS" + + +STEPMAKE_PYTHON_DEVEL(REQUIRED) + +STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20110222) + +STEPMAKE_PATH_PROG(T1ASM, t1asm, REQUIRED) + +AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h fpu_control.h]) +AC_CHECK_HEADERS([sstream]) +AC_HEADER_STAT +AC_FUNC_MEMCMP +AC_FUNC_VPRINTF +AC_CHECK_FUNCS([chroot fopencookie gettext isinf memmem snprintf vsnprintf]) + +STEPMAKE_PROGS(PKG_CONFIG, pkg-config, REQUIRED, 0.9.0) + +AC_MSG_CHECKING(whether to enable dynamic relocation) +if test "$reloc_b" = "yes"; then + AC_DEFINE(ARGV0_RELOCATION) +fi +AC_MSG_RESULT($reloc_b) + +AC_MSG_CHECKING(for rpath linkage) +if test "$rpath_b" = "yes"; then + LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,\\\$\$ORIGIN/../lib" +elif test "$rpath_b" != "no"; then + LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,$rpath_b" +fi +AC_MSG_RESULT($rpath_b) + +HOST_ARCH=`$CC -dumpmachine` +AC_SUBST(HOST_ARCH) + +STEPMAKE_PANGO_FT2(pangoft2, REQUIRED, 1.6.0) +STEPMAKE_FONTCONFIG(fontconfig, REQUIRED, 2.4.0) +STEPMAKE_FREETYPE2(freetype2, REQUIRED, 2.1.10) + +STEPMAKE_WINDOWS + +# guile executable for some scripts +STEPMAKE_GUILE(OPTIONAL) + +# perl for help2man. +STEPMAKE_PERL(OPTIONAL) + +## Optional tools for building documentation, website, extra fonts. +if test "$DOCUMENTATION" = "yes"; then + DOCUMENTATION_REQUIRED=REQUIRED +else + DOCUMENTATION_REQUIRED=OPTIONAL +fi + +STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, $DOCUMENTATION_REQUIRED, 8.60) + +STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11) +STEPMAKE_PROGS(TEXI2HTML, texi2html, $DOCUMENTATION_REQUIRED, 1.82) +STEPMAKE_PROGS(DBLATEX, dblatex, $DOCUMENTATION_REQUIRED, 0.1.4) +STEPMAKE_PROGS(BIBTEX, bibtex, $DOCUMENTATION_REQUIRED) +STEPMAKE_PROGS(PDFLATEX, pdflatex, $DOCUMENTATION_REQUIRED) +STEPMAKE_PROGS(PDFTEX, pdfetex pdftex etex, $DOCUMENTATION_REQUIRED) +STEPMAKE_PROGS(TEXI2PDF, texi2pdf, $DOCUMENTATION_REQUIRED) +STEPMAKE_PROGS(TEXINDEX, texindex, $DOCUMENTATION_REQUIRED) +AC_MSG_CHECKING(for epsf.tex) +TEX_EPSF=`kpsewhich tex epsf` +if test "$TEX_EPSF" = ""; then + AC_MSG_RESULT(not found) + STEPMAKE_ADD_ENTRY($DOCUMENTATION_REQUIRED,epsf.tex) +else + AC_MSG_RESULT($TEX_EPSF) +fi +AC_MSG_CHECKING(for Cyrillic characters support in TeX) +TEX_FIKPARM=`kpsewhich -format=mf fikparm` +if test "$TEX_FIKPARM" = ""; then + AC_MSG_RESULT(not found) + STEPMAKE_ADD_ENTRY($DOCUMENTATION_REQUIRED, +['lh CTAN package (texlive-lang-cyrillic or texlive-texmf-fonts)']) +else + AC_MSG_RESULT(yes) +fi +STEPMAKE_PROGS(NETPBM, pngtopnm, $DOCUMENTATION_REQUIRED) +STEPMAKE_PROGS(IMAGEMAGICK, convert, $DOCUMENTATION_REQUIRED) +# this name avoids a conflict with ZIP in stepmake/aclocal.m4 +STEPMAKE_PROGS(ZIPDOC, zip, $DOCUMENTATION_REQUIRED) +STEPMAKE_PROGS(RSYNC, rsync, $DOCUMENTATION_REQUIRED) + +AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}") + +# must also have local.make if configure fails. +touch local.make + +if test "$reloc_b$rpath_b" = "yesno"; then + STEPMAKE_WARN([Using --enable-relocation without --enable-rpath. LilyPond may have trouble finding libraries.]) +fi + +# Gather requirements and generate output. +STEPMAKE_END + +test -n "$CONFIGURATION" && mc=" conf=$CONFIGURATION" || mc="" + +if make top-doc 1>/dev/null 2>&1; then + rm -f INSTALL.txt && ln Documentation/topdocs/out/INSTALL.txt . + rm -f README.txt && ln Documentation/topdocs/out/README.txt . +fi + +cat <]) -AC_CHECK_TYPES([scm_t_subr], - [AC_DEFINE(HAVE_GUILE_SUBR_TYPE)], [], - [#include ]) -CXXFLAGS="$save_CXXFLAGS" - -## Check for usable cxxabi -save_LIBS="$LIBS" -LIBS="$LIBS $CXXABI_LIBS" -AC_MSG_CHECKING(for usable C++ demangler) -AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], - [abi::__cxa_demangle ("", 0, 0, 0)])], - [AC_DEFINE(HAVE_CXA_DEMANGLE) - AC_MSG_RESULT(yes)],[ - LIBS="$LIBS -lsupc++" - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], - [abi::__cxa_demangle ("", 0, 0, 0)])], - [AC_DEFINE(HAVE_CXA_DEMANGLE) - AC_MSG_RESULT([yes, using -lsupc++]) - CXXABI_LIBS="$CXXABI_LIBS -lsupc++"], - [AC_MSG_RESULT([no, use c++filt -t for manual demangling])])]) -LIBS="$save_LIBS" -AC_SUBST(CXXABI_LIBS) - -## check rational bugfix. -save_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$GUILE_CFLAGS $CPPFLAGS" -AC_MSG_CHECKING(GUILE rational bugfix) -AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include -#ifdef SCM_FRACTION_REDUCED_BIT -#error -#endif -]])],[AC_MSG_RESULT(ok)],[REQUIRED="$REQUIRED GUILE-with-rational-bugfix" -AC_MSG_RESULT(Must have patched GUILE rational support. See INSTALL.txt)]) -CPPFLAGS="$save_CPPFLAGS" - - -STEPMAKE_PYTHON_DEVEL(REQUIRED) - -STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20110222) - -STEPMAKE_PATH_PROG(T1ASM, t1asm, REQUIRED) - -AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h fpu_control.h]) -AC_CHECK_HEADERS([sstream]) -AC_HEADER_STAT -AC_FUNC_MEMCMP -AC_FUNC_VPRINTF -AC_CHECK_FUNCS([chroot fopencookie gettext isinf memmem snprintf vsnprintf]) - -STEPMAKE_PROGS(PKG_CONFIG, pkg-config, REQUIRED, 0.9.0) - -AC_MSG_CHECKING(whether to enable dynamic relocation) -if test "$reloc_b" = "yes"; then - AC_DEFINE(ARGV0_RELOCATION) -fi -AC_MSG_RESULT($reloc_b) - -AC_MSG_CHECKING(for rpath linkage) -if test "$rpath_b" = "yes"; then - LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,\\\$\$ORIGIN/../lib" -elif test "$rpath_b" != "no"; then - LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,$rpath_b" -fi -AC_MSG_RESULT($rpath_b) - -HOST_ARCH=`$CC -dumpmachine` -AC_SUBST(HOST_ARCH) - -STEPMAKE_PANGO_FT2(pangoft2, REQUIRED, 1.6.0) -STEPMAKE_FONTCONFIG(fontconfig, REQUIRED, 2.4.0) -STEPMAKE_FREETYPE2(freetype2, REQUIRED, 2.1.10) - -STEPMAKE_WINDOWS - -# guile executable for some scripts -STEPMAKE_GUILE(OPTIONAL) - -# perl for help2man. -STEPMAKE_PERL(OPTIONAL) - -## Optional tools for building documentation, website, extra fonts. -if test "$DOCUMENTATION" = "yes"; then - DOCUMENTATION_REQUIRED=REQUIRED -else - DOCUMENTATION_REQUIRED=OPTIONAL -fi - -STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, $DOCUMENTATION_REQUIRED, 8.60) - -STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11) -STEPMAKE_PROGS(TEXI2HTML, texi2html, $DOCUMENTATION_REQUIRED, 1.82) -STEPMAKE_PROGS(DBLATEX, dblatex, $DOCUMENTATION_REQUIRED, 0.1.4) -STEPMAKE_PROGS(BIBTEX, bibtex, $DOCUMENTATION_REQUIRED) -STEPMAKE_PROGS(PDFLATEX, pdflatex, $DOCUMENTATION_REQUIRED) -STEPMAKE_PROGS(PDFTEX, pdfetex pdftex etex, $DOCUMENTATION_REQUIRED) -STEPMAKE_PROGS(TEXI2PDF, texi2pdf, $DOCUMENTATION_REQUIRED) -STEPMAKE_PROGS(TEXINDEX, texindex, $DOCUMENTATION_REQUIRED) -AC_MSG_CHECKING(for epsf.tex) -TEX_EPSF=`kpsewhich tex epsf` -if test "$TEX_EPSF" = ""; then - AC_MSG_RESULT(not found) - STEPMAKE_ADD_ENTRY($DOCUMENTATION_REQUIRED,epsf.tex) -else - AC_MSG_RESULT($TEX_EPSF) -fi -AC_MSG_CHECKING(for Cyrillic characters support in TeX) -TEX_FIKPARM=`kpsewhich -format=mf fikparm` -if test "$TEX_FIKPARM" = ""; then - AC_MSG_RESULT(not found) - STEPMAKE_ADD_ENTRY($DOCUMENTATION_REQUIRED, -['lh CTAN package (texlive-lang-cyrillic or texlive-texmf-fonts)']) -else - AC_MSG_RESULT(yes) -fi -STEPMAKE_PROGS(NETPBM, pngtopnm, $DOCUMENTATION_REQUIRED) -STEPMAKE_PROGS(IMAGEMAGICK, convert, $DOCUMENTATION_REQUIRED) -# this name avoids a conflict with ZIP in stepmake/aclocal.m4 -STEPMAKE_PROGS(ZIPDOC, zip, $DOCUMENTATION_REQUIRED) -STEPMAKE_PROGS(RSYNC, rsync, $DOCUMENTATION_REQUIRED) - -AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}") - -# must also have local.make if configure fails. -touch local.make - -if test "$reloc_b$rpath_b" = "yesno"; then - STEPMAKE_WARN([Using --enable-relocation without --enable-rpath. LilyPond may have trouble finding libraries.]) -fi - -# Gather requirements and generate output. -STEPMAKE_END - -test -n "$CONFIGURATION" && mc=" conf=$CONFIGURATION" || mc="" - -if make top-doc 1>/dev/null 2>&1; then - rm -f INSTALL.txt && ln Documentation/topdocs/out/INSTALL.txt . - rm -f README.txt && ln Documentation/topdocs/out/README.txt . -fi - -cat <\\include { @@ -374,8 +374,8 @@ BOM_UTF8 \357\273\277 } \"[^""]* { // backup rule - error (_ ("end quote missing")); - exit (1); + LexerError (_ ("end quote missing").c_str ()); + yy_pop_state (); } /* Flex picks the longest matching pattern including trailing diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 47db681b6a..cc4a9c76e9 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -1333,12 +1333,14 @@ (outside-staff-padding . 0.5) (outside-staff-priority . 750) (self-alignment-X . ,CENTER) + (side-axis . ,Y) (staff-padding . 0.5) (stencil . ,measure-counter-stencil) (meta . ((class . Spanner) (interfaces . (font-interface measure-counter-interface self-alignment-interface + side-position-interface text-interface)))))) (MeasureGrouping diff --git a/smart-autogen.sh b/smart-autogen.sh index 09d8d95a44..6f4525dac1 100755 --- a/smart-autogen.sh +++ b/smart-autogen.sh @@ -3,7 +3,7 @@ srcdir=${srcdir:-.} set -ux -AUTOGEN_INPUT_CHECKSUM=`cat $srcdir/configure.in $srcdir/aclocal.m4 | md5sum | cut -b 1-32` +AUTOGEN_INPUT_CHECKSUM=`cat $srcdir/configure.ac $srcdir/aclocal.m4 | md5sum | cut -b 1-32` CHECKSUM_FILE=autogen.checksum @@ -14,4 +14,3 @@ fi set -e ${srcdir}/autogen.sh "$@" printf "%s" $AUTOGEN_INPUT_CHECKSUM > $CHECKSUM_FILE - diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make index f216898fe8..1b998b938d 100644 --- a/stepmake/stepmake/generic-targets.make +++ b/stepmake/stepmake/generic-targets.make @@ -95,7 +95,7 @@ $(outdir)/version.hh: $(depth)/VERSION $(config_make) $(top-src-dir)/scripts/bui $(outdir)/config.hh: $(config_h) cp -p $< $@ -configure: configure.in aclocal.m4 +configure: configure.ac aclocal.m4 NOCONFIGURE=yes $(src-depth)/autogen.sh chmod +x configure