[prev in list] [next in list] [prev in thread] [next in thread]
List: hugs-cvs
Subject: Re: make check on Windows (MSYS), with patch
From: Brian Smith <brianlsmith () gmail ! com>
Date: 2005-07-31 7:43:48
Message-ID: b0aab04e05073100436cc92a4a () mail ! gmail ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
On 7/30/05, Brian Smith <brianlsmith@gmail.com> wrote:
>
> On 7/30/05, Ross Paterson <ross@soi.city.ac.uk> wrote:
> >
> > On Fri, Jul 29, 2005 at 06:17:59PM -0500, Brian Smith wrote:
> > > Anyway, the other parts of the patch are not useful without the
> > > newline patch because the newline problem causes every test to fail.
> >
> > On second thoughts, shouldn't you have CR's in all the text files if
> > you've configured your CVS client properly?
>
>
> I think so, but "configure" and "xml2sgml" (and possibly other things)
> don't work correctly unless I use my CVS client's "Use Unix line endings"
> setting (I use TortoiseCVS). First, configure failed (I don't remember which
> step), and the only way I was able to solve it was by saving "configure.ac<http://configure.ac>"
> with Unix line endings (using Textpad). Then, sgml2xml failed, for the same
> reason.
>
Ross, you were right--please back out my patch for runstdtest. I have
included a patch to configure.ac <http://configure.ac> and a patch for the
docs/user_guide/Makefile.in that fixes the issues with newline problems.
That way, using a "Use Unix line endings" option is not necessary.
autoconf that comes with msysDTK does not escape line endings correctly
inside of AC_OUTPUT and AC_CHECK_HEADERS when the line endings contain
carriage returns; for AC_OUTPUT, the config.status field gets screwed up,
and for AC_CHECK_HEADERS, something else gets screwed up (but I didn't check
exactly what).
Also, MSYS's sed apparently does not like carriage returns in any scripts
that it is passed with its "-f" option. So, I changed the user guide's
Makefile.in <http://Makefile.in> so that it generates and uses a
carriage-return-free xml2sgml script.
- Brian
[Attachment #5 (text/html)]
On 7/30/05, <b class="gmail_sendername">Brian Smith</b> <<a \
href="mailto:brianlsmith@gmail.com">brianlsmith@gmail.com</a>> wrote:<div><span \
class="gmail_quote"></span><blockquote class="gmail_quote" style="border-left: 1px \
solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
<span class="q">On 7/30/05, <b class="gmail_sendername">Ross Paterson</b> <<a \
href="mailto:ross@soi.city.ac.uk" target="_blank" onclick="return \
top.js.OpenExtLink(window,event,this)">ross@soi.city.ac.uk</a>> wrote: </span>
<div><span class="q"><span class="gmail_quote"></span><blockquote class="gmail_quote" \
style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; \
padding-left: 1ex;"> On Fri, Jul 29, 2005 at 06:17:59PM -0500, Brian Smith \
wrote:<br>> Anyway, the other parts of the patch are not useful without \
the<br>> newline patch because the newline problem causes every test to \
fail.<br><br>On second thoughts, shouldn't you have CR's in all the text files if \
<br>you've configured your CVS client properly?</blockquote></span><div><br> I think \
so, but "configure" and "xml2sgml" (and possibly other things) \
don't work correctly unless I use my CVS client's "Use Unix line endings" \
setting (I use TortoiseCVS). First, configure failed (I don't remember which step), \
and the only way I was able to solve it was by saving "<a \
href="http://configure.ac" target="_blank" onclick="return \
top.js.OpenExtLink(window,event,this)">configure.ac</a>" with Unix line endings \
(using Textpad). Then, sgml2xml failed, for the same \
reason.</div></div></blockquote><div><br> Ross, you were right--please back out my \
patch for runstdtest. I have included a patch to <a \
href="http://configure.ac">configure.ac</a> and a patch for the \
docs/user_guide/Makefile.in that fixes the issues with newline problems. That way, \
using a "Use Unix line endings" option is not necessary.<br>
<br>
autoconf that comes with msysDTK does not escape line endings correctly
inside of AC_OUTPUT and AC_CHECK_HEADERS when the line endings contain
carriage returns; for AC_OUTPUT, the config.status field gets screwed
up, and for AC_CHECK_HEADERS, something else gets screwed up (but I
didn't check exactly what).<br>
<br>
Also, MSYS's sed apparently does not like carriage returns in any
scripts that it is passed with its "-f" option. So, I changed the user
guide's <a href="http://Makefile.in">Makefile.in</a> so that it generates and uses a
carriage-return-free xml2sgml script.<br>
<br>
- Brian<br>
<br>
</div></div>
["configure.ac.patch" (application/octet-stream)]
Index: configure.ac
===================================================================
RCS file: /cvs/hugs98/configure.ac,v
retrieving revision 1.38
diff -u -r1.38 configure.ac
--- configure.ac 28 Jul 2005 16:53:33 -0000 1.38
+++ configure.ac 31 Jul 2005 06:03:42 -0000
@@ -308,13 +308,10 @@
AC_HEADER_STDC
dnl checks for sys/wait.h
AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(
- stdarg.h stdlib.h unistd.h assert.h ctype.h string.h limits.h \
- fcntl.h sgtty.h termio.h termios.h signal.h \
- sys/stat.h sys/types.h sys/ioctl.h sys/resource.h sys/param.h \
- console.h Files.h errno.h stat.h direct.h \
- dirent.h
- )
+AC_CHECK_HEADERS(stdarg.h stdlib.h unistd.h assert.h ctype.h string.h limits.h)
+AC_CHECK_HEADERS(fcntl.h sgtty.h termio.h termios.h signal.h)
+AC_CHECK_HEADERS(sys/stat.h sys/types.h sys/ioctl.h sys/resource.h sys/param.h)
+AC_CHECK_HEADERS(console.h Files.h errno.h stat.h direct.h dirent.h)
AC_HEADER_TIME
AC_CHECK_HEADERS(time.h sys/time.h sys/timeb.h sys/times.h)
@@ -899,10 +896,9 @@
TESTSCRIPT=tests/config
fi
-AC_OUTPUT(MkDefs src/Makefile src/platform.h \
- docs/Makefile docs/users_guide/Makefile \
- docs/hugs.1 $TESTSCRIPT \
- demos/Makefile)
+AC_OUTPUT(MkDefs src/Makefile src/platform.h)
+AC_OUTPUT(docs/Makefile docs/users_guide/Makefile docs/hugs.1)
+AC_OUTPUT($TESTSCRIPT demos/Makefile)
echo ''
echo '************************************************'
["makefile.in.patch" (application/octet-stream)]
Index: docs/users_guide/Makefile.in
===================================================================
RCS file: /cvs/hugs98/docs/users_guide/Makefile.in,v
retrieving revision 1.15
diff -u -r1.15 Makefile.in
--- docs/users_guide/Makefile.in 13 Jul 2005 17:47:51 -0000 1.15
+++ docs/users_guide/Makefile.in 31 Jul 2005 04:42:12 -0000
@@ -29,8 +29,14 @@
# could be $(ROOT)/$(ROOT).html instead.
HTML = $(ROOT)/license.html
-%.sgml: %.xml
- LC_ALL=C sed -f xml2sgml.sed $*.xml >$@
+# MSYS sed cannot handle carriage returns in sed scripts, so we generate
+# one that is guarenteed to not have any.
+
+xml2sgml-no-cr.sed : xml2sgml.sed
+ cat xml2sgml.sed | tr -d '\r' > xml2sgml-no-cr.sed
+
+%.sgml: %.xml xml2sgml-no-cr.sed
+ LC_ALL=C sed -f xml2sgml-no-cr.sed $*.xml >$@
all: $(SGMLDocWays)
@@ -48,6 +54,7 @@
clean:
$(RM) $(PARTS)
$(RM) *~
+ $(RM) xml2sgml-no-cr.sed
distclean: clean
$(RM) $(ROOT).dvi $(ROOT).ps $(ROOT).pdf
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic