[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html ChangeLog configure configure.ac texi...
|
From: |
Patrice Dumas |
|
Subject: |
[Texi2html-cvs] texi2html ChangeLog configure configure.ac texi... |
|
Date: |
Sun, 17 May 2009 20:10:34 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Patrice Dumas <pertusus> 09/05/17 20:10:34
Modified files:
. : ChangeLog configure configure.ac texi2html.pl
test : .cvsignore Makefile.in run_test.sh
test/sectionning: Makefile.am Makefile.in tests.txt
Added files:
test : path_separator.in
Log message:
* texi2html.pl: a path separator may be used for -I and similar
options like makeinfo does.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.382&r2=1.383
http://cvs.savannah.gnu.org/viewcvs/texi2html/configure?cvsroot=texi2html&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/texi2html/configure.ac?cvsroot=texi2html&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.283&r2=1.284
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/.cvsignore?cvsroot=texi2html&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/Makefile.in?cvsroot=texi2html&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/run_test.sh?cvsroot=texi2html&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/path_separator.in?cvsroot=texi2html&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/Makefile.am?cvsroot=texi2html&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/Makefile.in?cvsroot=texi2html&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/sectionning/tests.txt?cvsroot=texi2html&r1=1.11&r2=1.12
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.382
retrieving revision 1.383
diff -u -b -r1.382 -r1.383
--- ChangeLog 17 May 2009 15:35:14 -0000 1.382
+++ ChangeLog 17 May 2009 20:10:16 -0000 1.383
@@ -1,3 +1,8 @@
+2009-05-17 Patrice Dumas <address@hidden>
+
+ * texi2html.pl: a path separator may be used for -I and similar
+ options like makeinfo does.
+
2009-05-16 Patrice Dumas <address@hidden>
* texi2html.pl,texi2html.init: handle @DH{}, @dh{}, @TH{}, @th{}.
Index: configure
===================================================================
RCS file: /cvsroot/texi2html/texi2html/configure,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- configure 5 Feb 2009 11:23:27 -0000 1.59
+++ configure 17 May 2009 20:10:17 -0000 1.60
@@ -2696,7 +2696,7 @@
ac_config_files="$ac_config_files manage_i18n.pl"
-ac_config_files="$ac_config_files Makefile Tests/Makefile test/Makefile
test/contents/Makefile test/coverage/Makefile test/formatting/Makefile
test/indices/Makefile test/invalid/Makefile test/misc/Makefile
test/encodings/Makefile test/macros/Makefile test/manuals/Makefile
test/nested_formats/Makefile test/sectionning/Makefile test/htmlxref/Makefile
test/htmlxref-only_mono/Makefile test/htmlxref-only_split/Makefile
test/xemacs_manual/Makefile test/texi2html_manual/Makefile
test/tar_manual/Makefile test/singular_manual/Makefile test/layout/Makefile
test/many_input_files/Makefile doc/Makefile"
+ac_config_files="$ac_config_files Makefile Tests/Makefile test/Makefile
test/contents/Makefile test/coverage/Makefile test/formatting/Makefile
test/indices/Makefile test/invalid/Makefile test/misc/Makefile
test/encodings/Makefile test/macros/Makefile test/manuals/Makefile
test/nested_formats/Makefile test/sectionning/Makefile test/htmlxref/Makefile
test/htmlxref-only_mono/Makefile test/htmlxref-only_split/Makefile
test/xemacs_manual/Makefile test/texi2html_manual/Makefile
test/tar_manual/Makefile test/singular_manual/Makefile test/layout/Makefile
test/many_input_files/Makefile doc/Makefile test/path_separator"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -3343,6 +3343,7 @@
"test/layout/Makefile") CONFIG_FILES="$CONFIG_FILES test/layout/Makefile"
;;
"test/many_input_files/Makefile") CONFIG_FILES="$CONFIG_FILES
test/many_input_files/Makefile" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+ "test/path_separator") CONFIG_FILES="$CONFIG_FILES test/path_separator" ;;
*) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target"
>&5
$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
Index: configure.ac
===================================================================
RCS file: /cvsroot/texi2html/texi2html/configure.ac,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- configure.ac 6 Jan 2009 01:09:09 -0000 1.19
+++ configure.ac 17 May 2009 20:10:18 -0000 1.20
@@ -129,6 +129,7 @@
test/singular_manual/Makefile \
test/layout/Makefile \
test/many_input_files/Makefile \
- doc/Makefile
+ doc/Makefile \
+ test/path_separator
])
AC_OUTPUT
Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -b -r1.283 -r1.284
--- texi2html.pl 17 May 2009 15:35:15 -0000 1.283
+++ texi2html.pl 17 May 2009 20:10:18 -0000 1.284
@@ -42,6 +42,12 @@
use File::Basename;
# used to find a relative path back to the current working directory
use File::Spec;
+#Â to determine the path separator and null file
+use Config;
+
+my $path_separator = $Config{'path_sep'};
+$path_separator = ':' if (!defined($path_separator));
+my $quoted_path_separator = quotemeta($path_separator);
#use encoding::warnings;
#Â for translations
@@ -79,7 +85,7 @@
}
# CVS version:
-# $Id: texi2html.pl,v 1.283 2009/05/17 15:35:15 pertusus Exp $
+# $Id: texi2html.pl,v 1.284 2009/05/17 20:10:18 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -3594,8 +3600,12 @@
$Texi2HTML::Config::OUT = '';
}
address@hidden::Config::INCLUDE_DIRS =
split(/$quoted_path_separator/,join($path_separator,@Texi2HTML::Config::INCLUDE_DIRS));
address@hidden::Config::PREPEND_DIRS =
split(/$quoted_path_separator/,join($path_separator,@Texi2HTML::Config::PREPEND_DIRS));
+
my @include_dirs_orig = @Texi2HTML::Config::INCLUDE_DIRS;
address@hidden::Config::CONF_DIRS =
split(/$quoted_path_separator/,join($path_separator,@Texi2HTML::Config::CONF_DIRS));
# extension
$Texi2HTML::GLOBAL{'extension'} = $Texi2HTML::Config::EXTENSION;
if ($Texi2HTML::Config::SHORTEXTN)
Index: test/.cvsignore
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- test/.cvsignore 20 Aug 2008 12:26:58 -0000 1.1
+++ test/.cvsignore 17 May 2009 20:10:27 -0000 1.2
@@ -1 +1,2 @@
Makefile
+path_separator
Index: test/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- test/Makefile.in 27 Apr 2009 17:14:06 -0000 1.10
+++ test/Makefile.in 17 May 2009 20:10:32 -0000 1.11
@@ -32,13 +32,14 @@
build_triplet = @build@
host_triplet = @host@
subdir = test
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(srcdir)/path_separator.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = path_separator
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -186,6 +187,8 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+path_separator: $(top_builddir)/config.status $(srcdir)/path_separator.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
Index: test/run_test.sh
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/run_test.sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- test/run_test.sh 9 Jan 2009 16:55:19 -0000 1.12
+++ test/run_test.sh 17 May 2009 20:10:32 -0000 1.13
@@ -6,6 +6,7 @@
export LANG=C
+
res_dir=res
out_dir=out
diffs_dir=diffs
@@ -106,6 +107,8 @@
exit 0
fi
+. ../path_separator ||Â exit 1
+
[ -d "$diffs_dir" ] || mkdir "$diffs_dir"
[ -d "$out_dir" ] || mkdir "$out_dir"
@@ -129,7 +132,7 @@
file=`echo $line | awk '{print $2}'`
[ "z$dir" = 'z' -o "$zfile" = 'z' ] && continue
basename=`basename $file .texi`
- remaining=`echo $line | sed 's/[a-zA-Z0-9_./-]\+ \+[a-zA-Z0-9_./-]\+ *//'`
+ remaining=`echo $line | sed 's/[a-zA-Z0-9_./-]\+ \+[a-zA-Z0-9_./-]\+ *//' |
sed 's,@PATH_SEPARATOR@,'"${PATH_SEPARATOR}$testdir/$srcdir_test/"',g'`
src_file="$testdir/$srcdir_test/$file"
if [ $one_test = 'yes' -a "z$dir" != "z$the_test" ]; then
continue
Index: test/sectionning/Makefile.am
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/sectionning/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- test/sectionning/Makefile.am 17 May 2009 15:35:37 -0000 1.9
+++ test/sectionning/Makefile.am 17 May 2009 20:10:33 -0000 1.10
@@ -11,7 +11,7 @@
node-whitespace.texi two_footnotes_in_nodes.texi section_in_unnumbered.texi \
top.texi more_nodes_than_sections.texi \
placed_things_before_element.texi menutextorder.texi semi_auto.texi \
- no_element.texi anchor_in_footnote.texi \
+ no_element.texi anchor_in_footnote.texi test_two_include.texi \
test_directions.init tests.txt res
DISTCLEANFILES = l2h_tmp_dir.init tests.log tests.out
Index: test/sectionning/Makefile.in
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/sectionning/Makefile.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- test/sectionning/Makefile.in 17 May 2009 15:35:37 -0000 1.13
+++ test/sectionning/Makefile.in 17 May 2009 20:10:33 -0000 1.14
@@ -141,7 +141,7 @@
node-whitespace.texi two_footnotes_in_nodes.texi section_in_unnumbered.texi \
top.texi more_nodes_than_sections.texi \
placed_things_before_element.texi menutextorder.texi semi_auto.texi \
- no_element.texi anchor_in_footnote.texi \
+ no_element.texi anchor_in_footnote.texi test_two_include.texi \
test_directions.init tests.txt res
DISTCLEANFILES = l2h_tmp_dir.init tests.log tests.out
Index: test/sectionning/tests.txt
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/sectionning/tests.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- test/sectionning/tests.txt 17 May 2009 15:35:38 -0000 1.11
+++ test/sectionning/tests.txt 17 May 2009 20:10:34 -0000 1.12
@@ -63,3 +63,4 @@
node_footnote_separated_info node_footnote.texi -init info.init
--footnote-style=separate
anchor_in_footnote_info anchor_in_footnote.texi -init info.init
anchor_in_footnote_separated_info anchor_in_footnote.texi -init info.init
--footnote-style=separate
+test_two_include test_two_include.texi -I
address@hidden@../address@hidden@../macros
Index: test/path_separator.in
===================================================================
RCS file: test/path_separator.in
diff -N test/path_separator.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ test/path_separator.in 17 May 2009 20:10:32 -0000 1.1
@@ -0,0 +1 @@
address@hidden@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Texi2html-cvs] texi2html ChangeLog configure configure.ac texi...,
Patrice Dumas <=