leosimons 2004/04/26 14:30:45
Modified: . build.xml
buildsystem/jbs build-project.xml
Log:
compiles and installs jars from scratch in a minute or two over here, less
than a minute when run like this on a rerun
ant -q -Ddo.not.test=true -Ddo.not.download=true
Revision Changes Path
1.214 +1 -1 avalon-excalibur/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/build.xml,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- build.xml 26 Apr 2004 13:49:43 -0000 1.213
+++ build.xml 26 Apr 2004 21:30:45 -0000 1.214
@@ -42,11 +42,11 @@
fortress/container-api/
fortress/container-impl/
+ fortress/bean/
fortress/container-test/
fortress/migration/
fortress/meta/
fortress/examples/
- fortress/bean/
"/>
<filelist id="subprojects.filelist" dir="." files="${subprojects}"/>
1.3 +19 -12 avalon-excalibur/buildsystem/jbs/build-project.xml
Index: build-project.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/buildsystem/jbs/build-project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-project.xml 26 Apr 2004 13:59:29 -0000 1.2
+++ build-project.xml 26 Apr 2004 21:30:45 -0000 1.3
@@ -157,7 +157,7 @@
<target name="jbs:compile"
depends="jbs:java-compile"/>
<target name="jbs:test"
- depends="jbs:java-test-compile, jbs:java-test,
jbs:java-test-reports"/>
+ depends="jbs:java-test-compile, jbs:java-test"/>
<target name="jbs:jar" unless="no.source.dir"
depends="jbs:java-compile, jbs:java-test, jbs:bin-jar">
@@ -259,7 +259,7 @@
</javac>
</target>
- <target name="jbs:java-test-compile" if="test.src.present"
+ <target name="jbs:java-test-compile" if="test.src.present"
unless="do.not.test"
depends="jbs:init, jbs:java-compile">
<echo>=======================================================================
Compiling Tests for ${project.name}
@@ -283,7 +283,7 @@
</javac>
</target>
- <target name="jbs:java-test" if="test.src.present"
+ <target name="jbs:java-test" if="test.src.present" unless="do.not.test"
depends="jbs:init, jbs:java-test-compile">
<echo>=======================================================================
Running tests for ${project.name}
@@ -319,7 +319,7 @@
</junit>
</target>
- <target name="jbs:java-test-reports" if="test.src.present"
+ <target name="jbs:java-test-reports" if="test.src.present"
unless="do.not.test"
depends="jbs:init, jbs:java-test">
<echo>=======================================================================
Generating test reports for ${project.name}
@@ -335,7 +335,7 @@
</junitreport>
</target>
- <target name="jbs:bin-jar" if="java.src.present"
+ <target name="jbs:bin-jar" if="java.src.present" unless="do.not.test"
depends="jbs:init, jbs:compile, jbs:test">
<echo>=======================================================================
Generating jar for ${project.name}
@@ -376,7 +376,7 @@
</javadoc>
</target>
- <target name="jbs:clover" if="test.src.present"
+ <target name="jbs:clover" if="test.src.present" unless="do.not.test"
depends="jbs:init">
<echo>=======================================================================
Generating clover report for ${project.name}
@@ -524,12 +524,17 @@
<![CDATA[
if( project.getProperty("dependencies.file.available") != null )
{
- msg =
"=======================================================================\n";
- msg += " Downloading dependencies for " +
project.getProperty("project.name") + "\n";
- msg +=
"=======================================================================\n";
- echo = project.createTask("echo");
- echo.setMessage( msg );
- echo.execute();
+ skipAllDownloads = project.getProperty("do.not.download");
+
+ if(skipAllDownloads == null)
+ {
+ msg =
"=======================================================================\n";
+ msg += " Downloading dependencies for " +
project.getProperty("project.name") + "\n";
+ msg +=
"=======================================================================\n";
+ echo = project.createTask("echo");
+ echo.setMessage( msg );
+ echo.execute();
+ }
importClass(java.lang.System);
importClass(java.lang.Character);
@@ -601,6 +606,8 @@
if( !file.exists() )
doDownload = true;
}
+
+ if(skipAllDownloads != null) doDownload = false;
if(doDownload)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
