tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Filip Hanik - Dev Lists <devli...@hanik.com>
Subject Re: DOS-Lineends in many files contained in distribution tar.gz
Date Sat, 26 Jan 2008 13:18:50 GMT
Rainer Jung wrote:
> Hi Filip,
>
> Filip Hanik - Dev Lists schrieb:
>> what effect do the line endings actually have, from a functionality 
>> point?
>
> It's more the human factor. I expect none of the mentioned files to 
> fail fatally with DOS style on Unix. On the other hand some of those 
> are also explicitely for humans and I find it very dirty to provide a 
> tar.gz download with DOS text files in it.
>
> Maybe more convincing: the way we do it provides Unix style LICENSE 
> and NOTICE file inside the deployer ZIP. So our procedure really is 
> broken.
>
> Bill Wrowe's approach seems to be easy. Fix once the props in svn and 
> then do two release builds, one based on a DOS style checkout, and 
> another one based on a Unix style checkout. It would allow an easier 
> dist.xml and still better release files.
that'd be a real pain, and I would stay away from it.
the beauty with java is that we can compile it once, and the same 
release for all platforms. I'd -1 building on separate platforms just 
cause human factor line endings.
>
>> only if it affects the distro in a negative way would I actually go 
>> through all this trouble. but I haven't had any problems so far, and 
>> we are on all kinds of platforms
>
> It depends on your definition of problem: users say: "We downloaded 
> the Unix tarball and there are mostly Windows files in there. What 
> went wrong with your release?".
not sure I follow, is there something that doesn't work?
>
>
> Regards,
>
> Rainer
>
>> Filip
>>
>> Rainer Jung wrote:
>>> Hello,
>>>
>>> no unfortunately I don't expect the patch to work. The fixcrlf is 
>>> done before packaging and in the dist.xml the various packagings 
>>> (dist, deployer, source, ...) are included in alternating platform 
>>> order, so first dist Win, then dist Unix, then deployer Win, then 
>>> deployer Unix and so on. If we change the line endings for some 
>>> deliverable to unix, we can't use the files later in another Win 
>>> deliverable.
>>>
>>> Example: Look at the 6.0.14 deployer zip. The LICENSE file included 
>>> has unix line ends, because it got "fixed" for inclusion in the unix 
>>> core distro before the Win deployer zip was produced.
>>>
>>> So we either:
>>>
>>> - reorder the targets underneath "release" (Windows first and Unix 
>>> afterwards (which then would make release builds on a windows system 
>>> OK, but not on a unix system). Then the default target works, but 
>>> calling the dist.xml with other targets alternating between target 
>>> platforms without clean in between would produce buggy deliverables.
>>>
>>> If we reorder, we need to check, if there are side effects between 
>>> the tasks, s.t. reordering breaks the release build.
>>>
>>> - cleanup and prepare for each of the targets underneath or "release".
>>>
>>> Either way, since in the source tgz target there is already an 
>>> exclude list, I would prefer to update that exclude list and use the 
>>> same one whereever possible, so something like:
>>>
>>> ===================================================================
>>> --- dist.xml    (revision 608958)
>>> +++ dist.xml    (working copy)
>>> @@ -560,8 +560,12 @@
>>>
>>>    <!-- Packages the core tar.gz distro -->
>>>    <target name="package-tgz">
>>> -    <fixcrlf srcdir="${tomcat.dist}" 
>>> includes="*.txt,LICENSE,NOTICE" eol="lf"/>
>>> +
>>> +    <fixcrlf srcdir="${tomcat.dist}" 
>>> includes="*.txt,LICENSE,NOTICE,RELEASE-NOTES" eol="lf"/>
>>> +    <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.xml" eol="lf"/>
>>>      <fixcrlf srcdir="${tomcat.dist}/conf" eol="lf"/>
>>> +    <fixcrlf srcdir="${tomcat.dist}/webapps"
>>> + 
>>> excludes="**/*.jar,**/*.classes,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.pdf,**/*.war"

>>> eol="lf"/>
>>>      <tar longfile="gnu" compression="gzip"
>>>           
>>> tarfile="${tomcat.release}/v${version}/bin/${final.name}.tar.gz">
>>>        <tarfileset dir="${tomcat.dist}" mode="755" 
>>> prefix="${final.name}">
>>> @@ -711,7 +715,7 @@
>>>    <!-- Packages the source code distribution in tar.gz format -->
>>>    <target name="package-src-tgz">
>>>         <fixcrlf srcdir="${tomcat.dist}/src"
>>> -     
>>> excludes="**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.war" 
>>> eol="lf"/>
>>> + 
>>> excludes="**/*.jar,**/*.classes,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.pdf,**/*.war"

>>> eol="lf"/>
>>>      <tar longfile="gnu" compression="gzip"
>>>
>>> tarfile="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz">
>>>        <tarfileset dir="${tomcat.dist}/src" 
>>> prefix="${final-src.name}" />
>>>
>>> But I think we first have to correct the ordering issue.
>>>
>>> However I'm not sure, if I should go into it, because I'm not the 
>>> biggest ant guy :)
>>>
>>> Remy: Since you are the RM of 6.0: are you going into this topic, or 
>>> should we try to solve it?
>>>
>>> Regards,
>>>
>>> Rainer
>>>
>>>
>>> Peter Rossbach wrote:
>>>> Hi Rainer,
>>>>
>>>> +1..
>>>>
>>>>
>>>> Is it fix with followig patch?
>>>> ===
>>>> Index: tomcat60/dist.xml
>>>> ===================================================================
>>>> --- /tomcat60/dist.xml    (Revision 613549)
>>>> +++ tomcat/tomcat60/dist.xml    (Arbeitskopie)
>>>> @@ -561,6 +561,22 @@
>>>>    <target name="package-tgz">
>>>>      <fixcrlf srcdir="${tomcat.dist}" 
>>>> includes="*.txt,LICENSE,NOTICE" eol="lf"/>
>>>>      <fixcrlf srcdir="${tomcat.dist}/conf" eol="lf"/>
>>>> +    <fixcrlf srcdir="${tomcat.dist}/webapps" eol="lf">
>>>> +        <include name="**/*.html" />
>>>> +        <include name="**/*.java" />
>>>> +        <include name="**/*.jsp" />
>>>> +        <include name="**/*.txt" />
>>>> +        <include name="**/*.properties" />
>>>> +        <include name="**/*.tag" />
>>>> +        <include name="**/*.tld" />
>>>> +        <include name="**/*.jspf" />
>>>> +        <include name="**/*.jspx" />
>>>> +        <include name="**/*.svg" />
>>>> +        <include name="**/*.xsd" />
>>>> +        <include name="**/*.xml" />
>>>> +        <include name="**/*.xsl" />
>>>> +        <include name="**/*.mdl" />
>>>> +    </fixcrlf>
>>>>      <tar longfile="gnu" compression="gzip"
>>>>           
>>>> tarfile="${tomcat.release}/v${version}/bin/${final.name}.tar.gz">
>>>>        <tarfileset dir="${tomcat.dist}" mode="755" 
>>>> prefix="${final.name}">
>>>> ==
>>>>
>>>> Peter
>>>>
>>>>
>>>> Am 25.01.2008 um 01:47 schrieb Rainer Jung:
>>>>
>>>>> Hi,
>>>>>
>>>>> I stumbled today over DOS line endings in the web.xml file of the 
>>>>> manager contained in TC 6.0.14 tar.gz download.
>>>>>
>>>>> A little check reveals, that the following files have DOS line 
>>>>> endings, although the tar.gz is supposed to use Unix convention 
>>>>> were appropriate:
>>>>>
>>>>> - RELEASE-NOTES
>>>>> - bin/catalina-tasks.xml
>>>>>
>>>>> and in webapps all files with suffixes:
>>>>>
>>>>> Count Suffix
>>>>>  286 html
>>>>>   46 java
>>>>>   48 jsp
>>>>>   12 txt
>>>>>   11 xml
>>>>>    5 properties
>>>>>    4 tag
>>>>>    3 tld
>>>>>    2 jspf
>>>>>    2 jspx
>>>>>    2 svg
>>>>>    1 xsd
>>>>>    1 xsl
>>>>>    1 mdl
>>>>>
>>>>> All of those suffixes under webapps always have DOS lineendings 
>>>>> (one file even has mixed ending: webapps/manager/sessionDetail.jsp 
>>>>> misses the ^M in the last line).
>>>>>
>>>>> I don't know if dist.xml is actually used for packaging. It uses 
>>>>> fixcrlf for a couple of files (mainly *.sh, *.txt, conf/*, some 
>>>>> [A-Z]*) but it would be nice, if we would also transform the above 
>>>>> mentioned.
>>>>>
>>>>> Regards,
>>>>>
>>>>> Rainer
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message