litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-56 Cleanup comments in build scripts.

Browse source
This commit is contained in:
jeb228 2010-02-22 13:32:29 +00:00
parent 82d8322393
commit 1afb527408
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
webapp/build.xml
View file

@ -26,7 +26,7 @@
--> -->
<dirname property="vitroCore.basedir" file="${ant.file.vitroCore}" /> <dirname property="vitroCore.basedir" file="${ant.file.vitroCore}" />
<property name="webapp.dir" location="${vitroCore.basedir}" /> <property name="webapp.dir" location="${vitroCore.basedir}" />
<!-- <!--
The log file names will be prefixed with the project name, if this is The log file names will be prefixed with the project name, if this is
called from a Product build script. called from a Product build script.
@ -34,7 +34,7 @@
<condition property="logfile.prefix" value=""> <condition property="logfile.prefix" value="">
<equals arg1="${ant.file.vitroCore}" arg2="${ant.file}" /> <equals arg1="${ant.file.vitroCore}" arg2="${ant.file}" />
</condition> </condition>
<property name="logfile.prefix" value="${ant.project.name}."/> <property name="logfile.prefix" value="${ant.project.name}." />
@ -67,7 +67,7 @@
<!-- ================================= <!-- =================================
target: describe target: describe
================================= --> ================================= -->
<target name="describe" description="--> The default target."> <target name="describe" description="--> Describe the targets (this is the default).">
<echo> <echo>
all - Runs "clean", then "deploy". all - Runs "clean", then "deploy".
clean - Delete all artifacts so the next build will be from scratch. clean - Delete all artifacts so the next build will be from scratch.
@ -81,7 +81,7 @@ deploy - Deploy the application directly into the Tomcat webapps directory.
<!-- ================================= <!-- =================================
target: all target: all
================================= --> ================================= -->
<target name="all" depends="clean, deploy" description="Run 'clean', then 'deploy'" /> <target name="all" depends="clean, deploy" description="--> Run 'clean', then 'deploy'" />
<!-- ================================= <!-- =================================
target: clean target: clean
@ -145,7 +145,7 @@ deploy - Deploy the application directly into the Tomcat webapps directory.
<!-- ================================= <!-- =================================
target: compile target: compile
================================= --> ================================= -->
<target name="compile" depends="prepare" description="Compile Java sources"> <target name="compile" depends="prepare" description="--> Compile Java sources">
<!-- deletes all files that depend on changed .java files --> <!-- deletes all files that depend on changed .java files -->
<depend srcdir="${webapp.dir}/src" <depend srcdir="${webapp.dir}/src"
destdir="${build.dir}/war/WEB-INF/classes" destdir="${build.dir}/war/WEB-INF/classes"
@ -167,7 +167,7 @@ deploy - Deploy the application directly into the Tomcat webapps directory.
<!-- ================================= <!-- =================================
target: test target: test
================================= --> ================================= -->
<target name="test" depends="compile" description="Run JUnit tests"> <target name="test" depends="compile" description="--> Run JUnit tests">
<javac srcdir="${webapp.dir}/test" <javac srcdir="${webapp.dir}/test"
destdir="${build.dir}/testclasses" destdir="${build.dir}/testclasses"
debug="true" debug="true"
@ -259,7 +259,7 @@ deploy - Deploy the application directly into the Tomcat webapps directory.
<!-- ================================= <!-- =================================
target: deploy target: deploy
================================= --> ================================= -->
<target name="deploy" depends="copyEtc" description="Deploy to Tomcat"> <target name="deploy" depends="copyEtc" description="--> Build the app and install in Tomcat">
<property name="webapp.deploy.home" value="${tomcat.home}/webapps/${webapp.name}" /> <property name="webapp.deploy.home" value="${tomcat.home}/webapps/${webapp.name}" />
<mkdir dir="${webapp.deploy.home}" /> <mkdir dir="${webapp.deploy.home}" />

14
webapp/product-build.xml
View file

@ -49,12 +49,12 @@
<path id="product.compile.classpath"> <path id="product.compile.classpath">
<pathelement location="${classes.dir}" /> <pathelement location="${classes.dir}" />
<!-- These come before the core classpath, so our local mods can override --> <!-- These come before the core classpath, so our local mods can override -->
<fileset dir="${product.modifications.dir}/WEB-INF/lib"> <fileset dir="${product.modifications.dir}/WEB-INF/lib">
<include name="**/*.jar" /> <include name="**/*.jar" />
</fileset> </fileset>
<path refid="compile.classpath" /> <path refid="compile.classpath" />
</path> </path>
@ -70,7 +70,7 @@
<!-- ================================= <!-- =================================
target: describe target: describe
================================= --> ================================= -->
<target name="describe" description="--> The default target."> <target name="describe" description="--> Describe the targets (this is the default).">
<echo> <echo>
all - Runs "clean", then "deploy". all - Runs "clean", then "deploy".
clean - Delete all artifacts so the next build will be from scratch. clean - Delete all artifacts so the next build will be from scratch.
@ -84,7 +84,7 @@ deploy - Deploy the application directly into the Tomcat webapps directory.
<!-- ================================= <!-- =================================
target: all target: all
================================= --> ================================= -->
<target name="all" depends="clean, deploy" description="Run 'clean', then 'deploy'" /> <target name="all" depends="clean, deploy" description="--> Run 'clean', then 'deploy'" />
<!-- ================================= <!-- =================================
target: clean target: clean
@ -103,13 +103,15 @@ deploy - Deploy the application directly into the Tomcat webapps directory.
<!-- ================================= <!-- =================================
target: test target: test
================================= --> ================================= -->
<target name="test" depends="vitroCore.test, productTest" description="-->Run JUnit tests"> <target name="test" depends="vitroCore.test, productTest" description="--> Run JUnit tests">
</target> </target>
<!-- ================================= <!-- =================================
target: deploy target: deploy
================================= --> ================================= -->
<target name="deploy" depends="productCopy, vitroCore.deploy" description="description"> <target name="deploy"
depends="productCopy, vitroCore.deploy"
description="--> Build the app and install in Tomcat">
</target> </target>
<!-- - - - - - - - - - - - - - - - - - <!-- - - - - - - - - - - - - - - - - -