A build request.... please allow the build to work either by building
xjavadoc (as you have it now, it seems) or with the presence of
xjavadoc.jar.
I personally won't have any need/desire to pull the source tree for xjavadoc
and build it myself, but I do want to work on the xdoclet codebase. With
clever use of <condition> and <available> and such it should be easy to have
the xdoclet build work either way.
Erik
----- Original Message -----
From: "Aslak Helles?y" <[EMAIL PROTECTED]>
To: <[EMAIL PROTECTED]>
Sent: Saturday, March 23, 2002 11:27 AM
Subject: [Xdoclet-devel] CVS update: xdoclet/core/script Build.bat build.sh
build.xml
> User: rinkrank
> Date: 02/03/23 08:27:59
>
> Modified: core/script Tag: XJAVADOC_REFACTORING Build.bat build.sh
> build.xml
> Log:
> Integrating xdoclet/xjavadoc build
>
> Revision Changes Path
> No revision
>
>
> No revision
>
>
> 1.3.4.1 +8 -3 xdoclet/core/script/Build.bat
>
> Index: Build.bat
> ===================================================================
> RCS file: /cvsroot/xdoclet/xdoclet/core/script/Build.bat,v
> retrieving revision 1.3
> retrieving revision 1.3.4.1
> diff -u -w -r1.3 -r1.3.4.1
> --- Build.bat 3 Jan 2002 21:59:19 -0000 1.3
> +++ Build.bat 23 Mar 2002 16:27:59 -0000 1.3.4.1
> @@ -7,9 +7,14 @@
>
> :gotJavaHome
>
> -set _CP_=..\..\lib\ant.jar
> -set _CP_=%_CP_%;..\..\lib\crimson.jar
> -set _CP_=%_CP_%;..\..\lib\jaxp.jar
> +REM %~dp0 is name of current script's directory under NT/2000, followed
by a \ character
> +REM Thanks, M$ for documenting this (yeah right).
> +SET __HERE__=%~dp0
> +
> +set _CP_=%__HERE__%..\..\lib\ant.jar
> +set _CP_=%_CP_%;%__HERE__%..\..\lib\crimson.jar
> +set _CP_=%_CP_%;%__HERE__%..\..\lib\jaxp.jar
> +set _CP_=%_CP_%;%__HERE__%..\..\lib\prettyprinter.jar
>
> "%JAVA_HOME%\bin\java.exe" -classpath
"%JAVA_HOME%\lib\tools.jar;%_CP_%;%CLASSPATH%" org.apache.tools.ant.Main %1
%2 %3 %4 %5
>
>
>
>
> 1.3.2.1 +1 -0 xdoclet/core/script/build.sh
>
> Index: build.sh
> ===================================================================
> RCS file: /cvsroot/xdoclet/xdoclet/core/script/build.sh,v
> retrieving revision 1.3
> retrieving revision 1.3.2.1
> diff -u -w -r1.3 -r1.3.2.1
> --- build.sh 10 Feb 2002 04:10:48 -0000 1.3
> +++ build.sh 23 Mar 2002 16:27:59 -0000 1.3.2.1
> @@ -15,6 +15,7 @@
> CP=../../lib/ant.jar\
> :../../lib/crimson.jar\
> :../../lib/jaxp.jar\
> +:../../lib/prettyprinter.jar\
> :$JAVA_HOME/lib/tools.jar
>
> if $cygwin; then
>
>
>
> 1.17.4.2 +11 -2 xdoclet/core/script/build.xml
>
> Index: build.xml
> ===================================================================
> RCS file: /cvsroot/xdoclet/xdoclet/core/script/build.xml,v
> retrieving revision 1.17.4.1
> retrieving revision 1.17.4.2
> diff -u -w -r1.17.4.1 -r1.17.4.2
> --- build.xml 16 Mar 2002 18:22:11 -0000 1.17.4.1
> +++ build.xml 23 Mar 2002 16:27:59 -0000 1.17.4.2
> @@ -7,7 +7,7 @@
> <!-- Define class
-->
> <!--
=================================================================== -->
> <path id="project.class.path">
> - <fileset dir="../lib">
> + <fileset dir="${basedir}/../lib">
> <include name="**/*.jar" />
> </fileset>
> <!-- append the external classpath lastly -->
> @@ -36,13 +36,14 @@
> <property name="build.compiler" value="modern" />
> <property name="classpath" value="" />
>
> + <available file="../../xjavadoc/build.xml"
property="xjavadoc.present"/>
> </target>
>
>
> <!--
=================================================================== -->
> <!-- Prepares the build
-->
> <!--
=================================================================== -->
> - <target name="prepare" depends="init">
> + <target name="prepare" depends="init,panic-if-xjavadoc-unavailable">
>
> <mkdir dir="${build.dir}" />
> <mkdir dir="${build.dir}/classes"/>
> @@ -55,8 +56,16 @@
> <mkdir dir="${dist.dir}/samples"/>
> <mkdir dir="${dist.dir}/lib"/>
>
> + <!-- build xjavadoc -->
> + <echo message="Building xjavadoc..."/>
> + <ant dir="../../xjavadoc" target="jar" inheritAll="false">
> + <property name="jar.file"
value="${basedir}/../lib/xjavadoc.jar"/>
> + </ant>
> </target>
>
> + <target name="panic-if-xjavadoc-unavailable"
unless="xjavadoc.present">
> + <fail message="xjavadoc is not avilable. it should be located
next to xdoclet and is available as a separate CVS module"/>
> + </target>
>
> <!--
=================================================================== -->
> <!-- Beautify the
-->
>
>
>
>
> _______________________________________________
> Xdoclet-devel mailing list
> [EMAIL PROTECTED]
> https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
>
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
