youys
/
ant
Not watched
1
0
Fork 1
Code
Releases 0 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

Added the JAXP reference distribution jars to make it easier to build 

ant out of the box. Ant should now build with an empty classpath. I haven't made
the changes for Unix scripts yet.

Also separated the building of ant.jar and optional.jar so that local
builds should more closely match distributions. There is a lot of duplication
between a normal build and a distribution build which can probably be readily
removed now.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268380 13f79535-47bb-0310-9956-ffa450edef68
master
Conor MacNeill 24 years ago
parent
d2d72df770
commit
44d572de88
5 changed files with 79 additions and 70 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      bootstrap.bat
  2. +77
    -69
      build.xml
  3. BIN
      lib/core/jaxp.jar
  4. BIN
      lib/core/parser.jar
  5. +1
    -0
      src/bin/ant.bat

+ 1
- 1
bootstrap.bat View File

@@ -21,7 +21,7 @@ echo ... Bootstrapping Ant Distribution
if exist lib\ant.jar erase lib\ant.jar if exist lib\ant.jar erase lib\ant.jar


SET LOCALCLASSPATH= SET LOCALCLASSPATH=
for %%i in (lib\*.jar) do call src\bin\lcp.bat %%i
for %%i in (lib\core\*.jar) do call src\bin\lcp.bat %%i


if exist %JAVA_HOME%\lib\tools.jar call src\bin\lcp.bat %JAVA_HOME%\lib\tools.jar if exist %JAVA_HOME%\lib\tools.jar call src\bin\lcp.bat %JAVA_HOME%\lib\tools.jar
if exist %JAVA_HOME%\lib\classes.zip call src\bin\lcp.bat %JAVA_HOME%\lib\classes.zip if exist %JAVA_HOME%\lib\classes.zip call src\bin\lcp.bat %JAVA_HOME%\lib\classes.zip


+ 77
- 69
build.xml View File

@@ -19,12 +19,14 @@
<property name="src.bin.dir" value="src/bin"/> <property name="src.bin.dir" value="src/bin"/>
<property name="src.etc.dir" value="src/etc"/> <property name="src.etc.dir" value="src/etc"/>
<property name="src.dir" value="src/main"/> <property name="src.dir" value="src/main"/>
<property name="srclib.dir" value="lib"/>
<property name="src.tests.dir" value="src/testcases"/> <property name="src.tests.dir" value="src/testcases"/>
<property name="docs.dir" value="docs"/> <property name="docs.dir" value="docs"/>
<property name="build.dir" value="../build/ant"/> <property name="build.dir" value="../build/ant"/>
<property name="lib.dir" value="${build.dir}/lib"/> <property name="lib.dir" value="${build.dir}/lib"/>
<property name="bin.dir" value="${build.dir}/bin"/> <property name="bin.dir" value="${build.dir}/bin"/>
<property name="build.classes" value="${build.dir}/classes"/>
<property name="build.classes.core" value="${build.dir}/classes/core"/>
<property name="build.classes.optional" value="${build.dir}/classes/optional"/>
<property name="build.javadocs" value="${build.dir}/javadocs"/> <property name="build.javadocs" value="${build.dir}/javadocs"/>
<property name="build.tests" value="${build.dir}/testcases"/> <property name="build.tests" value="${build.dir}/testcases"/>
<property name="ant.dist.dir" value="../dist/ant"/> <property name="ant.dist.dir" value="../dist/ant"/>
@@ -38,7 +40,7 @@
<!-- =================================================================== --> <!-- =================================================================== -->
<!-- Set some the defaults the user can override in .ant.properties --> <!-- Set some the defaults the user can override in .ant.properties -->
<!-- =================================================================== --> <!-- =================================================================== -->
<property name="build.compiler" value="classic"/>
<property name="build.compiler"/>
<property name="build.compiler.emacs" value="on"/> <property name="build.compiler.emacs" value="on"/>
<property name="junit.fork" value="false" /> <property name="junit.fork" value="false" />
<property name="javac.optimize" value="true" /> <property name="javac.optimize" value="true" />
@@ -90,39 +92,22 @@
<!-- =================================================================== --> <!-- =================================================================== -->
<!-- Compiles the source code --> <!-- Compiles the source code -->
<!-- =================================================================== --> <!-- =================================================================== -->
<target name="compile" depends="prepare,check_for_optional_packages">
<mkdir dir="${build.classes}"/>
<target name="compile-core" depends="prepare,check_for_optional_packages">
<mkdir dir="${build.classes.core}"/>


<javac srcdir="${src.dir}" <javac srcdir="${src.dir}"
destdir="${build.classes}"
destdir="${build.classes.core}"
debug="on" debug="on"
deprecation="off" deprecation="off"
optimize="${javac.optimize}" > optimize="${javac.optimize}" >
<classpath refid="classpath" /> <classpath refid="classpath" />


<exclude name="**/Script.java" unless="bsf.present" />
<exclude name="**/StyleBook.java" unless="stylebook.present" />
<exclude name="**/NetRexxC.java" unless="netrexx.present" />
<exclude name="**/XslpLiaison.java" unless="xslp.present" />
<exclude name="**/XalanLiaison.java" unless="xalan.present" />
<exclude name="**/Ejbc*.java" unless="ejb.ejbc.present" />
<exclude name="**/DDCreator*.java" unless="ejb.DDCreator.present" />
<exclude name="**/WLRun.java" unless="ejb.wls.present" />
<exclude name="**/WLStop.java" unless="ejb.wls.present" />
<exclude name="**/EjbJar.java" unless="jdk1.2+" />
<exclude name="**/*DeploymentTool.java" unless="jdk1.2+" />
<exclude name="**/Javah.java" unless="jdk1.2+" />
<exclude name="**/junit/*" unless="junit.present" />
<exclude name="**/net/*.java" unless="netcomp.present" />
<exclude name="**/AntStarTeam*.java" unless="starteam.present" />
<exclude name="**/ANTLR.java" unless="antlr.present" />
<exclude name="**/ide/VAJ*.java" unless="vaj.present" />
<exclude name="org/apache/tools/ant/taskdefs/optional/**/*.java"/>
<exclude name="**/JakartaRegexpMatcher.java" unless="jakarta.regexp.present" /> <exclude name="**/JakartaRegexpMatcher.java" unless="jakarta.regexp.present" />
<exclude name="**/JakartaOroMatcher.java" unless="jakarta.oro.present" /> <exclude name="**/JakartaOroMatcher.java" unless="jakarta.oro.present" />
<exclude name="**/perforce/*.java" unless="jakarta.oro.present" />
</javac> </javac>
<copy todir="${build.classes}">
<copy todir="${build.classes.core}">
<fileset dir="${src.dir}"> <fileset dir="${src.dir}">
<include name="**/*.properties" /> <include name="**/*.properties" />
</fileset> </fileset>
@@ -131,7 +116,7 @@
<filter token="VERSION" value="${version}" /> <filter token="VERSION" value="${version}" />
<filter token="DATE" value="${TODAY}" /> <filter token="DATE" value="${TODAY}" />
<filter token="TIME" value="${TSTAMP}" /> <filter token="TIME" value="${TSTAMP}" />
<copy todir="${build.classes}"
<copy todir="${build.classes.core}"
overwrite="true" overwrite="true"
filtering="on"> filtering="on">
<fileset dir="${src.dir}"> <fileset dir="${src.dir}">
@@ -141,22 +126,69 @@
</copy> </copy>
</target> </target>


<target name="compile-optional" depends="compile-core">
<mkdir dir="${build.classes.optional}"/>

<javac srcdir="${src.dir}"
destdir="${build.classes.optional}"
debug="on"
deprecation="off"
optimize="${javac.optimize}" >
<classpath>
<path refid="classpath" />
<pathelement location="${build.classes.core}" />
</classpath>
<include name="org/apache/tools/ant/taskdefs/optional/**/*.java"/>
<exclude name="**/Script.java" unless="bsf.present" />
<exclude name="**/StyleBook.java" unless="stylebook.present" />
<exclude name="**/NetRexxC.java" unless="netrexx.present" />
<exclude name="**/XslpLiaison.java" unless="xslp.present" />
<exclude name="**/XalanLiaison.java" unless="xalan.present" />
<exclude name="**/Ejbc*.java" unless="ejb.ejbc.present" />
<exclude name="**/DDCreator*.java" unless="ejb.DDCreator.present" />
<exclude name="**/WLRun.java" unless="ejb.wls.present" />
<exclude name="**/WLStop.java" unless="ejb.wls.present" />
<exclude name="**/EjbJar.java" unless="jdk1.2+" />
<exclude name="**/*DeploymentTool.java" unless="jdk1.2+" />
<exclude name="**/Javah.java" unless="jdk1.2+" />
<exclude name="**/junit/*" unless="junit.present" />
<exclude name="**/net/*.java" unless="netcomp.present" />
<exclude name="**/AntStarTeam*.java" unless="starteam.present" />
<exclude name="**/ANTLR.java" unless="antlr.present" />
<exclude name="**/ide/VAJ*.java" unless="vaj.present" />
<exclude name="**/perforce/*.java" unless="jakarta.oro.present" />
</javac>
</target>

<!-- =================================================================== --> <!-- =================================================================== -->
<!-- Creates the jar archive -->
<!-- Creates the lib directory including the ant jars, ant.jar and -->
<!-- optional.jar -->
<!-- =================================================================== --> <!-- =================================================================== -->
<target name="jar" depends="compile">
<target name="jars" depends="compile-core, compile-optional">
<mkdir dir="${lib.dir}"/> <mkdir dir="${lib.dir}"/>
<jar jarfile="${lib.dir}/${name}.jar" <jar jarfile="${lib.dir}/${name}.jar"
basedir="${build.classes}"
basedir="${build.classes.core}"
includes="org/**"
manifest="${manifest}"
/>
<jar jarfile="${lib.dir}/optional.jar"
basedir="${build.classes.optional}"
includes="org/**" includes="org/**"
manifest="${manifest}" manifest="${manifest}"
/> />
<copy todir="${lib.dir}">
<fileset dir="${srclib.dir}">
<include name="**/*.jar"/>
<exclude name="ant.jar"/>
</fileset>
</copy>
</target> </target>


<!-- =================================================================== --> <!-- =================================================================== -->
<!-- Creates the binary structure --> <!-- Creates the binary structure -->
<!-- =================================================================== --> <!-- =================================================================== -->
<target name="main" depends="jar" description="Creates the binary structure">
<target name="main" depends="jars" description="Creates the binary structure">
<mkdir dir="${bin.dir}"/> <mkdir dir="${bin.dir}"/>
<copy todir="${bin.dir}"> <copy todir="${bin.dir}">
<fileset dir="${src.bin.dir}"/> <fileset dir="${src.bin.dir}"/>
@@ -192,7 +224,7 @@
<!-- =================================================================== --> <!-- =================================================================== -->
<!-- Creates the distribution --> <!-- Creates the distribution -->
<!-- =================================================================== --> <!-- =================================================================== -->
<target name="dist" depends="main,jar,javadocs" description="Creates the distribution">
<target name="dist" depends="main,jars,javadocs" description="Creates the distribution">
<mkdir dir="${ant.dist.dir}"/> <mkdir dir="${ant.dist.dir}"/>
<mkdir dir="${ant.dist.dir}/bin"/> <mkdir dir="${ant.dist.dir}/bin"/>
<mkdir dir="${ant.dist.dir}/lib"/> <mkdir dir="${ant.dist.dir}/lib"/>
@@ -249,7 +281,7 @@
</target> </target>


<!-- =================================================================== --> <!-- =================================================================== -->
<!-- Installs the ant.jar library and binary files into ant.home -->
<!-- Installs the ant jars and binary files into ant.home -->
<!-- =================================================================== --> <!-- =================================================================== -->
<target name="bootstrap" depends="main" description="Installs the ant.jar library and binary files into ant.home"> <target name="bootstrap" depends="main" description="Installs the ant.jar library and binary files into ant.home">
<echo message="copying bootstrapped files into bin and lib"/> <echo message="copying bootstrapped files into bin and lib"/>
@@ -277,7 +309,7 @@
<target name="fullinstall" depends="install"/> <target name="fullinstall" depends="install"/>
<target name="mininstall" depends="main" if="ant.install"> <target name="mininstall" depends="main" if="ant.install">
<echo message="copy minimal ant installation into ${ant.install}"/>
<echo message="copying minimal ant installation into ${ant.install}"/>
<mkdir dir="${ant.install}"/> <mkdir dir="${ant.install}"/>
<copy todir="${ant.install}/lib"> <copy todir="${ant.install}/lib">
<fileset dir="${lib.dir}"/> <fileset dir="${lib.dir}"/>
@@ -308,7 +340,6 @@
<!-- =================================================================== --> <!-- =================================================================== -->
<target name="total-clean" depends="clean"> <target name="total-clean" depends="clean">
<delete dir="${bin.dir}"/> <delete dir="${bin.dir}"/>
<delete file="${lib.dir}/${name}.jar"/>
<delete file="${Name}-${version}.zip"/> <delete file="${Name}-${version}.zip"/>
<delete file="${Name}-${version}.tar"/> <delete file="${Name}-${version}.tar"/>
<delete file="${Name}-${version}.tar.gz"/> <delete file="${Name}-${version}.tar.gz"/>
@@ -331,7 +362,7 @@
<!-- =================================================================== --> <!-- =================================================================== -->
<!-- Compile testcases --> <!-- Compile testcases -->
<!-- =================================================================== --> <!-- =================================================================== -->
<target name="compiletests" depends="jar" if="junit.present">
<target name="compiletests" depends="jars" if="junit.present">
<mkdir dir="${build.tests}"/> <mkdir dir="${build.tests}"/>


<javac srcdir="${src.tests.dir}" <javac srcdir="${src.tests.dir}"
@@ -414,7 +445,6 @@
<!-- anybody but the people doing Ant releases. --> <!-- anybody but the people doing Ant releases. -->
<!-- =================================================================== --> <!-- =================================================================== -->


<property name="JAXP_HOME" value="/usr/local/java/lib/jaxp1.0.1" />
<property name="ant.srcdist.dir" value="../dist/jakarta-ant-src"/> <property name="ant.srcdist.dir" value="../dist/jakarta-ant-src"/>


<target name="srcbuild"> <target name="srcbuild">
@@ -424,7 +454,7 @@
<copy todir="${ant.srcdist.dir}"> <copy todir="${ant.srcdist.dir}">
<fileset dir="."> <fileset dir=".">
<exclude name="bin/**" /> <exclude name="bin/**" />
<exclude name="lib/**" />
<exclude name="lib/*.jar" />
</fileset> </fileset>
</copy> </copy>


@@ -435,12 +465,6 @@
<patternset refid="chmod.patterns"/> <patternset refid="chmod.patterns"/>
</fileset> </fileset>
</chmod> </chmod>

<copy todir="${ant.srcdist.dir}/lib">
<fileset dir="${JAXP_HOME}">
<include name="**/*.jar" />
</fileset>
</copy>
</target> </target>
<target name="src.zip" depends="srcbuild"> <target name="src.zip" depends="srcbuild">
@@ -461,24 +485,7 @@


<property name="ant.bindist.dir" value="../dist/jakarta-ant-bin"/> <property name="ant.bindist.dir" value="../dist/jakarta-ant-bin"/>


<target name="binbuild" depends="compile">

<!-- ugly hack to build a binary distribution without optional tasks -->
<delete>
<fileset dir="${build.classes}">
<include name="**/Script.java" />
<include name="**/NetRexxC.java" />
<include name="**/XslpLiaison.java" />
<include name="**/XalanLiaison.java" />
<include name="**/Ejbc*.java" />
<include name="**/DDCreator*.java" />
<include name="**/WLRun.java" />
<include name="**/WLStop.java" />
<include name="**/junit/*" />
<include name="**/FTP*.java" />
<include name="**/AntStarTeam*.java" />
</fileset>
</delete>
<target name="binbuild" depends="compile-core">


<mkdir dir="${ant.bindist.dir}"/> <mkdir dir="${ant.bindist.dir}"/>
<mkdir dir="${ant.bindist.dir}/bin"/> <mkdir dir="${ant.bindist.dir}/bin"/>
@@ -488,11 +495,18 @@
<mkdir dir="${ant.bindist.dir}/docs/api"/> <mkdir dir="${ant.bindist.dir}/docs/api"/>


<jar jarfile="${ant.bindist.dir}/lib/${name}.jar" <jar jarfile="${ant.bindist.dir}/lib/${name}.jar"
basedir="${build.classes}"
basedir="${build.classes.core}"
includes="org/**" includes="org/**"
manifest="${manifest}" manifest="${manifest}"
/> />


<copy todir="${ant.bindist.dir}/lib">
<fileset dir="${srclib.dir}">
<include name="**/*.jar"/>
<exclude name="ant.jar"/>
</fileset>
</copy>

<copy todir="${ant.bindist.dir}/docs"> <copy todir="${ant.bindist.dir}/docs">
<fileset dir="${docs.dir}"/> <fileset dir="${docs.dir}"/>
</copy> </copy>
@@ -534,11 +548,6 @@
<copy file="TODO" tofile="${ant.bindist.dir}/TODO"/> <copy file="TODO" tofile="${ant.bindist.dir}/TODO"/>
<copy file="LICENSE" tofile="${ant.bindist.dir}/LICENSE"/> <copy file="LICENSE" tofile="${ant.bindist.dir}/LICENSE"/>


<copy todir="${ant.bindist.dir}/lib">
<fileset dir="${JAXP_HOME}">
<include name="**/*.jar" />
</fileset>
</copy>
</target> </target>


<target name="bin.zip" depends="binbuild"> <target name="bin.zip" depends="binbuild">
@@ -560,12 +569,11 @@
<property name="contributed.tasks" value="../build/ant.contrib" /> <property name="contributed.tasks" value="../build/ant.contrib" />
<property name="optional" value="../dist/optional.jar" /> <property name="optional" value="../dist/optional.jar" />


<target name="optional.jar" depends="compile"
<target name="optional.jar" depends="compile-optional"
description="Creates a JAR of the optional tasks"> description="Creates a JAR of the optional tasks">
<mkdir dir="${contributed.tasks}" /> <mkdir dir="${contributed.tasks}" />
<copy todir="${contributed.tasks}"> <copy todir="${contributed.tasks}">
<fileset dir="${build.classes}">
<include name="**/optional/**" />
<fileset dir="${build.classes.optional}">
</fileset> </fileset>
</copy> </copy>
<jar jarfile="${optional}" <jar jarfile="${optional}"


BIN
lib/core/jaxp.jar View File


BIN
lib/core/parser.jar View File


+ 1
- 0
src/bin/ant.bat View File

@@ -52,6 +52,7 @@ goto end
set _JAVACMD=%JAVACMD% set _JAVACMD=%JAVACMD%
set LOCALCLASSPATH="%CLASSPATH%" set LOCALCLASSPATH="%CLASSPATH%"
for %%i in ("%ANT_HOME%\lib\*.jar") do call "%ANT_HOME%\bin\lcp.bat" "%%i" for %%i in ("%ANT_HOME%\lib\*.jar") do call "%ANT_HOME%\bin\lcp.bat" "%%i"
for %%i in ("%ANT_HOME%\lib\core\*.jar") do call "%ANT_HOME%\bin\lcp.bat" "%%i"


if "%JAVA_HOME%" == "" goto noJavaHome if "%JAVA_HOME%" == "" goto noJavaHome
if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java


Write Preview
Loading…
Cancel
Save
Please read the following content carefully:

Dear OpenI User

Thank you for your continuous support to the Openl Qizhi Community AI Collaboration Platform. In order to protect your usage rights and ensure network security, we updated the Openl Qizhi Community AI Collaboration Platform Usage Agreement in January 2024. The updated agreement specifies that users are prohibited from using intranet penetration tools. After you click "Agree and continue", you can continue to use our services. Thank you for your cooperation and understanding.

For more agreement content, please refer to the《Openl Qizhi Community AI Collaboration Platform Usage Agreement》

Agree and continue
Disagree, exit