From 70e05e80042e1e0b40202c65384883b446f03654 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 25 Jul 2021 03:00:49 +0000 Subject: CTAN sync 202107250300 --- info/latex2e-help-texinfo/Makefile | 59 ++++++++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 15 deletions(-) (limited to 'info/latex2e-help-texinfo/Makefile') diff --git a/info/latex2e-help-texinfo/Makefile b/info/latex2e-help-texinfo/Makefile index e50c84652e..390dc1040d 100644 --- a/info/latex2e-help-texinfo/Makefile +++ b/info/latex2e-help-texinfo/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 706 2018-10-13 15:35:22Z jimhefferon $ +# $Id: Makefile 935 2021-07-23 17:48:15Z jimhefferon $ # Public domain. Originally written 2006, Karl Berry. # Makefile for latexrefman. @@ -19,8 +19,8 @@ all_suffixes = dvi pdf $(mi_suffixes) # how to build. # -texi2dvi = texi2dvi --batch --tidy --build-dir=$*.t2dvi -texi2pdf = texi2pdf --batch --tidy --build-dir=$*.t2pdf +texi2dvi = texfot texi2dvi --batch --tidy --build-dir=$*.t2dvi +texi2pdf = texfot texi2pdf --batch --tidy --build-dir=$*.t2pdf # makeinfo = makeinfo texi2docbook = $(makeinfo) --docbook @@ -32,7 +32,7 @@ texi2xml = $(makeinfo) --xml htmlopts = --html --css-include=latex2e.css $(t2html_top) $(t2html_home) -c WORDS_IN_PAGE=10000 # # Go somewhere useful from Top: -t2html_top = -c TOP_NODE_UP_URL=http://tug.org/texinfohtml/ +t2html_top = -c TOP_NODE_UP_URL=https://tug.org/texinfohtml/ # # Put a link in the footer: t2html_home = -c PRE_BODY_CLOSE="
\ @@ -85,7 +85,8 @@ realclean maintainer-clean: distclean rm -f $(addprefix latex2e*., pdf dvi $(mi_suffixes) $(xref_suffixes)) -# dist for CTAN. Update NEWS before uploading! +# Basic dist target for CTAN, but please see ./README +# for all the necessary steps. # txt_files = ChangeLog Makefile NEWS README \ aspell.en.pws latex2e.css ltx-help.el @@ -109,25 +110,51 @@ $(addprefix $(distname)/, $(txt_files) \ $(addprefix $(distname)/spanish/, $(es_mi_output) latex2e-es.pdf) \ $(addprefix $(distname)/latex2e-figures/, $(figure_files)) \ $(addprefix $(distname)/graphics/, README $(figure_source_files)) - rm -rf $(distname) + rm -f $(htmlsplitzip) + cd $(htmlsplit) && zip -qr ../$(htmlsplitzip) latex2e + zip -q $(distzip) $(distname) @ls -l $(distzip); unzip -l $(distzip) -# Get many small .html files +easyurls: htmlsplit dist + cd src \ + && rm -rf testdist && mkdir -p testdist \ + && cp ../latex2e-help-texinfo-tree.zip testdist \ + && rm -rf latex2e && unzip -q testdist/latex2e-help-texinfo-tree \ + && ./easyurls.py --directory latex2e --action softlink --lower_case --rewrite_index --debug \ + && zip -rq ../latex2e-help-texinfo-tree-easyurls.zip latex2e + +# To update web site, after basic build is ok (check-dw, spelling, etc.), +# first undo temporary build results: +# make svr # revert generated single files +# make svrsplit # revert generated split html +# then update ChangeLog, etc., +# then svn commit the modified source files, +# then: +# make +# make htmlsplit +# make dist +# make commitready +# svn commit # to commit regenerated files +# then: +# svn update # to restore easy url stubs +# + +# Get many small .html files. htmlsplit: en rm -rf $(htmlsplit) mkdir $(htmlsplit) && cd $(htmlsplit) && ln -s ../* . - rm -f $(htmlsplitzip) cd $(htmlsplit) && $(makeinfo) $(htmlopts) latex2e.texi - cd $(htmlsplit) && zip -q ../$(htmlsplitzip) -r latex2e - src/easyurls.py --directory $(htmlsplit)/latex2e --action softlink --lower_case --rewrite_index -# rm -rf $(htmlsplit) -# @ls -l $(htmlsplitzip); unzip -l $(htmlsplitzip) + cd $(htmlsplit)/latex2e && ln -s ../../latex2e-figures . -# Right before a commit, delete html files that are gone and and add new ones +# Right before a commit, delete html files that are gone and add new ones. htmlsplitstatus = cd $(htmlsplit)/latex2e && svn status *.html commitready: htmlsplit $(htmlsplitstatus) | sed -n 's/^\!//p' | xargs -r svn rm $(htmlsplitstatus) | sed -n 's/^\?//p' | xargs -r svn add +# we linked everything above, remove the unused upper-level links. + cd $(htmlsplit) && svn status | sed -n 's/^\?//p' | xargs rm -f + rm -rf latex2e.t2dvi # fix requires rebuilding svn repo, it seems + svn status # A hacky spell check target. # Remove \commandnames to reduce exception list, but not {args} or @@ -142,8 +169,8 @@ spell spell-en: # The first sed expression elides a few @-command lines which cause # duplicates; the second expr some text in the middle of lines. check-dw: - sed -e 's/^@\(item\|anchor\|.index\) .*//' \ - -e 's/ da da\|{test test}\|[iI][jJ]//g' \ + sed -e 's/^@\(node\|item\|anchor\|.index\|.*section\) .*//' \ + -e 's/ da da\|xxx\|overwrite\|{test test}\|[iI][jJ]//g' \ latex2e.texi | dw # Convenience targets to svn revert the generated files, @@ -151,5 +178,7 @@ check-dw: svr: svn revert $(addprefix latex2e*., $(all_suffixes)) svn status +svrsplit: + svn revert --depth infinity $(htmlsplit) svd: svn diff $(txt_files) *.texi -- cgit v1.2.3