From 8bbaaadf4e23480ee9fb6ea8a19185aaf62bb182 Mon Sep 17 00:00:00 2001 From: "Unknown (aruna1)" <dev-null@apache.org> Date: Sat, 3 Jun 2000 01:19:41 +0000 Subject: [PATCH] Version number consolidated into single file for unix git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@172148 13f79535-47bb-0310-9956-ffa450edef68 --- obj/Makefile.in | 62 +-------------------------- obj/version.incl | 59 +++++++++++++++++++++++++ samples/CreateDOMDocument/Makefile.in | 20 +-------- samples/DOMCount/Makefile.in | 24 +---------- samples/DOMPrint/Makefile.in | 24 +---------- samples/EnumVal/Makefile.in | 12 +----- samples/Makefile.incl | 2 +- samples/MemParse/Makefile.in | 24 +---------- samples/PParse/Makefile.in | 24 +---------- samples/Redirect/Makefile.in | 24 +---------- samples/SAXCount/Makefile.in | 24 +---------- src/Makefile.in | 2 +- tests/DOM/DOMIDTest/Makefile.in | 1 + tests/DOM/DOMMemTest/Makefile.in | 1 + tests/DOM/DOMTest/Makefile.in | 1 + tests/DOM/Traversal/Makefile.in | 1 + tests/EncodingTest/Makefile.in | 16 +------ tests/Makefile.incl | 4 +- tests/ThreadTest/Makefile.in | 20 +-------- 19 files changed, 90 insertions(+), 255 deletions(-) create mode 100644 obj/version.incl diff --git a/obj/Makefile.in b/obj/Makefile.in index 6c44ef024..9416f95ac 100644 --- a/obj/Makefile.in +++ b/obj/Makefile.in @@ -54,65 +54,7 @@ # <http://www.apache.org/>. # # -# $Log$ -# Revision 1.15 2000/06/02 23:46:10 aruna1 -# Changed version no. to 1_2 -# -# Revision 1.14 2000/04/17 22:25:43 abagchi -# Follow the SMP/E procedures for the OS/390 BATCH install -# -# Revision 1.13 2000/03/17 19:28:28 abagchi -# Now generates object files in platform-specific directories -# -# Revision 1.12 2000/03/01 22:30:00 abagchi -# Object files are now created directly under obj directory -# -# Revision 1.11 2000/02/09 22:04:54 abagchi -# AS/400 change -# -# Revision 1.10 2000/02/06 07:47:16 rahulj -# Year 2K copyright swat. -# -# Revision 1.9 2000/01/21 22:21:15 abagchi -# OS390 Change: changed the batch target name from XML4C30 to XERCES11 -# -# Revision 1.8 2000/01/18 00:01:15 aruna1 -# Changed version number -# -# Revision 1.7 1999/12/20 23:04:51 aruna1 -# "transcoder information transferred" -# -# Revision 1.6 1999/12/17 01:28:52 rahulj -# Merged in changes submitted for UnixWare 7 port. Platform -# specific files are still missing. -# -# Revision 1.5 1999/12/14 23:53:17 rahulj -# Removed the offending Ctrl-M's from the commit message -# logs which was giving packaging problems. -# -# PR: -# Obtained from: -# Submitted by: -# Reviewed by: -# -# Revision 1.4 1999/11/24 23:21:42 rahulj -# Now works under HPUX 10.20 with CC and aCC, with ICU and native -# distclean target now remove and remaining Makefile(s) -# clean target now removes the template repository directory -# -# Revision 1.3 1999/11/23 01:59:16 rahulj -# Code now works under HPUX 11. Tested inmemory message loader. -# Revamped makefiles. Builds with both DCE threads as well as pthread libraries. -# -# Revision 1.2 1999/11/12 20:38:43 rahulj -# Replaced XML4CROOT with XERCESCROOT. -# -# Revision 1.1.1.1 1999/11/09 01:10:49 twl -# Initial checkin -# -# Revision 1.2 1999/11/08 20:43:14 rahul -# Swat for adding in Product name and CVS comment log variable. -# +# $Id$ # ################################################################### @@ -134,6 +76,7 @@ LIBS = @libs@ OSVER = @osver@ TRANSCODER = @transcoder@ +include version.incl include ../src/Makefile.incl LIB=${XERCESCROOT}/lib @@ -147,7 +90,6 @@ else LIBNAME=libxercesc endif THISLIB=${LIB}/${LIBNAME} -VER=1_2 ALL_OBJECTS=$(wildcard $(XML_OBJ_DIR)/*.o) diff --git a/obj/version.incl b/obj/version.incl new file mode 100644 index 000000000..ab09a8244 --- /dev/null +++ b/obj/version.incl @@ -0,0 +1,59 @@ +# +# The Apache Software License, Version 1.1 +# +# Copyright (c) 1999-2000 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/>. +# +# +# $Id$ +# +VER=1_2 diff --git a/samples/CreateDOMDocument/Makefile.in b/samples/CreateDOMDocument/Makefile.in index 776082f6a..352f75bf4 100644 --- a/samples/CreateDOMDocument/Makefile.in +++ b/samples/CreateDOMDocument/Makefile.in @@ -54,24 +54,7 @@ # <http://www.apache.org/>. # # -# $Log$ -# Revision 1.5 2000/02/08 02:24:20 abagchi -# OS390 fix -# -# Revision 1.4 2000/02/06 07:47:17 rahulj -# Year 2K copyright swat. -# -# Revision 1.3 2000/02/05 00:05:10 abagchi -# Made sure all targets are prepended with :: instead of single : -# -# Revision 1.2 2000/01/19 17:48:33 abagchi -# Now really works, fixed small problem -# -# Revision 1.1 2000/01/19 00:17:50 rahulj -# Added makefile for unix builds. Fixed the comments and usage -# string. -# -# +# $Id$ # ################################################################### @@ -90,6 +73,7 @@ CXXFLAGS = @cxxflags@ CFLAGS = @cflags@ PREFIX = @prefix@ +include ../../obj/version.incl include ../Makefile.incl APP_NAME=CreateDOMDocument diff --git a/samples/DOMCount/Makefile.in b/samples/DOMCount/Makefile.in index 2184a4673..f77121f9b 100644 --- a/samples/DOMCount/Makefile.in +++ b/samples/DOMCount/Makefile.in @@ -54,28 +54,7 @@ # <http://www.apache.org/>. # # -# $Log$ -# Revision 1.6 2000/02/06 07:47:17 rahulj -# Year 2K copyright swat. -# -# Revision 1.5 2000/02/05 00:04:34 abagchi -# Made sure all targets are prepended with :: instead of single : -# -# Revision 1.4 1999/12/21 00:16:20 aruna1 -# ICUROOT reference removed from samples -# -# Revision 1.3 1999/12/20 23:54:12 aruna1 -# "transcoder information checked instead of ICUROOT" -# -# Revision 1.2 1999/11/12 20:34:31 rahulj -# Replaced XML4CROOT with XERCESCROOT. -# -# Revision 1.1.1.1 1999/11/09 01:09:53 twl -# Initial checkin -# -# Revision 1.3 1999/11/08 20:43:35 rahul -# Swat for adding in Product name and CVS comment log variable. -# +# $Id$ # ################################################################### @@ -94,6 +73,7 @@ CXXFLAGS = @cxxflags@ CFLAGS = @cflags@ PREFIX = @prefix@ +include ../../obj/version.incl include ../Makefile.incl APP_NAME=DOMCount diff --git a/samples/DOMPrint/Makefile.in b/samples/DOMPrint/Makefile.in index 9ffee92a1..e48604dee 100644 --- a/samples/DOMPrint/Makefile.in +++ b/samples/DOMPrint/Makefile.in @@ -54,28 +54,7 @@ # <http://www.apache.org/>. # # -# $Log$ -# Revision 1.6 2000/02/06 07:47:18 rahulj -# Year 2K copyright swat. -# -# Revision 1.5 2000/02/05 00:04:44 abagchi -# Made sure all targets are prepended with :: instead of single : -# -# Revision 1.4 1999/12/21 00:16:25 aruna1 -# ICUROOT reference removed from samples -# -# Revision 1.3 1999/12/20 23:54:23 aruna1 -# "transcoder information checked instead of ICUROOT" -# -# Revision 1.2 1999/11/12 20:34:35 rahulj -# Replaced XML4CROOT with XERCESCROOT. -# -# Revision 1.1.1.1 1999/11/09 01:09:52 twl -# Initial checkin -# -# Revision 1.3 1999/11/08 20:43:36 rahul -# Swat for adding in Product name and CVS comment log variable. -# +# $Id$ # ################################################################### @@ -95,6 +74,7 @@ CXXFLAGS = @cxxflags@ CFLAGS = @cflags@ PREFIX = @prefix@ +include ../../obj/version.incl include ../Makefile.incl APP_NAME=DOMPrint diff --git a/samples/EnumVal/Makefile.in b/samples/EnumVal/Makefile.in index f0af62be5..04f1aa133 100644 --- a/samples/EnumVal/Makefile.in +++ b/samples/EnumVal/Makefile.in @@ -53,16 +53,7 @@ # on the Apache Software Foundation, please see # <http://www.apache.org/>. # -# $Log$ -# Revision 1.6 2000/02/06 07:47:19 rahulj -# Year 2K copyright swat. -# -# Revision 1.5 2000/02/05 00:04:47 abagchi -# Made sure all targets are prepended with :: instead of single : -# -# Revision 1.4 1999/12/21 19:54:44 rahulj -# Added Apache license and version tags. -# +# $Id$ # ################################################################### @@ -81,6 +72,7 @@ CXXFLAGS = @cxxflags@ CFLAGS = @cflags@ PREFIX = @prefix@ +include ../../obj/version.incl include ../Makefile.incl APP_NAME=EnumVal diff --git a/samples/Makefile.incl b/samples/Makefile.incl index 774c48fc4..962cb99b7 100644 --- a/samples/Makefile.incl +++ b/samples/Makefile.incl @@ -58,6 +58,7 @@ # ################## LIBRARY NAMES AND DIRECTORIES ################## + ifeq (${SYSOVR},OS400) PLATFORM = OS400 endif @@ -69,7 +70,6 @@ else LIBNAME=xercesc endif THISLIB=${LIB_DIR}/${LIBNAME} -VER=1_2 LIBRARY_NAMES=-l${LIBNAME}${VER} LIBRARY_SEARCH_PATHS=-L${LIB_DIR} diff --git a/samples/MemParse/Makefile.in b/samples/MemParse/Makefile.in index 2d5758fdb..5e2a68c90 100644 --- a/samples/MemParse/Makefile.in +++ b/samples/MemParse/Makefile.in @@ -54,28 +54,7 @@ # <http://www.apache.org/>. # # -# $Log$ -# Revision 1.6 2000/02/06 07:47:19 rahulj -# Year 2K copyright swat. -# -# Revision 1.5 2000/02/05 00:04:51 abagchi -# Made sure all targets are prepended with :: instead of single : -# -# Revision 1.4 1999/12/21 00:16:37 aruna1 -# ICUROOT reference removed from samples -# -# Revision 1.3 1999/12/20 23:54:41 aruna1 -# "transcoder information checked instead of ICUROOT" -# -# Revision 1.2 1999/11/12 20:34:39 rahulj -# Replaced XML4CROOT with XERCESCROOT. -# -# Revision 1.1.1.1 1999/11/09 01:09:49 twl -# Initial checkin -# -# Revision 1.3 1999/11/08 20:43:36 rahul -# Swat for adding in Product name and CVS comment log variable. -# +# $Id$ # ################################################################### @@ -94,6 +73,7 @@ CXXFLAGS = @cxxflags@ CFLAGS = @cflags@ PREFIX = @prefix@ +include ../../obj/version.incl include ../Makefile.incl APP_NAME=MemParse diff --git a/samples/PParse/Makefile.in b/samples/PParse/Makefile.in index c9c47c811..7ebfd5c87 100644 --- a/samples/PParse/Makefile.in +++ b/samples/PParse/Makefile.in @@ -54,28 +54,7 @@ # <http://www.apache.org/>. # # -# $Log$ -# Revision 1.6 2000/02/06 07:47:20 rahulj -# Year 2K copyright swat. -# -# Revision 1.5 2000/02/05 00:04:54 abagchi -# Made sure all targets are prepended with :: instead of single : -# -# Revision 1.4 1999/12/21 00:16:43 aruna1 -# ICUROOT reference removed from samples -# -# Revision 1.3 1999/12/20 23:54:48 aruna1 -# "transcoder information checked instead of ICUROOT" -# -# Revision 1.2 1999/11/12 20:34:42 rahulj -# Replaced XML4CROOT with XERCESCROOT. -# -# Revision 1.1.1.1 1999/11/09 01:09:45 twl -# Initial checkin -# -# Revision 1.2 1999/11/08 20:43:37 rahul -# Swat for adding in Product name and CVS comment log variable. -# +# $Id$ # ################################################################### @@ -94,6 +73,7 @@ CXXFLAGS = @cxxflags@ CFLAGS = @cflags@ PREFIX = @prefix@ +include ../../obj/version.incl include ../Makefile.incl APP_NAME=PParse diff --git a/samples/Redirect/Makefile.in b/samples/Redirect/Makefile.in index 9e8fe4196..db9830806 100644 --- a/samples/Redirect/Makefile.in +++ b/samples/Redirect/Makefile.in @@ -54,28 +54,7 @@ # <http://www.apache.org/>. # # -# $Log$ -# Revision 1.6 2000/02/06 07:47:21 rahulj -# Year 2K copyright swat. -# -# Revision 1.5 2000/02/05 00:04:57 abagchi -# Made sure all targets are prepended with :: instead of single : -# -# Revision 1.4 1999/12/21 00:16:48 aruna1 -# ICUROOT reference removed from samples -# -# Revision 1.3 1999/12/20 23:54:58 aruna1 -# "transcoder information checked instead of ICUROOT" -# -# Revision 1.2 1999/11/12 20:34:46 rahulj -# Replaced XML4CROOT with XERCESCROOT. -# -# Revision 1.1.1.1 1999/11/09 01:09:36 twl -# Initial checkin -# -# Revision 1.3 1999/11/08 20:43:38 rahul -# Swat for adding in Product name and CVS comment log variable. -# +# $Id$ # ################################################################### @@ -94,6 +73,7 @@ CXXFLAGS = @cxxflags@ CFLAGS = @cflags@ PREFIX = @prefix@ +include ../../obj/version.incl include ../Makefile.incl APP_NAME=Redirect diff --git a/samples/SAXCount/Makefile.in b/samples/SAXCount/Makefile.in index 75f0ac307..36751811a 100644 --- a/samples/SAXCount/Makefile.in +++ b/samples/SAXCount/Makefile.in @@ -54,28 +54,7 @@ # <http://www.apache.org/>. # # -# $Log$ -# Revision 1.6 2000/02/06 07:47:22 rahulj -# Year 2K copyright swat. -# -# Revision 1.5 2000/02/05 00:05:00 abagchi -# Made sure all targets are prepended with :: instead of single : -# -# Revision 1.4 1999/12/21 00:16:53 aruna1 -# ICUROOT reference removed from samples -# -# Revision 1.3 1999/12/20 23:55:06 aruna1 -# "transcoder information checked instead of ICUROOT" -# -# Revision 1.2 1999/11/12 20:34:51 rahulj -# Replaced XML4CROOT with XERCESCROOT. -# -# Revision 1.1.1.1 1999/11/09 01:09:30 twl -# Initial checkin -# -# Revision 1.3 1999/11/08 20:43:40 rahul -# Swat for adding in Product name and CVS comment log variable. -# +# $Id$ # ################################################################### @@ -94,6 +73,7 @@ CXXFLAGS = @cxxflags@ CFLAGS = @cflags@ PREFIX = @prefix@ +include ../../obj/version.incl include ../Makefile.incl APP_NAME=SAXCount diff --git a/src/Makefile.in b/src/Makefile.in index 325c8f399..10cf1e57e 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -74,6 +74,7 @@ CD=cd RM=rm CHMODE=chmod +include ../obj/version.incl include Makefile.incl UTIL_DIR = util @@ -86,7 +87,6 @@ VALIDATORS_DTD_DIR = validators/DTD LIBNAME = libxerces-c THISLIB = ${XML_LIB_DIR}/${LIBNAME} -VER = 1_2 #all these setting come from the arguments passed in to runConfigure. PLATFORM = @platform@ diff --git a/tests/DOM/DOMIDTest/Makefile.in b/tests/DOM/DOMIDTest/Makefile.in index 0c47409e7..2bdccc2ef 100644 --- a/tests/DOM/DOMIDTest/Makefile.in +++ b/tests/DOM/DOMIDTest/Makefile.in @@ -77,6 +77,7 @@ OSVER = @osver@ LIBS = @libs@ CC = @compiler@ +include ../../../obj/version.incl include ../../Makefile.incl APP_NAME=DOMIDTest diff --git a/tests/DOM/DOMMemTest/Makefile.in b/tests/DOM/DOMMemTest/Makefile.in index dfa4afa95..d799dc819 100644 --- a/tests/DOM/DOMMemTest/Makefile.in +++ b/tests/DOM/DOMMemTest/Makefile.in @@ -77,6 +77,7 @@ OSVER = @osver@ LIBS = @libs@ CC = @compiler@ +include ../../../obj/version.incl include ../../Makefile.incl APP_NAME=DOMMemTest diff --git a/tests/DOM/DOMTest/Makefile.in b/tests/DOM/DOMTest/Makefile.in index 6bd89f7ad..a3904b3b5 100644 --- a/tests/DOM/DOMTest/Makefile.in +++ b/tests/DOM/DOMTest/Makefile.in @@ -77,6 +77,7 @@ OSVER = @osver@ LIBS = @libs@ CC = @compiler@ +include ../../../obj/version.incl include ../../Makefile.incl APP_NAME=DTest diff --git a/tests/DOM/Traversal/Makefile.in b/tests/DOM/Traversal/Makefile.in index 984726c95..dec41e9be 100644 --- a/tests/DOM/Traversal/Makefile.in +++ b/tests/DOM/Traversal/Makefile.in @@ -77,6 +77,7 @@ OSVER = @osver@ LIBS = @libs@ CC = @compiler@ +include ../../../obj/version.incl include ../../Makefile.incl APP_NAME=Traversal diff --git a/tests/EncodingTest/Makefile.in b/tests/EncodingTest/Makefile.in index 0c486b5cc..5c616c84f 100644 --- a/tests/EncodingTest/Makefile.in +++ b/tests/EncodingTest/Makefile.in @@ -54,20 +54,7 @@ # <http://www.apache.org/>. # # -# $Log$ -# Revision 1.3 2000/02/26 07:20:20 rahulj -# - The threading tests now work on HPUX. -# - Under HPUX 10.20 we do no build DOMMemTest and DOMTest. -# It crashes the compiler. -# - One could not write more worse makefiles than what exists for the -# tests. Hopefully, I will get bugged enough to fix them oneday. -# -# Revision 1.2 2000/02/18 22:56:31 abagchi -# Changed target directory -# -# Revision 1.1 2000/02/17 20:21:31 abagchi -# Initial checkin -# +# $Id$ # ################################################################### @@ -89,6 +76,7 @@ OSVER = @osver@ LIBS = @libs@ CC = @compiler@ +include ../../obj/version.incl include ../Makefile.incl APP_NAME=EncodingTest diff --git a/tests/Makefile.incl b/tests/Makefile.incl index dc1aadecf..b148fcf1a 100644 --- a/tests/Makefile.incl +++ b/tests/Makefile.incl @@ -55,6 +55,9 @@ # # # $Log$ +# Revision 1.7 2000/06/03 01:13:51 aruna1 +# Version number consolidated into single file for unix +# # Revision 1.6 2000/06/02 01:04:32 aruna1 # Modifed version no. to 1_2 # @@ -86,7 +89,6 @@ INCLUDES= -I. -I${XERCESCROOT}/include LIB_DIR=${XERCESCROOT}/lib LIBNAME=xerces-c THISLIB=${LIB_DIR}/${LIBNAME} -VER=1_2 LIBRARY_NAMES=-l${LIBNAME}${VER} LIBRARY_SEARCH_PATHS=-L${LIB_DIR} diff --git a/tests/ThreadTest/Makefile.in b/tests/ThreadTest/Makefile.in index 23393fca1..b12068f84 100644 --- a/tests/ThreadTest/Makefile.in +++ b/tests/ThreadTest/Makefile.in @@ -54,24 +54,7 @@ # <http://www.apache.org/>. # # -# $Log$ -# Revision 1.4 2000/02/26 07:20:20 rahulj -# - The threading tests now work on HPUX. -# - Under HPUX 10.20 we do no build DOMMemTest and DOMTest. -# It crashes the compiler. -# - One could not write more worse makefiles than what exists for the -# tests. Hopefully, I will get bugged enough to fix them oneday. -# -# Revision 1.3 2000/02/18 22:57:24 abagchi -# Changed target directory -# -# Revision 1.2 2000/02/06 07:48:37 rahulj -# Year 2K copyright swat. -# -# Revision 1.1 2000/01/31 22:22:50 aruna1 -# initial checkin -# -# +# $Id$ # ################################################################### @@ -93,6 +76,7 @@ OSVER = @osver@ LIBS = @libs@ CC = @compiler@ +include ../../obj/version.incl include ../Makefile.incl APP_NAME=ThreadTest -- GitLab