From 096805037084e16546f994cbbb918e6a21f24ff4 Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Tue, 20 Sep 2005 20:18:58 +0000 Subject: Preparing 1.2.1 --- INSTALL | 6 +-- NEWS | 4 +- TODO | 4 +- configure.in | 8 ++-- doc/gendocs.sh | 107 ++++++++++++++++++++++++++++----------------------- doc/gendocs_template | 11 +++--- 6 files changed, 75 insertions(+), 65 deletions(-) diff --git a/INSTALL b/INSTALL index 18a80de..4a960d7 100644 --- a/INSTALL +++ b/INSTALL @@ -23,7 +23,7 @@ directory of your choice using the command: tar xfvz mdk-X.Y.tar.gz where X.Y stands for the downloaded version (the current stable release -being version 1.2). +being version 1.2.1). Requirements ============ @@ -78,7 +78,7 @@ and, if they are present, will generate the appropiate makefiles for building the `gmixvm' graphical user interface. Upon completion, you should see a message with the configuration results like the following: - *** GNU MDK 1.2 has been successfully configured. *** + *** GNU MDK 1.2.1 has been successfully configured. *** Type 'make' to build the following utilities: - mixasm (MIX assembler) @@ -336,4 +336,4 @@ you can use the `configure' options `--x-includes=DIR' and ---- -$Id: INSTALL,v 1.6 2004/08/02 11:26:40 jao Exp $ \ No newline at end of file +$Id: INSTALL,v 1.7 2005/09/20 20:18:58 jao Exp $ diff --git a/NEWS b/NEWS index 9c27bcf..5aee4ec 100644 --- a/NEWS +++ b/NEWS @@ -6,7 +6,7 @@ See the end for copying conditions. Please send mdk bug reports to bug-mdk@gnu.org. --------------------------------------------------------------------------- -* Version 1.2.1 (/09/05) +* Version 1.2.1 (20/09/05) ** MIXAL compliance improvements (Sergey Poznyakoff): @@ -447,4 +447,4 @@ Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. --- -$Id: NEWS,v 1.54 2005/09/20 19:14:16 jao Exp $ +$Id: NEWS,v 1.55 2005/09/20 20:18:58 jao Exp $ diff --git a/TODO b/TODO index d4918b4..84b7dcc 100644 --- a/TODO +++ b/TODO @@ -1,6 +1,6 @@ -*- mode: outline -*- -* Version 1.2.1 +* Version 1.2.2 ** gmixvm: list of last loaded programs ** gmixvm: history in terminal input dialog ** Add entries to concept index @@ -16,4 +16,4 @@ ** gtkhtml for help system -* $Id: TODO,v 1.11 2004/08/05 21:32:46 jao Exp $ +* $Id: TODO,v 1.12 2005/09/20 20:18:58 jao Exp $ diff --git a/configure.in b/configure.in index 93d334d..4e38888 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ -# Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. # -# $Id: configure.in,v 1.37 2004/08/06 12:14:41 jao Exp $ +# $Id: configure.in,v 1.38 2005/09/20 20:18:58 jao Exp $ # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without @@ -10,8 +10,8 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -AC_INIT([GNU MDK],1.2,[bug-mdk@gnu.org],mdk) -AM_INIT_AUTOMAKE(mdk,1.2) +AC_INIT([GNU MDK],1.2.1,[bug-mdk@gnu.org],mdk) +AM_INIT_AUTOMAKE(mdk,1.2.1) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE diff --git a/doc/gendocs.sh b/doc/gendocs.sh index 285e3af..7b8a3ca 100755 --- a/doc/gendocs.sh +++ b/doc/gendocs.sh @@ -1,9 +1,9 @@ #!/bin/sh # gendocs.sh -- generate a GNU manual in many formats. This script is # mentioned in maintain.texi. See the help message below for usage details. -# $Id: gendocs.sh,v 1.3 2005/09/20 19:43:14 jao Exp $ +# $Id: gendocs.sh,v 1.4 2005/09/20 20:18:58 jao Exp $ # -# Copyright (C) 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -39,12 +39,12 @@ templateurl="http://savannah.gnu.org/cgi-bin/viewcvs/texinfo/texinfo/util/gendoc : ${GENDOCS_TEMPLATE_DIR="."} unset CDPATH -rcs_revision='$Revision: 1.3 $' +rcs_revision='$Revision: 1.4 $' rcs_version=`set - $rcs_revision; echo $2` program=`echo $0 | sed -e 's!.*/!!'` version="gendocs.sh $rcs_version -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 2005 Free Software Foundation, Inc. There is NO warranty. You may redistribute this software under the terms of the GNU General Public License. For more information about these matters, see the files named COPYING." @@ -146,16 +146,18 @@ fi echo Generating output formats for $srcfile -echo Generating info files... -${MAKEINFO} -o $PACKAGE.info $srcfile +cmd="${MAKEINFO} -o $PACKAGE.info $srcfile" +echo "Generating info files... ($cmd)" +eval $cmd mkdir -p $outdir/ tar czf $outdir/$PACKAGE.info.tar.gz $PACKAGE.info* info_tgz_size="`calcsize $outdir/$PACKAGE.info.tar.gz`" # do not mv the info files, there's no point in having them available # separately on the web. -echo Generating dvi ... -${TEXI2DVI} $srcfile +cmd="${TEXI2DVI} $srcfile" +echo "Generating dvi ... ($cmd)" +eval $cmd # now, before we compress dvi: echo Generating postscript... @@ -169,28 +171,32 @@ gzip -f -9 $PACKAGE.dvi dvi_gz_size="`calcsize $PACKAGE.dvi.gz`" mv $PACKAGE.dvi.gz $outdir/ -echo Generating pdf ... -${TEXI2DVI} --pdf $srcfile +cmd="${TEXI2DVI} --pdf $srcfile" +echo "Generating pdf ... ($cmd)" +eval $cmd pdf_size="`calcsize $PACKAGE.pdf`" mv $PACKAGE.pdf $outdir/ -echo Generating ASCII... -${MAKEINFO} -o $PACKAGE.txt --no-split --no-headers $srcfile +cmd="${MAKEINFO} -o $PACKAGE.txt --no-split --no-headers $srcfile" +echo "Generating ASCII... ($cmd)" +eval $cmd ascii_size="`calcsize $PACKAGE.txt`" gzip -f -9 -c $PACKAGE.txt >$outdir/$PACKAGE.txt.gz ascii_gz_size="`calcsize $outdir/$PACKAGE.txt.gz`" mv $PACKAGE.txt $outdir/ -echo Generating monolithic html... +cmd="${MAKEINFO} --no-split --html -o $PACKAGE.html $html $srcfile" +echo "Generating monolithic html... ($cmd)" rm -rf $PACKAGE.html # in case a directory is left over -${MAKEINFO} --no-split --html -o $PACKAGE.html $html $srcfile +eval $cmd html_mono_size="`calcsize $PACKAGE.html`" gzip -f -9 -c $PACKAGE.html >$outdir/$PACKAGE.html.gz html_mono_gz_size="`calcsize $outdir/$PACKAGE.html.gz`" mv $PACKAGE.html $outdir/ -echo Generating html by node... -${MAKEINFO} --html -o $PACKAGE.html $html $srcfile +cmd="${MAKEINFO} --html -o $PACKAGE.html $html $srcfile" +echo "Generating html by node... ($cmd)" +eval $cmd split_html_dir=$PACKAGE.html ( cd ${split_html_dir} || exit 1 @@ -203,21 +209,23 @@ mv ${split_html_dir}/*.html $outdir/html_node/ rmdir ${split_html_dir} echo Making .tar.gz for sources... -srcfiles=`ls *.texinfo *.texi *.txi 2>/dev/null` -tar czfh $outdir/$PACKAGE.texi.tar.gz $srcfiles +srcfiles=`ls *.texinfo *.texi *.txi *.eps 2>/dev/null` +tar cvzfh $outdir/$PACKAGE.texi.tar.gz $srcfiles texi_tgz_size="`calcsize $outdir/$PACKAGE.texi.tar.gz`" if test -n "$docbook"; then - echo Generating docbook XML... - ${MAKEINFO} -o - --docbook $srcfile > ${srcdir}/$PACKAGE-db.xml + cmd="${MAKEINFO} -o - --docbook $srcfile > ${srcdir}/$PACKAGE-db.xml" + echo "Generating docbook XML... $(cmd)" + eval $cmd docbook_xml_size="`calcsize $PACKAGE-db.xml`" gzip -f -9 -c $PACKAGE-db.xml >$outdir/$PACKAGE-db.xml.gz docbook_xml_gz_size="`calcsize $outdir/$PACKAGE-db.xml.gz`" mv $PACKAGE-db.xml $outdir/ - echo Generating docbook HTML... + cmd="${DOCBOOK2HTML} -o $split_html_db_dir ${outdir}/$PACKAGE-db.xml" + echo "Generating docbook HTML... ($cmd)" + eval $cmd split_html_db_dir=html_node_db - ${DOCBOOK2HTML} -o $split_html_db_dir ${outdir}/$PACKAGE-db.xml ( cd ${split_html_db_dir} || exit 1 tar -czf ../$outdir/${PACKAGE}.html_node_db.tar.gz -- *.html @@ -228,19 +236,22 @@ if test -n "$docbook"; then mv ${split_html_db_dir}/*.html $outdir/html_node_db/ rmdir ${split_html_db_dir} - echo Generating docbook ASCII... - ${DOCBOOK2TXT} ${outdir}/$PACKAGE-db.xml + cmd="${DOCBOOK2TXT} ${outdir}/$PACKAGE-db.xml" + echo "Generating docbook ASCII... ($cmd)" + eval $cmd docbook_ascii_size="`calcsize $PACKAGE-db.txt`" mv $PACKAGE-db.txt $outdir/ - echo Generating docbook PS... - ${DOCBOOK2PS} ${outdir}/$PACKAGE-db.xml + cmd="${DOCBOOK2PS} ${outdir}/$PACKAGE-db.xml" + echo "Generating docbook PS... $(cmd)" + eval $cmd gzip -f -9 -c $PACKAGE-db.ps >$outdir/$PACKAGE-db.ps.gz docbook_ps_gz_size="`calcsize $outdir/$PACKAGE-db.ps.gz`" mv $PACKAGE-db.ps $outdir/ - echo Generating docbook PDF... - ${DOCBOOK2PDF} ${outdir}/$PACKAGE-db.xml + cmd="${DOCBOOK2PDF} ${outdir}/$PACKAGE-db.xml" + echo "Generating docbook PDF... ($cmd)" + eval $cmd docbook_pdf_size="`calcsize $PACKAGE-db.pdf`" mv $PACKAGE-db.pdf $outdir/ fi @@ -248,27 +259,27 @@ fi echo Writing index file... curdate="`date '+%B %d, %Y'`" sed \ - -e "s/%%TITLE%%/$MANUAL_TITLE/g" \ - -e "s/%%DATE%%/$curdate/g" \ - -e "s/%%PACKAGE%%/$PACKAGE/g" \ - -e "s/%%HTML_MONO_SIZE%%/$html_mono_size/g" \ - -e "s/%%HTML_MONO_GZ_SIZE%%/$html_mono_gz_size/g" \ - -e "s/%%HTML_NODE_TGZ_SIZE%%/$html_node_tgz_size/g" \ - -e "s/%%INFO_TGZ_SIZE%%/$info_tgz_size/g" \ - -e "s/%%DVI_GZ_SIZE%%/$dvi_gz_size/g" \ - -e "s/%%PDF_SIZE%%/$pdf_size/g" \ - -e "s/%%PS_GZ_SIZE%%/$ps_gz_size/g" \ - -e "s/%%ASCII_SIZE%%/$ascii_size/g" \ - -e "s/%%ASCII_GZ_SIZE%%/$ascii_gz_size/g" \ - -e "s/%%TEXI_TGZ_SIZE%%/$texi_tgz_size/g" \ - -e "s/%%DOCBOOK_HTML_NODE_TGZ_SIZE%%/$html_node_db_tgz_size/g" \ - -e "s/%%DOCBOOK_ASCII_SIZE%%/$docbook_ascii_size/g" \ - -e "s/%%DOCBOOK_PS_GZ_SIZE%%/$docbook_ps_gz_size/g" \ - -e "s/%%DOCBOOK_PDF_SIZE%%/$docbook_pdf_size/g" \ - -e "s/%%DOCBOOK_XML_SIZE%%/$docbook_xml_size/g" \ - -e "s/%%DOCBOOK_XML_GZ_SIZE%%/$docbook_xml_gz_size/g" \ + -e "s!%%TITLE%%!$MANUAL_TITLE!g" \ + -e "s!%%DATE%%!$curdate!g" \ + -e "s!%%PACKAGE%%!$PACKAGE!g" \ + -e "s!%%HTML_MONO_SIZE%%!$html_mono_size!g" \ + -e "s!%%HTML_MONO_GZ_SIZE%%!$html_mono_gz_size!g" \ + -e "s!%%HTML_NODE_TGZ_SIZE%%!$html_node_tgz_size!g" \ + -e "s!%%INFO_TGZ_SIZE%%!$info_tgz_size!g" \ + -e "s!%%DVI_GZ_SIZE%%!$dvi_gz_size!g" \ + -e "s!%%PDF_SIZE%%!$pdf_size!g" \ + -e "s!%%PS_GZ_SIZE%%!$ps_gz_size!g" \ + -e "s!%%ASCII_SIZE%%!$ascii_size!g" \ + -e "s!%%ASCII_GZ_SIZE%%!$ascii_gz_size!g" \ + -e "s!%%TEXI_TGZ_SIZE%%!$texi_tgz_size!g" \ + -e "s!%%DOCBOOK_HTML_NODE_TGZ_SIZE%%!$html_node_db_tgz_size!g" \ + -e "s!%%DOCBOOK_ASCII_SIZE%%!$docbook_ascii_size!g" \ + -e "s!%%DOCBOOK_PS_GZ_SIZE%%!$docbook_ps_gz_size!g" \ + -e "s!%%DOCBOOK_PDF_SIZE%%!$docbook_pdf_size!g" \ + -e "s!%%DOCBOOK_XML_SIZE%%!$docbook_xml_size!g" \ + -e "s!%%DOCBOOK_XML_GZ_SIZE%%!$docbook_xml_gz_size!g" \ -e "s,%%SCRIPTURL%%,$scripturl,g" \ - -e "s/%%SCRIPTNAME%%/$prog/g" \ + -e "s!%%SCRIPTNAME%%!$prog!g" \ $GENDOCS_TEMPLATE_DIR/gendocs_template >$outdir/index.html echo "Done! See $outdir/ subdirectory for new files." diff --git a/doc/gendocs_template b/doc/gendocs_template index 0d0cbc1..3fd6fd2 100644 --- a/doc/gendocs_template +++ b/doc/gendocs_template @@ -1,7 +1,7 @@ - + @@ -33,7 +33,7 @@

-

This manual (for %%PACKAGE%%) is available in the following formats:

+

This manual (%%PACKAGE%%) is available in the following formats:

-

(This page generated by the %%SCRIPTNAME%% script.) -

+

(This page generated by the %%SCRIPTNAME%% +script.)

@@ -92,7 +91,7 @@ permitted in any medium, provided this notice is preserved.

Updated: -$Date: 2005/09/20 19:43:14 $ $Author: jao $ +$Date: 2005/09/20 20:18:58 $ $Author: jao $

-- cgit v1.2.3