You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by pi...@apache.org on 2002/05/15 00:06:20 UTC
cvs commit: jakarta-tomcat-connectors/webapp Makedefs.in Makefile.in build.xml
pier 02/05/14 15:06:20
Modified: webapp Makedefs.in Makefile.in build.xml
Log:
Generate documentation in the build directory as if it was in the
distribution (everything in its own little place)
Revision Changes Path
1.21 +3 -2 jakarta-tomcat-connectors/webapp/Makedefs.in
Index: Makedefs.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makedefs.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Makedefs.in 14 May 2002 21:49:08 -0000 1.20
+++ Makedefs.in 14 May 2002 22:06:20 -0000 1.21
@@ -56,7 +56,7 @@
# ========================================================================= #
# @author Pier Fumagalli <ma...@betaversion.org>
-# @version $Id: Makedefs.in,v 1.20 2002/05/14 21:49:08 pier Exp $
+# @version $Id: Makedefs.in,v 1.21 2002/05/14 22:06:20 pier Exp $
.SUFFIXES: .c .o .lo
@@ -90,7 +90,8 @@
BLD_DIR = $(TGT_DIR)/build
OBJ_DIR = $(BLD_DIR)/objs
LIB_DIR = $(BLD_DIR)/libs
-API_DIR = $(BLD_DIR)/api-c
+DOC_DIR = $(BLD_DIR)/docs
+API_DIR = $(DOC_DIR)/api-c
# Distribution file names
TARBALL = webapp-module-$(WEBAPP_VERSION)
1.35 +5 -2 jakarta-tomcat-connectors/webapp/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Makefile.in 14 May 2002 21:49:51 -0000 1.34
+++ Makefile.in 14 May 2002 22:06:20 -0000 1.35
@@ -56,7 +56,7 @@
# ========================================================================= #
# @author Pier Fumagalli <ma...@betaversion.org>
-# @version $Id: Makefile.in,v 1.34 2002/05/14 21:49:51 pier Exp $
+# @version $Id: Makefile.in,v 1.35 2002/05/14 22:06:20 pier Exp $
include @TGT_DIR@/Makedefs
@@ -152,7 +152,10 @@
$(OBJ_DIR): $(BLD_DIR)
@if test ! -d "$(OBJ_DIR)" ; then mkdir $(OBJ_DIR) ; fi
-$(API_DIR): $(BLD_DIR)
+$(DOC_DIR): $(BLD_DIR)
+ @if test ! -d "$(DOC_DIR)" ; then mkdir $(DOC_DIR) ; fi
+
+$(API_DIR): $(DOC_DIR)
@if test ! -d "$(API_DIR)" ; then mkdir $(API_DIR) ; fi
$(BLD_DIR):
1.11 +8 -5 jakarta-tomcat-connectors/webapp/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 14 May 2002 20:48:30 -0000 1.10
+++ build.xml 14 May 2002 22:06:20 -0000 1.11
@@ -19,7 +19,7 @@
<property name="build.jar" value="${build.home}/tomcat-warp.jar"/>
<property name="build.classes" value="${build.home}/classes"/>
<property name="build.docs" value="${build.home}/docs"/>
- <property name="build.javadoc" value="${build.home}/api-java"/>
+ <property name="build.javadoc" value="${build.docs}/api-java"/>
<!-- The layout of the sources directory -->
<property name="source.home" value="${basedir}"/>
@@ -33,10 +33,6 @@
<pathelement location="${catalina.home}/common/lib/servlet.jar"/>
</path>
-
- <target name="clean">
- </target>
-
<!-- === PREPARATION AND GLOBAL TASKS ==================================== -->
<target
@@ -84,6 +80,12 @@
description="Build everything"
depends="compile,docs,javadoc"/>
+ <!--
+ Clean up all we generated using ANT (and nothing more)
+ -->
+ <target
+ name="clean"/>
+
<!-- === COMPILATION TASKS =============================================== -->
@@ -207,6 +209,7 @@
description="Create Java API documentation">
<!-- Create the directory where we're going to store the docs -->
+ <mkdir dir="${build.docs}"/>
<mkdir dir="${build.javadoc}"/>
<!-- Run JavaDoc -->
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>