From 58a49e2c9dd187063f479389376705391d817ad3 Mon Sep 17 00:00:00 2001 From: Marc Hohl Date: Sun, 26 Aug 2012 11:04:54 +0200 Subject: [PATCH] Issue 1236: CG+scripts should use $LILYPOND_GIT --- .../contributor/programming-work.itexi | 2 +- Documentation/contributor/quick-start.itexi | 20 +++++++++---------- Documentation/contributor/regressions.itexi | 2 +- Documentation/contributor/source-code.itexi | 10 +++++----- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Documentation/contributor/programming-work.itexi b/Documentation/contributor/programming-work.itexi index d72424ab4c..de22c42ec5 100644 --- a/Documentation/contributor/programming-work.itexi +++ b/Documentation/contributor/programming-work.itexi @@ -979,7 +979,7 @@ for all errors and defines functions for displaying scheme objects (ps), grobs (pgrob), and parsed music expressions (pmusic). @example -file ~/lilypond-git/build/out/bin/lilypond +file $LILYPOND_GIT/build/out/bin/lilypond b programming_error b Grob::programming_error diff --git a/Documentation/contributor/quick-start.itexi b/Documentation/contributor/quick-start.itexi index 2172677054..4788379f4c 100644 --- a/Documentation/contributor/quick-start.itexi +++ b/Documentation/contributor/quick-start.itexi @@ -282,7 +282,7 @@ the software directly. See @ref{Manually installing lily-git.tcl}. @item Finally, lily-git is always part of the LilyPond source code and is -located in @file{~/lilypond-git/scripts/auxillar/lily-git.tcl}. +located in @file{$LILYPOND_GIT/scripts/auxillar/lily-git.tcl}. @end itemize @@ -311,7 +311,7 @@ lily-git with this information. @item Click on the @qq{Get source} button. -A directory called @file{lilypond-git/} is now created within +A directory called @file{$LILYPOND_GIT} is now created within your home directory and the complete source code will start to be downloaded into it. @@ -328,7 +328,7 @@ minutes -- it could be an intermittant network problem. If the problem persists, please ask for help.} @item -Close the lily-git GUI and navigate to the @file{lilypond-git/} +Close the lily-git GUI and navigate to the @file{$LILYPOND_GIT} directory to view and edit the source files. @end enumerate @@ -444,7 +444,7 @@ the command-line; see @ref{Uploading a patch for review}. hopelessly confused!} The button labeled @qq{Abort changes -- Reset to origin} will copy -all changed files to a subdirectory of @file{lilypond-git/} named +all changed files to a subdirectory of @file{$LILYPOND_GIT} named @file{aborted_edits/}, and will reset the repository to the current state of the remote repository (at @code{git.sv.gnu.org}). @@ -465,7 +465,7 @@ text. This should take less than a minute. @c we heavily recommend the out-of-tree build; do not change this! @example -cd ~/lilypond-git/ +cd $LILYPOND_GIT sh autogen.sh --noconfigure mkdir -p build/ cd build/ @@ -481,14 +481,14 @@ building; this can have a non-negligible effect on compilation speed. @example -cd ~/lilypond-git/build/ +cd $LILYPOND_GIT/build/ make @end example You may run the compiled @code{lilypond} with: @example -cd ~/lilypond-git/build/ +cd $LILYPOND_GIT/build/ out/bin/lilypond my-file.ly @end example @@ -498,7 +498,7 @@ Compiling the documentation is a much more involved process, and will likely take 2 to 10 hours. @example -cd ~/lilypond-git/build/ +cd $LILYPOND_GIT/build/ make make doc @end example @@ -508,14 +508,14 @@ view the html files by entering the below text; we recommend that you bookmark the resulting page: @example -firefox ~/lilypond-git/build/out-www/offline-root/index.html +firefox $LILYPOND_GIT/build/out-www/offline-root/index.html @end example @subsubheading Installing Don't. There is no reason to install lilypond within LilyDev. All development work can (and should) stay within the -@file{$HOME/lilypond-git/} directory, and any personal composition +@file{$LILYPOND_GIT} directory, and any personal composition or typesetting work should be done with an official GUB release. diff --git a/Documentation/contributor/regressions.itexi b/Documentation/contributor/regressions.itexi index 7bca714f2c..c155a8b923 100644 --- a/Documentation/contributor/regressions.itexi +++ b/Documentation/contributor/regressions.itexi @@ -209,7 +209,7 @@ Run @code{make} with current git master without any of your changes. @item Before making changes to the code, establish a baseline for the comparison by -going to the @file{lilypond-git/build/} directory and running: +going to the @file{$LILYPOND_GIT/build/} directory and running: @example make test-baseline diff --git a/Documentation/contributor/source-code.itexi b/Documentation/contributor/source-code.itexi index d3f4f3a11b..72b05175d8 100644 --- a/Documentation/contributor/source-code.itexi +++ b/Documentation/contributor/source-code.itexi @@ -93,7 +93,7 @@ files. @end enumerate @warning{Throughout the rest of this manual, most command-line -input should be entered from @file{~/lilypond-git/}. This is +input should be entered from @file{$LILYPOND_GIT}. This is referred to as the @emph{top source directory}.} Further instructions are in @ref{How to use lily-git}. @@ -160,7 +160,7 @@ The above command will put the it in @file{~/lilypond-git}, where @subsubheading Technical details -This creates (within the @file{~/lilypond-git/} directory) a +This creates (within the @file{$LILYPOND_GIT} directory) a subdirectory called @file{.git/}, which Git uses to keep track of changes to the repository, among other things. Normally you don't need to access it, but it's good to know it's there. @@ -171,7 +171,7 @@ need to access it, but it's good to know it's there. @warning{Throughout the rest of this manual, all command-line input should be entered from the top directory of the Git -repository being discussed (eg. @file{~/lilypond-git/}). This is +repository being discussed (eg. @file{$LILYPOND_GIT}). This is referred to as the @emph{top source directory}.} Before working with the copy of the main LilyPond repository, you @@ -732,7 +732,7 @@ Already on 'master' @end example By now the source files should be accessible---you should be able -to edit any files in the @file{lilypond-git/} directory using a +to edit any files in the @file{$LILYPOND_GIT} directory using a text editor of your choice. But don't start just yet! Before editing any source files, learn how to keep your changes organized and prevent problems later---read @ref{Basic Git procedures}. @@ -1295,7 +1295,7 @@ cl} with the following commands. If you do not understand any question, just answer with a newline (CR). @example -cd $HOME/lilypond-git/ +cd $LILYPOND_GIT git cl config @end example -- 2.39.2