Clark's compromise changes to Fred's version info change.
This commit is contained in:
Clark Cooper
parent
01947d98ff
commit
604600883c
@ -19,13 +19,10 @@ 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
|
||||
dnl Note that these settings must be matched in lib/expat.h, in the
|
||||
dnl XML_*_VERSION constants.
|
||||
dnl
|
||||
|
||||
EXPAT_MAJOR_VERSION=1
|
||||
EXPAT_MINOR_VERSION=96
|
||||
EXPAT_EDIT=0
|
||||
EXPAT_MINOR_VERSION=95
|
||||
EXPAT_EDIT=2
|
||||
|
||||
EXPAT_VERSION=$EXPAT_MAJOR_VERSION.$EXPAT_MINOR_VERSION.$EXPAT_EDIT
|
||||
VERSION=$EXPAT_VERSION
|
||||
@ -42,9 +39,9 @@ dnl
|
||||
dnl If the API changes incompatibly set LIBAGE back to 0
|
||||
dnl
|
||||
|
||||
LIBCURRENT=0
|
||||
LIBREVISION=1
|
||||
LIBAGE=0
|
||||
LIBCURRENT=1
|
||||
LIBREVISION=0
|
||||
LIBAGE=1
|
||||
|
||||
AC_CONFIG_HEADER(config.h:config.hin)
|
||||
|
||||
@ -53,6 +50,9 @@ AC_PROG_LIBTOOL
|
||||
|
||||
AC_SUBST(PACKAGE)
|
||||
AC_SUBST(VERSION)
|
||||
AC_SUBST(EXPAT_MAJOR_VERSION)
|
||||
AC_SUBST(EXPAT_MINOR_VERSION)
|
||||
AC_SUBST(EXPAT_EDIT)
|
||||
|
||||
AC_SUBST(LIBCURRENT)
|
||||
AC_SUBST(LIBREVISION)
|
||||
|
||||
@ -203,9 +203,24 @@ shoveling the document to the parser so that it can do its work.
|
||||
<hr>
|
||||
<h2><a name="building">Building and Installing expat</a></h2>
|
||||
<p>The expat distribution comes as a compressed (with GNU gzip) tar file.
|
||||
After unpacking this, cd into the directory and run the configure shell
|
||||
script.
|
||||
</p>
|
||||
You may download the latest version from
|
||||
<a href="http://sourceforge.net/projects/expat/">Source Forge</a>.
|
||||
After unpacking this, cd into the directory. Then follow either the
|
||||
Win32 directions or Unix directions below.</p>
|
||||
|
||||
<h3>Building under Win32</h3>
|
||||
<p>If you're using the GNU compiler under cygwin, follow the Unix directions
|
||||
in the next section. Otherwise if you have Microsoft's Developer Studio
|
||||
installed, then from Windows Explorer double-click on "expat.dsp" in the
|
||||
lib directory and build and install in the usual manner.</p>
|
||||
|
||||
<p>Alternatively, you may download the win32 binary package that contains
|
||||
the expat.h include file and a pre-built dll.</p>
|
||||
|
||||
<h3>Building under Unix (or GNU)</h3>
|
||||
<p>First you'll need to run the configure shell script in order to configure
|
||||
the Makefiles and headers for your system.</p>
|
||||
|
||||
<p>If you're happy with all the defaults that configure picks for you,
|
||||
and you have permission on your system to install into /usr/local, you can
|
||||
install expat with this sequence of commands:</p>
|
||||
@ -1471,7 +1486,7 @@ XML_LChar *
|
||||
XML_ExpatVersion();
|
||||
</pre></a></div>
|
||||
<div class="fcndef">
|
||||
Return the library version as a string.
|
||||
Return the library version as a string (e.g. "expat_1.95.1").
|
||||
</div>
|
||||
|
||||
<div class="fcndec"><a name="XML_ExpatVersionInfo"><pre>
|
||||
@ -1488,15 +1503,6 @@ typedef struct {
|
||||
} XML_Expat_Version;
|
||||
</pre></div>
|
||||
</div>
|
||||
<p>The following constants are defined using pre-processor symbols,
|
||||
and so may be tested at compile time.</p>
|
||||
<dl>
|
||||
<dt><code>XML_MAJOR_VERSION</code></dt>
|
||||
<dd>The major version number.</dd>
|
||||
<dt><code>XML_MINOR_VERSION</code></dt>
|
||||
<dd>The minor version number.</dd>
|
||||
<dt><code>XML_MICRO_VERSION</code></dt>
|
||||
<dd>The "patch level".</dd>
|
||||
</dl>
|
||||
|
||||
</body>
|
||||
|
||||
@ -61,6 +61,10 @@ LN_S = @LN_S@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
PACKAGE = @PACKAGE@
|
||||
RANLIB = @RANLIB@
|
||||
VERSION = @VERSION@
|
||||
VMAJOR = @EXPAT_MAJOR_VERSION@
|
||||
VMINOR = @EXPAT_MINOR_VERSION@
|
||||
VMICRO = @EXPAT_EDIT@
|
||||
|
||||
LIBRARY = libexpat.la
|
||||
SOURCES = xmlparse.c xmltok.c xmlrole.c
|
||||
@ -77,7 +81,9 @@ CONFIG_HEADER = ../config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
|
||||
INCLUDES = -I$(srcdir) -I..
|
||||
DEFS = @DEFS@ -DPACKAGE='"$(PACKAGE)"'
|
||||
DEFS = @DEFS@ -DPACKAGE='"$(PACKAGE)"' -DVERSION='"$(PACKAGE)_$(VERSION)"' \
|
||||
-DEXPAT_VMAJOR=$(VMAJOR) -DEXPAT_VMINOR=$(VMINOR) -DEXPAT_VMICRO=$(VMICRO)
|
||||
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBS = @LIBS@
|
||||
|
||||
@ -93,9 +93,13 @@ LINK32=link.exe
|
||||
|
||||
SOURCE=.\xmlparse.c
|
||||
|
||||
!IF "$(CFG)" == "expat - Win32 Debug"
|
||||
!IF "$(CFG)" == "expat - Win32 Release"
|
||||
|
||||
# ADD CPP /GX- /Od
|
||||
# ADD CPP /D VERSION=\"expat_1.95.1\"
|
||||
|
||||
!ELSEIF "$(CFG)" == "expat - Win32 Debug"
|
||||
|
||||
# ADD CPP /GX- /Od /D VERSION=\"expat_1.95.1\"
|
||||
|
||||
!ENDIF
|
||||
|
||||
@ -104,19 +108,44 @@ SOURCE=.\xmlparse.c
|
||||
|
||||
SOURCE=.\xmlrole.c
|
||||
|
||||
!IF "$(CFG)" == "expat - Win32 Release"
|
||||
|
||||
# ADD CPP /D VERSION=\"expat_1.95.1\"
|
||||
|
||||
!ELSEIF "$(CFG)" == "expat - Win32 Debug"
|
||||
|
||||
# ADD CPP /D VERSION=\"expat_1.95.1\"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\xmltok.c
|
||||
|
||||
!IF "$(CFG)" == "expat - Win32 Release"
|
||||
|
||||
# ADD CPP /D VERSION=\"expat_1.95.1\"
|
||||
|
||||
!ELSEIF "$(CFG)" == "expat - Win32 Debug"
|
||||
|
||||
# ADD CPP /D VERSION=\"expat_1.95.1\"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=xmltok_impl.c
|
||||
|
||||
!IF "$(CFG)" == "expat - Win32 Debug"
|
||||
!IF "$(CFG)" == "expat - Win32 Release"
|
||||
|
||||
# ADD CPP /D VERSION=\"expat_1.95.1\"
|
||||
|
||||
!ELSEIF "$(CFG)" == "expat - Win32 Debug"
|
||||
|
||||
# PROP Exclude_From_Build 1
|
||||
# ADD CPP /D VERSION=\"expat_1.95.1\"
|
||||
|
||||
!ENDIF
|
||||
|
||||
@ -125,9 +154,14 @@ SOURCE=xmltok_impl.c
|
||||
|
||||
SOURCE=xmltok_ns.c
|
||||
|
||||
!IF "$(CFG)" == "expat - Win32 Debug"
|
||||
!IF "$(CFG)" == "expat - Win32 Release"
|
||||
|
||||
# ADD CPP /D VERSION=\"expat_1.95.1\"
|
||||
|
||||
!ELSEIF "$(CFG)" == "expat - Win32 Debug"
|
||||
|
||||
# PROP Exclude_From_Build 1
|
||||
# ADD CPP /D VERSION=\"expat_1.95.1\"
|
||||
|
||||
!ENDIF
|
||||
|
||||
|
||||
@ -705,16 +705,15 @@ XML_ErrorString(int code);
|
||||
const XML_LChar XMLPARSEAPI *
|
||||
XML_ExpatVersion(void);
|
||||
|
||||
#define XML_MAJOR_VERSION 1
|
||||
#define XML_MINOR_VERSION 96
|
||||
#define XML_MICRO_VERSION 0
|
||||
|
||||
typedef struct {
|
||||
int major;
|
||||
int minor;
|
||||
int micro;
|
||||
} XML_Expat_Version;
|
||||
|
||||
/* Return an XML_Expat_Version structure containing numeric version
|
||||
number information for this version of expat */
|
||||
|
||||
XML_Expat_Version XMLPARSEAPI
|
||||
XML_ExpatVersionInfo(void);
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@ See the file COPYING for copying permission.
|
||||
*/
|
||||
|
||||
static char RCSId[]
|
||||
= "$Header: /cvsroot/expat/expat/lib/xmlparse.c,v 1.11 2000/10/22 19:20:23 coopercc Exp $";
|
||||
= "$Header: /cvsroot/expat/expat/lib/xmlparse.c,v 1.12 2000/12/21 00:32:47 fdrake Exp $";
|
||||
|
||||
#ifdef COMPILED_FROM_DSP
|
||||
# include "winconfig.h"
|
||||
@ -1325,25 +1325,16 @@ const XML_LChar *XML_ErrorString(int code)
|
||||
|
||||
const XML_LChar *
|
||||
XML_ExpatVersion(void) {
|
||||
static char *buff = NULL;
|
||||
|
||||
if (buff == NULL) {
|
||||
buff = malloc(strlen(PACKAGE) + 3 + 10);
|
||||
if (buff != NULL) {
|
||||
sprintf(buff, "%s_%d.%d.%d", PACKAGE,
|
||||
XML_MAJOR_VERSION, XML_MINOR_VERSION, XML_MICRO_VERSION);
|
||||
}
|
||||
}
|
||||
return buff;
|
||||
return VERSION;
|
||||
}
|
||||
|
||||
XML_Expat_Version
|
||||
XML_ExpatVersionInfo(void) {
|
||||
XML_Expat_Version version;
|
||||
|
||||
version.major = XML_MAJOR_VERSION;
|
||||
version.minor = XML_MINOR_VERSION;
|
||||
version.micro = XML_MICRO_VERSION;
|
||||
version.major = EXPAT_VMAJOR;
|
||||
version.minor = EXPAT_VMINOR;
|
||||
version.micro = EXPAT_VMICRO;
|
||||
|
||||
return version;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user