craigmcc 01/03/09 21:15:32
Modified: . .cvsignore build.xml
Log:
Tweak the build.xml script so that "build clean" followed by "cvs update"
does not choke on missing "build" or "dist" directories that were removed
by "build clean". As part of this tweak, the "target" directory and its
associated subdirectories has been removed from the CVS repository -- this
directory should *only* be created by executing the build, and should not
appear in the repository.
Migrate creation of struts.jar from the "dist.library" target to the
"compile.library" target, in preparation for a further refactoring of the
build scripts (to be checked in later) that will include a
"build-webapp.xml" script that can be used for *any* web application, not
just one of the standard Struts examples.
Revision Changes Path
1.2 +1 -2 jakarta-struts/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/jakarta-struts/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 2001/01/24 22:37:25 1.1
+++ .cvsignore 2001/03/10 05:15:31 1.2
@@ -1,2 +1 @@
-build
-dist
+target
1.42 +12 -12 jakarta-struts/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- build.xml 2001/03/07 05:54:52 1.41
+++ build.xml 2001/03/10 05:15:31 1.42
@@ -2,11 +2,11 @@
<!-- Initialization properties -->
<property name="app.name" value="struts"/>
- <property name="build.home" value="build"/>
+ <property name="build.home" value="target"/>
<property name="catalina.home" value="../jakarta-tomcat-4.0/build"/>
<property name="debug" value="true"/>
<property name="deprecation" value="false"/>
- <property name="dist.home" value="dist"/>
+ <property name="dist.home" value="${build.home}/dist"/>
<property name="optimize" value="true"/>
<property name="project.name" value="jakarta-struts"/>
<property name="project.version" value="1.0-b1"/>
@@ -148,6 +148,9 @@
<copy todir="${build.home}/library/classes/META-INF/tlds">
<fileset dir="${build.home}/library" includes="struts-*.tld"/>
</copy>
+ <jar jarfile="${build.home}/library/${app.name}.jar"
+ manifest="src/conf/MANIFEST.MF"
+ basedir="${build.home}/library/classes" includes="**"/>
</target>
<!-- BUILD: Compile blank application components -->
@@ -166,7 +169,7 @@
<copy todir="${build.home}/blank">
<fileset dir="web/blank"/>
</copy>
- <copy file="${dist.home}/lib/${app.name}.jar"
+ <copy file="${build.home}/library/${app.name}.jar"
tofile="${build.home}/blank/WEB-INF/lib/${app.name}.jar"/>
<copy todir="${build.home}/blank/WEB-INF">
<fileset dir="${dist.home}/lib" includes="*.tld"/>
@@ -187,7 +190,7 @@
-->
<!-- Copy Struts JAR file and TLDs to the documentation app -->
- <copy file="${dist.home}/lib/${app.name}.jar"
+ <copy file="${build.home}/library/${app.name}.jar"
tofile="${build.home}/documentation/WEB-INF/lib/${app.name}.jar"/>
<copy todir="${build.home}/documentation/WEB-INF">
<fileset dir="${dist.home}/lib" includes="*.tld"/>
@@ -241,7 +244,7 @@
<copy todir="${build.home}/example">
<fileset dir="web/example"/>
</copy>
- <copy file="${dist.home}/lib/${app.name}.jar"
+ <copy file="${build.home}/library/${app.name}.jar"
tofile="${build.home}/example/WEB-INF/lib/${app.name}.jar"/>
<copy todir="${build.home}/example/WEB-INF">
<fileset dir="${dist.home}/lib" includes="*.tld"/>
@@ -254,7 +257,7 @@
<copy todir="${build.home}/template">
<fileset dir="web/template-example"/>
</copy>
- <copy file="${dist.home}/lib/${app.name}.jar"
+ <copy file="${build.home}/library/${app.name}.jar"
tofile="${build.home}/template/WEB-INF/lib/${app.name}.jar"/>
<copy todir="${build.home}/template/WEB-INF/tlds">
<fileset dir="${dist.home}/lib" includes="*.tld"/>
@@ -272,7 +275,7 @@
<copy todir="${build.home}/upload">
<fileset dir="web/upload" />
</copy>
- <copy file="${dist.home}/lib/${app.name}.jar"
+ <copy file="${build.home}/library/${app.name}.jar"
tofile="${build.home}/upload/WEB-INF/lib/${app.name}.jar"/>
<copy file="${dist.home}/lib/${app.name}-html.tld"
todir="${build.home}/upload/WEB-INF" />
@@ -292,7 +295,7 @@
<copy todir="${build.home}/exercise-taglib">
<fileset dir="web/exercise-taglib"/>
</copy>
- <copy file="${dist.home}/lib/${app.name}.jar"
+ <copy file="${build.home}/library/${app.name}.jar"
tofile="${build.home}/exercise-taglib/WEB-INF/lib/${app.name}.jar"/>
<copy todir="${build.home}/exercise-taglib/WEB-INF">
<fileset dir="${dist.home}/lib" includes="*.tld"/>
@@ -319,11 +322,9 @@
<target name="dist.library" depends="prepare.dist,compile.library">
<copy todir="${dist.home}/lib">
<fileset dir="${build.home}/library" includes="*.dtd"/>
+ <fileset dir="${build.home}/library" includes="*.jar"/>
<fileset dir="${build.home}/library" includes="*.tld"/>
</copy>
- <jar jarfile="${dist.home}/lib/${app.name}.jar"
- manifest="src/conf/MANIFEST.MF"
- basedir="${build.home}/library/classes" includes="**"/>
</target>
<!-- DIST: Construct blank distributables -->
@@ -483,7 +484,6 @@
<!-- UTILITY: Clean up build and distribution directories -->
<target name="clean">
<delete dir="${build.home}"/>
- <delete dir="${dist.home}"/>
</target>
<!-- UTILITY: All-in-one build target -->
