brett 2004/12/07 02:12:49
Modified: . Tag: MAVEN-1_0-BRANCH maven.xml
Log:
tweak touchstone to a more appropriate time
Revision Changes Path
No revision
No revision
1.97.2.36 +19 -31 maven/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven/maven.xml,v
retrieving revision 1.97.2.35
retrieving revision 1.97.2.36
diff -u -r1.97.2.35 -r1.97.2.36
--- maven.xml 3 Dec 2004 20:50:55 -0000 1.97.2.35
+++ maven.xml 7 Dec 2004 10:12:49 -0000 1.97.2.36
@@ -26,43 +26,12 @@
<ant:filter token="pom.currentVersion" value="${pom.currentVersion}" />
</preGoal>
- <goal name="maven:init">
- <j:choose>
- <j:when test="${systemScope['os.name'].startsWith('Windows')}">
- <j:set var="maven.bin.script" value="${maven.home}/bin/maven.bat"/>
- </j:when>
- <j:otherwise>
- <j:set var="maven.bin.script" value="${maven.home}/bin/maven"/>
- </j:otherwise>
- </j:choose>
- </goal>
-
<postGoal name="site">
<ant:mkdir dir="${maven.docs.dest}/xsd" />
<ant:copy tofile="${maven.docs.dest}/xsd/maven-project-3.0.0.xsd"
file="${basedir}/src/xsd/maven-project.xsd" />
<attainGoal name="pdf"/>
</postGoal>
- <!-- ================================================================== -->
- <!-- T O U C H S T O N E B U I L D -->
- <!-- ================================================================== -->
- <!-- This runs as part of the standard runtime testing in Maven. It is -->
- <!-- a build that tries to exercise as many of Maven's features as -->
- <!-- possible. -->
- <!-- ================================================================== -->
-
- <postGoal name="test:test">
-
- <echo>maven.mode.online = ${maven.mode.online}</echo>
-
- <j:if test="${maven.mode.online}">
- <j:if test="${context.getVariable('maven.touchstone.skip') != 'true'}">
- <echo>We are online so the touchstone will be run ... </echo>
- <attainGoal name="maven:run-touchstone" />
- </j:if>
- </j:if>
- </postGoal>
-
<goal name="maven:run-touchstone">
<maven:maven
descriptor="${basedir}/src/test/touchstone-build/project.xml"
@@ -197,6 +166,25 @@
todir="${installerDir}/plugins"
/>
</x:forEach>
+
+ <ant:echo>Running touchstone against the new Maven install...</ant:echo>
+ <j:choose>
+ <j:when test="${systemScope['os.name'].startsWith('Windows')}">
+ <j:set var="maven.bin.script" value="${installerDir}/bin/maven.bat"/>
+ </j:when>
+ <j:otherwise>
+ <j:set var="maven.bin.script" value="${installerDir}/bin/maven"/>
+ </j:otherwise>
+ </j:choose>
+ <ant:exec
+ executable="${maven.bin.script}"
+ failonerror="true">
+ <ant:arg value="-Dmaven.home=${installerDir}" />
+ <ant:arg value="-Dmaven.home.local=${maven.build.dir}/home-local"/>
+ <ant:arg value="-Dmaven.repo.local=${maven.repo.local}"/>
+ <ant:arg value="maven:run-touchstone"/>
+ <ant:arg value="-e"/>
+ </ant:exec>
<!-- Temporarily disabled - we cannot release this at Apache due to GPL
libraries included
<attainGoal name="maven:build-seed-repo" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
