You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/11/02 00:02:30 UTC
svn commit: r831778 - in /ofbiz/trunk: build.xml framework/build.xml
Author: jleroux
Date: Sun Nov 1 23:02:29 2009
New Revision: 831778
URL: http://svn.apache.org/viewvc?rev=831778&view=rev
Log:
A patch from Erwan de FERRIERES "Add an ant "clean-tempfiles" target in main build.xml" (https://issues.apache.org/jira/browse/OFBIZ-2447) - OFBIZ-2447
+ some target descriptions (for ant -p)
Modified:
ofbiz/trunk/build.xml
ofbiz/trunk/framework/build.xml
Modified: ofbiz/trunk/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=831778&r1=831777&r2=831778&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Sun Nov 1 23:02:29 2009
@@ -22,7 +22,7 @@
<property name="site.dir" value="../site"/>
<property name="memory.initial.param" value="-Xms128M"/>
<property name="memory.max.param" value="-Xmx512M"/>
- <property name="memory.maxpermsize.param" value="-XX:MaxPermSize=128m"/>
+ <property name="memory.maxpermsize.param" value="-XX:MaxPermSize=128m"/>
<available file="applications/build.xml" property="applications.present"/>
<available file="specialpurpose/build.xml" property="specialpurpose.present"/>
@@ -39,22 +39,26 @@
<!-- Removes all created files and directories -->
<!-- ================================================================== -->
- <target name="refresh">
+ <target name="refresh"
+ description="Clean all and rebuild">
<antcall target="clean-all"/>
<antcall target="build"/>
</target>
- <target name="clean-all">
+ <target name="clean-all"
+ description="Clean all DB, Catalina and caches data, logs, and runtime subdirectories and all specific files like .rej, .orig">
<antcall target="clean-data"/>
<antcall target="clean-logs"/>
<antcall target="clean-output"/>
<antcall target="clean-xtra"/>
<antcall target="clean-catalina"/>
<antcall target="clean-cache"/>
+ <antcall target="clean-tempfiles"/>
<antcall target="clean"/>
</target>
- <target name="clean-data">
+ <target name="clean-data"
+ description="Clean all DB data (Derby and HSQL) under runtime/data">
<subant target="clean-data">
<filelist dir="." files="framework/build.xml"/>
</subant>
@@ -62,43 +66,55 @@
<delete file="runtime/test-list-build.xml"/>
</target>
- <target name="clean-logs">
+ <target name="clean-logs"
+ description="Clean all logs in runtime/logs">
<subant target="clean-logs">
<filelist dir="." files="framework/build.xml"/>
</subant>
</target>
- <target name="clean-output">
+ <target name="clean-output"
+ description="Clean runtime/output directory">
<subant target="clean-output">
<filelist dir="." files="framework/build.xml"/>
</subant>
</target>
- <target name="clean-xtra">
+ <target name="clean-xtra"
+ description="Clean all other files like .rej, .orig, etc.">
<delete verbose="on">
<fileset dir="." includes="**/.nbattrs,**/*~,**/.#*,**/.DS_Store,**/*.rej,**/*.orig"/>
</delete>
</target>
- <target name="clean-catalina">
+ <target name="clean-catalina"
+ description="Clean Catalina data in runtime/catalina/work">
<subant target="clean-catalina">
<filelist dir="." files="framework/build.xml"/>
</subant>
</target>
- <target name="download-selenium" description="Download the selenium files">
- <subant target="install-seleniumxml">
- <filelist dir="." files="framework/testtools/build.xml"/>
- </subant>
- </target>
-
- <target name="clean-cache"
- description="Clean the UtilCache file if errors found with old objects in the cache (Java runtime error something like 'local class incompatible')">
+ <target name="clean-cache"
+ description="Clean the UtilCache file if errors found with old objects in the cache (Java runtime error something like 'local class incompatible')">
<property file="framework/base/config/cache.properties"/>
<echo message="NOTICE: deleting ${cache.file.store}.db"/>
<delete file="${cache.file.store}.db" verbose="true"/>
</target>
+ <target name="clean-tempfiles"
+ description="Remove files located in runtime/tempfiles (captcha, etc...)">
+ <subant target="clean-tempfiles">
+ <filelist dir="." files="framework/build.xml"/>
+ </subant>
+ </target>
+
+ <target name="download-selenium"
+ description="Download the selenium files">
+ <subant target="install-seleniumxml">
+ <filelist dir="." files="framework/testtools/build.xml"/>
+ </subant>
+ </target>
+
<target name="tests">
<subant target="tests">
<filelist dir="." files="framework/build.xml"/>
@@ -112,10 +128,12 @@
</fileset>
</subant>
- <subant target="clean" failonerror="${specialpurpose.present}" description="Use failonerror=false in case the specialpurpose directory is not there">
+ <subant target="clean" failonerror="${specialpurpose.present}"
+ description="Use failonerror=false in case the specialpurpose directory is not there">
<filelist dir="." files="specialpurpose/build.xml"/>
</subant>
- <subant target="clean" failonerror="${applications.present}" description="Use failonerror=false in case the applications directory is not there">
+ <subant target="clean" failonerror="${applications.present}"
+ description="Use failonerror=false in case the applications directory is not there">
<filelist dir="." files="applications/build.xml"/>
</subant>
<subant target="clean">
@@ -285,14 +303,16 @@
<!-- Start OFBiz -->
<!-- ================================================================== -->
- <target name="run" description="This will start OFBiz">
+ <target name="run"
+ description="This will start OFBiz">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
- <jvmarg value="${memory.maxpermsize.param}"/>
+ <jvmarg value="${memory.maxpermsize.param}"/>
</java>
</target>
- <target name="run-pos" description="Start the POS (Point of sale) system">
+ <target name="run-pos"
+ description="Start the POS (Point of sale) system">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -378,12 +398,13 @@
<delete file="runtime/tmp/tmpUserLogin.xml"/>
</target>
<target name="create-admin-user-login"
- description="Prompts for a user name, then creates a user login with admin privileges and a temporary password equal to 'ofbiz'; after a succesful login the user will be prompted for a new password.">
+ description="Prompts for a user name, then creates a user login with admin privileges and a temporary password equal to 'ofbiz'. After a succesful login the user will be prompted for a new password.">
<input addproperty="userLoginId" message="Enter user name (log in with the temporary password 'ofbiz'):"/>
<antcall target="load-admin-user-login"/>
</target>
- <target name="run-debug" depends="build" description="Starts OFBiz in debugging mode">
+ <target name="run-debug" depends="build"
+ description="Starts OFBiz in debugging mode">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -394,7 +415,8 @@
<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8091"/>
</java>
</target>
- <target name="run-tests" depends="build" description="Run OFBiz default tests">
+ <target name="run-tests" depends="build"
+ description="Run OFBiz default tests">
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
<jvmarg value="${memory.max.param}"/>
@@ -439,7 +461,8 @@
<arg value="-ant"/>
</java>
</target>
- <target name="run-single-test" description="Run a single test">
+ <target name="run-single-test"
+ description="Run a single test">
<antcall target="_restore-runtime-data"/>
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
@@ -455,7 +478,8 @@
<fileset dir="runtime/logs/test-results" includes="*.xml"/>
</move>
</target>
- <target name="run-single-test-suite" description="Run a single test suite">
+ <target name="run-single-test-suite"
+ description="Run a single test suite">
<antcall target="_restore-runtime-data"/>
<java jar="ofbiz.jar" fork="true">
<jvmarg value="${memory.initial.param}"/>
@@ -466,7 +490,8 @@
<arg value="-suitename=${test.suiteName}"/>
</java>
</target>
- <target name="run-test-list" depends="_setup-separated-test-run" description="Run all configured tests, stopping/starting ofbiz between each test">
+ <target name="run-test-list" depends="_setup-separated-test-run"
+ description="Run all configured tests, stopping/starting ofbiz between each test">
<delete dir="runtime/logs/test-results"/>
<ant antfile="runtime/test-list-build.xml" target="all-tests"/>
</target>
Modified: ofbiz/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/build.xml?rev=831778&r1=831777&r2=831778&view=diff
==============================================================================
--- ofbiz/trunk/framework/build.xml (original)
+++ ofbiz/trunk/framework/build.xml Sun Nov 1 23:02:29 2009
@@ -116,6 +116,12 @@
<delete dir="../runtime/catalina/work"/>
</target>
+ <target name="clean-tempfiles">
+ <delete verbose="on">
+ <fileset dir="../runtime/tempfiles" includes="**/*"/>
+ </delete>
+ </target>
+
<target name="tests">
<subant target="tests">
<filelist refid="test-builds"/>