You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@xalan.apache.org by Sean MacRoibeaird - Sun ireland - Solaris Software - Staff Engineer <Se...@ireland.sun.com> on 2000/08/14 14:30:22 UTC
RESEND - CVS diffs for Solaris 2.8 SC5.0 build
This is a resend of my e-mail from last week. I received no replied or comments
on this.
In order to get the Solaris 2.8 changes put into the code base do I need to get
committer status? As it stands I will need to perform the same steps every
couple of months becaus the changes required for the port are not in the CVS
repository.
------------------------------
MESSAGE OF LAST WEEK:
Hi,
Please find the CVS diffs (and a new header file) required to support the build
of Xalan on Solaris 2.8 using SC5.0.
I checked out the sourse tree yesterday to find that the changes below had not
been added to the source base from the last time I performed the port several
months ago. There should be no conflicts with Linux as I have used #ifdefs to
ring-fence the SC5.0 changes.
How do I ensure that these changes are put into the source?
What is the procedure to ensure that a Solaris 8 binary will be available for
download?
------------------------------
Index: xml-xalan/c/src/Makefile.in
===================================================================
RCS file: /home/cvspublic/xml-xalan/c/src/Makefile.in,v
retrieving revision 1.7
diff -r1.7 Makefile.in
130a131,147
>
> endif
>
> #=============== SOLARIS SPECIFIC OPTIONS =========================
> ifeq (${PLATFORM}, SOLARIS)
> PLATFORM_COMPILE_OPTIONS = -KPIC -mt -xs -ptr$(XALANCROOT)/obj \
> -features=rtti -D${PLATFORM} -D_REENTRANT
> MAKE_SHARED = ${CXX} -D${PLATFORM} -G -ptr$(XALANCROOT)/obj
> MAKE_SHARED_C = ${CC} -D${PLATFORM} -G
> ALLLIBS = -mt ${LIBS} -L/usr/local/lib -L/usr/ccs/lib \
> -lc -lgen
> CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
> LINK = CC -D${PLATFORM} -ptr$(XALANCROOT)/obj
> PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
> EXTRA_LINK_OPTIONS= -R$(XALANCROOT)/lib
> SHLIBSUFFIX=.so
>
133c150
< @echo Linux only unix platform supported
---
> @echo Linux & Solaris only unix platforms supported
144c161
< XSL_INCL = -I . -I $(XERCESCROOT)/src/
---
> XSL_INCL = -I. -I$(XERCESCROOT)/src/
Index: xml-xalan/c/src/Include/PlatformDefinitions.hpp
===================================================================
RCS file: /home/cvspublic/xml-xalan/c/src/Include/PlatformDefinitions.hpp,v
retrieving revision 1.4
diff -r1.4 PlatformDefinitions.hpp
63a64,65
> #elif defined(__SUNPRO_CC)
> #include "SunCCDefinitions.hpp"
Index: xml-xalan/c/src/PlatformSupport/DirectoryEnumerator.hpp
===================================================================
RCS file:
/home/cvspublic/xml-xalan/c/src/PlatformSupport/DirectoryEnumerator.hpp,v
retrieving revision 1.8
diff -r1.8 DirectoryEnumerator.hpp
69c69
< #else
---
> #elif defined(__GNUC__) || (__SUNPRO_CC)
70a71,72
> #else
> #error Unsupported platform!!!
130c132
< #else
---
> #elif defined(__GNUC__)
156a159,194
> #elif defined(__SUNPRO_CC)
>
> class FindFileStruct : public dirent
> {
> public:
>
> /**
> * Retrieve name of file
> *
> * @return file name
> */
> const char* getName() const
> {
> return d_name;
> }
>
> /**
> * Determine whether file is a directory
> *
> * @return true if file is a directory
> */
> bool isDirectory() const
> {
> DIR *dirp = opendir (d_name);
> if (dirp)
> {
> closedir(dirp);
> return true;
> }
> return false;
> }
> };
>
>
> #else
> #error Unsupported platform!!!
160a199
>
238c277
< #elif defined(__GNUC__)
---
> #elif defined(__GNUC__) || (__SUNPRO_CC)
256a296,299
> #if defined (__SUNPRO_CC)
> typename result_type
> operator()(const typename argument_type& theDirectory)
const
> #else
258a302
> #endif
Index: xml-xalan/c/src/PlatformSupport/STLHelper.hpp
===================================================================
RCS file: /home/cvspublic/xml-xalan/c/src/PlatformSupport/STLHelper.hpp,v
retrieving revision 1.9
diff -r1.9 STLHelper.hpp
84a85,88
> #if defined (__SUNPRO_CC)
> typename result_type
> operator()(typename argument_type thePointer) const
> #else
86a91
> #endif
230a236,239
> #if defined (__SUNPRO_CC)
> typename result_type
> operator()(typename argument_type thePair)
> #else
232c241,242
< operator()(argument_type thePair) const
---
> operator()(argument_type thePair)
> #endif
261a272,275
> #if defined (__SUNPRO_CC)
> typename result_type
> operator()(typename argument_type thePair)
> #else
263a278
> #endif
303a319,323
> #if defined (__SUNPRO_CC)
> typename result_type
> operator()(typename first_argument_type theLHS,
> typename second_argument_type theRHS)
const
> #else
305,307c325,327
< operator()(
< first_argument_type theLHS,
< second_argument_type theRHS) const
---
> operator()(first_argument_type theLHS,
> second_argument_type theRHS) const
> #endif
Index: xml-xalan/c/src/XPath/XPathFunctionTable.hpp
===================================================================
RCS file: /home/cvspublic/xml-xalan/c/src/XPath/XPathFunctionTable.hpp,v
retrieving revision 1.8
diff -r1.8 XPathFunctionTable.hpp
264a265
> #if defined(XALAN_NO_NAMESPACES) // __SUNPRO_CCC
265a267,269
> #else
> typedef std::vector<XalanDOMString> InstalledFunctionNameVectorType;
> #endif
Index: xml-xalan/c/src/XSLT/StylesheetConstructionContextDefault.cpp
===================================================================
RCS file:
/home/cvspublic/xml-xalan/c/src/XSLT/StylesheetConstructionContextDefault.cpp,v
retrieving revision 1.8
diff -r1.8 StylesheetConstructionContextDefault.cpp
183a184,186
> #if defined (__SUNPRO_CC)
> (XalanDOMString)theSystemID;
> #else
185c188
<
---
> #endif
348c351
< }
\ No newline at end of file
---
> }
Index: xml-xalan/c/src/XSLT/StylesheetHandler.hpp
===================================================================
RCS file: /home/cvspublic/xml-xalan/c/src/XSLT/StylesheetHandler.hpp,v
retrieving revision 1.14
diff -r1.14 StylesheetHandler.hpp
342a343,352
> #if defined (__SUNPRO_CC)
> #if defined(XALAN_NO_NAMESPACES)
> typedef vector<ElemTemplateElement*> ElemTemplateStackType;
> typedef vector<ElemTextLiteral*>
ElemTextLiteralStackType;
> #else
> typedef std::vector<ElemTemplateElement*> ElemTemplateStackType;
> typedef std::vector<ElemTextLiteral*>
ElemTextLiteralStackType;
> #endif
> #endif
>
397a408
> #if !defined (__SUNPRO_CC)
403a415
> #endif
Index: xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp
===================================================================
RCS file: /home/cvspublic/xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp,v
retrieving revision 1.54
diff -r1.54 XSLTEngineImpl.cpp
331c331,335
<
? XalanDOMString(XALAN_STATIC_UCODE_STRING("Input XSL")) :
stylesheetSource.getSystemId());
---
> #if defined (__SUNPRO_CC)
> ?
XalanDOMString(XALAN_STATIC_UCODE_STRING("Input XSL")) :
XalanDOMString(stylesheetSource.getSystemId()));
> #else
> ?
XalanDOMString(XALAN_STATIC_UCODE_STRING("Input XSL")) :
stylesheetSource.getSystemId());
> #endif
610a615,617
> #if defined (__SUNPRO_CC)
>
XalanDOMString(inputSource.getSystemId()) :
> #else
611a619
> #endif
Index: xml-xalan/c/src/XSLT/XSLTEngineImpl.hpp
===================================================================
RCS file: /home/cvspublic/xml-xalan/c/src/XSLT/XSLTEngineImpl.hpp,v
retrieving revision 1.41
diff -r1.41 XSLTEngineImpl.hpp
70a71,73
> #if defined (__SUNPRO_CC)
> #include <sys/types.h>
> #endif
? xml-xalan/c/src/Include/SunCCDefinitions.hpp
-- New File
/*
* The Apache Software License, Version 1.1
*
*
* Copyright (c) 1999 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 "Xalan" 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/>.
*/
#if !defined(SUNCCDEFINITIONS_HEADER_GUARD_1357924680)
#define SUNCCDEFINITIONS_HEADER_GUARD_1357924680
// ---------------------------------------------------------------------------
// A define in the build for each project is also used to control whether
// the export keyword is from the project's viewpoint or the client's.
// These defines provide the platform specific keywords that they need
// to do this.
// ---------------------------------------------------------------------------
#define XALAN_PLATFORM_EXPORT
#define XALAN_PLATFORM_IMPORT
#define XALAN_PLATFORM_EXPORT_FUNCTION(T) T XALAN_PLATFORM_EXPORT
#define XALAN_PLATFORM_IMPORT_FUNCTION(T) T XALAN_PLATFORM_IMPORT
#define XALAN_NO_MEMBER_TEMPLATES
#define XALAN_OLD_AUTO_PTR
#define XALAN_NO_COVARIANT_RETURN_TYPE
#define XALAN_NEED_SPECIAL_NAN_SUPPORT
#define XALAN_WIDE_STRING_UCODE_PROBLEM
#define XALAN_RTTI_AVAILABLE
#define XALAN_NO_LOCALES
#define XALAN_NO_TYPEINFO
#define XALAN_SGI_BASED_STL
#define XALAN_ICU_BRIDGE_UCHAR_MISMATCH
#endif // SUNCCDEFINITIONS_HEADER_GUARD_1357924680
----------------------------------------------------------
Sean MacRoibeaird
XML Technology Centre,
Sun Microsystems,
East Point Business Park,
Dublin 3,
Ireland
Phone: x19173/+353 1 8199173
e-mail: sean.macroibeaird@ireland.sun.com