From fdrake@users.sourceforge.net  Thu Aug  9 19:08:58 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Thu, 09 Aug 2001 11:08:58 -0700
Subject: [Expat-checkins] CVS: expat/lib xmlparse.c,1.21,1.22
Message-ID: <E15UuEs-0006lr-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/expat/expat/lib
In directory usw-pr-cvs1:/tmp/cvs-serv26008/lib

Modified Files:
	xmlparse.c 
Log Message:

XML_Parse():  If XML_GetBuffer() returns NULL, do not attempt to move
    data aronud, just propogate the error.

This closes SF bug #434665.


Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** xmlparse.c	2001/07/27 17:17:44	1.21
--- xmlparse.c	2001/08/09 18:08:56	1.22
***************
*** 1135,1140 ****
  #endif  /* not defined XML_CONTEXT_BYTES */
    else {
!     memcpy(XML_GetBuffer(parser, len), s, len);
!     return XML_ParseBuffer(parser, len, isFinal);
    }
  }
--- 1135,1145 ----
  #endif  /* not defined XML_CONTEXT_BYTES */
    else {
!     void *buff = XML_GetBuffer(parser, len);
!     if (buff == NULL)
!       return 0;
!     else {
!       memcpy(buff, s, len);
!       return XML_ParseBuffer(parser, len, isFinal);
!     }
    }
  }



From fdrake@users.sourceforge.net  Fri Aug 10 14:54:00 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Fri, 10 Aug 2001 06:54:00 -0700
Subject: [Expat-checkins] CVS: expat/xmlwf Makefile.in,1.6,1.7
Message-ID: <E15VCjg-0006d0-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/expat/expat/xmlwf
In directory usw-pr-cvs1:/tmp/cvs-serv25471

Modified Files:
	Makefile.in 
Log Message:

Make sure SHELL is properly set from the configure script.
This closes SF bug #448560.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile.in	2001/07/25 17:51:40	1.6
--- Makefile.in	2001/08/10 13:53:58	1.7
***************
*** 19,22 ****
--- 19,24 ----
  #
  
+ SHELL = @SHELL@
+ 
  bindir = @bindir@
  



From fdrake@users.sourceforge.net  Mon Aug 13 20:10:12 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Mon, 13 Aug 2001 12:10:12 -0700
Subject: [Expat-checkins] CVS: expat/doc reference.html,1.10,1.11
Message-ID: <E15WN6K-0006ih-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/expat/expat/doc
In directory usw-pr-cvs1:/tmp/cvs-serv25796

Modified Files:
	reference.html 
Log Message:

Added a note to the XML_GetCurrentByteCount() function that it returns 0
for the end tag event when an empty-element tag is used.  Noted on
expat-discuss by Michael Isard.


Index: reference.html
===================================================================
RCS file: /cvsroot/expat/expat/doc/reference.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** reference.html	2001/01/24 19:53:01	1.10
--- reference.html	2001/08/13 19:10:09	1.11
***************
*** 1327,1332 ****
  </pre></a></div>
  <div class="fcndef">
! Return the number of bytes in the current event. Returns 0 if the event is
! inside a reference to an internal entity.
  </div>
  
--- 1327,1335 ----
  </pre></a></div>
  <div class="fcndef">
! Return the number of bytes in the current event. Returns
! <code>0</code> if the event is inside a reference to an internal
! entity and for the end-tag event for empty element tags (the later can
! be used to distinguish empty-element tags from empty elements using
! separate start and end tags).
  </div>
  



From fdrake@users.sourceforge.net  Fri Aug 17 20:11:47 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Fri, 17 Aug 2001 12:11:47 -0700
Subject: [Expat-checkins] CVS: expat/tests - New directory
Message-ID: <E15Xp23-0001Ff-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/expat/expat/tests
In directory usw-pr-cvs1:/tmp/cvs-serv4799/tests

Log Message:
Directory /cvsroot/expat/expat/tests added to the repository




From fdrake@users.sourceforge.net  Fri Aug 17 20:16:44 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Fri, 17 Aug 2001 12:16:44 -0700
Subject: [Expat-checkins] CVS: expat/tests .cvsignore,NONE,1.1 Makefile.in,NONE,1.1 README.txt,NONE,1.1 runtests.c,NONE,1.1
Message-ID: <E15Xp6q-0001VI-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/expat/expat/tests
In directory usw-pr-cvs1:/tmp/cvs-serv5767

Added Files:
	.cvsignore Makefile.in README.txt runtests.c 
Log Message:

Tell CVS to ignore the intermediate files generated by building the test
suite.


--- NEW FILE: .cvsignore ---
Makefile
runtests

--- NEW FILE: Makefile.in ---
SHELL = @SHELL@

srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@

CC=@CC@
CPPFLAGS = @CPPFLAGS@ -I../lib
LDFLAGS = @LDFLAGS@ -L../lib
LIBS = @LIBS@ -lexpat -lcheck
CFLAGS = @CFLAGS@


check:	runtests
	@./runtests

runtests.o:  runtests.c
	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@

runtests:  runtests.o
	$(CC) $(LDFLAGS) $< -o $@ $(LIBS)

--- NEW FILE: README.txt ---
This directory contains the (fledgling) test suite for Expat.  The
tests provide general unit testing and regression coverage.  The tests
are not expected to be useful examples of Expat usage; see the
examples/ directory for that.

The Expat tests use the "Check" unit testing framework for C.  More
information on Check can be found at:

	http://check.sourceforge.net/

Check must be installed before the unit tests can be compiled & run.

Since both Check and this test suite are young, it can all change in a
later version.

--- NEW FILE: runtests.c ---
#include <check.h>
#include <stdlib.h>

#include "expat.h"


static XML_Parser parser;


static void
basic_setup(void)
{
    parser = XML_ParserCreate("us-ascii");
}

static void
basic_teardown(void)
{
    if (parser != NULL) {
        XML_ParserFree(parser);
    }
}


START_TEST(test_nul_byte)
{
    char *text = "<doc>\0</doc>";

    if (parser == NULL)
        fail("Parser not created.");

    /* test that a NUL byte (in US-ASCII data) is an error */
    if (XML_Parse(parser, text, 12, 1))
        fail("Parser did not report error on NUL-byte.");
    fail_unless(XML_GetErrorCode(parser) == XML_ERROR_INVALID_TOKEN,
                "Got wrong error code for NUL-byte in US-ASCII encoding.");
}
END_TEST


START_TEST(test_u0000_char)
{
    char *text = "<doc>&#0;</doc>";

    if (parser == NULL)
        fail("Parser not created.");

    /* test that a NUL byte (in US-ASCII data) is an error */
    if (XML_Parse(parser, text, strlen(text), 1))
        fail("Parser did not report error on NUL-byte.");
    fail_unless(XML_GetErrorCode(parser) == XML_ERROR_BAD_CHAR_REF,
                "Got wrong error code for &#0;.");
}
END_TEST


static Suite *
make_basic_suite(void)
{
    Suite *s = suite_create("basic");
    TCase *tc_nulls = tcase_create("null characters");

    suite_add_tcase(s, tc_nulls);
    tcase_set_fixture(tc_nulls, basic_setup, basic_teardown);
    tcase_add_test(tc_nulls, test_nul_byte);
    tcase_add_test(tc_nulls, test_u0000_char);

    return s;
}


int
main(int argc, char *argv[])
{
    int nf;
    int verbosity = CRNORMAL;
    Suite *s = make_basic_suite();
    SRunner *sr = srunner_create(s);

    if (argc >= 2) {
        char *opt = argv[1];
        if (strcmp(opt, "-v") == 0 || strcmp(opt, "--verbose") == 0)
            verbosity = CRVERBOSE;
        else if (strcmp(opt, "-q") == 0 || strcmp(opt, "--quiet") == 0)
            verbosity = CRSILENT;
    }
    srunner_run_all(sr, verbosity);
    nf = srunner_ntests_failed(sr);
    srunner_free(sr);
    suite_free(s);

    return (nf == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
}



From fdrake@users.sourceforge.net  Fri Aug 17 20:23:04 2001
From: fdrake@users.sourceforge.net (Fred L. Drake)
Date: Fri, 17 Aug 2001 12:23:04 -0700
Subject: [Expat-checkins] CVS: expat Makefile.in,1.13,1.14 configure.in,1.19,1.20
Message-ID: <E15XpCy-0001rF-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/expat/expat
In directory usw-pr-cvs1:/tmp/cvs-serv7124

Modified Files:
	Makefile.in configure.in 
Log Message:

Update so the tests will be run by "make check".


Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/Makefile.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile.in	2001/07/26 21:57:57	1.13
--- Makefile.in	2001/08/17 19:23:02	1.14
***************
*** 141,147 ****
  
  check:	$(SUBDIRS)
! 	@echo
! 	@echo This package does not yet have a regression test.
! 	@echo
  
  $(DISTRIBUTION): distdir
--- 141,145 ----
  
  check:	$(SUBDIRS)
! 	(cd tests && $(MAKE) check)
  
  $(DISTRIBUTION): distdir

Index: configure.in
===================================================================
RCS file: /cvsroot/expat/expat/configure.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** configure.in	2001/07/26 21:57:57	1.19
--- configure.in	2001/08/17 19:23:02	1.20
***************
*** 109,111 ****
--- 109,114 ----
      OUTPUT="$OUTPUT examples/Makefile"
  fi
+ if test -d ${srcdir}/tests; then
+     OUTPUT="$OUTPUT tests/Makefile"
+ fi
  AC_OUTPUT($OUTPUT)



From gstein@users.sourceforge.net  Thu Aug 23 10:24:47 2001
From: gstein@users.sourceforge.net (Greg Stein)
Date: Thu, 23 Aug 2001 02:24:47 -0700
Subject: [Expat-checkins] CVS: expat/examples Makefile.in,1.5,1.6
Message-ID: <E15ZqjH-00073s-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/expat/expat/examples
In directory usw-pr-cvs1:/tmp/cvs-serv26340/examples

Modified Files:
	Makefile.in 
Log Message:
Clean out some unused bits from the makefiles. Remove some of the recursion
and just do it from the top-level instead.



Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/examples/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile.in	2001/07/26 21:54:43	1.5
--- Makefile.in	2001/08/23 09:24:45	1.6
***************
*** 28,33 ****
  CFLAGS = @CFLAGS@ -I$(INCDIR)
  
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  
--- 28,31 ----
***************
*** 40,54 ****
  outline: outline.o
  	$(CC) -o $@ $< $(LDFLAGS) $(LIBS)
- 
- check:	$(SUBDIRS)
- 	@echo
- 	@echo This package does not yet have a regression test.
- 	@echo
- 
- clean:
- 	rm -f elements outline core *.o
- 
- distclean: clean
- 	rm -f Makefile
- 
- maintainer-clean: distclean
--- 38,39 ----



From gstein@users.sourceforge.net  Thu Aug 23 10:24:47 2001
From: gstein@users.sourceforge.net (Greg Stein)
Date: Thu, 23 Aug 2001 02:24:47 -0700
Subject: [Expat-checkins] CVS: expat/xmlwf Makefile.in,1.7,1.8
Message-ID: <E15ZqjH-000748-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/expat/expat/xmlwf
In directory usw-pr-cvs1:/tmp/cvs-serv26340/xmlwf

Modified Files:
	Makefile.in 
Log Message:
Clean out some unused bits from the makefiles. Remove some of the recursion
and just do it from the top-level instead.



Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/xmlwf/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.in	2001/08/10 13:53:58	1.7
--- Makefile.in	2001/08/23 09:24:45	1.8
***************
*** 19,26 ****
  #
  
- SHELL = @SHELL@
- 
- bindir = @bindir@
- 
  LIBDIR= ../lib/.libs
  INCDIR= ../lib
--- 19,22 ----
***************
*** 30,70 ****
  CC = @CC@
  
! FILEMAP_OBJ= @FILEMAP_OBJ@
! OBJS= xmlwf.o xmlfile.o codepage.o $(FILEMAP_OBJ)
  LIBS= -L$(LIBDIR) -lexpat
  
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = ${INSTALL}
- LIBTOOL = @LIBTOOL@
- mkinstalldirs = $(SHELL) $(top_srcdir)/conftools/mkinstalldirs
- 
- srcdir = @srcdir@
- top_builddir = ..
- top_srcdir = @top_srcdir@
  VPATH = @srcdir@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
  
- 
  xmlwf: $(OBJS)
  	$(CC) -o xmlwf $(LDFLAGS) $(OBJS) $(LIBS)
- 
- install: xmlwf
- 	$(mkinstalldirs) $(bindir)
- 	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf $(bindir)/xmlwf
- 
- uninstall:
- 	$(LIBTOOL) --mode=uninstall rm -f $(bindir)/xmlwf
- 
- check:	$(SUBDIRS)
- 	@echo
- 	@echo This package does not yet have a regression test.
- 	@echo
- 
- clean:
- 	rm -f xmlwf core *.o
- 
- distclean: clean
- 	rm -f Makefile
- 
- maintainer-clean: distclean
--- 26,34 ----
  CC = @CC@
  
! OBJS= xmlwf.o xmlfile.o codepage.o @FILEMAP_OBJ@
  LIBS= -L$(LIBDIR) -lexpat
  
  VPATH = @srcdir@
  
  xmlwf: $(OBJS)
  	$(CC) -o xmlwf $(LDFLAGS) $(OBJS) $(LIBS)



From gstein@users.sourceforge.net  Thu Aug 23 10:24:47 2001
From: gstein@users.sourceforge.net (Greg Stein)
Date: Thu, 23 Aug 2001 02:24:47 -0700
Subject: [Expat-checkins] CVS: expat Makefile.in,1.14,1.15 configure.in,1.20,1.21
Message-ID: <E15ZqjH-00073n-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/expat/expat
In directory usw-pr-cvs1:/tmp/cvs-serv26340

Modified Files:
	Makefile.in configure.in 
Log Message:
Clean out some unused bits from the makefiles. Remove some of the recursion
and just do it from the top-level instead.



Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/Makefile.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Makefile.in	2001/08/17 19:23:02	1.14
--- Makefile.in	2001/08/23 09:24:45	1.15
***************
*** 38,88 ****
  
  bindir = @bindir@
- sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
- sysconfdir = @sysconfdir@
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
  libdir = @libdir@
- infodir = @infodir@
- mandir = @mandir@
  includedir = @includedir@
- oldincludedir = /usr/include
  
  top_builddir = .
  
  
- AUTOCONF = autoconf
- 
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
! 
! NORMAL_INSTALL = :
! PRE_INSTALL = :
! POST_INSTALL = :
! NORMAL_UNINSTALL = :
! PRE_UNINSTALL = :
! POST_UNINSTALL = :
! host_alias = @host_alias@
! host_triplet = @host@
  
  CC = @CC@
  
  LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- PACKAGE = @PACKAGE@
- RANLIB = @RANLIB@
  VERSION = @VERSION@
  
  SUBDIRS = lib examples xmlwf
- INSTALLSUBDIRS = lib xmlwf
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  CONFIG_HEADERS = config.h
  
! DISTDIR = $(PACKAGE)-$(VERSION)
  DISTRIBUTION = $(DISTDIR).tar.gz
  
  default:  lib xmlwf
  
--- 38,69 ----
  
  bindir = @bindir@
  libdir = @libdir@
  includedir = @includedir@
  
  top_builddir = .
  
  
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
! mkinstalldirs = $(SHELL) $(top_srcdir)/conftools/mkinstalldirs
  
  CC = @CC@
  
  LIBTOOL = @LIBTOOL@
  VERSION = @VERSION@
  
  SUBDIRS = lib examples xmlwf
  CONFIG_HEADERS = config.h
  
! APIHEADER = expat.h
! LIBRARY = libexpat.la
! 
! 
! DISTDIR = expat-$(VERSION)
  DISTRIBUTION = $(DISTDIR).tar.gz
  
+ 
  default:  lib xmlwf
  
***************
*** 91,126 ****
  all: $(SUBDIRS)
  
- Makefile: Makefile.in config.status
- 	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) config.status
- 
- config.status: configure
- 	@if test -f $@; then \
- 		$(SHELL) config.status --recheck ; \
- 	else \
- 		$(SHELL) configure ; \
- 	fi
- 
- configure: configure.in
- 	$(AUTOCONF)
- 
- config.h: config.h.in config.status
- 	CONFIG_FILES= CONFIG_HEADERS=$(CONFIG_HEADERS) \
- 	$(SHELL) ./config.status
- 
  $(SUBDIRS):
  	cd $@ && $(MAKE)
  
  clean:
! 	for dir in $(SUBDIRS); do \
! 		(cd $$dir && $(MAKE) clean); \
! 	done
! 	rm -f core *~
  
! distclean:
! 	for dir in $(SUBDIRS); do \
! 		(cd $$dir && $(MAKE) distclean); \
! 	done
  	rm -f config.h config.status config.log config.cache libtool
! 	rm -f Makefile examples/Makefile xmlwf/Makefile
  
  extraclean: distclean
--- 72,92 ----
  all: $(SUBDIRS)
  
  $(SUBDIRS):
  	cd $@ && $(MAKE)
  
  clean:
! 	# clean up the lib dir
! 	cd lib && rm -f $(LIBRARY) *.o *.lo && rm -rf .libs _libs
! 	# clean up the xmlwf dir
! 	cd xmlwf && rm -f xmlwf *.o
! 	# clean up the examples dir
! 	cd examples && rm -f elements outline *.o
! 	# other random cleanup
! 	find . -name core | xargs rm -f
  
! distclean: clean
  	rm -f config.h config.status config.log config.cache libtool
! 	rm -f Makefile lib/Makefile examples/Makefile xmlwf/Makefile tests/Makefile
! 	rm -f lib/expat.h
  
  extraclean: distclean
***************
*** 141,145 ****
  
  check:	$(SUBDIRS)
! 	(cd tests && $(MAKE) check)
  
  $(DISTRIBUTION): distdir
--- 107,111 ----
  
  check:	$(SUBDIRS)
! 	cd tests && $(MAKE) check
  
  $(DISTRIBUTION): distdir
***************
*** 148,160 ****
  dist: $(DISTRIBUTION)
  
! install:
! 	for dir in $(INSTALLSUBDIRS); do \
! 		(cd $$dir && $(MAKE) install); \
! 	done
  
  uninstall:
! 	for dir in $(INSTALLSUBDIRS); do \
! 		(cd $$dir && $(MAKE) uninstall); \
! 	done
  
  .PHONY: buildlib all $(SUBDIRS) \
--- 114,127 ----
  dist: $(DISTRIBUTION)
  
! install: xmlwf/xmlwf lib/$(LIBRARY) lib/$(APIHEADER)
! 	$(mkinstalldirs) $(bindir) $(libdir) $(includedir)
! 	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xmlwf/xmlwf $(bindir)/xmlwf
! 	$(LIBTOOL) --mode=install $(INSTALL) lib/$(LIBRARY) $(libdir)/$(LIBRARY)
! 	$(INSTALL_DATA) lib/$(APIHEADER) $(includedir)
  
  uninstall:
! 	$(LIBTOOL) --mode=uninstall rm -f $(bindir)/xmlwf
! 	$(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(LIBRARY)
! 	rm -f $(libdir)/$(APIHEADER)
  
  .PHONY: buildlib all $(SUBDIRS) \

Index: configure.in
===================================================================
RCS file: /cvsroot/expat/expat/configure.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** configure.in	2001/08/17 19:23:02	1.20
--- configure.in	2001/08/23 09:24:45	1.21
***************
*** 27,31 ****
  EXPAT_VERSION=$EXPAT_MAJOR_VERSION.$EXPAT_MINOR_VERSION.$EXPAT_EDIT
  VERSION=$EXPAT_VERSION
- PACKAGE=expat
  
  dnl
--- 27,30 ----
***************
*** 49,53 ****
  AC_PROG_LIBTOOL
  
- AC_SUBST(PACKAGE)
  AC_SUBST(VERSION)
  AC_SUBST(EXPAT_MAJOR_VERSION)
--- 48,51 ----



From gstein@users.sourceforge.net  Thu Aug 23 10:24:47 2001
From: gstein@users.sourceforge.net (Greg Stein)
Date: Thu, 23 Aug 2001 02:24:47 -0700
Subject: [Expat-checkins] CVS: expat/lib Makefile.in,1.15,1.16
Message-ID: <E15ZqjH-000742-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/expat/expat/lib
In directory usw-pr-cvs1:/tmp/cvs-serv26340/lib

Modified Files:
	Makefile.in 
Log Message:
Clean out some unused bits from the makefiles. Remove some of the recursion
and just do it from the top-level instead.



Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/lib/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Makefile.in	2001/07/25 15:13:38	1.15
--- Makefile.in	2001/08/23 09:24:45	1.16
***************
*** 28,81 ****
  exec_prefix = @exec_prefix@
  
- bindir = @bindir@
- sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
- sysconfdir = @sysconfdir@
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
  libdir = @libdir@
- infodir = @infodir@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
  
- subdir = lib
- 
  top_builddir = ..
  
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- 
- host_alias = @host_alias@
- host_triplet = @host@
- AS = @AS@
  CC = @CC@
- DLLTOOL = @DLLTOOL@
  LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- OBJDUMP = @OBJDUMP@
- PACKAGE = @PACKAGE@
- RANLIB = @RANLIB@
  VERSION = @VERSION@
  
  LIBRARY = libexpat.la
! SOURCES = xmlparse.c xmltok.c xmlrole.c
! OBJECTS = $(SOURCES:.c=.o)
! LTOBJECTS = $(SOURCES:.c=.lo)
! 
! TEMPLATES = xmltok_impl.c xmltok_ns.c
! APIHEADER = expat.h
! HEADERS = ascii.h iasciitab.h utf8tab.h xmltok.h asciitab.h latin1tab.h \
!           nametab.h xmldef.h xmlrole.h xmltok_impl.h
! 
! mkinstalldirs = $(SHELL) $(top_srcdir)/conftools/mkinstalldirs
! CONFIG_HEADER = ../config.h
! CONFIG_CLEAN_FILES = 
  
  INCLUDES = -I$(srcdir) -I. -I..
! DEFS = @DEFS@ -DPACKAGE='"$(PACKAGE)"' -DVERSION='"$(PACKAGE)_$(VERSION)"'
  
  CPPFLAGS = @CPPFLAGS@
--- 28,44 ----
  exec_prefix = @exec_prefix@
  
  libdir = @libdir@
  
  top_builddir = ..
  
  CC = @CC@
  LIBTOOL = @LIBTOOL@
  VERSION = @VERSION@
  
  LIBRARY = libexpat.la
! LTOBJECTS = xmlparse.lo xmltok.lo xmlrole.lo
  
  INCLUDES = -I$(srcdir) -I. -I..
! DEFS = @DEFS@ -DVERSION='"expat_$(VERSION)"'
  
  CPPFLAGS = @CPPFLAGS@
***************
*** 90,107 ****
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
  LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
! CCLD = $(CC)
! LINK = $(LIBTOOL) --mode=link  $(CCLD) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) $(CFLAGS) $(LDFLAGS) -o $@
! DIST_COMMON =  Makefile.in
! 
  
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(TEMPLATES) $(APIHEADER) $(HEADERS) 
  
- TAR = gtar
- GZIP_ENV = --best
- 
  all: $(LIBRARY)
  
  .SUFFIXES: .c .lo .o
! .PHONY: all clean distclean maintainer-clean
  
  .c.o:
--- 53,63 ----
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
  LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
! LINK = $(LIBTOOL) --mode=link  $(CC) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) $(CFLAGS) $(LDFLAGS) -o $@
  
  
  all: $(LIBRARY)
  
  .SUFFIXES: .c .lo .o
! .PHONY: all
  
  .c.o:
***************
*** 110,146 ****
  .c.lo:
  	$(LTCOMPILE) -c $<
- 
- Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) \
- 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
- $(top_builddir)/config.status: $(top_builddir)/configure
- 	cd $(top_builddir) && $(MAKE) config.status
- 
- $(top_builddir)/config.h: $(top_builddir)/config.h.in
- 	cd $(top_builddir) && $(MAKE) config.h
- 
- clean:
- 	rm -f $(LIBRARY) *.o *.lo *~
- 	rm -rf .libs _libs
- 
- distclean: clean
- 	rm -f Makefile
- 
- maintainer-clean: distclean
- 
- check:	$(SUBDIRS)
- 	@echo
- 	@echo This package does not yet have a regression test.
- 	@echo
- 
- install: $(LIBRARY) $(APIHEADER)
- 	$(mkinstalldirs) $(libdir) $(includedir)
- 	$(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(libdir)/$(LIBRARY)
- 	$(INSTALL_DATA) $(APIHEADER) $(includedir)
- 
- uninstall:
- 	$(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(LIBRARY);
- 	rm -f $(libdir)/$(APIHEADER)
  
  $(LIBRARY): $(LTOBJECTS)
--- 66,69 ----



From gstein@users.sourceforge.net  Thu Aug 23 12:27:28 2001
From: gstein@users.sourceforge.net (Greg Stein)
Date: Thu, 23 Aug 2001 04:27:28 -0700
Subject: [Expat-checkins] CVS: expat .cvsignore,1.6,1.7 MANIFEST,1.6,1.7 Makefile.in,1.15,1.16 buildconf.sh,1.2,1.3 configure.in,1.21,1.22
Message-ID: <E15Zse0-0006pg-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/expat/expat
In directory usw-pr-cvs1:/tmp/cvs-serv24948

Modified Files:
	.cvsignore MANIFEST Makefile.in buildconf.sh configure.in 
Log Message:
* stop using aclocal.m4 and directly sinclude() the .m4 files into the
  configure script. don't "clean" it and remove it from .cvsignore.
  Note: to avoid problems in developer dirs, we nuke the file in
  buildconf.sh for now; we'll stop doing that at some future time.
  [idea from ASF]

* look for glibtoolize, in addition to libtoolize (e.g. the MacOS X platform
  names it differently). [patch from ASF]

* conftools/missing is not needed

* use "exit 0" in buildconf.sh to help calling scripts. [patch from ASF]

* minor output cleanup in "make clean"



Index: .cvsignore
===================================================================
RCS file: /cvsroot/expat/expat/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** .cvsignore	2001/07/27 14:42:33	1.6
--- .cvsignore	2001/08/23 11:27:26	1.7
***************
*** 1,4 ****
  Makefile
- aclocal.m4
  configure
  config.cache
--- 1,3 ----

Index: MANIFEST
===================================================================
RCS file: /cvsroot/expat/expat/MANIFEST,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MANIFEST	2001/07/27 13:28:49	1.6
--- MANIFEST	2001/08/23 11:27:26	1.7
***************
*** 14,18 ****
  conftools/ltconfig
  conftools/ltmain.sh
- conftools/missing
  conftools/mkinstalldirs
  doc/reference.html
--- 14,17 ----

Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Makefile.in	2001/08/23 09:24:45	1.15
--- Makefile.in	2001/08/23 11:27:26	1.16
***************
*** 76,86 ****
  
  clean:
- 	# clean up the lib dir
  	cd lib && rm -f $(LIBRARY) *.o *.lo && rm -rf .libs _libs
- 	# clean up the xmlwf dir
  	cd xmlwf && rm -f xmlwf *.o
- 	# clean up the examples dir
  	cd examples && rm -f elements outline *.o
- 	# other random cleanup
  	find . -name core | xargs rm -f
  
--- 76,82 ----
***************
*** 91,95 ****
  
  extraclean: distclean
! 	rm -f aclocal.m4 config.h.in configure
  	rm -f conftools/config.guess conftools/config.sub
  	rm -f conftools/ltconfig conftools/ltmain.sh
--- 87,91 ----
  
  extraclean: distclean
! 	rm -f config.h.in configure
  	rm -f conftools/config.guess conftools/config.sub
  	rm -f conftools/ltconfig conftools/ltmain.sh

Index: buildconf.sh
===================================================================
RCS file: /cvsroot/expat/expat/buildconf.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** buildconf.sh	2001/07/24 19:54:20	1.2
--- buildconf.sh	2001/08/23 11:27:26	1.3
***************
*** 2,27 ****
  
  #
! # Build aclocal.m4 from libtool's libtool.m4
  #
! ltpath=`conftools/PrintPath libtoolize`
! ltpath=`dirname $ltpath`
! ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
! echo "Incorporating $ltfile into aclocal.m4 ..."
! echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4
! echo "dnl edits here will be lost" >> aclocal.m4
! cat $ltfile >> aclocal.m4
! 
! ltfile='conftools/ac_c_bigendian_cross.m4'
! echo "Incorporating $ltfile into aclocal.m4 ..."
! cat $ltfile >> aclocal.m4
  
  #
! # Create the libtool helper files
  #
! # Note: we always replace the files, and we copy (rather than link) them.
  #
! echo "Copying libtool helper files ..."
! $ltpath/libtoolize --force --copy
  
  #
  # Generate the autoconf header template (config.h.in) and ./configure
--- 2,34 ----
  
  #
! # Create the libtool helper files
  #
! echo "Copying libtool helper files ..."
  
  #
! # find libtoolize, or glibtoolize on MacOS X
  #
! libtoolize=`conftools/PrintPath glibtoolize libtoolize`
! if [ "x$libtoolize" = "x" ]; then
!     echo "libtoolize not found in path"
!     exit 1
! fi
! 
  #
! # --force to ensure that we replace with current files
! # --copy to avoid symlinks; we want originals for the distro
! # --automake to make it shut up about "things to do"
! #
! $libtoolize --force --copy --automake
  
+ ltpath=`dirname $libtoolize`
+ ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
+ cp $ltfile conftools/libtool.m4
+ 
+ ### for a little while... remove stray aclocal.m4 files from
+ ### developers' working copies. we no longer use it. (nothing else
+ ### will remove it, and leaving it creates big problems)
+ rm -f aclocal.m4
+ 
  #
  # Generate the autoconf header template (config.h.in) and ./configure
***************
*** 33,34 ****
--- 40,44 ----
  ### do some work to toss config.cache?
  autoconf
+ 
+ # exit with the right value, so any calling script can continue
+ exit 0

Index: configure.in
===================================================================
RCS file: /cvsroot/expat/expat/configure.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** configure.in	2001/08/23 09:24:45	1.21
--- configure.in	2001/08/23 11:27:26	1.22
***************
*** 45,48 ****
--- 45,51 ----
  AC_CONFIG_HEADER(config.h)
  
+ sinclude(conftools/libtool.m4)
+ sinclude(conftools/ac_c_bigendian_cross.m4)
+ 
  AC_LIBTOOL_WIN32_DLL
  AC_PROG_LIBTOOL



From gstein@users.sourceforge.net  Thu Aug 23 12:27:28 2001
From: gstein@users.sourceforge.net (Greg Stein)
Date: Thu, 23 Aug 2001 04:27:28 -0700
Subject: [Expat-checkins] CVS: expat/conftools missing,1.1,NONE
Message-ID: <E15Zse0-0006pk-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/expat/expat/conftools
In directory usw-pr-cvs1:/tmp/cvs-serv24948/conftools

Removed Files:
	missing 
Log Message:
* stop using aclocal.m4 and directly sinclude() the .m4 files into the
  configure script. don't "clean" it and remove it from .cvsignore.
  Note: to avoid problems in developer dirs, we nuke the file in
  buildconf.sh for now; we'll stop doing that at some future time.
  [idea from ASF]

* look for glibtoolize, in addition to libtoolize (e.g. the MacOS X platform
  names it differently). [patch from ASF]

* conftools/missing is not needed

* use "exit 0" in buildconf.sh to help calling scripts. [patch from ASF]

* minor output cleanup in "make clean"



--- missing DELETED ---



From gstein@users.sourceforge.net  Thu Aug 23 13:35:55 2001
From: gstein@users.sourceforge.net (Greg Stein)
Date: Thu, 23 Aug 2001 05:35:55 -0700
Subject: [Expat-checkins] CVS: expat Makefile.in,1.16,1.17 configure.in,1.22,1.23
Message-ID: <E15ZtiF-0002p3-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/expat/expat
In directory usw-pr-cvs1:/tmp/cvs-serv8620

Modified Files:
	Makefile.in configure.in 
Log Message:
Revamp how the version stuff is handled. Use the header file as the
original, and extract the numbers within the configure script.

* configure.in: extract the numbers from lib/expat.h

* Makefile.in: simplify the construction of DISTDIR

* lib/Makefile.in: no need to define the VERSION preprocessor symbol

* lib/expat.dsp: do not define VERSION (changed, but untested!)

* lib/xmlparse.c: revamp the XML_ExpatVersion() function

* lib/expat.h(.in): just ship the baby, rather than generating it



Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/Makefile.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Makefile.in	2001/08/23 11:27:26	1.16
--- Makefile.in	2001/08/23 12:35:53	1.17
***************
*** 53,57 ****
  
  LIBTOOL = @LIBTOOL@
- VERSION = @VERSION@
  
  SUBDIRS = lib examples xmlwf
--- 53,56 ----
***************
*** 62,66 ****
  
  
! DISTDIR = expat-$(VERSION)
  DISTRIBUTION = $(DISTDIR).tar.gz
  
--- 61,65 ----
  
  
! DISTDIR = expat-@EXPAT_MAJOR_VERSION@.@EXPAT_MINOR_VERSION@.@EXPAT_MICRO_VERSION@
  DISTRIBUTION = $(DISTDIR).tar.gz
  
***************
*** 84,88 ****
  	rm -f config.h config.status config.log config.cache libtool
  	rm -f Makefile lib/Makefile examples/Makefile xmlwf/Makefile tests/Makefile
- 	rm -f lib/expat.h
  
  extraclean: distclean
--- 83,86 ----

Index: configure.in
===================================================================
RCS file: /cvsroot/expat/expat/configure.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** configure.in	2001/08/23 11:27:26	1.22
--- configure.in	2001/08/23 12:35:53	1.23
***************
*** 14,30 ****
  AC_CONFIG_AUX_DIR(conftools)
  
! dnl
! dnl Follow the GNU/Linux convention of odd number minor version for
! dnl beta/development releases and even number minor version for stable
! dnl releases. Edit is bumped with each release and set to 0 with
! dnl change to major or minor version.
! dnl
! 
! EXPAT_MAJOR_VERSION=1
! EXPAT_MINOR_VERSION=95
! EXPAT_EDIT=2
  
- EXPAT_VERSION=$EXPAT_MAJOR_VERSION.$EXPAT_MINOR_VERSION.$EXPAT_EDIT
- VERSION=$EXPAT_VERSION
  
  dnl
--- 14,23 ----
  AC_CONFIG_AUX_DIR(conftools)
  
! changequote({,})
! EXPAT_MAJOR_VERSION="`sed -n '/MAJOR_VERSION/s/[^0-9]*//gp' lib/expat.h`"
! EXPAT_MINOR_VERSION="`sed -n '/MINOR_VERSION/s/[^0-9]*//gp' lib/expat.h`"
! EXPAT_MICRO_VERSION="`sed -n '/MICRO_VERSION/s/[^0-9]*//gp' lib/expat.h`"
! changequote([,])
  
  
  dnl
***************
*** 51,58 ****
  AC_PROG_LIBTOOL
  
- AC_SUBST(VERSION)
  AC_SUBST(EXPAT_MAJOR_VERSION)
  AC_SUBST(EXPAT_MINOR_VERSION)
! AC_SUBST(EXPAT_EDIT)
  
  AC_SUBST(LIBCURRENT)
--- 44,50 ----
  AC_PROG_LIBTOOL
  
  AC_SUBST(EXPAT_MAJOR_VERSION)
  AC_SUBST(EXPAT_MINOR_VERSION)
! AC_SUBST(EXPAT_MICRO_VERSION)
  
  AC_SUBST(LIBCURRENT)
***************
*** 103,107 ****
  dnl are included in the sources for another project.
  
! OUTPUT="Makefile lib/Makefile lib/expat.h"
  if test -d ${srcdir}/xmlwf; then
      OUTPUT="$OUTPUT xmlwf/Makefile"
--- 95,99 ----
  dnl are included in the sources for another project.
  
! OUTPUT="Makefile lib/Makefile"
  if test -d ${srcdir}/xmlwf; then
      OUTPUT="$OUTPUT xmlwf/Makefile"



From gstein@users.sourceforge.net  Thu Aug 23 13:35:56 2001
From: gstein@users.sourceforge.net (Greg Stein)
Date: Thu, 23 Aug 2001 05:35:56 -0700
Subject: [Expat-checkins] CVS: expat/lib expat.h,1.13,1.14 Makefile.in,1.16,1.17 expat.dsp,1.5,1.6 xmlparse.c,1.22,1.23 expat.h.in,1.13,NONE
Message-ID: <E15ZtiG-0002pE-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/expat/expat/lib
In directory usw-pr-cvs1:/tmp/cvs-serv8620/lib

Modified Files:
	Makefile.in expat.dsp xmlparse.c 
Added Files:
	expat.h 
Removed Files:
	expat.h.in 
Log Message:
Revamp how the version stuff is handled. Use the header file as the
original, and extract the numbers within the configure script.

* configure.in: extract the numbers from lib/expat.h

* Makefile.in: simplify the construction of DISTDIR

* lib/Makefile.in: no need to define the VERSION preprocessor symbol

* lib/expat.dsp: do not define VERSION (changed, but untested!)

* lib/xmlparse.c: revamp the XML_ExpatVersion() function

* lib/expat.h(.in): just ship the baby, rather than generating it




Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/lib/Makefile.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Makefile.in	2001/08/23 09:24:45	1.16
--- Makefile.in	2001/08/23 12:35:53	1.17
***************
*** 34,38 ****
  CC = @CC@
  LIBTOOL = @LIBTOOL@
- VERSION = @VERSION@
  
  LIBRARY = libexpat.la
--- 34,37 ----
***************
*** 40,44 ****
  
  INCLUDES = -I$(srcdir) -I. -I..
! DEFS = @DEFS@ -DVERSION='"expat_$(VERSION)"'
  
  CPPFLAGS = @CPPFLAGS@
--- 39,43 ----
  
  INCLUDES = -I$(srcdir) -I. -I..
! DEFS = @DEFS@
  
  CPPFLAGS = @CPPFLAGS@

Index: expat.dsp
===================================================================
RCS file: /cvsroot/expat/expat/lib/expat.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** expat.dsp	2001/07/27 14:56:31	1.5
--- expat.dsp	2001/08/23 12:35:53	1.6
***************
*** 97,105 ****
  !IF  "$(CFG)" == "expat - Win32 Release"
  
- # ADD CPP /D VERSION=\"expat_1.95.2\"
- 
  !ELSEIF  "$(CFG)" == "expat - Win32 Debug"
  
! # ADD CPP /GX- /Od /D VERSION=\"expat_1.95.2\"
  
  !ENDIF 
--- 97,103 ----
  !IF  "$(CFG)" == "expat - Win32 Release"
  
  !ELSEIF  "$(CFG)" == "expat - Win32 Debug"
  
! # ADD CPP /GX- /Od
  
  !ENDIF 
***************
*** 109,118 ****
  
  SOURCE=.\xmlrole.c
- # ADD CPP /D VERSION=\"expat_1.95.2\"
  # End Source File
  # Begin Source File
  
  SOURCE=.\xmltok.c
- # ADD CPP /D VERSION=\"expat_1.95.2\"
  # End Source File
  # End Group
--- 107,114 ----

Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** xmlparse.c	2001/08/09 18:08:56	1.22
--- xmlparse.c	2001/08/23 12:35:53	1.23
***************
*** 1330,1334 ****
  const XML_LChar *
  XML_ExpatVersion(void) {
!   return VERSION;
  }
  
--- 1330,1349 ----
  const XML_LChar *
  XML_ExpatVersion(void) {
! 
!   /* V1 is used to string-ize the version number. However, it would
!      string-ize the actual version macro *names* unless we get them
!      substituted before being passed to V1. CPP is defined to expand
!      a macro, then rescan for more expansions. Thus, we use V2 to expand
!      the version macros, then CPP will expand the resulting V1() macro
!      with the correct numerals. */
!   /* ### I'm assuming cpp is portable in this respect... */
! 
! #define V1(a,b,c) "expat_"#a"."#b"."#c
! #define V2(a,b,c) V1(a,b,c)
! 
!   return V2(XML_MAJOR_VERSION, XML_MINOR_VERSION, XML_MICRO_VERSION);
! 
! #undef V1
! #undef V2
  }
  

--- expat.h.in DELETED ---



From gstein@users.sourceforge.net  Thu Aug 23 14:12:19 2001
From: gstein@users.sourceforge.net (Greg Stein)
Date: Thu, 23 Aug 2001 06:12:19 -0700
Subject: [Expat-checkins] CVS: expat MANIFEST,1.7,1.8
Message-ID: <E15ZuHT-000565-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/expat/expat
In directory usw-pr-cvs1:/tmp/cvs-serv19561

Modified Files:
	MANIFEST 
Log Message:
We are shipping expat.h now, not expat.h.in



Index: MANIFEST
===================================================================
RCS file: /cvsroot/expat/expat/MANIFEST,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MANIFEST	2001/08/23 11:27:26	1.7
--- MANIFEST	2001/08/23 13:12:17	1.8
***************
*** 23,27 ****
  lib/ascii.h
  lib/asciitab.h
! lib/expat.h.in
  lib/iasciitab.h
  lib/latin1tab.h
--- 23,27 ----
  lib/ascii.h
  lib/asciitab.h
! lib/expat.h
  lib/iasciitab.h
  lib/latin1tab.h



From gstein@users.sourceforge.net  Thu Aug 23 14:26:39 2001
From: gstein@users.sourceforge.net (Greg Stein)
Date: Thu, 23 Aug 2001 06:26:39 -0700
Subject: [Expat-checkins] CVS: expat make-release.sh,NONE,1.1 Makefile.in,1.17,1.18 configure.in,1.23,1.24
Message-ID: <E15ZuVL-0005rE-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/expat/expat
In directory usw-pr-cvs1:/tmp/cvs-serv22015

Modified Files:
	Makefile.in configure.in 
Added Files:
	make-release.sh 
Log Message:
Simplify the version handling some more by breaking the release process out
of the makefile into a separate script -- the script can do much more and
the makefile dependencies were not used anyways (just serving to obfuscate).



--- NEW FILE: make-release.sh ---
#! /bin/bash
#
# make-release.sh: make an Expat release
#
# USAGE: make-release.sh tagname
#
# Note: tagname may be HEAD to just grab the head revision (e.g. for testing)
#

if test $# != 1; then
  echo "USAGE: $0 tagname"
  exit 1
fi

tmpdir=expat-release.$$
if test -e $tmpdir; then
  echo "ERROR: oops. chose the $tmpdir subdir, but it exists."
  exit 1
fi

echo "Checking out into temporary area: $tmpdir"
cvs -d :pserver:anonymous@cvs.expat.sourceforge.net:/cvsroot/expat export -r "$1" -d $tmpdir expat || exit 1

echo ""
echo "----------------------------------------------------------------------"
echo "Preparing $tmpdir for release (running buildconf.sh)"
(cd $tmpdir && ./buildconf.sh) || exit 1

# figure out the release version
hdr="$tmpdir/lib/expat.h"
MAJOR_VERSION="`sed -n -e '/MAJOR_VERSION/s/[^0-9]*//gp' $hdr`"
MINOR_VERSION="`sed -n -e '/MINOR_VERSION/s/[^0-9]*//gp' $hdr`"
MICRO_VERSION="`sed -n -e '/MICRO_VERSION/s/[^0-9]*//gp' $hdr`"
vsn=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION

echo ""
echo "Release version: $vsn"

distdir=expat-$vsn
if test -e $distdir; then
  echo "ERROR: for safety, you must manually remove $distdir."
  rm -rf $tmpdir
  exit 1
fi
mkdir $distdir || exit 1

echo ""
echo "----------------------------------------------------------------------"
echo "Building $distdir based on the MANIFEST:"
files="`sed -e 's/[ 	]:.*$//' $tmpdir/MANIFEST`"
for file in $files; do
  echo "Copying $file..."
  (cd $tmpdir && cp -Pp $file ../$distdir) || exit 1
done

echo ""
echo "----------------------------------------------------------------------"
echo "Removing (temporary) checkout directory..."
rm -rf $tmpdir

tarball=$distdir.tar.gz
echo "Constructing $tarball..."
tar cf - $distdir | gzip -9 > $tarball

echo "Done."

Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/Makefile.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Makefile.in	2001/08/23 12:35:53	1.17
--- Makefile.in	2001/08/23 13:26:37	1.18
***************
*** 47,51 ****
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
  mkinstalldirs = $(SHELL) $(top_srcdir)/conftools/mkinstalldirs
  
--- 47,50 ----
***************
*** 61,68 ****
  
  
- DISTDIR = expat-@EXPAT_MAJOR_VERSION@.@EXPAT_MINOR_VERSION@.@EXPAT_MICRO_VERSION@
- DISTRIBUTION = $(DISTDIR).tar.gz
- 
- 
  default:  lib xmlwf
  
--- 60,63 ----
***************
*** 89,110 ****
  	rm -f conftools/ltconfig conftools/ltmain.sh
  
- maintainer-clean: distclean
- 	rm -f $(DISTRIBUTION)
- 	rm -rf $(DISTDIR)
- 
- distdir: MANIFEST
- 	test -d $(DISTDIR) && rm -rf $(DISTDIR); \
- 	mkdir $(DISTDIR); \
- 	flist=`sed -e "s/[ 	]:.*$$//" MANIFEST`; for file in $$flist; do \
- 		cp -P $$file $(DISTDIR); \
- 	done
- 
  check:	$(SUBDIRS)
  	cd tests && $(MAKE) check
- 
- $(DISTRIBUTION): distdir
- 	tar cf - $(DISTDIR) | gzip -9 >$(DISTRIBUTION)
- 
- dist: $(DISTRIBUTION)
  
  install: xmlwf/xmlwf lib/$(LIBRARY) lib/$(APIHEADER)
--- 84,89 ----

Index: configure.in
===================================================================
RCS file: /cvsroot/expat/expat/configure.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** configure.in	2001/08/23 12:35:53	1.23
--- configure.in	2001/08/23 13:26:37	1.24
***************
*** 14,24 ****
  AC_CONFIG_AUX_DIR(conftools)
  
- changequote({,})
- EXPAT_MAJOR_VERSION="`sed -n '/MAJOR_VERSION/s/[^0-9]*//gp' lib/expat.h`"
- EXPAT_MINOR_VERSION="`sed -n '/MINOR_VERSION/s/[^0-9]*//gp' lib/expat.h`"
- EXPAT_MICRO_VERSION="`sed -n '/MICRO_VERSION/s/[^0-9]*//gp' lib/expat.h`"
- changequote([,])
  
- 
  dnl
  dnl Increment LIBREVISION if source code has changed at all
--- 14,18 ----
***************
*** 43,50 ****
  AC_LIBTOOL_WIN32_DLL
  AC_PROG_LIBTOOL
- 
- AC_SUBST(EXPAT_MAJOR_VERSION)
- AC_SUBST(EXPAT_MINOR_VERSION)
- AC_SUBST(EXPAT_MICRO_VERSION)
  
  AC_SUBST(LIBCURRENT)
--- 37,40 ----



From gstein@users.sourceforge.net  Thu Aug 23 14:27:40 2001
From: gstein@users.sourceforge.net (Greg Stein)
Date: Thu, 23 Aug 2001 06:27:40 -0700
Subject: [Expat-checkins] CVS: expat/conftools .cvsignore,1.1,1.2
Message-ID: <E15ZuWK-0005vD-00@usw-pr-cvs1.sourceforge.net>

Update of /cvsroot/expat/expat/conftools
In directory usw-pr-cvs1:/tmp/cvs-serv22591/conftools

Modified Files:
	.cvsignore 
Log Message:
Hush up, cvs...



Index: .cvsignore
===================================================================
RCS file: /cvsroot/expat/expat/conftools/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** .cvsignore	2001/03/10 15:41:50	1.1
--- .cvsignore	2001/08/23 13:27:38	1.2
***************
*** 1,2 ****
--- 1,3 ----
+ libtool.m4
  config.guess
  config.sub