This commit was manufactured by cvs2svn to create tag
'Xalan-C_1_6_0'.
diff --git a/build.bat b/build.bat
new file mode 100755
index 0000000..ab604ce
--- /dev/null
+++ b/build.bat
@@ -0,0 +1,62 @@
+@echo off
+rem build.bat: Build Xalan-J 2.x using Ant
+rem Usage: build [ant-options] [targets]
+rem Setup:
+rem - you should set JAVA_HOME
+rem - you can set ANT_HOME if you use your own Ant install
+rem - JAVA_OPTS is added to the java command line
+rem - PARSER_JAR may be set to use alternate parser (default:bin\xercesImpl.jar)
+echo.
+echo Xalan-J 2.x Build
+echo -------------
+
+if not "%JAVA_HOME%" == "" goto setant
+:noJavaHome
+rem Default command used to call java.exe; hopefully it's on the path here
+if "%_JAVACMD%" == "" set _JAVACMD=java
+echo.
+echo Warning: JAVA_HOME environment variable is not set.
+echo If build fails because sun.* classes could not be found
+echo you will need to set the JAVA_HOME environment variable
+echo to the installation directory of java.
+echo.
+
+:setant
+rem Default command used to call java.exe or equivalent
+if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java
+
+rem Default _ANT_HOME to Xalan's checked-in copy if not set
+set _ANT_HOME=%ANT_HOME%
+if "%_ANT_HOME%" == "" set _ANT_HOME=.
+
+rem Default locations of jars we depend on to run Ant on our build.xml file
+rem Set our local vars to all start with _underscore
+set _ANT_JAR=%ANT_JAR%
+if "%_ANT_JAR%" == "" set _ANT_JAR=bin\ant.jar
+set _PARSER_JAR=%PARSER_JAR%
+if "%_PARSER_JAR%" == "" set _PARSER_JAR=bin\xercesImpl.jar
+set _XML-APIS_JAR=%XML-APIS_JAR%
+if "%_XML-APIS_JAR%" == "" set _XML-APIS_JAR=bin\xml-apis.jar
+
+rem Attempt to automatically add system classes to _CLASSPATH
+rem Use _underscore prefix to not conflict with user's settings
+set _CLASSPATH=%CLASSPATH%
+if exist "%JAVA_HOME%\lib\tools.jar" set _CLASSPATH=%CLASSPATH%;%JAVA_HOME%\lib\tools.jar
+if exist "%JAVA_HOME%\lib\classes.zip" set _CLASSPATH=%CLASSPATH%;%JAVA_HOME%\lib\classes.zip
+set _CLASSPATH=%_ANT_JAR%;%_XML-APIS_JAR%;%_PARSER_JAR%;%_CLASSPATH%
+
+@echo on
+"%_JAVACMD%" -mx64m %JAVA_OPTS% -Dant.home="%ANT_HOME%" -classpath "%_CLASSPATH%" org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
+@echo off
+
+goto end
+
+:end
+rem Cleanup environment variables
+set _JAVACMD=
+set _CLASSPATH=
+set _ANT_HOME=
+set _ANT_JAR=
+set _PARSER_JAR=
+set _XML-APIS_JAR=
+
diff --git a/build.xml b/build.xml
index c49abc1..9459320 100644
--- a/build.xml
+++ b/build.xml
@@ -2,7 +2,11 @@
<property name="name" value="xalan"/>
<property name="Name" value="Xalan-C++"/>
- <property name="year" value="2001"/>
+ <property name="year" value="2003"/>
+
+ <property name="version.VERSION" value="1"/>
+ <property name="version.RELEASE" value="6"/>
+ <property name="version.MINOR" value="0"/>
<property name="xdocs.dir" value="./xdocs"/>
<property name="xdocs.book" value="${xdocs.dir}/sources/xalanLocal.xml"/>
@@ -19,6 +23,11 @@
<property name="build.docs" value="${build.dir}/docs"/>
<property name="build.apidocs" value="${build.docs}/apidocs"/>
<property name="site.dir" value="./xml-site"/>
+
+ <property name="package.name" value="Xalan-C"/>
+ <property name="docs.package.name" value="${build.dir}/${package.name}_${version.VERSION}_${version.RELEASE}-docs"/>
+ <property name="webdocs.package.name" value="${build.dir}/${package.name}_${version.VERSION}_${version.RELEASE}-webdocs"/>
+ <property name="src.package.name" value="${build.dir}/${package.name}_${version.VERSION}_${version.RELEASE}-src"/>
<target name="prepare">
<gunzip src="${doc.generator.styletargz}"/>
@@ -44,7 +53,7 @@
<fileset dir="${xdocs.apidocs}"/>
</copy>
<exec executable="doxygen.exe" dir="${xdocs.dir}">
- <arg value="DoxyFileXalan"/>
+ <arg value="DoxyfileXalan"/>
</exec>
</target>
@@ -97,24 +106,32 @@
</java>
</target>
- <!-- pack doc for distribution -->
- <target name="pack.distribdocs">
- <!--tar tarfile="./build/xalan-c-apidocs.tar" basedir="./build/docs/apidocs" includes="*"/>
- <gzip src="./build/xalan-c-apidocs.tar" zipfile="./build/xalan-c-apidocs.tar.gz"/-->
- <zip zipfile="./build/xalan-c-distribdocs.zip" basedir="./build/docs" includes="**"/>
+ <!-- package documentation (user guide and apidocs) for distribution -->
+ <target name="pack.docs">
+ <tar tarfile="${docs.package.name}.tar" basedir="${build.docs}" includes="**"/>
+ <gzip src="${docs.package.name}.tar" zipfile="${docs.package.name}.tar.gz"/>
+ <delete file="${docs.package.name}.tar"/>
+
+ <zip zipfile="${docs.package.name}.zip" basedir="${build.docs}" includes="**"/>
</target>
- <!-- pack user guide doc for transfer to website -->
- <target name="pack.docs">
- <!--tar tarfile="./build/xalan-c-docs.tar" basedir="./build/docs" includes="**"/>
- <gzip src="./build/xalan-c-docs.tar" zipfile="./build/xalan-c-docs.tar.gz"/-->
- <zip zipfile="./build/xalan-c-docs.zip" basedir="./xml-site" includes="**" excludes="apidocs/*"/>
+ <!-- package documentation (user guide and apidocs) for transfer to website -->
+ <target name="pack.webdocs">
+ <tar tarfile="${webdocs.package.name}.tar" basedir="${site.dir}" includes="**"/>
+ <gzip src="${webdocs.package.name}.tar" zipfile="${webdocs.package.name}.tar.gz"/>
+ <delete file="${webdocs.package.name}.tar"/>
+
+ <zip zipfile="${webdocs.package.name}.zip" basedir="${site.dir}" includes="**"/>
</target>
- <!-- pack all doc for transfer to website -->
- <target name="pack.webdocs">
- <!--tar tarfile="./build/xalan-c-docs.tar" basedir="./build/docs" includes="**"/>
- <gzip src="./build/xalan-c-docs.tar" zipfile="./build/xalan-c-docs.tar.gz"/-->
- <zip zipfile="./build/xalan-c-webdocs.zip" basedir="./xml-site" includes="**"/>
+
+ <!-- package source code for distribution -->
+ <target name="pack.src">
+ <tar tarfile="${src.package.name}.tar" basedir="../.." includes="xml-xalan/**" excludes="xml-xalan/c/build/** xml-xalan/c/xml-site/**" defaultexcludes="no"/>
+ <gzip src="${src.package.name}.tar" zipfile="${src.package.name}.tar.gz"/>
+ <delete file="${src.package.name}.tar"/>
+
+ <!-- this rule is not picking up the CVS directories -- anybody know how to fix? -->
+ <zip zipfile="${src.package.name}.zip" basedir="../.." includes="xml-xalan/**" excludes="xml-xalan/c/build/** xml-xalan/c/xml-site/**" defaultexcludes="no"/>
</target>
</project>
\ No newline at end of file
diff --git a/src/XPath/FunctionDoc.hpp b/src/XPath/FunctionDoc.hpp
deleted file mode 100644
index 6e72d3d..0000000
--- a/src/XPath/FunctionDoc.hpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * 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(FUNCTIONDOC_HEADER_GUARD_1357924680)
-#define FUNCTIONDOC_HEADER_GUARD_1357924680
-
-
-
-// Base header file. Must be first.
-#include <XSLT/XSLTDefinitions.hpp>
-
-
-
-#include <vector>
-
-
-
-#include <PlatformSupport/DOMStringHelper.hpp>
-
-
-
-// Base class header file...
-#include <XPath/Function.hpp>
-
-
-/**
- * XPath implementation of "document" function.
- */
-//
-// These are all inline, even though
-// there are virtual functions, because we expect that they will only be
-// needed by the XSLT class.
-class XALAN_XSLT_EXPORT FunctionDoc : public Function
-{
-public:
-
- // These methods are inherited from Function ...
-
- virtual XObjectPtr
- execute(
- XPathExecutionContext& executionContext,
- const DOM_Node& context,
- int /* opPos */,
- const XObjectArgVectorType& args)
- {
- executionContext.error("Document() function implementation has been replaced by xslt/FunctionDocument!",
- context);
-
- return executionContext.getXObjectFactory().createNull();
- }
-
-#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
- virtual Function*
-#else
- virtual FunctionDoc*
-#endif
- clone() const
- {
- return new FunctionDoc(*this);
- }
-
-private:
-
- // Not implemented...
- FunctionDoc&
- operator=(const FunctionDoc&);
-
- bool
- operator==(const FunctionDoc&) const;
-};
-
-
-
-#endif // FUNCTIONDOC_HEADER_GUARD_1357924680
