plynch 2002/10/28 02:04:55
Modified: . build-bootstrap.xml
Log:
o applying Tom Palmer's ([EMAIL PROTECTED]) patch for bootstrapping under cygwin by
using maven.sh instead of maven.bat.
Works good except maven.bat remains hosed for me :(
Revision Changes Path
1.167 +32 -3 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- build-bootstrap.xml 23 Oct 2002 07:47:55 -0000 1.166
+++ build-bootstrap.xml 28 Oct 2002 10:04:55 -0000 1.167
@@ -177,16 +177,42 @@
<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" />
<equals arg1="${maven.script}" arg2="$${maven.script}" />
+ <not>
+ <isset property="cygwin.home" />
+ </not>
</and>
</condition>
<condition property="maven.script" value="maven">
<equals arg1="${maven.script}" arg2="$${maven.script}" />
</condition>
+ <condition property="maven.script.processor" value="${cygwin.home}\bin\sh">
+ <isset property="cygwin.home" />
+ </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.script}">
+ <isset property="cygwin.home" />
+ </condition>
+ <condition property="maven.script.arg" value="">
+ <equals arg1="${maven.script.arg}" arg2="$${maven.script.arg}" />
+ </condition>
+
<echo>
+------------------------------------------------------------------+
| |
@@ -195,7 +221,8 @@
+------------------------------------------------------------------+
</echo>
- <exec executable="${maven.home}/bin/${maven.script}" failonerror="true">
+ <exec executable="${maven.script.processor}" failonerror="true">
+ <arg line="${maven.script.arg}"/>
<arg line="${maven.bootstrap.online}"/>
<arg line="maven:reactor-install"/>
</exec>
@@ -214,7 +241,8 @@
+------------------------------------------------------------------+
</echo>
- <exec executable="${maven.home}/bin/${maven.script}" failonerror="true">
+ <exec executable="${maven.script.processor}" failonerror="true">
+ <arg line="${maven.script.arg}"/>
<arg line="${maven.bootstrap.online}"/>
<arg line="maven:plugins-build"/>
</exec>
@@ -281,7 +309,8 @@
+------------------------------------------------------------------+
</echo>
- <exec executable="${maven.home}/bin/${maven.script}" failonerror="true">
+ <exec executable="${maven.script.processor}" failonerror="true">
+ <arg line="${maven.script.arg}"/>
<arg line="${maven.bootstrap.online}"/>
<arg line="clean"/>
<arg line="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>
