[6384] changes to README-hacking

[Gavin D. Smith]

Revision: 6384
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6384
Author:   gavin
Date:     2015-07-03 20:00:34 +0000 (Fri, 03 Jul 2015)
Log Message:
-----------
changes to README-hacking

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/README-hacking

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-07-03 19:13:34 UTC (rev 6383)
+++ trunk/ChangeLog     2015-07-03 20:00:34 UTC (rev 6384)
@@ -1,5 +1,12 @@
 2015-07-03  Gavin Smith  <address@hidden>
 
+       * README-hacking: Mention gnupload --user and --replace.  Move 
+       dtd version check earlier, and explanations of how to make diffs 
+       and upload dtd file earlier.  Explanation of how to upload 
+       texi2dvi.  Move explanations of release announcements together.
+
+2015-07-03  Gavin Smith  <address@hidden>
+
        * util/texi2dvi (local): Remove.  All usages removed.  Rename
        variables in some functions to reduce chances of a conflict.
        Failure to run on a Solaris 10 shell reported by Brian Ripley.

Modified: trunk/README-hacking
===================================================================
--- trunk/README-hacking        2015-07-03 19:13:34 UTC (rev 6383)
+++ trunk/README-hacking        2015-07-03 20:00:34 UTC (rev 6384)
@@ -126,10 +126,30 @@
 version number in texi2dvi, texi2pdf, txirefcard.tex.
 version and date in NEWS.
 (cd tp && ./maintain/change_perl_modules_version.sh auto)
+  -- this updates all the version numbers in the Perl modules
 sync texi2html/test/ results with tp/.
 ensure building standalone modules for CPAN still works.
 make V=1 pdf and fix underfull/overfull boxes.
 
+#  ... dtd version check:
+TEXINFO_DTD_VERSION should already have been updated to $ver in
+configure.ac if it was needed, but check again.  See comments in
+configure.ac, and run (at the top level) make dtd-check.
+
+#  ... set up dtd directory on web pages:
+cd $HOME/gnu/www/texinfo/dtd # or wherever webpages checkout is
+mkdir $ver && cvs add $ver
+cp $tutil/texinfo.dtd $ver
+cvs add -kb $ver $ver/texinfo.dtd
+cvs commit -m$ver $ver
+
+# If -kb is forgotten, CVS will do its own $Id expansion.
+# Recover by editing and committing a new version of texinfo.dtd in svn,
+# copying it again to the cvs dir, then:
+#   cvs admin -kb texinfo.dtd; cvs update -A
+# (See the "How to store binary files" node in the CVS manual.)
+
+
 - Changes to sources:
 update version in configure.ac, notice in ChangeLog.
 gnulib-tool --add-import  # for pretest
@@ -142,8 +162,19 @@
 make long-checks          # distcheck does not do this
 (export MALLOC_CHECK_=2; make distcheck)  # repeat until clean
 svn commit                # when clean, then distcheck to be sure
-#create diff for official, see below 
 
+#  ... make diffs at official release:
+prev=5.2
+ver=6.0
+cd $misc/archive/$pkg/prod
+tar xf $txi/texinfo-$ver.tar.gz
+tar xf texinfo-$prev.tar.gz
+diff -Nrc2 texinfo-$prev texinfo-$ver | xz >texinfo-$prev-$ver.diff.xz
+ls -l !$
+gnupload --to ftp.gnu.org:texinfo !$
+rm -rf texinfo-$ver texinfo-$prev
+ro texinfo-*$ver*
+
 - To do the actual upload:
 pkg=texinfo
 ver=6.0
@@ -151,16 +182,14 @@
 then do one of:
 gnupload --to alpha.gnu.org:$pkg $pkg-$ver.tar.xz                #pretest
 gnupload --to ftp.gnu.org:$pkg   $pkg-$ver.tar.{gz,xz} *.diff.xz #official
-  (also gnupload texi2dvi at each official release.
-   The standalone texinfo.tex should already be up to date, but check.)
+   Use --user option if not using default key
+   texinfo.tex and texi2dvi should already be up to date, but check.  Use
+gnupload --replace --to ftp.gnu.org:texinfo texi2dvi
 
 and the corresponding, to save in local archives:
 mv -v $pkg-$ver.tar.xz* $misc/archive/$pkg/alpha/                #pretest
 mv -v $pkg-$ver.tar.{gz,xz}* *.diff.xz $misc/archive/$pkg/prod/  #official
 
-For pretest release, send announcement to bug-texinfo and
-bcc address@hidden
-
 - When official release is out there ...
 update home page (texinfo.html) and commit as needed.
 including:
@@ -173,31 +202,14 @@
 followed by cvs rm -f.  Likewise, check for added files with
 cvs -qn update, followed by cvs add.  When done, run cvs commit.
 
-#  ... dtd version check:
-TEXINFO_DTD_VERSION should already have been updated to $ver in
-configure.ac if it was needed, but check again.  See comments in
-configure.ac, and run (at the top level) make dtd-check.
-
-#  ... set up dtd directory on web pages:
-cd $HOME/gnu/www/texinfo/dtd # or wherever webpages checkout is
-mkdir $ver && cvs add $ver
-cp $tutil/texinfo.dtd $ver
-cvs add -kb $ver $ver/texinfo.dtd
-cvs commit -m$ver $ver
-
-# If -kb is forgotten, CVS will do its own $Id expansion.
-# Recover by editing and committing a new version of texinfo.dtd in svn,
-# copying it again to the cvs dir, then:
-#   cvs admin -kb texinfo.dtd; cvs update -A
-# (See the "How to store binary files" node in the CVS manual.)
-
-#  ... tag source tree (use your own username before @):
+#  Official releases only: tag source tree (use your own username before @):
 svn copy -r 6363 -m'texinfo_6_0 tag based on r6363' \
   svn+ssh://address@hidden/texinfo/trunk \
   svn+ssh://address@hidden/texinfo/tags/texinfo_6_0
 [for karl: /srv/svn/texinfo]  
 
-#  ... update texinfo at tug.org (contact address@hidden):
+#  Official releases only: ... update texinfo at tug.org
+#  (contact address@hidden):
 prev=5.2
 ver=6.0
 cd ~ftp/tex
@@ -208,23 +220,14 @@
 !!:gs/gz/xz
 relink texinfo $ver
 
-#  ... announcements:
+#  For pretest release, send announcement to bug-texinfo and
+bcc address@hidden
+
+#  For official releases:
 send announcement to info-gnu,
   cc bug-texinfo and bcc address@hidden
 news item at savannah.
 
-#  ... make diffs at official release:
-prev=5.2
-ver=6.0
-cd $misc/archive/$pkg/prod
-tar xf $txi/texinfo-$ver.tar.gz
-tar xf texinfo-$prev.tar.gz
-diff -Nrc2 texinfo-$prev texinfo-$ver | xz >texinfo-$prev-$ver.diff.xz
-ls -l !$
-gnupload --to ftp.gnu.org:texinfo !$
-rm -rf texinfo-$ver texinfo-$prev
-ro texinfo-*$ver*
-
 #  ... post-release, or when development resumes:
 configure.ac, util/texi2dvi: add "dev" to versions for clarity,
 until it's time to do pretests again.