User: rinkrank
Date: 02/03/24 09:44:16
Modified: core/script Build.bat build.sh build.xml
Log:
Merging changes from XJAVADOC_REFACTORING branch back to main branch
Revision Changes Path
1.4 +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.4
diff -u -w -r1.3 -r1.4
--- Build.bat 3 Jan 2002 21:59:19 -0000 1.3
+++ Build.bat 24 Mar 2002 17:44:16 -0000 1.4
@@ -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.4 +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.4
diff -u -w -r1.3 -r1.4
--- build.sh 10 Feb 2002 04:10:48 -0000 1.3
+++ build.sh 24 Mar 2002 17:44:16 -0000 1.4
@@ -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.18 +14 -6 xdoclet/core/script/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/script/build.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -r1.17 -r1.18
--- build.xml 28 Dec 2001 18:47:03 -0000 1.17
+++ build.xml 24 Mar 2002 17:44:16 -0000 1.18
@@ -7,7 +7,7 @@
<!-- Define class path -->
<!-- =================================================================== -->
<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 directory -->
<!-- =================================================================== -->
- <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 code -->
@@ -66,11 +75,11 @@
<taskdef name="pretty" classname="org.acm.seguin.ant.Pretty"
classpath="${basedir}/../lib/prettyprinter.jar"/>
- <pretty settingsDir="${basedir}/../config" cvs="true"
compileDir="${build.dir}/classes">
+ <!--pretty settingsDir="${basedir}/../config" cvs="true"
compileDir="${build.dir}/classes">
<fileset dir="${src.dir}">
<include name="**/*.java" />
</fileset>
- </pretty>
+ </pretty-->
</target>
@@ -148,10 +157,9 @@
<!-- Generate template tags documentation from source -->
<!-- =================================================================== -->
<target name="document" depends="jar">
-
<taskdef name="document"
classname="xdoclet.doc.DocumentDocletTask"
-
classpath="../core/dist/lib/${name}.jar;../lib/ant.jar;../lib/log4j.jar"
+
classpath="${basedir}/../core/dist/lib/${name}.jar;../lib/ant.jar;../lib/log4j.jar"
/>
<document sourcepath="${src.dir}"
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
