roddey 99/11/22 17:04:21
Modified: c/Projects/Win32/Unsupported/IntVC6/NLSXlat NLSXlat.dsp
c/Projects/Win32/Unsupported/IntVC6/Validators
Validators.dsp
c/Projects/Win32/Unsupported/IntVC6/XML4CParser
XML4CParser.dsp
c/Projects/Win32/Unsupported/IntVC6/XMLUtil XMLUtil.dsp
c/src/framework XMLBuffer.cpp
Added: c/scripts/Win32 ccd.cmd
Log:
Updates to some of the internal VC++ project files and some small
fixes to make XMLBuffer correctly character size agnostic.
Revision Changes Path
1.2 +4 -4
xml-xerces/c/Projects/Win32/Unsupported/IntVC6/NLSXlat/NLSXlat.dsp
Index: NLSXlat.dsp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/Projects/Win32/Unsupported/IntVC6/NLSXlat/NLSXlat.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NLSXlat.dsp 1999/11/09 01:10:25 1.1
+++ NLSXlat.dsp 1999/11/23 01:04:07 1.2
@@ -42,7 +42,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D
"_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /I
"\ICU\Include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /I
"\icu_1_3_1\Include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -51,7 +51,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib IXDom.lib IXUtil.lib IXPar.lib
IXSAX.lib icuuc.lib /nologo /version:3.0 /subsystem:console /machine:I386
/libpath:"..\..\..\..\..\Build\Win32\VC6\Release" /libpath:"\ICU\Lib\Release"
+# ADD LINK32 kernel32.lib user32.lib IXDom.lib IXUtil.lib IXPar.lib
IXSAX.lib icuuc.lib /nologo /version:3.0 /subsystem:console /machine:I386
/libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
/libpath:"\icu_1_3_1\Lib\Release"
!ELSEIF "$(CFG)" == "NLSXlat - Win32 Debug"
@@ -67,7 +67,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G6 /MDd /Za /W3 /GX /Zi /Od /I "..\..\..\..\..\src" /I
"\ICU\Include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /GZ /c
+# ADD CPP /nologo /G6 /MDd /Za /W3 /GX /Zi /Od /I "..\..\..\..\..\src" /I
"\icu_1_3_1\Include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -76,7 +76,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
/pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib IXDom.lib IXUtil.lib IXPar.lib
IXSAX.lib icuuc.lib /nologo /version:3.0 /subsystem:console /debug
/machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
/libpath:"\ICU\Lib\Debug"
+# ADD LINK32 kernel32.lib user32.lib IXDom.lib IXUtil.lib IXPar.lib
IXSAX.lib icuuc.lib /nologo /version:3.0 /subsystem:console /debug
/machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
/libpath:"\icu_1_3_1\Lib\Debug"
!ENDIF
1.2 +1 -1
xml-xerces/c/Projects/Win32/Unsupported/IntVC6/Validators/Validators.dsp
Index: Validators.dsp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/Projects/Win32/Unsupported/IntVC6/Validators/Validators.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Validators.dsp 1999/11/09 01:10:10 1.1
+++ Validators.dsp 1999/11/23 01:04:11 1.2
@@ -82,7 +82,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib IXUtil.Lib IXCore.Lib IXSAX.Lib /nologo
/base:"0x12000000" /version:3.0 /dll /debug /machine:I386
/out:"..\..\..\..\..\Build\Win32\VC6\Debug\IXVal.dll"
/libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" /libpath:"\ICU\Lib\Debug"
+# ADD LINK32 kernel32.lib user32.lib IXUtil.Lib IXCore.Lib IXSAX.Lib /nologo
/base:"0x12000000" /version:3.0 /dll /debug /machine:I386
/out:"..\..\..\..\..\Build\Win32\VC6\Debug\IXVal.dll"
/libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
# SUBTRACT LINK32 /profile
!ENDIF
1.2 +2 -2
xml-xerces/c/Projects/Win32/Unsupported/IntVC6/XML4CParser/XML4CParser.dsp
Index: XML4CParser.dsp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/Projects/Win32/Unsupported/IntVC6/XML4CParser/XML4CParser.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XML4CParser.dsp 1999/11/09 01:10:09 1.1
+++ XML4CParser.dsp 1999/11/23 01:04:13 1.2
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib IXUtil.Lib /nologo /base:"0x11000000"
/version:3.0 /dll /map /machine:I386
/out:"..\..\..\..\..\Build\Win32\VC6\Release/IXCore.dll"
/libpath:"..\..\..\..\..\Build\Win32\VC6\Release" /libpath:"\ICU\Lib\Release"
+# ADD LINK32 kernel32.lib user32.lib IXUtil.Lib /nologo /base:"0x11000000"
/version:3.0 /dll /map /machine:I386
/out:"..\..\..\..\..\Build\Win32\VC6\Release/IXCore.dll"
/libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
# SUBTRACT LINK32 /profile
!ELSEIF "$(CFG)" == "XML4CParser - Win32 Debug"
@@ -82,7 +82,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib IXUtil.Lib /nologo /base:"0x11000000"
/version:3.0 /dll /debug /machine:I386
/out:"..\..\..\..\..\Build\Win32\VC6\Debug/IXCore.dll"
/libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" /libpath:"\ICU\Lib\Debug"
+# ADD LINK32 kernel32.lib user32.lib IXUtil.Lib /nologo /base:"0x11000000"
/version:3.0 /dll /debug /machine:I386
/out:"..\..\..\..\..\Build\Win32\VC6\Debug/IXCore.dll"
/libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
# SUBTRACT LINK32 /profile /map
!ENDIF
1.2 +4 -4
xml-xerces/c/Projects/Win32/Unsupported/IntVC6/XMLUtil/XMLUtil.dsp
Index: XMLUtil.dsp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/Projects/Win32/Unsupported/IntVC6/XMLUtil/XMLUtil.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLUtil.dsp 1999/11/09 01:10:08 1.1
+++ XMLUtil.dsp 1999/11/23 01:04:15 1.2
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/D "_MBCS" /D "_USRDLL" /D "XMLUTIL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /I
"\icu\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "PROJ_XMLUTIL" /D
"XML_USE_ICU_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /FD /c
+# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /I
"\icu_1_3_1\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "PROJ_XMLUTIL" /D
"XML_USE_ICU_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib icuuc.lib /nologo /base:"0x10000000"
/version:3.0 /dll /map /machine:I386
/out:"..\..\..\..\..\Build\Win32\VC6\Release/IXUtil.dll"
/libpath:"..\..\..\..\..\Build\Win32\VC6\Release" /libpath:"\ICU\Lib\Release"
+# ADD LINK32 kernel32.lib user32.lib icuuc.lib /nologo /base:"0x10000000"
/version:3.0 /dll /map /machine:I386
/out:"..\..\..\..\..\Build\Win32\VC6\Release/IXUtil.dll"
/libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
/libpath:"\icu_1_3_1\Lib\Release"
# SUBTRACT LINK32 /profile
!ELSEIF "$(CFG)" == "XMLUtil - Win32 Debug"
@@ -71,7 +71,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XMLUTIL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src"
/I "\icu\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "PROJ_XMLUTIL" /D
"XML_USE_ICU_TRANSCODER" /D "XML_USE_INMEMORY_MSGLOADER" /FD /GZ /c
+# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src"
/I "\icu_1_3_1\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "PROJ_XMLUTIL"
/D "XML_USE_ICU_TRANSCODER" /D "XML_USE_INMEMORY_MSGLOADER" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -82,7 +82,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib icuuc.lib /nologo /base:"0x10000000"
/version:3.0 /dll /debug /machine:I386
/out:"..\..\..\..\..\Build\Win32\VC6\Debug/IXUtil.dll"
/libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" /libpath:"\ICU\Lib\Debug"
+# ADD LINK32 kernel32.lib user32.lib icuuc.lib /nologo /base:"0x10000000"
/version:3.0 /dll /debug /machine:I386
/out:"..\..\..\..\..\Build\Win32\VC6\Debug/IXUtil.dll"
/libpath:"..\..\..\..\..\Build\Win32\VC6\Debug" /libpath:"\icu_1_3_1\Lib\Debug"
# SUBTRACT LINK32 /profile
!ENDIF
1.1 xml-xerces/c/scripts/Win32/ccd.cmd
Index: ccd.cmd
===================================================================
@ECHO OFF
%DevDrive%
IF "%1"=="build" GOTO CD_BUILD
IF "%1"=="data" GOTO CD_DATA
IF "%1"=="dom" GOTO CD_DOM
IF "%1"=="framework" GOTO CD_FRAMEWORK
IF "%1"=="internal" GOTO CD_INTERNAL
IF "%1"=="intl" GOTO CD_INTL
IF "%1"=="intl" GOTO CD_INTLBUILD
IF "%1"=="parsers" GOTO CD_PARSERS
IF "%1"=="samples" GOTO CD_SAMPLES
IF "%1"=="sax" GOTO CD_SAX
IF "%1"=="scripts" GOTO CD_SCRIPTS
IF "%1"=="src" GOTO CD_SRC
IF "%1"=="tests" GOTO CD_TESTS
IF "%1"=="util" GOTO CD_UTIL
ECHO Unknown target directory
GOTO :EXIT
:CD_BUILD
CD %XML4CRoot%\Build\Win32\VC6
GOTO EXIT
:CD_DATA
CD %XML4CRoot%\samples\data
GOTO EXIT
:CD_DOM
CD %XML4CRoot%\src\com\ibm\xml\dom
GOTO EXIT
:CD_FRAMEWORK
CD %XML4CRoot%\src\com\ibm\xml\framework
GOTO EXIT
:CD_INTERNAL
CD %XML4CRoot%\src\com\ibm\xml\internal
GOTO EXIT
:CD_INTL
CD %XML4CRoot%\intlFiles
GOTO EXIT
:CD_INTLBUILD
CD %XML4CRoot%\intlFiles\Build\Win32\VC6
GOTO EXIT
:CD_PARSERS
CD %XML4CRoot%\src\com\ibm\xml\parsers
GOTO EXIT
:CD_SAMPLES
CD %XML4CRoot%\samples
GOTO EXIT
:CD_SAX
CD %XML4CRoot%\src\sax
GOTO EXIT
:CD_SCRIPTS
CD %XML4CRoot%\scripts\Win32
GOTO EXIT
:CD_SRC
CD %XML4CRoot%\src
GOTO EXIT
:CD_TESTS
CD %XML4CRoot%\src\com\ibm\xml\util\tests
GOTO EXIT
:CD_UTIL
CD %XML4CRoot%\src\com\ibm\xml\util
GOTO EXIT
:EXIT
1.2 +8 -5 xml-xerces/c/src/framework/XMLBuffer.cpp
Index: XMLBuffer.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/framework/XMLBuffer.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLBuffer.cpp 1999/11/09 01:08:29 1.1
+++ XMLBuffer.cpp 1999/11/23 01:04:19 1.2
@@ -56,9 +56,13 @@
/**
* $Log: XMLBuffer.cpp,v $
- * Revision 1.1 1999/11/09 01:08:29 twl
- * Initial revision
+ * Revision 1.2 1999/11/23 01:04:19 roddey
+ * Updates to some of the internal VC++ project files and some small
+ * fixes to make XMLBuffer correctly character size agnostic.
*
+ * Revision 1.1.1.1 1999/11/09 01:08:29 twl
+ * Initial checkin
+ *
* Revision 1.2 1999/11/08 20:44:35 rahul
* Swat for adding in Product name and CVS comment log variable.
*
@@ -84,7 +88,7 @@
if (!count)
actualCount = XMLString::stringLen(chars);
insureCapacity(actualCount);
- memcpy(&fBuffer[fIndex], chars, actualCount * 2);
+ memcpy(&fBuffer[fIndex], chars, actualCount * sizeof(XMLCh));
fIndex += actualCount;
}
@@ -95,7 +99,7 @@
actualCount = XMLString::stringLen(chars);
fIndex = 0;
insureCapacity(actualCount);
- memcpy(fBuffer, chars, actualCount * 2);
+ memcpy(fBuffer, chars, actualCount * sizeof(XMLCh));
fIndex = actualCount;
}
@@ -108,10 +112,10 @@
unsigned int newCap = (unsigned int)(fCapacity * 1.5);
// Allocate the new buffer
- XMLCh* newBuf = new XMLCh[newCap+1];
+ XMLCh* newBuf = new XMLCh[newCap + 1];
// Copy over the old stuff
- memcpy(newBuf, fBuffer, fCapacity * 2);
+ memcpy(newBuf, fBuffer, fCapacity * sizeof(XMLCh));
// Clean up old buffer and store new stuff
delete [] fBuffer;
@@ -130,7 +134,7 @@
XMLCh* newBuf = new XMLCh[newCap+1];
// Copy over the old stuff
- memcpy(newBuf, fBuffer, fCapacity * 2);
+ memcpy(newBuf, fBuffer, fCapacity * sizeof(XMLCh));
// Clean up old buffer and store new stuff
delete [] fBuffer;
