You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mu...@apache.org on 2022/12/26 09:55:46 UTC
[xalan-java] branch xalan-j_2_7_1_maint updated: xalanj commit : 1) minor changes to, readme files 2) few ant configuration corrections
This is an automated email from the ASF dual-hosted git repository.
mukulg pushed a commit to branch xalan-j_2_7_1_maint
in repository https://gitbox.apache.org/repos/asf/xalan-java.git
The following commit(s) were added to refs/heads/xalan-j_2_7_1_maint by this push:
new 2c6f486b xalanj commit : 1) minor changes to, readme files 2) few ant configuration corrections
2c6f486b is described below
commit 2c6f486b2597735ffbddb93b3439aa16fecd89d8
Author: Mukul Gandhi <ga...@gmail.com>
AuthorDate: Mon Dec 26 15:25:28 2022 +0530
xalanj commit : 1) minor changes to, readme files 2) few ant
configuration corrections
---
README | 26 +++++++++++++++++---------
build.bat | 18 +++++++++++-------
xdocs/sources/xalan/readme.xml | 2 +-
3 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/README b/README
index 008326c9..1e76f80f 100644
--- a/README
+++ b/README
@@ -39,10 +39,12 @@ git clone https://gitbox.apache.org/repos/asf/xalan-test.git
This creates two folders: xalan-java and xalan-test
-2) Set JAVA_HOME environment variable, for example:
+2) Set JAVA_HOME and ANT_HOME environment variables, for example:
set JAVA_HOME=C:\Program Files\Eclipse Adoptium\jdk-8.0.352.8-hotspot\
+set ANT_HOME=C:\java\apache-ant-1.10.12
+
3) Run the command, "build clean fulldist" from folder xalan-java. This shall produce the following jars,
relevant for testing the XalanJ build : xalan.jar, serializer.jar. [1]
@@ -55,10 +57,16 @@ For XalanJ source distribution users, xalan-test folder, is located at the root
source distribution folder (i.e, parallel to folders "src", "tools" etc) from where XalanJ
source distribution users may run XalanJ tests.
-2) Run the command "build clean jar" from folder xalan-test. This produces
+2) Set JAVA_HOME and ANT_HOME environment variables, for example:
+
+set JAVA_HOME=C:\Program Files\Eclipse Adoptium\jdk-8.0.352.8-hotspot\
+
+set ANT_HOME=C:\java\apache-ant-1.10.12
+
+3) Run the command "build clean jar" from folder xalan-test. This produces
the file testxsl.jar within folder xalan-test/java/build.
-3) Create a folder xalanjrelease_jardir somewhere on file system.
+4) Create a folder xalanjrelease_jardir somewhere on file system.
Copy the jar file testxsl.jar produced within the previous step, to the folder
xalanjrelease_jardir. Copy the jars xalan.jar, serializer.jar [1] to this
folder. From the folder xalan-java/lib/endorsed, copy jars xml-apis.jar and
@@ -86,13 +94,13 @@ copy /Y ..\xalan-java\lib\rhino-1.7.14.jar "%JARDIR%"
copy /Y ..\xalan-java\lib\endorsed\xercesImpl.jar "%JARDIR%"
copy /Y ..\xalan-java\lib\endorsed\xml-apis.jar "%JARDIR%"
-4) Set JARDIR environment variable, pointing to the folder "xalanjrelease_jardir".
+5) Set JARDIR environment variable, pointing to the folder "xalanjrelease_jardir".
-5) Run the necessary XalanJ tests as follows,
+6) Run the necessary XalanJ tests as follows,
The tests described below within points 5.1, 5.2 and 5.3 need to be run from folder xalan-test.
-5.1 Run the ant target "smoketest", using following two commands in sequence shown below
+6.1 Run the ant target "smoketest", using following two commands in sequence shown below
build extensions
@@ -103,7 +111,7 @@ The output of the command "build smoketest" should be following, and without any
smoketest-pass:
[echo] [minitest] CONGRATULATIONS! The Smoketest passed!
-5.2 Run the ant target "smoketest.xsltc", using following three commands in sequence shown below
+6.2 Run the ant target "smoketest.xsltc", using following three commands in sequence shown below
build conf.xsltc
@@ -116,7 +124,7 @@ The output of the command "build smoketest.xsltc" should be following, and witho
smoketest.xsltc-pass:
[echo] [minitest] CONGRATULATIONS! The Smoketest passed!
-5.3 Run the ant target "smoketest.dev", using following two commands in sequence shown below
+6.3 Run the ant target "smoketest.dev", using following two commands in sequence shown below
build extensions
@@ -127,7 +135,7 @@ The output of the command "build smoketest.dev" should be following, and without
smoketest-pass:
[echo] [minitest] CONGRATULATIONS! The Smoketest passed!
-5.4 From folder xalan-test/tests/xsltc_integer_truncation, run the batch file
+6.4 From folder xalan-test/tests/xsltc_integer_truncation, run the batch file
xsltc_int_truncation_test.bat (provided for Windows platform) to run test for,
"XalanJ integer truncation bug fix, when using XSLTC".
\ No newline at end of file
diff --git a/build.bat b/build.bat
index 389f3c46..9fea694d 100755
--- a/build.bat
+++ b/build.bat
@@ -43,14 +43,18 @@ echo.
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 ANT_HOME to the one what user has set
+if not "%ANT_HOME%"=="" set _ANT_HOME=%ANT_HOME%
+if "%ANT_HOME%"=="" set _ANT_HOME=.
+
+if EXIST "%_ANT_HOME%\tools\ant.jar" (
+ set _ANT_JARS=%_ANT_HOME%\tools\ant.jar
+) else (
+ set _ANT_JARS=%_ANT_HOME%\lib\ant.jar;%_ANT_HOME%\lib\ant-launcher.jar
+)
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=tools\ant.jar
set _PARSER_JAR=%PARSER_JAR%
if "%_PARSER_JAR%" == "" set _PARSER_JAR=lib\endorsed\xercesImpl.jar
set _XML-APIS_JAR=%XML-APIS_JAR%
@@ -61,7 +65,7 @@ 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%
+set _CLASSPATH=%_ANT_JARS%;%_XML-APIS_JAR%;%_PARSER_JAR%;%_CLASSPATH%
@echo on
"%_JAVACMD%" -mx1024m %JAVA_OPTS% -Dant.home="%ANT_HOME%" -classpath "%_CLASSPATH%" org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
@@ -74,7 +78,7 @@ rem Cleanup environment variables
set _JAVACMD=
set _CLASSPATH=
set _ANT_HOME=
-set _ANT_JAR=
+set _ANT_JARS=
set _PARSER_JAR=
set _XML-APIS_JAR=
diff --git a/xdocs/sources/xalan/readme.xml b/xdocs/sources/xalan/readme.xml
index 1c4f87b8..3bc99628 100644
--- a/xdocs/sources/xalan/readme.xml
+++ b/xdocs/sources/xalan/readme.xml
@@ -51,7 +51,7 @@
</s3>
<s3 title="Enhancements for, performing XalanJ build and running of XalanJ tests from source distribution">
The XalanJ users, can now make XalanJ builds and perform XalanJ tests from the XalanJ source
- distribution [Gary Gregory, Mukul Gandhi, Joseph Kessselman].
+ distribution [Gary Gregory, Joseph Kessselman, Mukul Gandhi].
</s3>
<s3 title="Upgrade to Xerces-J 2.12.2">
This XalanJ release, contains upgraded versions of <code>xercesImpl.jar</code>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org