docs-common/bin fdp-functions,1.1,1.2 insert-changelog,1.3,1.4
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28296/docs-common/bin
Modified Files:
fdp-functions insert-changelog
Log Message:
Use xmlformat-fdp.conf options properly in functions
Index: fdp-functions
===================================================================
RCS file: /cvs/docs/docs-common/bin/fdp-functions,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fdp-functions 15 Jan 2006 22:32:26 -0000 1.1
+++ fdp-functions 15 Jan 2006 23:26:25 -0000 1.2
@@ -9,7 +9,9 @@
FDPPKGDIR="${FDPDIR}/docs-common/packaging"
RPMINFO=${RPMINFO:-"rpm-info.xml"}
XSLTPROC=${XSLTPROC:-xsltproc}
-XMLFORMAT=${XMLFORMAT:-"${FDPBINDIR}/xmlformat" -f "${FDPBINDIR}/xmlformat-fdp.conf"}
+XMLFORMAT=${XMLFORMAT:-"${FDPBINDIR}/xmlformat"}
+XMLFOPTS=${XMLFOPTS:-"-f ${FDPBINDIR}/xmlformat-fdp.conf"}
+
get_all_workers()
{
Index: insert-changelog
===================================================================
RCS file: /cvs/docs/docs-common/bin/insert-changelog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- insert-changelog 15 Jan 2006 22:57:40 -0000 1.3
+++ insert-changelog 15 Jan 2006 23:26:25 -0000 1.4
@@ -5,7 +5,6 @@
. "$(dirname $0)/fdp-functions"
-RPMINFO="rpm-info.xml"
OUTPUT="${1:-${PWD}/$RPMINFO.clog$$}"
echo -n "Change to [r]pm package or [d]ocument source? [r/D] "
@@ -62,5 +61,5 @@
--stringparam date "$REVDATE" \
--stringparam detail "$DETAILS" \
../docs-common/packaging/insert-changelog.xsl "$RPMINFO" | \
- ${XMLFORMAT} > ${OUTPUT}
+ ${XMLFORMAT} ${XMLFOPTS} > ${OUTPUT}
echo "New $RPMINFO written to $OUTPUT"
18 years, 4 months
docs-common Makefile.common,1.29,1.30
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28252/docs-common
Modified Files:
Makefile.common
Log Message:
Add function to insert colophon entry
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Makefile.common 15 Jan 2006 22:47:52 -0000 1.29
+++ Makefile.common 15 Jan 2006 23:25:37 -0000 1.30
@@ -220,5 +220,14 @@
#
#########################################################################
+# Make a new colophon entry for an existing rpm-info.xml file.
+
+colophon:: $(RPMINFO)
+ @XMLFORMAT="$(XMLFORMAT)" XSLTPROC="$(XSLTPROC)" \
+ ${FDPBIN}/insert-colophon $(RPMINFO).worker
+ mv -b $(RPMINFO).worker $(RPMINFO)
+
+#
+#########################################################################
# End of Makefile.common
#########################################################################
18 years, 4 months
docs-common/bin insert-colophon,NONE,1.1
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28252/docs-common/bin
Added Files:
insert-colophon
Log Message:
Add function to insert colophon entry
--- NEW FILE insert-colophon ---
#!/bin/sh
#
# insert-colophon - Add a new worker to rpm-info.xml
#
. "$(dirname "$0")/fdp-functions"
OUTPUT="${1:-${PWD}/rpm-info.xml.worker$$}"
echo "Current worker list includes the following:"
get_all_workers
while test -z "$FIRSTNAME"; do
echo -n "Enter contributor's first name: "
read FIRSTNAME
done
echo -n "Enter contributor's middle initial/name (leave blank for NONE): "
read OTHERNAME
while test -z "$SURNAME"; do
echo -n "Enter contributor's surname: "
read SURNAME
done
while test -z "$INITIALS"; do
echo -n "Enter contributor's initials (or other identifier): "
read INITIALS
done
while test -z "$EMAIL"; do
echo -n "Enter contributor's Fedora Project email: "
read EMAIL
done
echo "You may change these values by hand if necessary in $RPMINFO"
${XSLTPROC} --stringparam firstname "$FIRSTNAME" \
--stringparam othername "$OTHERNAME" \
--stringparam surname "$SURNAME" \
--stringparam initials "$INITIALS" \
--stringparam email "$EMAIL" \
"${FDPPKGDIR}/insert-colophon.xsl" "$RPMINFO" | \
${XMLFORMAT} ${XMLFOPTS} > ${OUTPUT}
echo "New $RPMINFO written to $OUTPUT"
18 years, 4 months
docs-common/bin xmlformat-fdp.conf,1.10,1.11
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28212/docs-common/bin
Modified Files:
xmlformat-fdp.conf
Log Message:
Trivial change, should not affect OMF adversely
Index: xmlformat-fdp.conf
===================================================================
RCS file: /cvs/docs/docs-common/bin/xmlformat-fdp.conf,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xmlformat-fdp.conf 2 Jan 2006 22:31:21 -0000 1.10
+++ xmlformat-fdp.conf 15 Jan 2006 23:20:35 -0000 1.11
@@ -104,14 +104,14 @@
format = inline
# Cover OMF files
-creator description format identifier language maintainer omf relation rights subject type version
+creator description format identifier language maintainer omf relation subject type
format = block
normalize = yes
entry-break = 1
exit-break = 1
# Cover rpm-info files
-details
+details rights version
format = block
entry-break = 0
exit-break = 0
18 years, 4 months
docs-common/bin insert-changelog,1.2,1.3
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26432/docs-common/bin
Modified Files:
insert-changelog
Log Message:
Better handling of brand-new rpm-info.xml files
Index: insert-changelog
===================================================================
RCS file: /cvs/docs/docs-common/bin/insert-changelog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- insert-changelog 15 Jan 2006 22:32:57 -0000 1.2
+++ insert-changelog 15 Jan 2006 22:57:40 -0000 1.3
@@ -22,16 +22,24 @@
if test $ROLE = "rpm"; then
REVDATE=`date +"%a %b %d %Y"`
+ ZEROREV=0
+ REVDESC="an integer release number"
elif test $ROLE = "doc"; then
REVDATE=`date +"%Y-%M-%d"`
+ ZEROREV=0.0 # unlikely, but you never know
+ REVDESC="a decimal version number"
else
echo "This should never happen; aborting"
exit 1
fi
LASTREV=$(get_latest_revision "$ROLE")
+if [ -z "$LASTREV" ]; then # this is the first revision for this role
+ LASTREV=$ZEROREV
+fi
+
while test -z "$NUMBER"; do
- echo -n "Enter revision number greater than $LASTREV: "
+ echo -n "Enter $REVDESC greater than $LASTREV: "
read NUMBER
# Yes, it's perfectly safe to assume Python is present
if test `python -c "from distutils import version; a=version.LooseVersion('$LASTREV') ; b=version.LooseVersion('$NUMBER'); print b>a"` = "False"; then
18 years, 4 months
docs-common Makefile.common,1.28,1.29
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26351/docs-common
Modified Files:
Makefile.common
Log Message:
And make the clog target easier to read
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Makefile.common 15 Jan 2006 22:46:50 -0000 1.28
+++ Makefile.common 15 Jan 2006 22:47:52 -0000 1.29
@@ -214,7 +214,7 @@
# Make a new changelog entry for an existing rpm-info.xml file.
clog:: $(RPMINFO)
- XMLFORMAT="$(XMLFORMAT)" XSLTPROC="$(XSLTPROC)" \
+ @XMLFORMAT="$(XMLFORMAT)" XSLTPROC="$(XSLTPROC)" \
${FDPBIN}/insert-changelog $(RPMINFO).clog
mv -b $(RPMINFO).clog $(RPMINFO)
18 years, 4 months
docs-common Makefile.common,1.27,1.28
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26327/docs-common
Modified Files:
Makefile.common
Log Message:
Make it possible to use alternate rpm-info.xml file if needed
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Makefile.common 12 Jan 2006 18:18:18 -0000 1.27
+++ Makefile.common 15 Jan 2006 22:46:50 -0000 1.28
@@ -52,6 +52,9 @@
ifeq (${HTMLCSSEXTRA},)
HTMLCSSEXTRA = ${FDPDIR}/docs-common/images/watermark-${LANG}.png
endif
+ifeq (${RPMINFO},)
+RPMINFO = ${PWD}/rpm-info.xml
+endif
#########################################################################
# Define a macro to locate xmlto(1) so we can choose a specific version
# by "make XMLTO=/path/to/xmlto", if we so desire.
@@ -193,13 +196,13 @@
# "rpm-info.xml" file.
#
define fdp-info_template
-fdp-info-$(1).xml:: rpm-info.xml
+fdp-info-$(1).xml:: $(RPMINFO)
${XSLTPROC} --stringparam lang $(1) \
--stringparam doctype $(shell \
${FDPDIR}/docs-common/packaging/doctype \
$(DOCBASE)-$(1).xml \
) ${FDPDIR}/docs-common/packaging/bookinfo.xsl \
- rpm-info.xml | \
+ $(RPMINFO) | \
$(XMLFORMAT) $(XMLFOPTS) > fdp-info-$(1).xml
endef
#
@@ -208,5 +211,14 @@
fdp-info:: $(foreach LANG,${LANGUAGES},fdp-info-$(LANG).xml)
#
#########################################################################
+# Make a new changelog entry for an existing rpm-info.xml file.
+
+clog:: $(RPMINFO)
+ XMLFORMAT="$(XMLFORMAT)" XSLTPROC="$(XSLTPROC)" \
+ ${FDPBIN}/insert-changelog $(RPMINFO).clog
+ mv -b $(RPMINFO).clog $(RPMINFO)
+
+#
+#########################################################################
# End of Makefile.common
#########################################################################
18 years, 4 months
docs-common/packaging insert-changelog.xsl,1.1,1.2
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26228/docs-common/packaging
Modified Files:
insert-changelog.xsl
Log Message:
Use new abstracted functions
Index: insert-changelog.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/insert-changelog.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- insert-changelog.xsl 15 Jan 2006 17:05:14 -0000 1.1
+++ insert-changelog.xsl 15 Jan 2006 22:33:03 -0000 1.2
@@ -14,7 +14,7 @@
-->
-<xsl:stylesheet version="1.0" xml:space="preserve" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output encoding="UTF-8" indent="yes" method="xml" omit-xml-declaration="yes" standalone="no" version="1.0"/>
18 years, 4 months
docs-common/bin insert-changelog,1.1,1.2
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26228/docs-common/bin
Modified Files:
insert-changelog
Log Message:
Use new abstracted functions
Index: insert-changelog
===================================================================
RCS file: /cvs/docs/docs-common/bin/insert-changelog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- insert-changelog 15 Jan 2006 19:18:08 -0000 1.1
+++ insert-changelog 15 Jan 2006 22:32:57 -0000 1.2
@@ -3,10 +3,12 @@
# insert-changelog - Add a new revision to rpm-info.xml
#
-XSLTPROC=${XSLTPROC:-xsltproc}
-XMLFORMAT=${XMLFORMAT:-../docs-common/bin/xmlformat -f ../docs-common/bin/xmlformat-fdp.conf}
+. "$(dirname $0)/fdp-functions"
-echo -n "Change to [r]pm package or [d]ocument source (q=Abort)? [r/D/q] "
+RPMINFO="rpm-info.xml"
+OUTPUT="${1:-${PWD}/$RPMINFO.clog$$}"
+
+echo -n "Change to [r]pm package or [d]ocument source? [r/D] "
while test -z "$ROLE" ; do
read -s -n 1 R
case "$R" in
@@ -14,8 +16,6 @@
ROLE="rpm" ;;
'd' | 'D' | '' )
ROLE="doc" ;;
- 'q' | 'Q' )
- ROLE="ABORT" ;;
esac
done
echo $ROLE
@@ -25,12 +25,11 @@
elif test $ROLE = "doc"; then
REVDATE=`date +"%Y-%M-%d"`
else
- echo "Aborting"
+ echo "This should never happen; aborting"
exit 1
fi
-LASTREV=$(${XSLTPROC} --stringparam role "$ROLE" \
- ../docs-common/packaging/doc-version.xsl rpm-info.xml)
+LASTREV=$(get_latest_revision "$ROLE")
while test -z "$NUMBER"; do
echo -n "Enter revision number greater than $LASTREV: "
read NUMBER
@@ -40,13 +39,11 @@
fi
done
-${XSLTPROC} ../docs-common/packaging/get-all-workers.xsl \
- rpm-info.xml | sed 's/^ \+//g' | grep -v '^$' | cat -n
+get_all_workers
echo -n "Enter number for responsible contributor: "
read PERSON
+ID=$(get_worker_attribute "id" $PERSON)
-ID=$(${XSLTPROC} --stringparam att "id" --param pos $PERSON \
- ../docs-common/packaging/get-worker.xsl rpm-info.xml)
echo "Enter a one-line description of the change."
echo "To add extra details, edit rpm-info.xml afterward."
read DETAILS
@@ -56,5 +53,6 @@
--stringparam person "$ID" \
--stringparam date "$REVDATE" \
--stringparam detail "$DETAILS" \
- ../docs-common/packaging/insert-changelog.xsl rpm-info.xml | \
- ${XMLFORMAT}
+ ../docs-common/packaging/insert-changelog.xsl "$RPMINFO" | \
+ ${XMLFORMAT} > ${OUTPUT}
+echo "New $RPMINFO written to $OUTPUT"
18 years, 4 months
docs-common/bin fdp-functions,NONE,1.1
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26205/docs-common/bin
Added Files:
fdp-functions
Log Message:
Draw out some functions that might be useful elsewhere
--- NEW FILE fdp-functions ---
#!/bin/sh
#
# Some common functions for use in other FDP scripts
#
FDPDIR=${FDPDIR:-".."}
FDPBINDIR="${FDPDIR}/docs-common/bin"
FDPPKGDIR="${FDPDIR}/docs-common/packaging"
RPMINFO=${RPMINFO:-"rpm-info.xml"}
XSLTPROC=${XSLTPROC:-xsltproc}
XMLFORMAT=${XMLFORMAT:-"${FDPBINDIR}/xmlformat" -f "${FDPBINDIR}/xmlformat-fdp.conf"}
get_all_workers()
{
# Return list of workers, in format "email:wholename"
${XSLTPROC} "${FDPPKGDIR}/get-all-workers.xsl" \
"$RPMINFO" | sed 's/^ \+//g' | grep -v '^$' | cat -n
}
get_worker_attribute()
{
# Return an attribute for a specific worker
if [ ! -z "$2" ]; then POS=$2 ; fi
if [ ! -z "$1" ]; then ATT="$1" ; fi
${XSLTPROC} --stringparam att "$ATT" --param pos $POS \
"${FDPPKGDIR}/get-worker.xsl" "$RPMINFO"
}
get_latest_revision()
{
# Return latest revision for an optional role argument
if [ ! -z "$1" ]; then
OPTS="--stringparam role $1"
fi
${XSLTPROC} ${OPTS} "${FDPPKGDIR}/doc-version.xsl" "$RPMINFO"
}
18 years, 4 months