July 2005 - Wine-commits - list.winehq.org

docs/. configure configure.ac
by Dimi Paun 01 Jul '05

01 Jul '05

ChangeSet ID: 1120224074952441089860262 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs1.sourceforge.net 2005/07/01 06:21:14 Modified files: . : configure configure.ac Log message: Francois Gouget <fgouget(a)codeweavers.com> Check for nsgmls and warn the user if it is missing. Old revision New revision Changes Path 1.3 1.4 +54 -1 docs/configure 1.3 1.4 +12 -0 docs/configure.ac Index: docs/configure diff -u -p docs/configure:1.3 docs/configure:1.4 --- docs/configure 1 Jul 2005 13:21:14 -0000 +++ /dev/null 1 Jul 2005 13:21:14 -0000 @@ -273,7 +273,7 @@ PACKAGE_VERSION='20050419' PACKAGE_STRING='Wine 20050419' PACKAGE_BUGREPORT='wine-devel(a)winehq.org' -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SET_MAKE DB2HTML DB2PDF DB2PS DB2TXT LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SET_MAKE DB2HTML DB2PDF DB2PS DB2TXT NSGMLS LIBOBJS LTLIBOBJS' ac_subst_files='MAKE_RULES' # Initialize some variables set by options. @@ -1423,6 +1423,47 @@ fi done test -n "$DB2TXT" || DB2TXT="false" +for ac_prog in nsgmls +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_NSGMLS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$NSGMLS"; then + ac_cv_prog_NSGMLS="$NSGMLS" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_NSGMLS="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +fi +fi +NSGMLS=$ac_cv_prog_NSGMLS +if test -n "$NSGMLS"; then + echo "$as_me:$LINENO: result: $NSGMLS" >&5 +echo "${ECHO_T}$NSGMLS" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$NSGMLS" && break +done +test -n "$NSGMLS" || NSGMLS="false" + MAKE_RULES=Make.rules @@ -2073,6 +2114,7 @@ s,@DB2HTML@,$DB2HTML,;t t s,@DB2PDF@,$DB2PDF,;t t s,@DB2PS@,$DB2PS,;t t s,@DB2TXT@,$DB2TXT,;t t +s,@NSGMLS@,$NSGMLS,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t /@MAKE_RULES@/r $MAKE_RULES @@ -2353,6 +2395,17 @@ then echo "*** - SUSE: docbook-utils" fi +if test "$NSGMLS" = "false" +then + echo + echo "*** Note: Your system appears to be missing the nsgmls parser" + echo "*** which is needed to build the translated documentation using po4a." + echo "*** To remedy this you will need one of the following packages" + echo "*** - Debian: sp" + echo "*** - Fedora Core: openjade" + echo "*** - SUSE: opensp" +fi + echo echo "Configure finished. Do '${ac_make}' to compile the documentation." echo Index: docs/configure.ac diff -u -p docs/configure.ac:1.3 docs/configure.ac:1.4 --- docs/configure.ac 1 Jul 2005 13:21:14 -0000 +++ /dev/null 1 Jul 2005 13:21:14 -0000 @@ -12,6 +12,7 @@ AC_CHECK_PROGS(DB2HTML, docbook2html db2 AC_CHECK_PROGS(DB2PDF, docbook2pdf db2pdf, false) AC_CHECK_PROGS(DB2PS, docbook2ps db2ps, false) AC_CHECK_PROGS(DB2TXT, docbook2txt db2txt, false) +AC_CHECK_PROGS(NSGMLS, nsgmls, false) dnl **** Generate output files **** @@ -39,6 +40,17 @@ then echo "*** - SUSE: docbook-utils" fi +if test "$NSGMLS" = "false" +then + echo + echo "*** Note: Your system appears to be missing the nsgmls parser" + echo "*** which is needed to build the translated documentation using po4a." + echo "*** To remedy this you will need one of the following packages" + echo "*** - Debian: sp" + echo "*** - Fedora Core: openjade" + echo "*** - SUSE: opensp" +fi + echo echo "Configure finished. Do '${ac_make}' to compile the documentation." echo

1 0

docs/fr .cvsignore Makefile.in
by Dimi Paun 01 Jul '05

01 Jul '05

ChangeSet ID: 1120223965809808748615072 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs1.sourceforge.net 2005/07/01 06:19:25 Modified files: fr : .cvsignore Makefile.in Log message: Francois Gouget <fgouget(a)codeweavers.com> Now that Po4a can translate attributes we don't need the posgml+sed step. Po4a also handles the includes right now so we don't need to change the current directory anymore. This fixes out-of-tree builds. Old revision New revision Changes Path 1.1 1.2 +1 -1 docs/fr/.cvsignore 1.2 1.3 +4 -8 docs/fr/Makefile.in Index: docs/fr/.cvsignore diff -u -p docs/fr/.cvsignore:1.1 docs/fr/.cvsignore:1.2 --- docs/fr/.cvsignore 1 Jul 2005 13:19:25 -0000 +++ /dev/null 1 Jul 2005 13:19:25 -0000 @@ -1,6 +1,6 @@ Makefile wine-faq.html wine-faq.pdf -wine-faq.posgml +wine-faq.sgml wine-faq.ps wine-faq.txt Index: docs/fr/Makefile.in diff -u -p docs/fr/Makefile.in:1.2 docs/fr/Makefile.in:1.3 --- docs/fr/Makefile.in 1 Jul 2005 13:19:25 -0000 +++ /dev/null 1 Jul 2005 13:19:25 -0000 @@ -5,7 +5,6 @@ VPATH = @srcdir@ LANG = fr SGMLDIR = $(TOPSRCDIR)/en -DOCDIR = $(TOPSRCDIR)/fr MIN_TRANS = 1 WINEFAQ_SRCS = \ @@ -22,13 +21,10 @@ all: doc updatepo: $(ALLBOOKS:%=%.updatepo) %.updatepo: - cd $(SGMLDIR) && $(PO4AENV) perl $(PO4ADIR)/po4a-updatepo -f sgml -m $*.sgml -p $(DOCDIR)/$*.po + $(PO4AENV) perl $(PO4ADIR)/po4a-updatepo -f sgml -m $(SGMLDIR)/$*.sgml -p $(SRCDIR)/$*.po -%.posgml: $(SGMLDIR)/%.sgml %.po - cd $(SGMLDIR) && $(PO4AENV) perl $(PO4ADIR)/po4a-translate -v -f sgml -m $*.sgml -p $(DOCDIR)/$*.po -l $(DOCDIR)/$*.posgml -k $(MIN_TRANS) - -%.sgml: %.posgml - sed -e 's/^<$article .*$ lang="en">$$/<\1 lang="$(LANG)">/' -e 's/^<$book .*$ lang="en">$$/<\1 lang="$(LANG)">/' $*.posgml >$*.sgml || ($(RM) $*.sgml && false) +%.sgml: $(SGMLDIR)/%.sgml %.po + $(PO4AENV) perl $(PO4ADIR)/po4a-translate -v -f sgml -m $(SGMLDIR)/$*.sgml -p $(SRCDIR)/$*.po -l $*.sgml -k $(MIN_TRANS) clean:: - $(RM) $(ALLBOOKS:%=%.sgml) $(ALLBOOKS:%=%.posgml) + $(RM) $(ALLBOOKS:%=%.sgml)

1 0

docs/po4a META.yml
by Dimi Paun 01 Jul '05

01 Jul '05

ChangeSet ID: 1120223461831562325664894 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs1.sourceforge.net 2005/07/01 06:11:01 Removed files: po4a : META.yml Log message: Merged PO4A 20050630 Old revision New revision Changes Path 1.1.1.1 Removed +0 -0 docs/po4a/META.yml Index: docs/po4a/META.yml diff -u -p docs/po4a/META.yml:1.1.1.1 /dev/null --- docs/po4a/META.yml 1 Jul 2005 13:11: 1 -0000 +++ /dev/null 1 Jul 2005 13:11: 1 -0000 @@ -1,44 +0,0 @@ ---- -name: po4a -version: 0.21 -author: - - Martin Quinson (mquinson#debian.org) - - Denis Barbier <barbier(a)linuxfr.org> -abstract: Tools for helping translation of documentation -license: gpl -requires: - Locale::gettext: 1.01 - SGMLS: 0 - Term::ReadKey: 0 - Text::WrapI18N: 0 -provides: - Locale::Po4a::Chooser: - file: lib/Locale/Po4a/Chooser.pm - Locale::Po4a::Common: - file: lib/Locale/Po4a/Common.pm - Locale::Po4a::Dia: - file: lib/Locale/Po4a/Dia.pm - Locale::Po4a::Docbook: - file: lib/Locale/Po4a/Docbook.pm - Locale::Po4a::Guide: - file: lib/Locale/Po4a/Guide.pm - Locale::Po4a::KernelHelp: - file: lib/Locale/Po4a/KernelHelp.pm - Locale::Po4a::LaTeX: - file: lib/Locale/Po4a/LaTeX.pm - Locale::Po4a::Man: - file: lib/Locale/Po4a/Man.pm - Locale::Po4a::Po: - file: lib/Locale/Po4a/Po.pm - Locale::Po4a::Pod: - file: lib/Locale/Po4a/Pod.pm - Locale::Po4a::Sgml: - file: lib/Locale/Po4a/Sgml.pm - Locale::Po4a::TeX: - file: lib/Locale/Po4a/TeX.pm - Locale::Po4a::TransTractor: - file: lib/Locale/Po4a/TransTractor.pm - version: 0.21 - Locale::Po4a::Xml: - file: lib/Locale/Po4a/Xml.pm -generated_by: Module::Build version 0.26

1 0

docs/. .cvsignore
by Dimi Paun 01 Jul '05

01 Jul '05

ChangeSet ID: 1120192638869013756820099 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs1.sourceforge.net 2005/06/30 21:37:18 Modified files: . : .cvsignore Log message: Ignore config.* files Old revision New revision Changes Path 1.2 1.3 +2 -0 docs/.cvsignore Index: docs/.cvsignore diff -u -p docs/.cvsignore:1.2 docs/.cvsignore:1.3 --- docs/.cvsignore 1 Jul 2005 4:37:18 -0000 +++ /dev/null 1 Jul 2005 4:37:18 -0000 @@ -1,3 +1,5 @@ autom4te.cache Makefile Make.rules +config.log +config.status

1 0

Import
by Dimi Paun 01 Jul '05

01 Jul '05

ChangeSet ID: 1120192513211065362514095 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs1.sourceforge.net 2005/06/30 21:35:13 Log message: Import of PO4A release cvs-20050630 Status: Vendor Tag: PO4A Release Tags: po4a-cvs_20050630 U docs/po4a/po4a-normalize U docs/po4a/TODO U docs/po4a/po4a-updatepo U docs/po4a/MANIFEST U docs/po4a/Makefile U docs/po4a/README.translators U docs/po4a/po4a-translate N docs/po4a/msgsearch U docs/po4a/Build.PL U docs/po4a/po4a-gettextize U docs/po4a/po4a N docs/po4a/html-build-upload.sh U docs/po4a/README.tests U docs/po4a/COPYING U docs/po4a/README N docs/po4a/debian/compat N docs/po4a/debian/rules N docs/po4a/debian/control N docs/po4a/debian/changelog N docs/po4a/debian/dirs N docs/po4a/debian/copyright U docs/po4a/po/pod/es.po U docs/po4a/po/pod/it.po U docs/po4a/po/pod/ca.po U docs/po4a/po/pod/fr.po U docs/po4a/po/pod/po4a-pod.pot U docs/po4a/po/bin/es.po U docs/po4a/po/bin/it.po U docs/po4a/po/bin/ca.po U docs/po4a/po/bin/cs.po U docs/po4a/po/bin/de.po U docs/po4a/po/bin/po4a.pot U docs/po4a/po/bin/af.po U docs/po4a/po/bin/fr.po N docs/po4a/testsuite/stats.man N docs/po4a/testsuite/test.man.addendum N docs/po4a/testsuite/stats.sh N docs/po4a/testsuite/check N docs/po4a/testsuite/test.man U docs/po4a/doc/addendum.it U docs/po4a/doc/addendum.es U docs/po4a/doc/po4a.7.pod U docs/po4a/doc/addendum.ca U docs/po4a/doc/addendum.fr U docs/po4a/t/04-charsets.t N docs/po4a/t/05-config.t U docs/po4a/t/01-classes.t N docs/po4a/t/24-tex.t U docs/po4a/t/03-addendums.t U docs/po4a/t/10-discard-fuzzy.t U docs/po4a/t/21-dia.t N docs/po4a/t/22-html.t U docs/po4a/t/02-TransTractors.t U docs/po4a/t/20-xml.t U docs/po4a/t/23-man.t U docs/po4a/t/data-21/transl.dia U docs/po4a/t/data-21/transl.po U docs/po4a/t/data-21/transl.dia-ok U docs/po4a/t/data-21/extract.po-ok U docs/po4a/t/data-21/extract.dia U docs/po4a/t/data-10/pod.po U docs/po4a/t/data-10/pod U docs/po4a/t/data-10/pod.fr U docs/po4a/t/data-02/pod.po U docs/po4a/t/data-02/pod U docs/po4a/t/data-02/man.po U docs/po4a/t/data-02/man.fr-normalized U docs/po4a/t/data-02/man.fr U docs/po4a/t/data-02/man U docs/po4a/t/data-02/pod.po-empty U docs/po4a/t/data-02/pod.fr-normalized U docs/po4a/t/data-02/pod.fr U docs/po4a/t/data-02/man.po-empty U docs/po4a/t/data-02/man.po-ok U docs/po4a/t/data-02/pod.po-ok N docs/po4a/t/data-24/simple-translate.out N docs/po4a/t/data-24/simple.pot N docs/po4a/t/data-24/simple-gettextize.out N docs/po4a/t/data-24/simple.fr.tex N docs/po4a/t/data-24/simple.tex N docs/po4a/t/data-24/simple.fr.po N docs/po4a/t/data-24/simple-updatepo.out U docs/po4a/t/data-04/text-ascii.pod U docs/po4a/t/data-04/utf.pod-ok U docs/po4a/t/data-04/trans.po U docs/po4a/t/data-04/utf.po U docs/po4a/t/data-04/utf.po-ok U docs/po4a/t/data-04/ascii.po-ok U docs/po4a/t/data-04/text-iso8859.pod U docs/po4a/t/data-04/ascii-iso8859.po-ok U docs/po4a/t/data-04/iso8859.po-ok U docs/po4a/t/data-04/text-iso8859.pod-ok U docs/po4a/t/data-04/text-iso8859_.pod U docs/po4a/t/data-23/dot4.err U docs/po4a/t/data-23/dot5.it.po U docs/po4a/t/data-23/dot2 U docs/po4a/t/data-23/quotes.fr.po U docs/po4a/t/data-23/quotes U docs/po4a/t/data-23/null U docs/po4a/t/data-23/null.pot U docs/po4a/t/data-23/escapes1 U docs/po4a/t/data-23/escapes1.it.po U docs/po4a/t/data-23/quotes.pot U docs/po4a/t/data-23/dot3 U docs/po4a/t/data-23/null.fr.po U docs/po4a/t/data-23/dot4 U docs/po4a/t/data-23/dot5 U docs/po4a/t/data-23/dot3.err U docs/po4a/t/data-23/dot1.fr.po U docs/po4a/t/data-23/dot1.fr U docs/po4a/t/data-23/dot1.pot U docs/po4a/t/data-23/dot5.it U docs/po4a/t/data-23/null.fr U docs/po4a/t/data-23/dot2.err U docs/po4a/t/data-23/dot1 U docs/po4a/t/data-23/dot5.pot U docs/po4a/t/data-23/escapes1.it U docs/po4a/t/data-23/escapes1.pot U docs/po4a/t/data-23/quotes.fr N docs/po4a/t/data-05/test2.it.po-empty N docs/po4a/t/data-05/test6.err N docs/po4a/t/data-05/test3.err N docs/po4a/t/data-05/test4.conf N docs/po4a/t/data-05/test2_man.1 N docs/po4a/t/data-05/test2.pot N docs/po4a/t/data-05/test2.conf N docs/po4a/t/data-05/test0.fr.po-empty N docs/po4a/t/data-05/test2.de.po N docs/po4a/t/data-05/test2.es.po-empty N docs/po4a/t/data-05/test0.conf N docs/po4a/t/data-05/test0.pot N docs/po4a/t/data-05/test1.err N docs/po4a/t/data-05/test0.fr.po N docs/po4a/t/data-05/test2.es.po N docs/po4a/t/data-05/test0_man.1 N docs/po4a/t/data-05/test2.fr.po-empty N docs/po4a/t/data-05/test2.it.po N docs/po4a/t/data-05/test0_man.fr.1 N docs/po4a/t/data-05/test2.de.po-empty N docs/po4a/t/data-05/test7.err N docs/po4a/t/data-05/test2.err N docs/po4a/t/data-05/test2_man.it.1 N docs/po4a/t/data-05/test2_man.fr.1 N docs/po4a/t/data-05/test2_man.de.1 N docs/po4a/t/data-05/test3.conf N docs/po4a/t/data-05/test5.conf N docs/po4a/t/data-05/test0.err N docs/po4a/t/data-05/test4.err N docs/po4a/t/data-05/test2.fr.po N docs/po4a/t/data-05/test2_man.es.1 U docs/po4a/t/data-20/xml.po U docs/po4a/t/data-20/text.xml N docs/po4a/t/data-22/html.html N docs/po4a/t/data-22/attribute_out.html N docs/po4a/t/data-22/spaces.po N docs/po4a/t/data-22/spaces.html N docs/po4a/t/data-22/attribute.html N docs/po4a/t/data-22/spaces_out.html N docs/po4a/t/data-22/html.po U docs/po4a/t/data-03/man.addendum3 U docs/po4a/t/data-03/man.fr.add2 U docs/po4a/t/data-03/man.addendum2 U docs/po4a/t/data-03/man.fr U docs/po4a/t/data-03/man.fr.add4 U docs/po4a/t/data-03/man.addendum4 U docs/po4a/t/data-03/man U docs/po4a/t/data-03/man.po-ok U docs/po4a/t/data-03/man.addendum1 U docs/po4a/t/data-03/man.fr.add1 U docs/po4a/t/data-03/man.fr.add3 U docs/po4a/lib/Locale/Po4a/KernelHelp.pm N docs/po4a/lib/Locale/Po4a/Html.pm U docs/po4a/lib/Locale/Po4a/Pod.pm U docs/po4a/lib/Locale/Po4a/Man.pm N docs/po4a/lib/Locale/Po4a/Debconf.pm U docs/po4a/lib/Locale/Po4a/TransTractor.pm U docs/po4a/lib/Locale/Po4a/Xml.pm U docs/po4a/lib/Locale/Po4a/Guide.pm U docs/po4a/lib/Locale/Po4a/Common.pm U docs/po4a/lib/Locale/Po4a/Po.pm U docs/po4a/lib/Locale/Po4a/Docbook.pm U docs/po4a/lib/Locale/Po4a/TeX.pm U docs/po4a/lib/Locale/Po4a/Chooser.pm N docs/po4a/lib/Locale/Po4a/NewsDebian.pm U docs/po4a/lib/Locale/Po4a/Sgml.pm U docs/po4a/lib/Locale/Po4a/Dia.pm U docs/po4a/lib/Locale/Po4a/LaTeX.pm No conflicts created by this import

1 0