mcconnell 2003/09/10 14:34:31
Modified: merlin maven.xml
Log:
Fix the CRLF issue on the .sh scripts.
Revision Changes Path
1.60 +11 -4 avalon-sandbox/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/maven.xml,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- maven.xml 10 Sep 2003 20:14:58 -0000 1.59
+++ maven.xml 10 Sep 2003 21:34:30 -0000 1.60
@@ -64,8 +64,8 @@
ignoreFailures="false" />
</goal>
- <goal name="merlin:build" description="Build Merlin." >
+ <goal name="merlin:build" description="Build Merlin." >
<!-- build the subprojects -->
<maven:reactor basedir="${basedir}"
includes="**/project.xml"
@@ -73,14 +73,16 @@
goals="jar:install"
banner="Installing:"
ignoreFailures="false" />
-
<attainGoal name="merlin:plugin"/>
-
</goal>
+
<goal name="merlin:install"
- description="Build the Merlin distribution." prereqs="merlin:build">
+ description="Build the Merlin distribution." prereqs="merlin:build,xinstall"/>
+
+ <goal name="xinstall">
+ <!-- prepare structure -->
<ant:mkdir dir="${merlin.build.inst.dir}"/>
<ant:mkdir dir="${merlin.build.inst.dir}/ext"/>
<ant:mkdir dir="${merlin.build.inst.dir}/bin/lib"/>
@@ -139,6 +141,11 @@
<ant:chmod file="${merlin.build.inst.dir}/bin/merlin.sh" perm="ugo+rx"/>
<ant:chmod file="${merlin.build.inst.dir}/bin/merlinx.sh" perm="ugo+rx"/>
<ant:chmod file="${merlin.build.inst.dir}/bin/merlin-server.sh" perm="ugo+rx"/>
+ <ant:fixcrlf eol="lf" srcdir="${merlin.build.inst.dir}/bin">
+ <include name="merlin.sh"/>
+ <include name="merlinx.sh"/>
+ <include name="merlin-server.sh"/>
+ </ant:fixcrlf>
<ant:copy toDir="${maven.build.dir}">
<fileset dir="${basedir}">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
