Update info for OWASP build and for Release 5.0
git-svn-id: http://webgoat.googlecode.com/svn/trunk@62 4033779f-a91e-0410-96ef-6bf7bf53c507
This commit is contained in:
@ -56,9 +56,10 @@
|
||||
|
||||
<property name="app.home" value="${basedir}/project"/>
|
||||
<property name="app.name" value="WebGoat"/> <!-- MUST BE CONSISTENT WITH project/build.xml! -->
|
||||
<property name="app.version" value="5.0"/> <!-- MUST BE CONSISTENT WITH project/build.xml! -->
|
||||
<property name="app.version" value="5.0-RC1"/> <!-- MUST BE CONSISTENT WITH project/build.xml! -->
|
||||
<property name="catalina.home" value="${basedir}/tomcat"/>
|
||||
<property name="dist.home" value="${app.home}/dist"/>
|
||||
<property name="dist.owasp" value="${app.home}/owasp_distributions"/>
|
||||
<property name="install.home" value="WebGoatClassCD"/>
|
||||
|
||||
<!-- ==================== Clean Target ==================================== -->
|
||||
@ -84,7 +85,9 @@
|
||||
<target name="clean_all"
|
||||
description="Delete old build, dist directories and zips">
|
||||
<delete dir="${dist.home}"/>
|
||||
<delete dir="${dist.owasp}"/>
|
||||
<mkdir dir="${dist.home}"/>
|
||||
<mkdir dir="${dist.owasp}"/>
|
||||
</target>
|
||||
|
||||
<!-- ==================== Compile Target ===================================== -->
|
||||
@ -189,6 +192,13 @@
|
||||
<zip destfile="${dist.home}/Unix_${app.name}-${app.version}_Release.zip"
|
||||
basedir=""
|
||||
includes="doc/, tomcat/, webgoat.sh, readme.txt"/>
|
||||
<!-- Add the WebGoat-x.x on the path -->
|
||||
<unzip src="${dist.home}/Unix_${app.name}-${app.version}_Release.zip" dest="${dist.home}/temp/${app.name}-${app.version}"/>
|
||||
<delete file="${dist.home}/Unix_${app.name}-${app.version}_Release.zip"/>
|
||||
<zip destfile="${dist.home}/Unix_${app.name}-${app.version}_Release.zip"
|
||||
basedir="${dist.home}/temp"/>
|
||||
<delete dir="${dist.home}/temp" includeemptydirs="true"/>
|
||||
|
||||
<move file="${dist.home}/${app.name}-${app.version}.war" tofile="${dist.home}/Unix_${app.name}-${app.version}.war"/>
|
||||
<delete file="${catalina.home}/webapps/${app.name}.war"/>
|
||||
</target>
|
||||
@ -221,7 +231,14 @@
|
||||
<copy file="${dist.home}/${app.name}-${app.version}.war" tofile="${catalina.home}/webapps/${app.name}.war"/>
|
||||
<zip destfile="${dist.home}/Windows_${app.name}-${app.version}_Release.zip"
|
||||
basedir=""
|
||||
includes="doc/, java/, tomcat/, webgoat.bat, readme.txt"/>
|
||||
includes="doc/, java/, tomcat/, webgoat.bat, webgoat_8080.bat, readme.txt"/>
|
||||
<!-- Add the WebGoat-x.x on the path -->
|
||||
<unzip src="${dist.home}/Windows_${app.name}-${app.version}_Release.zip" dest="${dist.home}/temp/${app.name}-${app.version}"/>
|
||||
<delete file="${dist.home}/Windows_${app.name}-${app.version}_Release.zip"/>
|
||||
<zip destfile="${dist.home}/Windows_${app.name}-${app.version}_Release.zip"
|
||||
basedir="${dist.home}/temp"/>
|
||||
<delete dir="${dist.home}/temp" includeemptydirs="true"/>
|
||||
|
||||
<move file="${dist.home}/${app.name}-${app.version}.war" tofile="${dist.home}/Windows_${app.name}-${app.version}.war"/>
|
||||
<delete file="${catalina.home}/webapps/${app.name}.war"/>
|
||||
</target>
|
||||
@ -232,7 +249,7 @@
|
||||
<delete dir="${dist.home}/temp" includeemptydirs="true"/>
|
||||
<zip destfile="${dist.home}/${app.name}-${app.version}_developer.zip"
|
||||
basedir=""
|
||||
includes="java/, eclipse/, tomcat/, project/JavaSource/, project/WebContent/, project/build.xml, project/doc, webgoat.bat, webgoat.sh, eclipse.bat, readme.txt, HOW*"
|
||||
includes="java/, eclipse/, tomcat/, project/JavaSource/, project/WebContent/, project/build.xml, project/doc, webgoat.bat, webgoat_8080.bat, webgoat.sh, eclipse.bat, readme.txt, HOW*"
|
||||
excludes="project/JavaSource/org/owasp/webgoat/lessons/instructor/, project/.*, project/WebContent/WEB-INF/webgoat-lab.properties, project/WebContent/WEB-INF/webgoat-class.properties, project/build/WEB-INF/webgoat-lab.properties, project/build/WEB-INF/webgoat-class.properties"/>
|
||||
<unzip src="${dist.home}/${app.name}-${app.version}_developer.zip" dest="${dist.home}/temp"/>
|
||||
<move file="${dist.home}/temp/project/WebContent/WEB-INF/webgoat-owasp.properties" tofile="${dist.home}/temp/project/WebContent/WEB-INF/webgoat.properties"/>
|
||||
@ -257,7 +274,7 @@
|
||||
|
||||
<!-- Build the WebGoat WAR with the desired properties file -->
|
||||
<ant dir="${app.home}" inheritAll="false">
|
||||
<target name="WebGoatPropertiesLAB"/>
|
||||
<target name="WebGoatPropertiesOWASP"/>
|
||||
<target name="BuildWindowsWar"/>
|
||||
</ant>
|
||||
|
||||
@ -266,25 +283,22 @@
|
||||
<!-- Build the CD image -->
|
||||
<zip destfile="${dist.home}/${ant.project.name}.zip">
|
||||
<zipfileset dir="." prefix="${install.home}"
|
||||
includes="eclipse/, java/, project/, tomcat/, webscarab/, InfoZip/, eclipse.bat, webgoat.bat, webscarab.bat"
|
||||
excludes="project/.*, project/.settings/**, project/dist/**, project/bin/**, project/build/**"/>
|
||||
<zipfileset src="project-student.zip" prefix="${install.home}"/>
|
||||
includes="eclipse/, java/, project/, tomcat/, webscarab/, eclipse.bat, webgoat.bat, webgoat_8080.bat, webscarab.bat"
|
||||
excludes="project/.*, project/.settings/**, project/dist/**, project/owasp_distributions/**, project/bin/**, project/build/**"/>
|
||||
</zip>
|
||||
<copy todir="${dist.home}">
|
||||
<fileset dir="." includes="install.bat, uninstall.bat InfoZip/"/>
|
||||
<fileset dir="doc" includes="install.doc, readme.doc"/>
|
||||
<fileset dir="doc">
|
||||
<include name="J2EE Labs Slides.ppt"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
|
||||
</target>
|
||||
|
||||
<!--Build all release -->
|
||||
<target name="Build_OWASP_Course" depends="clean_all, BuildDev_release, BuildUnixWar_release, BuildWindowsWar_release"
|
||||
<target name="Build_OWASP_Release" depends="clean_all"
|
||||
description="Creates all binary distributions for OWASP">
|
||||
<copy file="${basedir}/readme.txt" tofile="${dist.home}/readme.txt"/>
|
||||
<copy file="${basedir}/readme.txt" tofile="${dist.owasp}/readme.txt"/>
|
||||
<antcall target="BuildDev_release"> </antcall>
|
||||
<copydir dest="${dist.owasp}" src="${dist.home}"/>
|
||||
<antcall target="BuildUnixWar_release"> </antcall>
|
||||
<copydir dest="${dist.owasp}" src="${dist.home}"/>
|
||||
<antcall target="BuildWindowsWar_release"> </antcall>
|
||||
<copydir dest="${dist.owasp}" src="${dist.home}"/>
|
||||
|
||||
</target>
|
||||
|
||||
<!-- ==================== Prepare Target ================================== -->
|
||||
|
Reference in New Issue
Block a user