Skip to content

Commit

Permalink
Change from 1.5.2 to 1.6.0
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@173294 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Tinny Ng committed Nov 23, 2001
1 parent 5e24af4 commit a3c3e78
Show file tree
Hide file tree
Showing 16 changed files with 64 additions and 61 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* Localized versions of Info.plist keys */

CFBundleName = "Xerces";
CFBundleShortVersionString = "XercesLib version 1.5.2";
CFBundleGetInfoString = "XercesLib version 1.5.2";
CFBundleShortVersionString = "XercesLib version 1.6.0";
CFBundleGetInfoString = "XercesLib version 1.6.0";
NSHumanReadableCopyright = "Copyright";
Original file line number Diff line number Diff line change
Expand Up @@ -4464,7 +4464,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.5.2</string>
<string>1.6.0</string>
</dict>
</plist>
";
Expand Down
18 changes: 9 additions & 9 deletions Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions Projects/Win32/VC6/xerces-all/xerces-com/xerces-com.dsp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion doc/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ PROJECT_NAME = Xerces-C++
# This could be handy for archiving the generated documentation or
# if some version control system is used.

PROJECT_NUMBER = v1.5.2
PROJECT_NUMBER = v1.6.0

# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
Expand Down
10 changes: 5 additions & 5 deletions doc/dtd/entities.ent
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<!ENTITY XercesCFullName "Xerces C++ Parser"> <!-- fullproductname -->
<!ENTITY XercesCName "Xerces-C++"> <!-- productname -->
<!ENTITY XercesPreCVersion "1.4.0"> <!-- versionnumber -->
<!ENTITY XercesCVersion "1.6"> <!-- versionnumber -->
<!ENTITY XercesCVersion "1.6.0"> <!-- versionnumber -->
<!ENTITY XercesCProjectName "Xerces"> <!-- projectname -->
<!ENTITY XercesCInstallDir "xerces-c1_6"> <!-- installdirname -->
<!ENTITY XercesCSrcInstallDir "xerces-c-src1_6"> <!-- sourcedirectory -->
<!ENTITY XercesCInstallDir "xerces-c1_6_0"> <!-- installdirname -->
<!ENTITY XercesCSrcInstallDir "xerces-c-src1_6_0"> <!-- sourcedirectory -->
<!ENTITY XercesCWindowsLib "xerces-c_1"> <!-- windowslibname -->
<!ENTITY XercesCWindowsDLL "xerces-c_1_6"> <!-- windowsDLLname -->
<!ENTITY XercesCUnixLib "libxerces-c1_6"> <!-- unixlibname -->
<!ENTITY XercesCWindowsDLL "xerces-c_1_6_0"> <!-- windowsDLLname -->
<!ENTITY XercesCUnixLib "libxerces-c1_6_0"> <!-- unixlibname -->
<!ENTITY XercesCEmailAddress "[email protected] "> <!-- emailaddress -->
<!ENTITY XercesDistDir "xml.apache.org/dist/xerces-c"> <!-- download directory -->
2 changes: 1 addition & 1 deletion samples/Projects/OS2/VACPP40/basedir.icc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SRC_DIR = "I:\\Xerces\\source\\xml-xerces\\c"
SAMPLES = SRC_DIR "\\samples"
BASE_DIR = "I:\\Xerces\\1.5.2"
BASE_DIR = "I:\\Xerces\\1.6.0"
LIB_DIR = BASE_DIR "\\lib"
BIN_DIR = BASE_DIR "\\bin"

Expand Down
8 changes: 4 additions & 4 deletions scripts/packageBinaries.pl
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
print (" -j suppress building of ICU (speeds up builds when debugging)\n");
print (" -h to get help on these commands\n\n");
print ("Example: Under unix's\n");
print (" perl packageBinaries.pl -s \$HOME/xerces-c-src_1_5_2");
print (" -o \$HOME/xerces-c_1_5_2-linux -c gcc -x g++ -m inmem -n fileonly -t native\n\n");
print (" perl packageBinaries.pl -s \$HOME/xerces-c-src_1_6_0");
print (" -o \$HOME/xerces-c_1_6_0-linux -c gcc -x g++ -m inmem -n fileonly -t native\n\n");
print ("Example: Under Windows\n");
print (" perl packageBinaries.pl -s \\xerces-c-src_1_5_2");
print (" -o\\xerces-c_1_5_2-win32 [-n fileonly] [-t icu]\n\n");
print (" perl packageBinaries.pl -s \\xerces-c-src_1_6_0");
print (" -o\\xerces-c_1_6_0-win32 [-n fileonly] [-t icu]\n\n");
print ("Note:\n");
print (" Under Windows, by default the XercesLib project files is\n");
print (" configured to use Win32 resource file based message loader,\n");
Expand Down
8 changes: 4 additions & 4 deletions scripts/packageSources.pl
Original file line number Diff line number Diff line change
Expand Up @@ -288,11 +288,11 @@ ()
while ($line = <FIZZLE>) {
$line =~ s/"Xerces C\+\+ Parser"/"XML for C\+\+ Parser"/g;
$line =~ s/"Xerces-C\+\+"/"XML4C"/g;
$line =~ s/"1\.5\.2"/"3\.5\.1"/g;
$line =~ s/"1\.6\.0"/"4\.0\.0"/g;
$line =~ s/"1\.4\.0"/"3\.3\.1"/g;
$line =~ s/"Xerces"/"XML4C"/g;
$line =~ s/"xerces-c1_5_2"/"xml4c-3_5_1"/g;
$line =~ s/"xerces-c-src1_5_2"/"xml4c-src-3_5_1"/g;
$line =~ s/"xerces-c1_6_0"/"xml4c-4_0_0"/g;
$line =~ s/"xerces-c-src1_6_0"/"xml4c-src-4_0_0"/g;
$line =~ s/xerces-c-dev\@xml\.apache\.org/xml4c\@us\.ibm\.com/g;
$line =~ s/xml\.apache\.org\/dist\/xerces-c/www\.alphaworks\.ibm\.com\/tech\/xml4c/g;
print FIZZLEOUT $line;
Expand All @@ -313,7 +313,7 @@ ()
open (FIZZLEOUT, ">$thefile");
while ($line = <FIZZLE>) {
$line =~ s/Xerces-C\+\+/XML4C/g;
$line =~ s/1\.5\.2/3\.5\.1/g;
$line =~ s/1\.6\.0/4\.0\.0/g;
$line =~ s/header.html/header_ibm.html/g;
print FIZZLEOUT $line;
}
Expand Down
2 changes: 1 addition & 1 deletion src/com/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ The following lines would create an instance of a Xerces parser:
Dim xmlparser as new Xerces.DOMDocument
Dim xmlparser as new DOMDocument
Set object = CreateObject("Xerces.DOMDocument")
set object = CreateObject("Xerces.DOMDocument.1.5.2")
set object = CreateObject("Xerces.DOMDocument.1.6.0")

If you leave both MSXML and Xerces in the same project, you may need to disambiguate interfaces by prepending MSXML or Xerces.

Expand Down
4 changes: 2 additions & 2 deletions src/com/xml4com.idl
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ import "oaidl.idl";
// Format for version is major.minor
// no support for additional parts (like 1.5.2)
// Use 1.60 for subsequent release
version(1.52),
helpstring("Xerces XML Parser 1.5.2")
version(1.60),
helpstring("Xerces XML Parser 1.6.0")
]
library Xerces
{
Expand Down
6 changes: 3 additions & 3 deletions src/com/xmldocument.rgs
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
HKCR
{
Xerces.DOMDocument.1.5.2 = s 'Apache Xerces Parser for COM'
Xerces.DOMDocument.1.6.0 = s 'Apache Xerces Parser for COM'
{
CLSID = s '{C4775B61-ECD6-11d4-94B4-00A0CC57CBCB}'
}
Xerces.DOMDocument = s 'Apache Xerces Parser For COM'
{
CLSID = s '{C4775B61-ECD6-11d4-94B4-00A0CC57CBCB}'
CurVer = s 'Xerces.DOMDocument.1.5.2'
CurVer = s 'Xerces.DOMDocument.1.6.0'
}
NoRemove CLSID
{
ForceRemove = '{C4775B61-ECD6-11d4-94B4-00A0CC57CBCB}' = s 'Apache Xerces Parser for COM'
{
ProgID = s 'Xerces.DOMDocument.1.5.2'
ProgID = s 'Xerces.DOMDocument.1.6.0'
VersionIndependentProgID = s 'Xerces.DOMDocument'
ForceRemove 'Programmable'
InprocServer32 = s '%XMLMODULE%'
Expand Down
6 changes: 3 additions & 3 deletions src/com/xmlhttprequest.rgs
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
HKCR
{
IBMXML.XMLHttpRequest.1.5.2 = s 'Apache Xerces XML Http Request'
IBMXML.XMLHttpRequest.1.6.0 = s 'Apache Xerces XML Http Request'
{
CLSID = s '{3A725053-15FB-4065-9171-BC02BCF3876C}'
}
IBMXML.XMLHttpRequest = s 'Apache Xerces XML Http Request'
{
CLSID = s '{3A725053-15FB-4065-9171-BC02BCF3876C}'
CurVer = s 'Xerces.XMLHttpRequest.1.5.2'
CurVer = s 'Xerces.XMLHttpRequest.1.6.0'
}
NoRemove CLSID
{
ForceRemove {3A725053-15FB-4065-9171-BC02BCF3876C} = s 'Apache Xerces XML Http Request'
{
ProgID = s 'Xerces.XMLHttpRequest.1.5.2'
ProgID = s 'Xerces.XMLHttpRequest.1.6.0'
VersionIndependentProgID = s 'Xerces.XMLHttpRequest'
ForceRemove 'Programmable'
InprocServer32 = s '%XMLMODULE%'
Expand Down
16 changes: 8 additions & 8 deletions src/util/Platforms/Win32/Version.rc
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,5,2,0
PRODUCTVERSION 1,5,2,0
FILEVERSION 1,6,0,0
PRODUCTVERSION 1,6,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -47,15 +47,15 @@ BEGIN
BEGIN
VALUE "Comments", "Dynamic linked library for Xerces-C\0"
VALUE "CompanyName", "Apache Software Foundation\0"
VALUE "FileDescription", "Shared Library for Xerces-C Version 1.5.2\0"
VALUE "FileVersion", "1, 5, 2\0"
VALUE "InternalName", "xerces-c_1_5_2.dll\0"
VALUE "FileDescription", "Shared Library for Xerces-C Version 1.6.0\0"
VALUE "FileVersion", "1, 6, 0\0"
VALUE "InternalName", "xerces-c_1_6_0.dll\0"
VALUE "LegalCopyright", "Copyright � Apache Software Foundation 2000 subject to licensing terms\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "xerces-c_1_5_2.dll\0"
VALUE "OriginalFilename", "xerces-c_1_6_0.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Xerces-C Version 1.5.2\0"
VALUE "ProductVersion", "1, 5, 2\0"
VALUE "ProductName", "Xerces-C Version 1.6.0\0"
VALUE "ProductVersion", "1, 6, 0\0"
VALUE "SpecialBuild", "\0"
END
END
Expand Down
13 changes: 8 additions & 5 deletions src/util/XercesDefs.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@

/*
* $Log$
* Revision 1.17 2001/11/23 17:19:33 tng
* Change from 1.5.2 to 1.6.0
*
* Revision 1.16 2001/10/15 16:27:35 tng
* Changes for Xerces-C 1.5.2
*
Expand Down Expand Up @@ -165,12 +168,12 @@
// These are updated for every build. They must be at the top because they
// can be used by various per-compiler headers below.
// ---------------------------------------------------------------------------
#define Xerces_DLLVersionStr "1_5_2"
const char* const gXercesVersionStr = "1_5";
const char* const gXercesFullVersionStr = "1_5_2";
#define Xerces_DLLVersionStr "1_6_0"
const char* const gXercesVersionStr = "1_6";
const char* const gXercesFullVersionStr = "1_6_0";
const unsigned int gXercesMajVersion = 1;
const unsigned int gXercesMinVersion = 5;
const unsigned int gXercesRevision = 2;
const unsigned int gXercesMinVersion = 6;
const unsigned int gXercesRevision = 0;


// ---------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion version.incl
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@
#
# $Id$
#
VER=1_5_2
VER=1_6_0

0 comments on commit a3c3e78

Please sign in to comment.