jdillon 2003/08/25 08:41:19
Modified: . maven.xml
Log:
o Fix CRLF for windows scripts
Revision Changes Path
1.25 +27 -4 incubator-geronimo/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/incubator-geronimo/maven.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- maven.xml 24 Aug 2003 17:35:55 -0000 1.24
+++ maven.xml 25 Aug 2003 15:41:19 -0000 1.25
@@ -207,8 +207,31 @@
<!-- Cleanse some stuff -->
<u:available file="${aggregate.dir}/bin">
- <chmod dir="${aggregate.dir}/bin" perm="ugo+rx" includes="*"/>
- <chmod dir="${aggregate.dir}/bin" perm="ugo-x" includes="*.bat"/>
+ <!-- Fix permissions -->
+ <chmod perm="ugo+x">
+ <fileset dir="${aggregate.dir}/bin">
+ <include name="*"/>
+ <exclude name="*.bat"/>
+ <exclude name="*.cmd"/>
+ </fileset>
+ </chmod>
+ <chmod perm="ugo-x">
+ <fileset dir="${aggregate.dir}/bin">
+ <include name="*.bat"/>
+ <include name="*.cmd"/>
+ </fileset>
+ </chmod>
+
+ <!-- Fix CRLF -->
+ <fixcrlf srcdir="${aggregate.dir}/bin" eol="lf" eof="remove">
+ <include name="*"/>
+ <exclude name="*.bat"/>
+ <exclude name="*.cmd"/>
+ </fixcrlf>
+ <fixcrlf srcdir="${aggregate.dir}/bin" eol="crlf">
+ <include name="*.bat"/>
+ <include name="*.cmd"/>
+ </fixcrlf>
</u:available>
</goal>
@@ -343,8 +366,8 @@
<pathelement location="${run.dir}/lib/forehead-SNAPSHOT.jar"/>
</classpath>
- <sysproperty key="program.name" value="maven:run"/>
<sysproperty key="forehead.conf.file"
value="${run.dir}/etc/forehead.conf"/>
+ <sysproperty key="program.name" value="maven:run"/>
<sysproperty key="twiddle.home" value="${run.dir}"/>
<arg value="geronimo/start"/>
