You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2002/07/10 14:56:45 UTC
cvs commit: xml-xerces/c/src/xercesc/util XercesVersion.hpp Makefile.in XercesDefs.hpp
tng 2002/07/10 05:56:45
Modified: c/src/xercesc/util Makefile.in XercesDefs.hpp
Added: c/src/xercesc/util XercesVersion.hpp
Log:
[Bug 9154] Requesting Xerces Version Macro.
Revision Changes Path
1.9 +4 -0 xml-xerces/c/src/xercesc/util/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 18 Jun 2002 19:59:12 -0000 1.8
+++ Makefile.in 10 Jul 2002 12:56:45 -0000 1.9
@@ -55,6 +55,9 @@
#
#
# $Log$
+# Revision 1.9 2002/07/10 12:56:45 tng
+# [Bug 9154] Requesting Xerces Version Macro.
+#
# Revision 1.8 2002/06/18 19:59:12 knoaman
# Remove DOMInputSourceWrapper.
#
@@ -401,6 +404,7 @@
ValueStackOf.hpp \
ValueVectorOf.hpp \
XercesDefs.hpp \
+ XercesVersion.hpp \
XML256TableTranscoder.hpp \
XML88591Transcoder.hpp \
XMLASCIITranscoder.hpp \
1.6 +6 -9 xml-xerces/c/src/xercesc/util/XercesDefs.hpp
Index: XercesDefs.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XercesDefs.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XercesDefs.hpp 21 May 2002 19:35:08 -0000 1.5
+++ XercesDefs.hpp 10 Jul 2002 12:56:45 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2002/07/10 12:56:45 tng
+ * [Bug 9154] Requesting Xerces Version Macro.
+ *
* Revision 1.5 2002/05/21 19:35:08 tng
* Update from 1.7 to 2.0
*
@@ -185,16 +188,10 @@
#define XERCESDEFS_HPP
// ---------------------------------------------------------------------------
-// These are the various representations of the current version of Xerces.
-// These are updated for every build. They must be at the top because they
-// can be used by various per-compiler headers below.
+// Include the Xerces version information; this is kept in a separate file to
+// make modification simple and obvious. Updates to the version header file
// ---------------------------------------------------------------------------
-#define Xerces_DLLVersionStr "2_0_0"
-const char* const gXercesVersionStr = "2_0";
-const char* const gXercesFullVersionStr = "2_0_0";
-const unsigned int gXercesMajVersion = 2;
-const unsigned int gXercesMinVersion = 0;
-const unsigned int gXercesRevision = 0;
+#include <xercesc/util/XercesVersion.hpp>
// ---------------------------------------------------------------------------
1.1 xml-xerces/c/src/xercesc/util/XercesVersion.hpp
Index: XercesVersion.hpp
===================================================================
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
* software without prior written permission. For written
* permission, please contact apache\@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
* Business Machines, Inc., http://www.ibm.com . For more information
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
#if !defined(XERCESVERSION_HPP)
#define XERCESVERSION_HPP
// ---------------------------------------------------------------------------
// X E R C E S V E R S I O N S P E C I F I C A T I O N
/**
* MODIFY THESE NUMERIC VALUES TO COINCIDE WITH XERCES VERSION
* AND DO NOT MODIFY ANYTHING ELSE IN THIS VERSION HEADER FILE
*/
#define XERCES_VERSION_MAJOR 2
#define XERCES_VERSION_MINOR 0
#define XERCES_VERSION_REVISION 0
/** DO NOT MODIFY BELOW THIS LINE */
/**
* MAGIC THAT AUTOMATICALLY GENERATES THE FOLLOWING:
*
* Xerces_DLLVersionStr, gXercesVersionStr, gXercesFullVersionStr,
* gXercesMajVersion, gXercesMinVersion, gXercesRevision
*/
// ---------------------------------------------------------------------------
// T W O A R G U M E N T C O N C A T E N A T I O N M A C R O S
// two argument concatenation routines
#define CAT2_SEP_UNDERSCORE(a, b) #a "_" #b
#define CAT2_SEP_PERIOD(a, b) #a "." #b
#define CAT2_SEP_NIL(a, b) #a #b
#define CAT2_RAW_NUMERIC(a, b) a ## b
// two argument macro invokers
#define INVK_CAT2_SEP_UNDERSCORE(a,b) CAT2_SEP_UNDERSCORE(a,b)
#define INVK_CAT2_SEP_PERIOD(a,b) CAT2_SEP_PERIOD(a,b)
#define INVK_CAT2_STR_SEP_NIL(a,b) CAT2_SEP_NIL(a,b)
#define INVK_CAT2_RAW_NUMERIC(a,b) CAT2_RAW_NUMERIC(a,b)
// ---------------------------------------------------------------------------
// T H R E E A R G U M E N T C O N C A T E N A T I O N M A C R O S
// three argument concatenation routines
#define CAT3_SEP_UNDERSCORE(a, b, c) #a "_" #b "_" #c
#define CAT3_SEP_PERIOD(a, b, c) #a "." #b "." #c
#define CAT3_SEP_NIL(a, b, c) #a #b #c
#define CAT3_RAW_NUMERIC(a, b, c) a ## b ## c
// three argument macro invokers
#define INVK_CAT3_SEP_UNDERSCORE(a,b,c) CAT3_SEP_UNDERSCORE(a,b,c)
#define INVK_CAT3_SEP_PERIOD(a,b,c) CAT3_SEP_PERIOD(a,b,c)
#define INVK_CAT3_SEP_NIL(a,b,c) CAT3_SEP_NIL(a,b,c)
#define INVK_CAT3_RAW_NUMERIC(a,b,c) CAT3_RAW_NUMERIC(a,b,c)
// ---------------------------------------------------------------------------
// X E R C E S V E R S I O N I N F O R M A T I O N
// Xerces version strings; these particular macros cannot be used for
// conditional compilation as they are not numeric constants
#define XERCES_FULLVERSIONSTR INVK_CAT3_SEP_UNDERSCORE(XERCES_VERSION_MAJOR,XERCES_VERSION_MINOR,XERCES_VERSION_REVISION)
#define XERCES_FULLVERSIONDOT INVK_CAT3_SEP_PERIOD(XERCES_VERSION_MAJOR,XERCES_VERSION_MINOR,XERCES_VERSION_REVISION)
#define XERCES_FULLVERSIONNUM INVK_CAT3_SEP_NIL(XERCES_VERSION_MAJOR,XERCES_VERSION_MINOR,XERCES_VERSION_REVISION)
#define XERCES_VERSIONSTR INVK_CAT2_SEP_UNDERSCORE(XERCES_VERSION_MAJOR,XERCES_VERSION_MINOR)
// original from Xerces header
#define Xerces_DLLVersionStr XERCES_FULLVERSIONSTR
const char* const gXercesVersionStr = XERCES_VERSIONSTR;
const char* const gXercesFullVersionStr = XERCES_FULLVERSIONSTR;
const unsigned int gXercesMajVersion = XERCES_VERSION_MAJOR;
const unsigned int gXercesMinVersion = XERCES_VERSION_MINOR;
const unsigned int gXercesRevision = XERCES_VERSION_REVISION;
// Xerces version numeric constants that can be used for conditional
// compilation purposes.
#define _XERCES_VERSION INVK_CAT3_RAW_NUMERIC(XERCES_VERSION_MAJOR,XERCES_VERSION_MINOR,XERCES_VERSION_REVISION)
#endif // XERCESVERSION_HPP
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org