You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@avalon.apache.org by Stephen McConnell <mc...@apache.org> on 2003/09/10 23:48:04 UTC
[merlin] build suppliment
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>
Could someone confirrm that the .sh files after processing though the
install are ok.
The quick way to test this if you already have an installation built is
to invoke the following internal goal:
$ maven xinstall
The .sh file in target/merlin/bin should be ok (in principal).
Steve.
--
Stephen J. McConnell
mailto:mcconnell@apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org
Re: [merlin] build suppliment
Posted by Niclas Hedhman <ni...@hedhman.org>.
On Thursday 11 September 2003 06:04, Stephen McConnell wrote:
> I've also updated the <short-description> on the
> composition-imp package to be a little shorter than what it was (just to
> be on the safe side).
I saw that, and I think the culprit was NOT the length BUT the whitespace.
<shortDescription>
An API supporting component composition.
</shortDescription>
This is what it used to be!
And looking at snippet of the Manifest I used to have;
Specification-Vendor: Apache Software Foundation^M
Specification-Title:
An API supporting component composition.
^M
Implementation-Version: 1.0^M
The CR is added by Maven, but the LF from the XML file is actually present in
the Manifest. So I am pretty sure it is not length related, but whitespace
related, and could exlain a bit the differences (diff XML parsers).
Cheers.
Niclas
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org
Re: [merlin] build suppliment
Posted by Stephen McConnell <mc...@apache.org>.
Alexis Agahi wrote:
>On Wednesday 10 September 2003 23: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>
>>
>>Could someone confirrm that the .sh files after processing though the
>>install are ok.
>>
>>
>
>confirmed
>
Good. This should means that all of the ity-bitty-platform-issues are
resolved. I've also updated the <short-description> on the
composition-imp package to be a little shorter than what it was (just to
be on the safe side).
Steve.
--
Stephen J. McConnell
mailto:mcconnell@apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org
Re: [merlin] build suppliment
Posted by Alexis Agahi <al...@users.sf.net>.
On Wednesday 10 September 2003 23: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>
>
> Could someone confirrm that the .sh files after processing though the
> install are ok.
confirmed
ok
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org
Re: [merlin] build suppliment
Posted by Stephen McConnell <mc...@apache.org>.
Niclas Hedhman wrote:
>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.
>
>
Applied.
>
>Cheers.
>Niclas
>
>P.S. What is the preferred patch format.
>
Preferred format for dealing with patches is to nominate the offending
provider as a committer then make em do their own dirty work ;-)
>The attachment is
>cvs -q diff maven.xml
>
Its fine.
Steve.
>------------------------------------------------------------------------
>
>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: dev-unsubscribe@avalon.apache.org
>For additional commands, e-mail: dev-help@avalon.apache.org
>
--
Stephen J. McConnell
mailto:mcconnell@apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org
Re: [merlin] build suppliment
Posted by Niclas Hedhman <ni...@hedhman.org>.
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