translation-quick-start-guide translation-quick-start-en.xml, NONE, 1.1
by fedora-docs-commits@redhat.com
Author: mospina
Update of /cvs/docs/translation-quick-start-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22988
Added Files:
translation-quick-start-en.xml
Log Message:
trans-quick
--- NEW FILE translation-quick-start-en.xml ---
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
<!ENTITY % FEDORA-ENTITIES-EN SYSTEM
"../docs-common/common/fedora-entities-en.ent">
%FEDORA-ENTITIES-EN;
<!ENTITY DOCNAME "translation-quick-start-guide">
<!ENTITY DOCVERSION "0.0.2">
<!ENTITY DOCDATE "2005-12-20">
<!ENTITY DOCID "&DOCNAME;-&DOCVERSION; (&DOCDATE;)">
<!-- this will soon vanish -->
<!ENTITY BOOKID "&DOCNAME;-&DOCVERSION; (&DOCDATE;)">
<!ENTITY FCLOCALVER "4">
]>
<article id="translation-quickstart-guide" lang="en">
<articleinfo>
<title>Translation Quick Start Guide</title>
<copyright>
<year>2005</year>
<holder>&FORMAL-RHI;</holder>
<holder>Manuel Ospina</holder>
</copyright>
<authorgroup>
<author>
<surname>Ospina</surname>
<firstname>Manuel</firstname>
</author>
</authorgroup>
&LEGALNOTICE;
</articleinfo>
<section id="sn_intro">
<title>Introduction</title>
<para>
This guide intends to be a fast, simple step by step set of instructions to
start contributing with the translation of Fedora Project's software and
documents. Those interested in getting a better understanding of the
translation process involved can see the Translation guide or refer to the
manual of the specific translation tool.
</para>
</section>
<section id="sn_accounts">
<title>Accounts and subscriptions</title>
<para>
To participate in the Fedora Project as a translator you need an account.
You can apply for an account at <ulink
url="http://i18n.redhat.com/cgi-bin/i18n-signup/">
http://i18n.redhat.com/cgi-bin/i18n-signup/</ulink>. You need to provide a
username (login), an e-mail address, a target language -most likely your
native language-, and the public part of your ssh key.
</para>
<para>
If you do not have a ssh key yet, you can generate one using the following steps:
</para>
<para>
1. Type in a comand line:
</para>
<screen>
<command>ssh-keygen -t dsa</command>
</screen>
<para>
Accept the default location (~/.ssh/id_dsa) and enter a passphrase.
</para>
<caution>
<title>Note</title>
<para>
Do not forget this passphrase as you will need it to access to the CVS
repository.
</para>
</caution>
<para>
2. Copy the key to the appropiate file:
</para>
<screen>
<command>cat ~/.ssh/id_dsa.pub >> ~/.ssh/authorized_keys</command>
</screen>
<para>
3. Change permissions to your key and .ssh directory:
</para>
<screen>
<command>chmod 755 ~/.ssh</command>
<command>chmod 644 ~/.ssh/authorized_keys</command>
</screen>
<para>
Next, copy and paste the ssh key in the space provided in order to complete the
account application.
</para>
<para>
There are also two lists where you can discuss translation issues.
fedora-trans-list is a general list to discuss problems that affect all
languages; the second is the language-specific list (ex. fedora-trans-es for
Spanish language) to discuss issues that affect only the individual community of
translators. It is also useful to subscribe to fedora-doc-list to be informed of issues concerning the general documentation.
</para>
</section>
<section id="sn_translating_software">
<title>Translating software</title>
<para>
The translatable part of a software package is available in one or more po files. Fedora
Project stores these files in a CVS repository under the directory /translate.
Once your account has been approved, you can download this directory typing the
following instructions in a command line:
</para>
<screen>
<command>export CVS_RSH=ssh</command>
<command>export CVSROOT=:ext:[username]@i18.redhat.com:/usr/local/CVS</command>
<command>cvs -z9 co translate/</command>
</screen>
<para>
All the modules and po files will be downloaded to your machine following the
same hierarchy of the repository. Each directory contains a pot file
(ex. anaconda.pot) and the po files for each language (af.po, de.po, es.po,
etc).
</para>
<para>
You can check the status of the translations at
<ulink
url="http://i18n.redhat.com/cgi-bin/i18n-status">http://i18n.redhat.com/cgi-bin/i18n-status</ulink>.
Choose your language in the dropdown menu or check the
overall status. You can click on each package to view the maintainer and the name
of the last translator of this module. If you want to translate a module,
contact your language-specific list and let your community know you are working
on that module. Afterwards, press [take] in the status page. The
module will be assigned to you. When asked for a password, enter the one you
have received via e-mail after applying for the account.
</para>
<para>
You can now start translating:
</para>
<para>
1. Go to the directory of the package you have taken.
</para>
<screen>
<command>cd ~/translate/[package_name]</command>
</screen>
<para>
2. Update the files with the command:
</para>
<screen>
<command>cvs up</command>
</screen>
<para>
3. Translate the po file of your language in a po editor like KBabel,
gtranslator, etc. For example, to open the po file for Spanish in kbabel, type:
</para>
<screen>
<command>kbabel es.po</command>
</screen>
<para>
4. When you finish your work, commit your changes back to the repository:
</para>
<screen>
<command>cvs commit -m 'comments' [lang].po</command>
</screen>
<para>
5. As a last step, release the module in the status page clicking on the
[release] link so other people can work on it.
</para>
<para>
If you want to proofread your translation as part of the software, follow these steps:
</para>
<para>
1. Go to the directory of the package you want to proofread:
</para>
<screen>
<command>cd ~/translate/[package_name]</command>
</screen>
<para>
2. Convert the .po file in .mo file with msgfmt:
</para>
<screen>
<command>msgfmt [lang].po</command>
</screen>
<para>
3. Overwrite the existing .mo file in /usr/share/locale/[lang]/LC_MESSAGES/ .
Firstly, make sure to back up the existing file:
</para>
<screen>
<command>cp /usr/share/locale/[lang]/LC_MESSAGES/[package_name].mo [package_name].mo-backup</command>
<command>mv [package_name].mo /usr/share/locale/[lang]/LC_MESSAGES/</command>
</screen>
<para>
4. Proofread the package with the translated strings as part of the application:
</para>
<screen>
<command>LANG=[lang] rpm -qi [package_name]</command>
</screen>
<para>
The application related to the translated package will run with the translated strings.
</para>
</section>
<section id="sn_translating_docs">
<title>Translating documentation</title>
<para>
The Fedora documentation is also stored in a CVS repository under the directory /docs. The
process to download the documentation is similar to the one used to download po
files:
</para>
<screen>
<command>export CVSROOT=:ext:[username]@cvs.fedora.redhat.com:/cvs/docs</command>
<command>cvs co docs</command>
</screen>
<para>
This will download all the current documents in the directory. If you want to
download only the document you are interested to translate, list the current
documents in the repository and then check out the directory containing the
document you want:
</para>
<screen>
<command>cvs co -c</command>
<command>cvs co example-tutorial</command>
</screen>
<para>
The documents are written in xml format (docBook to be precise) and named using
the specific-language locale: example-tutorial-en.xml. If you are planning to
translate directly from the original xml file, you should create the document for your
language; for instance:
</para>
<screen>
<command>cp example-tutorial-en.xml example-tutorial-es.xml</command>
</screen>
<para>
Afterwards you can work on the new copy.
</para>
<para>
You can also convert the xml files into po files and work with a po editor
like KBabel o gtranslator. To do so, follow these steps:
</para>
<para>
1. In a terminal, go to the directory of the document you
want to translate:
</para>
<screen>
<command>cd ~/docs/example-tutorial</command>
</screen>
<para>
2. Extract the translatable strings with xml2pot:
</para>
<screen>
<command>xml2pot example-tutorial-en.xml > [lang].po</command>
</screen>
<para>
3. Now you can translate the file using the same application used to translate
software:
</para>
<screen>
<command>kbabel [lang].po</command>
</screen>
<para>
4. Once you finish, it is necessary to convert the translated .po file to .xml file in the target
language with po2xml:
</para>
<screen>
<command>po2xml example-tutorial-en.xml [lang].po > example-tutorial-[lang].xml</command>
</screen>
<para>
As the filter (xml2po) does not include entities in the .po file, you have to
change the language of the document from English:
</para>
<para><article id="example-tutorial" lang="en"></para>
<para>to your language:</para>
<para><article id="example-tutorial" lang="es"></para>
<para>
When the translated file is ready, add it to the repository:
</para>
<screen>
<command>cvs add example-tutorial-[lang].xml</command>
<command>cvs commit -m 'any comment' example-tutorial-[lang].xml</command>
</screen>
<para>
As a final step, you may have to change the Makefile so the document can be
built in HTML and PDF formats.
</para>
<caution>
<title>Note:</title>
<para>
Please advise fedora-doc-list and fedora-trans-[locale] that you are modifying
the Makefile. You should tell your community that you are working on the
translation of this document before you start translating to avoid that
different people work on the same file.
</para>
</caution>
<para>
1. In the text editor of your preference, open the Makefile.
</para>
<screen>
<command>vi Makefile</command>
</screen>
<para>
2. Add the locale of the new translation after the other languages as in the
following example:
</para>
<para>
LANGUAGES = en de [lang]
</para>
<para>
3. Include also the following lines:
</para>
<para>
DOCTITLE-[lang] = [name of tutorial]
XMLEXTRAFILES-[lang]=
</para>
<para>
4. Commit the Makefile
</para>
<screen>
<command>cvs commit -m 'any comment' Makefile</command>
</screen>
<para>
Then, you can build the document in your machine by typing:
</para>
<screen>
<command>make</command>
</screen>
</section>
</article>
18 years, 3 months
translation-quick-start-guide Makefile,NONE,1.1
by fedora-docs-commits@redhat.com
Author: mospina
Update of /cvs/docs/translation-quick-start-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22952
Added Files:
Makefile
Log Message:
trans-quick
--- NEW FILE Makefile ---
###############################################################################
# Makefile for RHLP docs project
# Created by: Tammy Fox <tfox(a)redhat.com>
# Last edited by: Tommy Reynolds <Tommy.Reynolds(a)MegaCoder.com>
# WARNING: need passivetex 1.24 for pdf generation to work
# License: GPL
# Copyright 2003 Tammy Fox, Red Hat, Inc.
# Copyright 2005 Tommy Reynolds, MegaCoder.com
###############################################################################
LANGUAGES = en es
DOCBASE = translation-quick-start
XMLEXTRAFILES-en =
######################################################
include ../docs-common/Makefile.common
######################################################
# If you want to add additional steps to any of the
# targets defined in "Makefile.common", be sure to use
# a double-colon in your rule here. For example, to
# print the message "FINISHED AT LAST" after building
# the HTML document version, uncomment the following
# line:
#${DOCNAME}/index.html::
# echo FINISHED AT LAST
18 years, 3 months
docs-common/bin fdp-functions,1.2,1.3
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22922
Modified Files:
fdp-functions
Log Message:
Added helper function 'iso2date' to convert YYYY-MM-DD into ctime(3)
format, as neded by the <revision@date> attributes.
Also added more error checking and usage hints.
Index: fdp-functions
===================================================================
RCS file: /cvs/docs/docs-common/bin/fdp-functions,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fdp-functions 15 Jan 2006 23:26:25 -0000 1.2
+++ fdp-functions 18 Jan 2006 06:41:34 -0000 1.3
@@ -1,7 +1,8 @@
-#!/bin/sh
+########################################################################
#
# Some common functions for use in other FDP scripts
#
+########################################################################
FDPDIR=${FDPDIR:-".."}
@@ -15,26 +16,63 @@
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
+ # Return list of workers, in format "email:wholename"
+ if [ ! -f "${RPMINFO}" ]; then
+ echo "$0: File '${RPMINFO}' missing." >&2
+ return 1
+ fi
+ ${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"
+ # Return an attribute for a specific worker
+ if [ ! -f "${RPMINFO}" ]; then
+ echo "$0: File '${RPMINFO}' missing." >&2
+ return 1
+ fi
+ 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()
+version()
{
- # Return latest revision for an optional role argument
- if [ ! -z "$1" ]; then
- OPTS="--stringparam role $1"
- fi
- ${XSLTPROC} ${OPTS} "${FDPPKGDIR}/doc-version.xsl" "$RPMINFO"
+ # Return latest revision for an optional role argument
+ # Don't gumble if we cannot find ${RPMINF}, because it
+ # may not have been created yet.
+ if [ ! -z "$1" ]; then
+ OPTS="--stringparam role $1"
+ fi
+ if [ -f "${RPMINFO}" ]; then
+ ${XSLTPROC} ${OPTS} "${FDPPKGDIR}/doc-version.xsl" "$RPMINFO"
+ else
+ echo -n XXX
+ fi
+ # The stylesheet doesn't put a NL at the end.
+ echo
+}
+
+iso2date() {
+ # Convert ISO format date (YYYY-MM-DD) to ctime(3)
+ # format, which is needed by the "rpm-info.xml" <revision@date>
+ case "$#" in
+ 0 ) echo -e "usage: iso2date YYYY-MM-DD ..." >&2
+ echo -e "\tiso2date YYYY-MM-DD" >&2
+ echo -e "\tiso2date today" >&2
+ return 1
+ ;;
+ 1 ) multi=0;;
+ * ) multi=1;;
+ esac
+ for x in $@
+ do
+ if [ ${multi} -eq 1 ]; then
+ echo -ne "${x}\t"
+ fi
+ date -d 2006-01-18 +'%a %b %d %Y'
+ done
}
18 years, 3 months
translation-quick-start-guide - New directory
by fedora-docs-commits@redhat.com
Author: mospina
Update of /cvs/docs/translation-quick-start-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22870/translation-quick-start-guide
Log Message:
Directory /cvs/docs/translation-quick-start-guide added to the repository
18 years, 3 months
install-guide rpm-info.xml,1.2,1.3
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/install-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6749
Modified Files:
rpm-info.xml
Log Message:
Dates must be in ctime(3) format, not ISO format.
TODO: We need an XSL magic to translate the dates if they have dashes.
Index: rpm-info.xml
===================================================================
RCS file: /cvs/docs/install-guide/rpm-info.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rpm-info.xml 17 Jan 2006 22:49:29 -0000 1.2
+++ rpm-info.xml 17 Jan 2006 23:04:15 -0000 1.3
@@ -28,7 +28,7 @@
<!--PLEASE ADD A TRANSLATION FOR EACH ADDITIONAL LANGUAGE.-->
</titles>
<changelog order="newest-first">
- <revision date="2006-01-17" number="0" role="rpm">
+ <revision date="Tue Jan 17 2006" number="0" role="rpm">
<author worker="megacoder"/>
<details>Added initial empty RPM revision to test packaging.</details>
</revision>
18 years, 3 months
install-guide rpm-info.xml,1.1,1.2
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/install-guide
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4889
Modified Files:
rpm-info.xml
Log Message:
Made the "rpm-info.xml" file validate. May not have the correct ID
that quaid wants to use, though.
Index: rpm-info.xml
===================================================================
RCS file: /cvs/docs/install-guide/rpm-info.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpm-info.xml 16 Jan 2006 00:23:00 -0000 1.1
+++ rpm-info.xml 17 Jan 2006 22:49:29 -0000 1.2
@@ -1,8 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE rpm-info SYSTEM "../docs-common/packaging/rpm-info.dtd" >
+
<rpm-info>
<colophon>
<worker surname="Ellis" firstname="Stuart" othername="" id="StuartEllis" email="stuart(a)elsn.org" wholename="Stuart Ellis" initials="StuartEllis"/>
- <worker surname="Frields" firstname="Paul" othername="W." id="PaulFrields" email="stickster(a)gmail.com" wholename="Paul W. Frields" initials="PaulFrields"/>
+ <worker surname="Frields" firstname="Paul" othername="W." id="PaulWFrields" email="stickster(a)gmail.com" wholename="Paul W. Frields" initials="PaulFrields"/>
+ <worker email="Tommy.Reynolds(a)MegaCoder.com" firstname="Tommy" id="megacoder" initials="JTR" surname="Reynolds" wholename="Tommy Reynolds"/>
+ <worker email="kwade(a)redhat.com" firstname="Karsten" id="quaid" initials="KW" surname="Wade" wholename="Karsten Wade"/>
</colophon>
+ <author worker="StuartEllis"/>
<license>
<rights>GNU FDL</rights>
<version>1.0</version>
@@ -21,6 +28,10 @@
<!--PLEASE ADD A TRANSLATION FOR EACH ADDITIONAL LANGUAGE.-->
</titles>
<changelog order="newest-first">
+ <revision date="2006-01-17" number="0" role="rpm">
+ <author worker="megacoder"/>
+ <details>Added initial empty RPM revision to test packaging.</details>
+ </revision>
<revision date="2006-01-16" number="1.13" role="doc">
<author worker="StuartEllis"/>
<details lang="en">Added information on driver disks.</details>
@@ -74,11 +85,11 @@
<details lang="en">Reorganization of introductory material</details>
</revision>
<revision date="2005-06-10" number="1.0" role="doc">
- <author worker="KarstenWade"/>
+ <author worker="quaid"/>
<details lang="en">Release version</details>
</revision>
<revision date="2005-06-08" number="1.0rc1" role="doc">
- <author worker="KarstenWade"/>
+ <author worker="quaid"/>
<details lang="en">Publication edit and declaration of release candidate</details>
</revision>
<revision date="2005-05-15" number="0.7" role="doc">
18 years, 3 months
example-tutorial Makefile,1.25,1.26
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/example-tutorial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1956
Modified Files:
Makefile
Log Message:
Moved all the packaging stuff to "docs-common/Makefile.common".
Index: Makefile
===================================================================
RCS file: /cvs/docs/example-tutorial/Makefile,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Makefile 30 Dec 2005 16:56:39 -0000 1.25
+++ Makefile 17 Jan 2006 21:11:02 -0000 1.26
@@ -17,141 +17,6 @@
LANGUAGES = en de
DOCBASE = example-tutorial
#
-DOCTITLE-en = Example Tutorial
-XMLEXTRAFILES-en= fdp-info-en.xml
-#
-DOCTITLE-de = Beispiel Tutorial
-XMLEXTRAFILES-de= fdp-info-de.xml
-#
######################################################
include ../docs-common/Makefile.common
######################################################
-#
-# If you want to add additional steps to any of the
-# targets defined in "Makefile.common", be sure to use
-# a double-colon in your rule here. For example, to
-# print the message "FINISHED AT LAST" after building
-# the HTML document version, uncomment the following
-# line:
-#${DOCBASE}-en/index.html::
-# echo FINISHED AT LAST
-
-######################################################
-#
-######################################################
-
-######################################################
-# Some packaging specific vars
-
-# These are obviated by new standard
-DATE=$(shell grep DOCID $(DOCBASE)-en.xml | sed 's/.\+(//' | sed 's/).\+//')
-VERSION=$(shell grep " DOCVERSION" $(DOCBASE)-en.xml | sed 's/.\+"\([0-9\.]\+\)".\+/\1/' )
-NOW=$(shell date +"%a %b %e %Y")
-
-XMLFORMAT=$(FDPDIR)/docs-common/bin/xmlformat
-XMLFOPTS=-f $(FDPDIR)/docs-common/bin/xmlformat-fdp.conf
-######################################################
-# Some RPM flags...
-######################################################
-RPMFLAGS=--define "docbase $(DOCBASE)" --define "version $(VERSION)" --define "_topdir $(PWD)" --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" --define "_sourcedir $(PWD)" --define "_rpmdir $(PWD)" --define "_srcrpmdir $(PWD)" --define "_specdir $(PWD)" --define "fdpdir $(FDPDIR)"
-
-SPECFILE=$(PWD)/fedora-doc-$(DOCBASE).spec
-ifeq (${RPMDEBUG},1)
-RPMDFLAG = -vv
-endif
-######################################################
-
-
-clean::
- ${RM} -rf fedora-doc-$(DOCBASE)*.rpm
- ${RM} -rf $(DOCBASE)-$(VERSION)*.src.tar.gz
- ${RM} -rf BUILD/ $(DOCBASE)-$(VERSION)/
- ${RM} -f *omf *desktop $(SPECFILE)
- ${RM} -f fdp-info-*.xml
- sed -i 's@^\( *[^<]*&FDP-INFO;.*\)@\<!-- \1 - DO NOT REMOVE THIS COMMENT --\>@g' $(DOCBASE)-*.xml
-
-
-define fdp-info_template
-fdp-info-$(1).xml::
- ${XSLTPROC} --stringparam doctype $(shell ${XSLTPROC} \
- ../docs-common/packaging/doctype.xsl $(DOCBASE)-$(1).xml) \
- --stringparam lang $(1) ../docs-common/packaging/bookinfo.xsl \
- rpm-info.xml | exec $(XMLFORMAT) $(XMLFOPTS) > \
- fdp-info-$(1).xml
- sed -i 's@<!-- .*&FDP-INFO;.* -->@\&FDP-INFO;@g' $(DOCBASE)-$(1).xml
-endef
-
-fdp-info:: $(foreach LANG,${LANGUAGES},fdp-info-$(LANG).xml)
-
-$(foreach LANG,${LANGUAGES},$(eval $(call fdp-info_template,${LANG})))
-
-
-spec::
- $(XSLTPROC) ../docs-common/packaging/spec.xsl rpm-info.xml > \
- $(SPECFILE)
-
-
-gnome.desktop::
- $(XSLTPROC) ../docs-common/packaging/gnome-desktop.xsl rpm-info.xml > \
- fedora-doc-$(DOCBASE)-gnome.desktop
-
-
-kde.desktop::
- $(XSLTPROC) ../docs-common/packaging/kde-desktop.xsl rpm-info.xml > \
- fedora-doc-$(DOCBASE)-kde.desktop
-
-
-khelp.desktop::
- $(XSLTPROC) ../docs-common/packaging/khelpcenter-plugin.xsl \
- rpm-info.xml > fedora-doc-$(DOCBASE)-khelp.desktop
-
-
-define omf_template
-omf-$(1)::
-# xmllint is part of libxml2
- ${XSLTPROC} ../docs-common/packaging/omf.xsl rpm-info.xml | \
- $(XMLFORMAT) $(XMLFOPTS) > fedora-doc-$(DOCBASE)-$(1).omf
-endef
-
-omf:: $(foreach LANG,${LANGUAGES},omf-$(LANG))
-# correct lang=en for scrollkeeper document
- mv fedora-doc-$(DOCBASE)-en.omf fedora-doc-$(DOCBASE)-C.omf
-
-$(foreach LANG,${LANGUAGES},$(eval $(call omf_template,${LANG})))
-
-
-$(DOCBASE)-$(VERSION).src.tar.gz:: clean fdp-info gnome.desktop kde.desktop khelp.desktop omf
- mkdir $(DOCBASE)-$(VERSION)
- find . -maxdepth 1 -type f ! \( -name '*~' \
- -o -name '#*' \
- -o -name '$(DOCBASE)*.tar.gz' \
- -o -name '.*' \) \
- | cpio -pamdv $(DOCBASE)-$(VERSION)
- find . -maxdepth 1 -type d ! \( -name '$(DOCBASE)-$(VERSION)' \
- -o -name 'CVS' \
- -o -name '*~' \
- -o -name '$(DOCBASE)*' \) \
- | cpio -pamdv $(DOCBASE)-$(VERSION)
- tar -zcvf $(DOCBASE)-$(VERSION).src.tar.gz $(DOCBASE)-$(VERSION)/
- rm -rf $(DOCBASE)-$(VERSION)/
- sed -i 's@^\( *[^<]*&FDP-INFO;.*\)@\<!-- \1 - DO NOT REMOVE THIS COMMENT --\>@g' $(DOCBASE)-*.xml
-
-src-tarball:: $(DOCBASE)-$(VERSION).src.tar.gz
-
-
-package-prep::
-# This keeps things tidier when looking at results
- mkdir -p BUILD
-
-i386 ppc x86_64 noarch:: src-tarball package-prep spec
-# Capture all arch since package is noarch anyway
- rpmbuild -bb $(RPMDFLAG) $(RPMFLAGS) $(SPECFILE)
-
-srpm:: src-tarball package-prep spec
- rpmbuild -bs $(RPMDFLAG) $(RPMFLAGS) $(SPECFILE)
-
-rpm:: src-tarball package-prep spec noarch srpm
-
-
-showvars::
- @echo "VERSION=$(VERSION)"
18 years, 3 months
example-tutorial example-tutorial-en.xml,1.19,1.20
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/example-tutorial
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1924
Modified Files:
example-tutorial-en.xml
Log Message:
Define and use "&FDP-INFO;" entity.
Index: example-tutorial-en.xml
===================================================================
RCS file: /cvs/docs/example-tutorial/example-tutorial-en.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- example-tutorial-en.xml 28 Dec 2005 22:19:04 -0000 1.19
+++ example-tutorial-en.xml 17 Jan 2006 21:07:56 -0000 1.20
@@ -12,13 +12,13 @@
<!ENTITY DOCID "&DOCNAME;-&DOCVERSION; (&DOCDATE;)">
<!ENTITY BUG-NUM "000000"> <!-- use this only while in draft stage -->
-<!ENTITY FDP-INFO SYSTEM "fdp-info-en.xml" >
+<!ENTITY FDP-INFO SYSTEM "fdp-info-en.xml" >
]>
<article id="example-tutorial" lang="en">
-<!-- &FDP-INFO; - DO NOT REMOVE THIS COMMENT -->
+&FDP-INFO;
<section id="sn-some-section">
<title>Some Section</title>
18 years, 3 months
docs-common/common fedora-entities-en.ent, 1.12, 1.13 fedora-entities-it.ent, 1.2, 1.3
by fedora-docs-commits@redhat.com
Author: pfrields
Update of /cvs/docs/docs-common/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23191
Modified Files:
fedora-entities-en.ent fedora-entities-it.ent
Log Message:
Argggh, why were these not changed earlier?
Index: fedora-entities-en.ent
===================================================================
RCS file: /cvs/docs/docs-common/common/fedora-entities-en.ent,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fedora-entities-en.ent 16 Jan 2006 14:21:22 -0000 1.12
+++ fedora-entities-en.ent 17 Jan 2006 02:25:49 -0000 1.13
@@ -30,8 +30,8 @@
<!-- *************** Fedora version numbers *************** -->
<!ENTITY FCVER "4"> <!-- Current release version of main project -->
-<!ENTITY TESTVER "test1"> <!-- Current test number of main project -->
-<!ENTITY FCTESTVER "4 &TESTVER;"> <!-- Current test version of main project -->
+<!ENTITY TESTVER "test2"> <!-- Current test number of main project -->
+<!ENTITY FCTESTVER "5 &TESTVER;"> <!-- Current test version of main project -->
<!-- ************** other common names *********** -->
Index: fedora-entities-it.ent
===================================================================
RCS file: /cvs/docs/docs-common/common/fedora-entities-it.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-entities-it.ent 24 Dec 2005 14:22:06 -0000 1.2
+++ fedora-entities-it.ent 17 Jan 2006 02:25:49 -0000 1.3
@@ -30,8 +30,8 @@
<!-- *************** Fedora version numbers *************** -->
<!ENTITY FCVER "4"> <!-- Current release version of main project -->
-<!ENTITY TESTVER "test1"> <!-- Current test number of main project -->
-<!ENTITY FCTESTVER "4 &TESTVER;"> <!-- Current test version of main project -->
+<!ENTITY TESTVER "test2"> <!-- Current test number of main project -->
+<!ENTITY FCTESTVER "5 &TESTVER;"> <!-- Current test version of main project -->
<!-- ************** other common names *********** -->
18 years, 3 months
docs-common Makefile.common,1.31,1.32
by fedora-docs-commits@redhat.com
Author: jtr
Update of /cvs/docs/docs-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22941
Modified Files:
Makefile.common
Log Message:
Select "fdpsh" as the shell used by make(1). This lets us avoid
ugly "${FDPBIN}/foo" in preference to a lovely, lonely, "foo".
Also, replace unconditional mv(1) commands with "move-if-change"
to help avoid needlessly touching a file, thus triggering a
useless rebuild. Don't know if this happens here, but its a
best practices thing.
Index: Makefile.common
===================================================================
RCS file: /cvs/docs/docs-common/Makefile.common,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Makefile.common 16 Jan 2006 20:05:43 -0000 1.31
+++ Makefile.common 17 Jan 2006 02:14:49 -0000 1.32
@@ -64,6 +64,10 @@
XMLFORMAT=$(FDPDIR)/docs-common/bin/xmlformat
XMLFOPTS=-f $(FDPDIR)/docs-common/bin/xmlformat-fdp.conf
#########################################################################
+# Use our very own "docs-common/bin/fdpsh" as the command interpreter
+# This automatically has ${FDPBIN} as first in the ${PATH}
+SHELL =${FDPBIN}/fdpsh
+#########################################################################
# PUT NO TARGETS BEFORE THIS ONE, not even in your base Makefile
# In a properly-constructed Makefile, this will be the default target
@@ -97,7 +101,7 @@
cp ${HTMLCSS} $(DOCBASE)-$(1)/fedora.css
[ -z "${HTMLCSSEXTRA}" ] || \
cp ${HTMLCSSEXTRA} $(DOCBASE)-$(1)/watermark.png
- [ ! -d figs ] || ${FDPBIN}/copy-figs -v -f '*.png' \
+ [ ! -d figs ] || copy-figs -v -f '*.png' \
-l ${LANG} figs $(DOCBASE)-$(1)
endef
#
@@ -159,6 +163,7 @@
$(foreach LANG,${LANGUAGES},$(eval $(call CLEAN_template,${LANG})))
#
clean:: $(foreach LANG,${LANGUAGES},${DOCBASE}-${LANG}-clean)
+ ${RM} *.tmp
#########################################################################
define DISTCLEAN_template
${DOCBASE}-$(1)-distclean:: ${DOCBASE}-$(1)-clean
@@ -188,7 +193,7 @@
DIFFS =-u
diff::
- ${FDPBIN}/xmldiff ${DIFFS} ${OLD} ${NEW}
+ xmldiff ${DIFFS} ${OLD} ${NEW}
#
#########################################################################
# The "fdp-info-${LANG}.xml" file contains the <articleinfo> or
@@ -214,16 +219,16 @@
# Make a new changelog entry for an existing rpm-info.xml file.
clog:: $(RPMINFO)
- @${FDPBIN}/fdpsh -c insert-changelog $(RPMINFO).clog
- mv -b $(RPMINFO).clog $(RPMINFO)
+ insert-changelog $(RPMINFO).tmp && \
+ move-if-change $(RPMINFO).tmp $(RPMINFO)
#
#########################################################################
# Make a new colophon entry for an existing rpm-info.xml file.
colophon:: $(RPMINFO)
- @${FDPBIN}/fdpsh -c insert-colophon $(RPMINFO).worker
- mv -b $(RPMINFO).worker $(RPMINFO)
+ insert-colophon $(RPMINFO).tmp && \
+ move-if-change $(RPMINFO).tmp $(RPMINFO)
#
#########################################################################
18 years, 3 months