jstrachan 2002/11/07 00:41:12
Modified: . build-bootstrap.xml
Log:
Applied Jeffrey D. Brekke's patch that fixes the bootstrap process on unix and
removes the cygwin crap thats not really needed for windows users anyways.
Revision Changes Path
1.170 +4 -45 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- build-bootstrap.xml 6 Nov 2002 15:02:54 -0000 1.169
+++ build-bootstrap.xml 7 Nov 2002 08:41:12 -0000 1.170
@@ -176,16 +176,6 @@
<!-- Now we have a functional maven install -->
<chmod file="${maven.home}/bin/maven" perm="+x"/>
- <!-- make sure we run the correct maven script per os -->
- <exec
- executable="cygpath"
- outputproperty="cygwin.home"
- failonerror="false"
- failifexecutionfails="false">
- <arg value="--dos"/>
- <arg value="/"/>
- </exec>
-
<condition property="maven.script" value="maven.bat">
<and>
<os family="windows" />
@@ -193,31 +183,7 @@
</and>
</condition>
<condition property="maven.script" value="maven">
- <and>
<equals arg1="${maven.script}" arg2="$${maven.script}" />
- <isset property="cygwin.home" />
- <isset property="maven.use.cygwin" />
- </and>
- </condition>
-
- <condition property="maven.script.processor" value="${cygwin.home}\bin\sh">
- <and>
- <isset property="cygwin.home" />
- <isset property="maven.use.cygwin" />
- </and>
- </condition>
- <condition property="maven.script.processor"
value="${maven.home}/bin/${maven.script}">
- <equals arg1="${maven.script.processor}" arg2="$${maven.script.processor}" />
- </condition>
-
- <condition property="maven.script.arg" value="${maven.home}/bin/maven">
- <and>
- <isset property="cygwin.home" />
- <isset property="maven.use.cygwin" />
- </and>
- </condition>
- <condition property="maven.script.arg" value="">
- <equals arg1="${maven.script.arg}" arg2="$${maven.script.arg}" />
</condition>
<echo>
@@ -226,15 +192,10 @@
| B U I L D I N G T H E R E A C T O R |
| |
+------------------------------------------------------------------+
+About to execute Maven via ${maven.script}
</echo>
- <echo>
-About to execute Maven via
-${maven.script.processor} ${maven.script.arg}
- </echo>
-
- <exec executable="${maven.script.processor}" failonerror="true">
- <arg value="${maven.script.arg}"/>
+ <exec executable="${maven.script}" failonerror="true">
<arg value="${maven.bootstrap.online}"/>
<arg value="maven:reactor-install"/>
</exec>
@@ -253,8 +214,7 @@
+------------------------------------------------------------------+
</echo>
- <exec executable="${maven.script.processor}" failonerror="true">
- <arg value="${maven.script.arg}"/>
+ <exec executable="${maven.script}" failonerror="true">
<arg value="${maven.bootstrap.online}"/>
<arg value="maven:plugins-build"/>
</exec>
@@ -321,8 +281,7 @@
+------------------------------------------------------------------+
</echo>
- <exec executable="${maven.script.processor}" failonerror="true">
- <arg value="${maven.script.arg}"/>
+ <exec executable="${maven.script}" failonerror="true">
<arg value="${maven.bootstrap.online}"/>
<arg value="clean"/>
<arg value="java:jar"/>
--
To unsubscribe, e-mail: <mailto:turbine-maven-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:turbine-maven-dev-help@;jakarta.apache.org>
