On Thursday 11 September 2003 05:48, Stephen McConnell wrote:
> I have just updated the maven.xml file in the merlin project to include
> the following:
>
> <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>
Good thinking.
Find attached a patch of additional processing one should do;
1. I would recommend that permissions on files are that groups don't get write
access to the scripts. This could be debated.
2. Explicit (=rwx) settings of permission flags is better than adding (+rx).
3. All Windows files also get fixcrlf, in case the binaries are built on
Linux/Unix.
4. Shared text files have CRLF, because typically Linux/Unix handles the extra
CR better than Windows handles the missing CR.
Cheers.
Niclas
P.S. What is the preferred patch format. The attachment is
cvs -q diff maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvspublic/avalon-sandbox/merlin/maven.xml,v
retrieving revision 1.60
diff -r1.60 maven.xml
141,143c141,158
< <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:chmod file="${merlin.build.inst.dir}/bin/merlin.sh" perm="u=rwx,go=rx"/>
> <ant:chmod file="${merlin.build.inst.dir}/bin/merlinx.sh" perm="u=rwx,go=rx"/>
> <ant:chmod file="${merlin.build.inst.dir}/bin/merlin-server.sh" perm="u=rwx,go=rx"/>
> <ant:fixcrlf eol="crlf" srcdir="${merlin.build.inst.dir}/bin">
> <include name="README.TXT"/>
> </ant:fixcrlf>
> <ant:fixcrlf eol="crlf" srcdir="${merlin.build.inst.dir}/bin">
> <include name="merlin.bat"/>
> <include name="merlinx.bat"/>
> <include name="README.TXT"/>
> <include name="LICENSE.TXT"/>
> </ant:fixcrlf>
> <ant:fixcrlf eol="crlf" srcdir="${merlin.build.inst.dir}/bin/nt">
> <include name="InstallService-NT.bat"/>
> <include name="UninstallService-NT.bat"/>
> <include name="TANUKISOFTWARE_LICENSE.txt"/>
> <include name="wrapper.conf"/>
> </ant:fixcrlf>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
