You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by an...@locus.apache.org on 2000/08/31 00:21:51 UTC
cvs commit: xml-xerces/c/tests/DOM/DOMTest DTest.cpp
andyh 00/08/30 15:21:48
Modified: c/samples Makefile.incl
c/scripts packageBinaries.pl
c/src/dom AttrMapImpl.cpp CharacterDataImpl.cpp DOM_Node.hpp
RangeImpl.cpp
c/src/framework XMLRecognizer.hpp
c/src/internal XMLReader.cpp
c/src/sax2 XMLReaderFactory.hpp
c/tests Makefile.incl
c/tests/DOM/DOMTest DTest.cpp
Log:
Unix Build script fixes. Clean up some UNIX compiler warnings.
Revision Changes Path
1.23 +2 -2 xml-xerces/c/samples/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/Makefile.incl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile.incl 2000/08/01 18:27:00 1.22
+++ Makefile.incl 2000/08/30 22:21:09 1.23
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.incl,v 1.22 2000/08/01 18:27:00 aruna1 Exp $
+# $Id: Makefile.incl,v 1.23 2000/08/30 22:21:09 andyh Exp $
#
################## LIBRARY NAMES AND DIRECTORIES ##################
@@ -162,7 +162,7 @@
CC= g++ -c -D${PLATFORM} -D_REENTRANT -fpic -instances=static
LINK = g++ -D${PLATFORM} -fpic
PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
-EXTRA_LINK_OPTIONS=-lc
+EXTRA_LINK_OPTIONS=-lc -Wl,-rpath-link,$(XERCESCROOT)/lib
SHLIBSUFFIX=.so
endif
1.42 +24 -6 xml-xerces/c/scripts/packageBinaries.pl
Index: packageBinaries.pl
===================================================================
RCS file: /home/cvs/xml-xerces/c/scripts/packageBinaries.pl,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- packageBinaries.pl 2000/08/29 16:51:19 1.41
+++ packageBinaries.pl 2000/08/30 22:21:15 1.42
@@ -142,7 +142,7 @@
# Make the icu dlls
pchdir ("$ICUROOT/source/allinone");
- if ($opt_j eq "") { # Optionally suppress ICU build, to speed up overlong builds while debugging.
+ if (!$opt_j) { # Optionally suppress ICU build, to speed up overlong builds while debugging.
#For nt we ship both debug and release dlls
psystem("msdev allinone.dsw /MAKE \"all - $platformname Release\" /REBUILD /OUT buildlog.txt");
psystem("cat buildlog.txt");
@@ -492,8 +492,14 @@
psystem ("mkdir $targetdir/doc/html/apiDocs");
# Build ICU if needed
- if (length(($ICUROOT) > 0) && ($opt_j eq "")) {
+ if ($opt_t =~ m/icu/i && !$opt_j)
+ {
print("\n\nBuild ICU ...\n");
+ if(length($ICUROOT) == 0) {
+ print("Error, ICUROOT not set, can not build ICU\n");
+ exit(-1);
+ }
+
# First make the ICU files executable
pchdir ("$ICUROOT/source");
psystem ("chmod +x configure config.*");
@@ -540,6 +546,14 @@
psystem ("gmake clean"); # May want to comment this line out to speed up
psystem ("gmake");
+ # Move ICU libs into lib dir, so samples will link. This matches the structure of
+ # the eventual binary packaging, even though we are doing it in the build directory.
+ #
+ if (length($ICUROOT) > 0) {
+ psystem("cp -f $ICUROOT/lib/libicu-uc.* $XERCESCROOT/lib");
+ psystem("cp -f $ICUROOT/data/libicudata.* $XERCESCROOT/lib");
+ }
+
# Now build the samples
print("\n\nBuild the samples ...\n");
pchdir ("$XERCESCROOT/samples");
@@ -606,10 +620,14 @@
# Populate the binary output directory
print ("\n\nCopying binary outputs ...\n");
psystem("cp -Rf $XERCESCROOT/bin/* $targetdir/bin");
- if (length($ICUROOT) > 0) {
- psystem("cp -f $ICUROOT/lib/libicu-uc.* $targetdir/lib");
- psystem("cp -f $ICUROOT/data/libicudata.* $targetdir/lib");
- }
+
+
+
+ #if (length($ICUROOT) > 0) {
+ # psystem("cp -f $ICUROOT/lib/libicu-uc.* $targetdir/lib");
+ # psystem("cp -f $ICUROOT/data/libicudata.* $targetdir/lib");
+ #}
+
psystem("cp -f $XERCESCROOT/lib/*.a $targetdir/lib");
psystem("cp -f $XERCESCROOT/lib/*.so $targetdir/lib");
psystem("cp -f $XERCESCROOT/lib/*.sl $targetdir/lib");
1.3 +4 -4 xml-xerces/c/src/dom/AttrMapImpl.cpp
Index: AttrMapImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/AttrMapImpl.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AttrMapImpl.cpp 2000/07/06 21:03:23 1.2
+++ AttrMapImpl.cpp 2000/08/30 22:21:18 1.3
@@ -56,7 +56,7 @@
/*
- * $Id: AttrMapImpl.cpp,v 1.2 2000/07/06 21:03:23 jpolast Exp $
+ * $Id: AttrMapImpl.cpp,v 1.3 2000/08/30 22:21:18 andyh Exp $
*/
#include "AttrMapImpl.hpp"
@@ -88,9 +88,9 @@
{
}
-AttrMapImpl *AttrMapImpl::cloneAttrMap(NodeImpl *ownerNode)
+AttrMapImpl *AttrMapImpl::cloneAttrMap(NodeImpl *ownerNode_p)
{
- AttrMapImpl *newmap = new AttrMapImpl(ownerNode);
+ AttrMapImpl *newmap = new AttrMapImpl(ownerNode_p);
newmap->cloneContent(this);
newmap->attrDefaults = this->attrDefaults;
return newmap;
@@ -134,4 +134,4 @@
}
return removed;
-}
\ No newline at end of file
+}
1.16 +3 -2 xml-xerces/c/src/dom/CharacterDataImpl.cpp
Index: CharacterDataImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/CharacterDataImpl.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- CharacterDataImpl.cpp 2000/08/17 22:47:08 1.15
+++ CharacterDataImpl.cpp 2000/08/30 22:21:19 1.16
@@ -55,7 +55,7 @@
*/
/*
- * $Id: CharacterDataImpl.cpp,v 1.15 2000/08/17 22:47:08 lehors Exp $
+ * $Id: CharacterDataImpl.cpp,v 1.16 2000/08/30 22:21:19 andyh Exp $
*/
#include "CharacterDataImpl.hpp"
@@ -138,7 +138,8 @@
unsigned int sz = ranges->size();
if (sz != 0) {
for (unsigned int i =0; i<sz; i++) {
- ranges->elementAt(i)->updateRangeForDeletedText( (DOM_Node&)*this, offset, count);
+ DOM_Node dn = DOM_Node(this);
+ ranges->elementAt(i)->updateRangeForDeletedText( dn, offset, count);
}
}
}
1.11 +2 -1 xml-xerces/c/src/dom/DOM_Node.hpp
Index: DOM_Node.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/DOM_Node.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DOM_Node.hpp 2000/07/28 01:33:31 1.10
+++ DOM_Node.hpp 2000/08/30 22:21:20 1.11
@@ -55,7 +55,7 @@
*/
/*
- * $Id: DOM_Node.hpp,v 1.10 2000/07/28 01:33:31 aruna1 Exp $
+ * $Id: DOM_Node.hpp,v 1.11 2000/08/30 22:21:20 andyh Exp $
*/
#ifndef DOM_Node_HEADER_GUARD_
@@ -627,6 +627,7 @@
friend class DOMParser;
friend class DOM_Entity;
friend class RangeImpl;
+ friend class CharacterDataImpl;
};
1.6 +2 -2 xml-xerces/c/src/dom/RangeImpl.cpp
Index: RangeImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/dom/RangeImpl.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RangeImpl.cpp 2000/08/17 22:47:11 1.5
+++ RangeImpl.cpp 2000/08/30 22:21:23 1.6
@@ -55,7 +55,7 @@
*/
/*
- * $Id: RangeImpl.cpp,v 1.5 2000/08/17 22:47:11 lehors Exp $
+ * $Id: RangeImpl.cpp,v 1.6 2000/08/30 22:21:23 andyh Exp $
*/
#include <util/RefVectorOf.hpp>
@@ -939,7 +939,7 @@
unsigned short RangeImpl::indexOf(const DOM_Node& child, const DOM_Node& parent) const
{
unsigned short i = 0;
- if (child.getParentNode() != parent) return -1;
+ if (child.getParentNode() != parent) return (unsigned short)-1;
for(DOM_Node node = child; node!= null; node=node.getPreviousSibling()) {
i++;
}
1.8 +6 -2 xml-xerces/c/src/framework/XMLRecognizer.hpp
Index: XMLRecognizer.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/framework/XMLRecognizer.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLRecognizer.hpp 2000/07/31 19:00:36 1.7
+++ XMLRecognizer.hpp 2000/08/30 22:21:28 1.8
@@ -55,7 +55,7 @@
*/
/*
- * $Id: XMLRecognizer.hpp,v 1.7 2000/07/31 19:00:36 aruna1 Exp $
+ * $Id: XMLRecognizer.hpp,v 1.8 2000/08/30 22:21:28 andyh Exp $
*/
#if !defined(XMLRECOGNIZER_HPP)
@@ -153,12 +153,16 @@
static const XMLCh* nameForEncoding(const Encodings theEncoding);
-private :
+protected :
// -----------------------------------------------------------------------
// Unimplemented constructors, operators, and destructor
//
// This class is effectively being used as a namespace for some static
// methods.
+ //
+ // (these functions are protected rather than private only to get rid of
+ // some annoying compiler warnings.)
+ //
// -----------------------------------------------------------------------
XMLRecognizer();
~XMLRecognizer();
1.21 +2 -2 xml-xerces/c/src/internal/XMLReader.cpp
Index: XMLReader.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/internal/XMLReader.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- XMLReader.cpp 2000/07/31 19:00:48 1.20
+++ XMLReader.cpp 2000/08/30 22:21:32 1.21
@@ -55,7 +55,7 @@
*/
/*
- * $Id: XMLReader.cpp,v 1.20 2000/07/31 19:00:48 aruna1 Exp $
+ * $Id: XMLReader.cpp,v 1.21 2000/08/30 22:21:32 andyh Exp $
*/
// ---------------------------------------------------------------------------
@@ -1383,7 +1383,7 @@
// A char greater than 0x7F is not allowed in this case. If
// so, undo and throw.
//
- if (curCh > 0x7F)
+ if (curCh & 0x80)
{
fCharsAvail = 0;
fRawBufIndex = 0;
1.3 +4 -1 xml-xerces/c/src/sax2/XMLReaderFactory.hpp
Index: XMLReaderFactory.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/sax2/XMLReaderFactory.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLReaderFactory.hpp 2000/08/07 18:21:27 1.2
+++ XMLReaderFactory.hpp 2000/08/30 22:21:37 1.3
@@ -56,6 +56,9 @@
/*
* $Log: XMLReaderFactory.hpp,v $
+ * Revision 1.3 2000/08/30 22:21:37 andyh
+ * Unix Build script fixes. Clean up some UNIX compiler warnings.
+ *
* Revision 1.2 2000/08/07 18:21:27 jpolast
* change SAX_EXPORT module to SAX2_EXPORT
*
@@ -75,7 +78,7 @@
class SAX2_EXPORT XMLReaderFactory
{
-private:
+protected: // really should be private, but that causes compiler warnings.
XMLReaderFactory() ;
~XMLReaderFactory() ;
1.9 +5 -1 xml-xerces/c/tests/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/Makefile.incl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.incl 2000/06/09 23:45:03 1.8
+++ Makefile.incl 2000/08/30 22:21:40 1.9
@@ -55,6 +55,9 @@
#
#
# $Log: Makefile.incl,v $
+# Revision 1.9 2000/08/30 22:21:40 andyh
+# Unix Build script fixes. Clean up some UNIX compiler warnings.
+#
# Revision 1.8 2000/06/09 23:45:03 rahulj
# More PTX port related changes submitted by
# Sumit Chawla <su...@us.ibm.com>.
@@ -150,7 +153,7 @@
CC= g++ -c -D${PLATFORM} -D_REENTRANT -fpic -instances=static
LINK = g++ -D${PLATFORM} -fpic
PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
-EXTRA_LINK_OPTIONS=-lc
+EXTRA_LINK_OPTIONS=-lc -Wl,-rpath-link,$(XERCESCROOT)/lib
SHLIBSUFFIX=.so
endif
1.13 +7 -2 xml-xerces/c/tests/DOM/DOMTest/DTest.cpp
Index: DTest.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/tests/DOM/DOMTest/DTest.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DTest.cpp 2000/05/15 23:08:59 1.12
+++ DTest.cpp 2000/08/30 22:21:44 1.13
@@ -56,6 +56,9 @@
/*
* $Log: DTest.cpp,v $
+ * Revision 1.13 2000/08/30 22:21:44 andyh
+ * Unix Build script fixes. Clean up some UNIX compiler warnings.
+ *
* Revision 1.12 2000/05/15 23:08:59 andyh
* Remove entity tests, which failed because entity nodes are (correctly)
* read-only.
@@ -484,7 +487,7 @@
* version 2.0 10/12/98
*
*/
- void main(int argc, char **argv)
+ int main(int argc, char **argv)
{
{
@@ -500,7 +503,7 @@
char *pMessage = XMLString::transcode(toCatch.getMessage());
fprintf(stderr, "Error during initialization! \n %s \n", pMessage);
delete [] pMessage;
- return;
+ return -1;
}
long avgTime = 0;
@@ -643,6 +646,7 @@
XMLPlatformUtils::Terminate();
DomMemDebug().print();
+ return 0;
};