CG: Add LILYPOND_BUILD_DIR environment variable, fix issues 2604 and 2524.

[lilypond.git] / Documentation / contributor / release-work.itexi

diff --git a/Documentation/contributor/release-work.itexi b/Documentation/contributor/release-work.itexi
index baa68a85e468768c8defbf0d24412aaba1570134..26a8223584e20ce0cd0121f7d04999131028b4a6 100644 (file)
--- a/Documentation/contributor/release-work.itexi
+++ b/Documentation/contributor/release-work.itexi
@@ -83,6 +83,8 @@ checkout displays modified files, you might want to run @code{git reset
 git fetch
 git checkout origin/release/unstable
 git merge origin
+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
 @end example
 
@@ -90,6 +92,7 @@ vi Documentation/web/news-front.itexi Documentation/web/news.itexi
 Commit, push, switch back to master (or wherever else):
 
 @example
+git commit -m "PO: update template." po/lilypond.pot
 git commit -m "Release: update news." Documentation/web/
 git push origin HEAD:release/unstable
 git checkout master
@@ -184,9 +187,10 @@ make lilypond-upload \
 
 @enumerate
 
-@item Switch back to master and get the updated news:
+@item Update the current staging branch with the current news:
 
 @example
+git fetch
 git checkout origin/staging
 git merge origin/release/unstable
 @end example
@@ -214,6 +218,16 @@ git commit -m "Release: bump version." VERSION
 git push origin HEAD:staging
 @end example
 
+If the push fails with a message like
+
+@example
+ ! [rejected]        HEAD -> staging (non-fast-forward)
+@end example
+
+@noindent
+it means that somebody else updated the staging branch while you were
+preparing your change.  In that case, you need to restart the Post
+Release process.  Otherwise, proceed:
 
 @item (for now) do a @code{make doc} and manually upload:
 
@@ -297,6 +311,14 @@ various websites, so be brief.
 @item
 Run convert-ly on all files, bump parser minimum version.
 
+@item
+Update lilypond.pot:
+
+@example
+make -C $LILYPOND_BUILD_DIR po-replace
+mv $LILYPOND_BUILD_DIR/po/lilypond.pot po/
+@end example
+
 @item
 Make directories on lilypond.org:
 
@@ -360,8 +382,8 @@ Disallow: /doc/v2.CURRENT-DEVELOPMENT/
 
 @itemize
 @item
-submit pots for translation: send url of tarball to
-translation@@iro.umontreal.ca, mentioning lilypond-VERSION.pot
+submit po template for translation: send url of tarball to
+coordinator@@translationproject.org, mentioning lilypond-VERSION.pot
 
 @item
 update links to distros providing lilypond packages?  link in: