jfarcand 2003/03/13 11:24:07
Modified: . build.xml
catalina build.xml
Log:
Fix broken build (from a clean workspace). Do we realy need the shared directory?
Will regenerate the nightly build now :-)
Revision Changes Path
1.101 +9 -7 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- build.xml 13 Mar 2003 00:20:32 -0000 1.100
+++ build.xml 13 Mar 2003 19:24:07 -0000 1.101
@@ -10,7 +10,6 @@
<!-- If not set explicitely in one of the user overrides, set it here
-->
- <property name="base.path" location="../repository" />
<property file="build.properties.default"/>
@@ -82,7 +81,7 @@
<mkdir dir="${tomcat.build}"/>
<mkdir dir="${tomcat.build}/classes" />
<mkdir dir="${tomcat.build}/server/lib" />
- <mkdir dir="${tomcat.build}/shared/lib" />
+ <mkdir dir="${tomcat.build}/common/lib" />
<mkdir dir="${tomcat.build}/common/lib" />
<uptodate property="servletapi.build.notrequired"
@@ -252,6 +251,7 @@
<mkdir dir="${ROOT.base}/WEB-INF/src" />
<mkdir dir="${ROOT.base}/WEB-INF/classes" />
<mkdir dir="${jsp-examples.base}/WEB-INF/src" />
+ <echo message="${tomcat.build}"/>
<path id="jspc.classpath">
<pathelement location="${java.home}/../lib/tools.jar"/>
@@ -259,8 +259,8 @@
<fileset dir="${tomcat.build}/server/lib">
<include name="*.jar"/>
</fileset>
- <pathelement location="${tomcat.build}/shared/classes"/>
- <fileset dir="${tomcat.build}/shared/lib">
+ <pathelement location="${tomcat.build}/common/classes"/>
+ <fileset dir="${tomcat.build}/common/lib">
<include name="*.jar"/>
</fileset>
<pathelement location="${tomcat.build}/common/classes"/>
@@ -546,7 +546,6 @@
<antcall target="fix-webapps" />
- <ant dir="." target="build-webapps-precompile" />
</target>
<target name="fix-webapps" depends="init"
@@ -965,12 +964,15 @@
<copy todir="${tomcat.dist}/server/webapps">
<fileset dir="${tomcat.build}/server/webapps" />
</copy>
- <copy todir="${tomcat.dist}/shared/classes">
- <fileset dir="${tomcat.build}/shared/classes" />
+ <mkdir dir="${tomcat.dist}/shared/classes"/>
+ <copy todir="${tomcat.dist}/common/classes">
+ <fileset dir="${tomcat.build}/common/classes" />
</copy>
+<!--
<copy todir="${tomcat.dist}/shared/lib">
<fileset dir="${tomcat.build}/shared/lib" />
</copy>
+-->
<copy todir="${tomcat.dist}/webapps">
<fileset dir="${tomcat.build}/webapps" />
</copy>
1.45 +2 -1 jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- build.xml 12 Mar 2003 23:25:06 -0000 1.44
+++ build.xml 13 Mar 2003 19:24:07 -0000 1.45
@@ -891,10 +891,11 @@
</copy>
<!-- Shared Extensions -->
+<!--
<copy todir="${catalina.deploy}/shared/lib">
<fileset dir="${catalina.build}/shared/lib" />
</copy>
-
+-->
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
