You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ar...@locus.apache.org on 2000/09/21 02:54:19 UTC
cvs commit: xml-xerces/c/src/util/Transcoders/Iconv IconvTransService.cpp
aruna1 00/09/20 17:54:19
Modified: c/Projects/OS2/VACPP40 Xerces.icc genICC.cmd
packageBinaries.cmd xerces_dom.icc
xerces_internal.icc xerces_parsers.icc
xerces_sax.icc xerces_util.icc
c/samples/Projects/OS2/VACPP40 basedir.icc bldsamples.cmd
c/src/util AutoSense.hpp
c/src/util/Platforms/OS2 OS2PlatformUtils.cpp
c/src/util/Transcoders/Iconv IconvTransService.cpp
Log:
OS2 related changes given by Bill Schindler
Revision Changes Path
1.2 +2 -0 xml-xerces/c/Projects/OS2/VACPP40/Xerces.icc
Index: Xerces.icc
===================================================================
RCS file: /home/cvs/xml-xerces/c/Projects/OS2/VACPP40/Xerces.icc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Xerces.icc 2000/06/23 18:10:36 1.1
+++ Xerces.icc 2000/09/21 00:54:13 1.2
@@ -4,6 +4,7 @@
include "xerces_internal.icc"
include "xerces_parsers.icc"
include "xerces_sax.icc"
+include "xerces_sax2.icc"
include "xerces_util.icc"
include "xerces_validators.icc"
include "xerces_OS2.icc"
@@ -18,6 +19,7 @@
source type("cpp") xerces_internal
source type("cpp") xerces_parsers
source type("cpp") xerces_sax
+ source type("cpp") xerces_sax2
source type("cpp") xerces_util
source type("cpp") xerces_validators
source type("cpp") xerces_os2
1.2 +2 -1 xml-xerces/c/Projects/OS2/VACPP40/genICC.cmd
Index: genICC.cmd
===================================================================
RCS file: /home/cvs/xml-xerces/c/Projects/OS2/VACPP40/genICC.cmd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- genICC.cmd 2000/06/23 18:10:36 1.1
+++ genICC.cmd 2000/09/21 00:54:13 1.2
@@ -56,7 +56,7 @@
*/
/*
- * $Id: genICC.cmd,v 1.1 2000/06/23 18:10:36 aruna1 Exp $
+ * $Id: genICC.cmd,v 1.2 2000/09/21 00:54:13 aruna1 Exp $
* Object Rexx script to generate ICC include files for Xerces-C project.
*/
@@ -126,6 +126,7 @@
"\Compilers\", ,
"\NetAccessors\", ,
"\dom\AncestorNode.cpp", ,
+ "\dom\CommonParentNode.cpp", ,
"\com\", ,
"\NLS\", ,
"Win32", ,
1.2 +49 -0 xml-xerces/c/Projects/OS2/VACPP40/packageBinaries.cmd
Index: packageBinaries.cmd
===================================================================
RCS file: /home/cvs/xml-xerces/c/Projects/OS2/VACPP40/packageBinaries.cmd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- packageBinaries.cmd 2000/06/23 18:10:36 1.1
+++ packageBinaries.cmd 2000/09/21 00:54:13 1.2
@@ -56,6 +56,7 @@
CALL MakeTargetDirectories targetdir
CALL CopyHeaderFiles targetdir, sourcedir
CALL CopyBinaries targetdir, sourcedir
+CALL CopySamples targetdir, sourcedir
EXIT
@@ -94,9 +95,12 @@
CALL SysMkDir targetdir || "\samples"
CALL SysMkDir targetdir || "\samples\Projects"
CALL SysMkDir targetdir || "\samples\Projects\OS2"
+ CALL SysMkDir targetdir || "\samples\Projects\OS2\VACPP40"
CALL SysMkDir targetdir || "\samples\data"
CALL SysMkDir targetdir || "\samples\SAXCount"
+ CALL SysMkDir targetdir || "\samples\SAX2Count"
CALL SysMkDir targetdir || "\samples\SAXPrint"
+ CALL SysMkDir targetdir || "\samples\SAX2Print"
CALL SysMkDir targetdir || "\samples\DOMCount"
CALL SysMkDir targetdir || "\samples\DOMPrint"
CALL SysMkDir targetdir || "\samples\Redirect"
@@ -111,6 +115,50 @@
RETURN
+ /*------------------------------- CopySamples -------------------------------
+ */
+::routine CopySamples
+ USE ARG targetdir, sourcedir
+
+ project = "\samples\Projects\OS2\VACPP40"
+
+ /* Copy the project files */
+ srcSpec = sourcedir || project || "\*"
+ CALL SysFileTree srcSpec, 'F.', 'FO'
+ DO i = 1 TO f.0
+ srcfn = f.i
+ trgfn = targetdir || project || "\" || Filespec('N', f.i)
+ 'copy' srcfn trgfn '> nul'
+ END
+
+ samples = .array~of( ,
+ "SAXCount", ,
+ "SAX2Count", ,
+ "SAXPrint", ,
+ "SAX2Print", ,
+ "DOMCount", ,
+ "DOMPrint", ,
+ "Redirect", ,
+ "MemParse", ,
+ "PParse", ,
+ "StdInParse", ,
+ "EnumVal", ,
+ "CreateDOMDocument" ,
+ )
+
+ /* Copy the sample code */
+ DO sample OVER samples
+ srcSpec = sourcedir || "\samples\" || sample || "\*.?pp"
+ CALL SysFileTree srcSpec, 'F.', 'FO'
+ DO i = 1 TO f.0
+ srcfn = f.i
+ trgfn = targetdir || "\samples\" || sample || "\" || Filespec('N', f.i)
+ 'copy' srcfn trgfn '> nul'
+ END
+ END
+
+ RETURN
+
/*------------------------------ CopyBinaries -------------------------------
* Copy the DLL and LIB files to their destination directories
*/
@@ -136,6 +184,7 @@
hdirs = .array~of( ,
"sax", ,
+ "sax2", ,
"framework", ,
"dom", ,
"internal", ,
1.2 +4 -0 xml-xerces/c/Projects/OS2/VACPP40/xerces_dom.icc
Index: xerces_dom.icc
===================================================================
RCS file: /home/cvs/xml-xerces/c/Projects/OS2/VACPP40/xerces_dom.icc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xerces_dom.icc 2000/06/23 18:10:36 1.1
+++ xerces_dom.icc 2000/09/21 00:54:15 1.2
@@ -1,5 +1,6 @@
group xerces_dom =
BASE_DIR "\\src\\dom\\AttrImpl.cpp",
+ BASE_DIR "\\src\\dom\\AttrMapImpl.cpp",
BASE_DIR "\\src\\dom\\AttrNSImpl.cpp",
BASE_DIR "\\src\\dom\\CDATASectionImpl.cpp",
BASE_DIR "\\src\\dom\\CharacterDataImpl.cpp",
@@ -31,6 +32,8 @@
BASE_DIR "\\src\\dom\\DOM_NodeList.cpp",
BASE_DIR "\\src\\dom\\DOM_Notation.cpp",
BASE_DIR "\\src\\dom\\DOM_ProcessingInstruction.cpp",
+ BASE_DIR "\\src\\dom\\DOM_Range.cpp",
+ BASE_DIR "\\src\\dom\\DOM_RangeException.cpp",
BASE_DIR "\\src\\dom\\DOM_Text.cpp",
BASE_DIR "\\src\\dom\\DOM_TreeWalker.cpp",
BASE_DIR "\\src\\dom\\DOM_XMLDecl.cpp",
@@ -49,6 +52,7 @@
BASE_DIR "\\src\\dom\\NotationImpl.cpp",
BASE_DIR "\\src\\dom\\ParentNode.cpp",
BASE_DIR "\\src\\dom\\ProcessingInstructionImpl.cpp",
+ BASE_DIR "\\src\\dom\\RangeImpl.cpp",
BASE_DIR "\\src\\dom\\RefCountedImpl.cpp",
BASE_DIR "\\src\\dom\\TextImpl.cpp",
BASE_DIR "\\src\\dom\\TreeWalkerImpl.cpp",
1.2 +1 -0 xml-xerces/c/Projects/OS2/VACPP40/xerces_internal.icc
Index: xerces_internal.icc
===================================================================
RCS file: /home/cvs/xml-xerces/c/Projects/OS2/VACPP40/xerces_internal.icc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xerces_internal.icc 2000/06/23 18:10:36 1.1
+++ xerces_internal.icc 2000/09/21 00:54:15 1.2
@@ -1,6 +1,7 @@
group xerces_internal =
BASE_DIR "\\src\\internal\\ElemStack.cpp",
BASE_DIR "\\src\\internal\\ReaderMgr.cpp",
+ BASE_DIR "\\src\\internal\\VecAttributesImpl.cpp",
BASE_DIR "\\src\\internal\\VecAttrListImpl.cpp",
BASE_DIR "\\src\\internal\\XMLReader.cpp",
BASE_DIR "\\src\\internal\\XMLScanner.cpp",
1.2 +1 -0 xml-xerces/c/Projects/OS2/VACPP40/xerces_parsers.icc
Index: xerces_parsers.icc
===================================================================
RCS file: /home/cvs/xml-xerces/c/Projects/OS2/VACPP40/xerces_parsers.icc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xerces_parsers.icc 2000/06/23 18:10:36 1.1
+++ xerces_parsers.icc 2000/09/21 00:54:15 1.2
@@ -1,3 +1,4 @@
group xerces_parsers =
BASE_DIR "\\src\\parsers\\DOMParser.cpp",
+ BASE_DIR "\\src\\parsers\\SAX2XMLReaderImpl.cpp",
BASE_DIR "\\src\\parsers\\SAXParser.cpp"
1.2 +1 -0 xml-xerces/c/Projects/OS2/VACPP40/xerces_sax.icc
Index: xerces_sax.icc
===================================================================
RCS file: /home/cvs/xml-xerces/c/Projects/OS2/VACPP40/xerces_sax.icc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xerces_sax.icc 2000/06/23 18:10:36 1.1
+++ xerces_sax.icc 2000/09/21 00:54:15 1.2
@@ -1,4 +1,5 @@
group xerces_sax =
BASE_DIR "\\src\\sax\\Dummy.cpp",
BASE_DIR "\\src\\sax\\InputSource.cpp",
+ BASE_DIR "\\src\\sax\\SAXException.cpp",
BASE_DIR "\\src\\sax\\SAXParseException.cpp"
1.2 +2 -0 xml-xerces/c/Projects/OS2/VACPP40/xerces_util.icc
Index: xerces_util.icc
===================================================================
RCS file: /home/cvs/xml-xerces/c/Projects/OS2/VACPP40/xerces_util.icc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xerces_util.icc 2000/06/23 18:10:36 1.1
+++ xerces_util.icc 2000/09/21 00:54:15 1.2
@@ -3,6 +3,8 @@
BASE_DIR "\\src\\util\\BinInputStream.cpp",
BASE_DIR "\\src\\util\\BinMemInputStream.cpp",
BASE_DIR "\\src\\util\\BitSet.cpp",
+ BASE_DIR "\\src\\util\\HashPtr.cpp",
+ BASE_DIR "\\src\\util\\HashXMLCh.cpp",
BASE_DIR "\\src\\util\\HeaderDummy.cpp",
BASE_DIR "\\src\\util\\KVStringPair.cpp",
BASE_DIR "\\src\\util\\Mutexes.cpp",
1.2 +1 -1 xml-xerces/c/samples/Projects/OS2/VACPP40/basedir.icc
Index: basedir.icc
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/Projects/OS2/VACPP40/basedir.icc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- basedir.icc 2000/06/23 18:12:06 1.1
+++ basedir.icc 2000/09/21 00:54:17 1.2
@@ -1,6 +1,6 @@
SRC_DIR = "I:\\Xerces\\source\\xml-xerces\\c"
SAMPLES = SRC_DIR "\\samples"
-BASE_DIR = "I:\\Xerces\\1.2.0"
+BASE_DIR = "I:\\Xerces\\1.3.0"
LIB_DIR = BASE_DIR "\\lib"
BIN_DIR = BASE_DIR "\\bin"
1.2 +4 -0 xml-xerces/c/samples/Projects/OS2/VACPP40/bldsamples.cmd
Index: bldsamples.cmd
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/Projects/OS2/VACPP40/bldsamples.cmd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bldsamples.cmd 2000/06/23 18:12:07 1.1
+++ bldsamples.cmd 2000/09/21 00:54:17 1.2
@@ -13,6 +13,10 @@
vacbld PParse.icc
echo making Redirect
vacbld Redirect.icc
+echo making SAX2Count
+vacbld SAX2Count.icc
+echo making SAX2Print
+vacbld SAX2Print.icc
echo making SAXCount
vacbld SAXCount.icc
echo making SAXPrint
1.15 +8 -8 xml-xerces/c/src/util/AutoSense.hpp
Index: AutoSense.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/AutoSense.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AutoSense.hpp 2000/08/01 18:26:02 1.14
+++ AutoSense.hpp 2000/09/21 00:54:18 1.15
@@ -56,6 +56,9 @@
/*
* $Log: AutoSense.hpp,v $
+ * Revision 1.15 2000/09/21 00:54:18 aruna1
+ * OS2 related changes given by Bill Schindler
+ *
* Revision 1.14 2000/08/01 18:26:02 aruna1
* Tru64 support added
*
@@ -221,18 +224,15 @@
#define XML_MVSCPP
#elif defined(EXM_OS390) && defined(__cplusplus)
#define XML_MVSCPP
-#elif defined(__IBMCPP__)
+#elif defined(__IBMC__) || defined(__IBMCPP__)
#if defined(XML_WIN32)
#define XML_IBMVAW32
#elif defined(XML_OS2)
#define XML_IBMVAOS2
- #endif
-#elif defined(__IBMC__)
- #if defined(XML_WIN32)
- #define XML_IBMVAW32
- #elif defined(XML_OS2)
- #define XML_IBMVAOS2
- #endif
+ #if (__IBMC__ >= 400 || __IBMCPP__ >= 400)
+ #define XML_IBMVA4_OS2
+ #endif
+ #endif
#elif defined(XML_TRU64) && defined(__DECCXX)
#define XML_DECCXX
#elif defined(__MWERKS__)
1.7 +10 -10 xml-xerces/c/src/util/Platforms/OS2/OS2PlatformUtils.cpp
Index: OS2PlatformUtils.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/Platforms/OS2/OS2PlatformUtils.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- OS2PlatformUtils.cpp 2000/07/25 22:30:14 1.6
+++ OS2PlatformUtils.cpp 2000/09/21 00:54:18 1.7
@@ -55,7 +55,7 @@
*/
/*
- * $Id: OS2PlatformUtils.cpp,v 1.6 2000/07/25 22:30:14 aruna1 Exp $
+ * $Id: OS2PlatformUtils.cpp,v 1.7 2000/09/21 00:54:18 aruna1 Exp $
*/
@@ -89,13 +89,13 @@
#error A transcoding service must be chosen
#endif
- defined(XML_USE_INMEMORY_MSGLOADER)
+ #if defined(XML_USE_INMEMORY_MSGLOADER)
#include <util/MsgLoaders/InMemory/InMemMsgLoader.hpp>
#else
#error A message loading service must be chosen
#endif
-#if defined(__IBMCPP__)
+#if defined(XML_IBMVAOS2)
#include <builtin.h>
#endif
#include <OS2.h>
@@ -377,7 +377,7 @@
// -----------------------------------------------------------------------
void XMLPlatformUtils::closeMutex(void* const mtxHandle)
{
-#if defined(__MT__)
+#if ! defined(APP_NO_THREADS)
if (mtxHandle == NULL)
return;
@@ -390,7 +390,7 @@
void XMLPlatformUtils::lockMutex(void* const mtxHandle)
{
-#if defined(__MT__)
+#if ! defined(APP_NO_THREADS)
if (mtxHandle == NULL)
return;
@@ -403,7 +403,7 @@
void* XMLPlatformUtils::makeMutex()
{
-#if defined(__MT__)
+#if ! defined(APP_NO_THREADS)
HMTX hRet; // Mutex Handle
if (DosCreateMutexSem(NULL, &hRet, 0, FALSE))
@@ -416,7 +416,7 @@
void XMLPlatformUtils::unlockMutex(void* const mtxHandle)
{
-#if defined(__MT__)
+#if ! defined(APP_NO_THREADS)
if (mtxHandle == NULL)
return;
@@ -436,7 +436,7 @@
, const void* const newValue
, const void* const toCompare )
{
-#if defined(__IBMCPP__)
+#if defined(XML_IBMVA4_OS2)
return (void *)__smp_cmpxchg4((unsigned int *)toFill,
(unsigned int)newValue,
(unsigned int)toCompare);
@@ -472,7 +472,7 @@
// -----------------------------------------------------------------------
int XMLPlatformUtils::atomicIncrement(int& location)
{
-#if defined(__IBMCPP__)
+#if defined(XML_IBMVA4_OS2)
return __smp_inc4(&location);
#elif defined(__GNUG__)
__asm__ __volatile__ ("lock; incl %0" : "=m" (location) : );
@@ -484,7 +484,7 @@
int XMLPlatformUtils::atomicDecrement(int& location)
{
-#if defined(__IBMCPP__)
+#if defined(XML_IBMVA4_OS2)
return __smp_dec4(&location);
#elif defined(__GNUG__)
__asm__ __volatile__ ("lock; decl %0" : "=m" (location) : );
1.20 +2 -2 xml-xerces/c/src/util/Transcoders/Iconv/IconvTransService.cpp
Index: IconvTransService.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/util/Transcoders/Iconv/IconvTransService.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- IconvTransService.cpp 2000/07/25 22:31:07 1.19
+++ IconvTransService.cpp 2000/09/21 00:54:19 1.20
@@ -55,7 +55,7 @@
*/
/*
- * $Id: IconvTransService.cpp,v 1.19 2000/07/25 22:31:07 aruna1 Exp $
+ * $Id: IconvTransService.cpp,v 1.20 2000/09/21 00:54:19 aruna1 Exp $
*/
@@ -66,7 +66,7 @@
#include <util/XMLUni.hpp>
#include "IconvTransService.hpp"
#include <wchar.h>
-#if defined (XML_GCC) || defined (XML_PTX)
+#if defined (XML_GCC) || defined (XML_PTX) || defined (XML_IBMVAOS2)
#include <wctype.h>
#endif
#include <string.h>