You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2010/01/14 21:21:25 UTC
svn commit: r899395 - /tomcat/trunk/dist.xml
Author: markt
Date: Thu Jan 14 20:21:23 2010
New Revision: 899395
URL: http://svn.apache.org/viewvc?rev=899395&view=rev
Log:
zip is for non-windows platforms
Modified:
tomcat/trunk/dist.xml
Modified: tomcat/trunk/dist.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/dist.xml?rev=899395&r1=899394&r2=899395&view=diff
==============================================================================
--- tomcat/trunk/dist.xml (original)
+++ tomcat/trunk/dist.xml Thu Jan 14 20:21:23 2010
@@ -391,8 +391,8 @@
<!-- Packages the core zip distro -->
<target name="package-zip">
- <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="crlf" encoding="ISO-8859-1" fixlast="false" />
- <fixcrlf srcdir="${tomcat.dist}/conf" eol="crlf" encoding="ISO-8859-1" fixlast="false" />
+ <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf" encoding="ISO-8859-1" fixlast="false" />
+ <fixcrlf srcdir="${tomcat.dist}/conf" eol="lf" encoding="ISO-8859-1" fixlast="false" />
<zip zipfile="${tomcat.release}/v${version}/bin/${final.name}.zip">
<zipfileset dir="${tomcat.dist}" prefix="${final.name}">
<include name="bin/**"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r899395 - /tomcat/trunk/dist.xml
Posted by Mladen Turk <mt...@apache.org>.
On 01/15/2010 05:21 PM, Rainer Jung wrote:
>
>> Also the tar produced by ant doesn't look at all
>> like the one produced by gtar.
>> Think the problem is that we should add all files
>> at once during the build since it looks the tar has
>> multiple header sections or something.
>
> I never had problems extracting the Tomcat ant tarballs with gtar ...
>
No that's fine, it works, although some GUI
archive viewers show wired content.
(e.g. double package directory, no .sh files, etc...)
This probably comes from the fact the tar is created
incrementally, and those tools only parse the
initial header.
Cheers
--
^TM
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r899395 - /tomcat/trunk/dist.xml
Posted by Rainer Jung <ra...@kippdata.de>.
On 15.01.2010 16:06, Mladen Turk wrote:
> Although some platforms have broken(limited) default tar.
> Dunno if we are using very long paths that would break tar
> on Solaris (eg. +100 character path names)
Yes, src, bin and fulldocs tarballs include longer path names then 100
chars.
OTOH even the most traditional Solaris admin got used to using gtar
instead of Solaris tar when unpacking non-Sun downloads. Sun even ships
it e.g. with Solaris 10 as /usr/sfw/bin/gtar in package SUNWgtar.
> Also the tar produced by ant doesn't look at all
> like the one produced by gtar.
> Think the problem is that we should add all files
> at once during the build since it looks the tar has
> multiple header sections or something.
I never had problems extracting the Tomcat ant tarballs with gtar ...
Regards,
Rainer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r899395 - /tomcat/trunk/dist.xml
Posted by Mladen Turk <mt...@apache.org>.
On 01/15/2010 03:41 PM, Rainer Jung wrote:
> On 14.01.2010 21:21, markt@apache.org wrote:
>> Author: markt
>> Date: Thu Jan 14 20:21:23 2010
>> New Revision: 899395
>>
>> URL: http://svn.apache.org/viewvc?rev=899395&view=rev
>> Log:
>> zip is for non-windows platforms
>
> Hmmm, really?
>
> Until recently we didn't have the individual binary release zips for
> Windows, they are new. Previously the zip was for DOS/Windows.
>
> If we encode the package-zip now for Unix, don't we create confusion
> w.r.t. package-src-zip (DOS) and package-deployer-zip (undefined until
> now)?
>
> I'd prefer keep the package-zip with CRLF (and ensure CRLF in
> package-deployer-zip too).
>
+1
Although some platforms have broken(limited) default tar.
Dunno if we are using very long paths that would break tar
on Solaris (eg. +100 character path names)
Also the tar produced by ant doesn't look at all
like the one produced by gtar.
Think the problem is that we should add all files
at once during the build since it looks the tar has
multiple header sections or something.
Regards
--
^TM
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r899395 - /tomcat/trunk/dist.xml
Posted by Filip Hanik - Dev Lists <de...@hanik.com>.
On 01/15/2010 08:41 AM, Mark Thomas wrote:
> On 15/01/2010 15:13, Mladen Turk wrote:
>
>> On 01/15/2010 03:41 PM, Rainer Jung wrote:
>>
>>> On 14.01.2010 21:21, markt@apache.org wrote:
>>>
>>> I'd prefer keep the package-zip with CRLF (and ensure CRLF in
>>> package-deployer-zip too).
>>>
>>>
>> Just to update.
>> Since beginning of time httpd has x.x-win32-src.zip
>> We could have something like that as well instead relaying
>> on arch extension for CRLF type.
>>
that actually makes more sense, I'd be +1 for that.
> Something to think about for Tomcat 7.
>
> Mark
>
>
>
> ---------------------------------------------------------------------
> 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
Re: svn commit: r899395 - /tomcat/trunk/dist.xml
Posted by Mark Thomas <ma...@apache.org>.
On 15/01/2010 15:56, Mladen Turk wrote:
> On 01/15/2010 04:41 PM, Mark Thomas wrote:
>> On 15/01/2010 15:13, Mladen Turk wrote:
>>> On 01/15/2010 03:41 PM, Rainer Jung wrote:
>>>> On 14.01.2010 21:21, markt@apache.org wrote:
>>>>
>>>> I'd prefer keep the package-zip with CRLF (and ensure CRLF in
>>>> package-deployer-zip too).
>>>>
>>>
>>> Just to update.
>>> Since beginning of time httpd has x.x-win32-src.zip
>>> We could have something like that as well instead relaying
>>> on arch extension for CRLF type.
>>
>> Something to think about for Tomcat 7.
>>
>
> Sure.
>
> Anyhow, I might just gave +1 prematurely on Rainer's
> .zip == CRLF presumption.
>
> I see 6.0.20 has LF line endings in src.zip, so IMO
> we should stick with that. Other would mean a sudden surprise
> to the end users.
That is a bug we should have caught in 6.0.20 but didn't.
Historically .zip has had CRLF line endings and .tar.gz LF. That worked
if you built on Windows but didn't if you built on unix so when Remy
switched from Windows to unix for the build stuff broke but we didn't
catch all of it.
There have been a series of changes recently to fix all of that and I
think (once the current patches are applied) we should be in a position
where you can build on Windows and unix and get the same result.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r899395 - /tomcat/trunk/dist.xml
Posted by Mladen Turk <mt...@apache.org>.
On 01/15/2010 04:41 PM, Mark Thomas wrote:
> On 15/01/2010 15:13, Mladen Turk wrote:
>> On 01/15/2010 03:41 PM, Rainer Jung wrote:
>>> On 14.01.2010 21:21, markt@apache.org wrote:
>>>
>>> I'd prefer keep the package-zip with CRLF (and ensure CRLF in
>>> package-deployer-zip too).
>>>
>>
>> Just to update.
>> Since beginning of time httpd has x.x-win32-src.zip
>> We could have something like that as well instead relaying
>> on arch extension for CRLF type.
>
> Something to think about for Tomcat 7.
>
Sure.
Anyhow, I might just gave +1 prematurely on Rainer's
.zip == CRLF presumption.
I see 6.0.20 has LF line endings in src.zip, so IMO
we should stick with that. Other would mean a sudden surprise
to the end users.
Cheers
--
^TM
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r899395 - /tomcat/trunk/dist.xml
Posted by Mark Thomas <ma...@apache.org>.
On 15/01/2010 15:13, Mladen Turk wrote:
> On 01/15/2010 03:41 PM, Rainer Jung wrote:
>> On 14.01.2010 21:21, markt@apache.org wrote:
>>
>> I'd prefer keep the package-zip with CRLF (and ensure CRLF in
>> package-deployer-zip too).
>>
>
> Just to update.
> Since beginning of time httpd has x.x-win32-src.zip
> We could have something like that as well instead relaying
> on arch extension for CRLF type.
Something to think about for Tomcat 7.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r899395 - /tomcat/trunk/dist.xml
Posted by Mladen Turk <mt...@apache.org>.
On 01/15/2010 03:41 PM, Rainer Jung wrote:
> On 14.01.2010 21:21, markt@apache.org wrote:
>
> I'd prefer keep the package-zip with CRLF (and ensure CRLF in
> package-deployer-zip too).
>
Just to update.
Since beginning of time httpd has x.x-win32-src.zip
We could have something like that as well instead relaying
on arch extension for CRLF type.
Regards
--
^TM
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r899395 - /tomcat/trunk/dist.xml
Posted by Mark Thomas <ma...@apache.org>.
On 15/01/2010 14:41, Rainer Jung wrote:
> On 14.01.2010 21:21, markt@apache.org wrote:
>> Author: markt
>> Date: Thu Jan 14 20:21:23 2010
>> New Revision: 899395
>>
>> URL: http://svn.apache.org/viewvc?rev=899395&view=rev
>> Log:
>> zip is for non-windows platforms
>
> Hmmm, really?
I believe so yes. Going back to the original thread [1] it was for
platforms with limited default tar implementations (like Solaris).
> Until recently we didn't have the individual binary release zips for
> Windows, they are new. Previously the zip was for DOS/Windows.
>
> If we encode the package-zip now for Unix, don't we create confusion
> w.r.t. package-src-zip (DOS) and package-deployer-zip (undefined until
> now)?
I share those concerns but in the end decided to change to LF for .zip.
If windows users do download it, it will still work (.bat & .sh are
always platform specific in the distros) but they won't be able to use
notepad to edit the config files. There are plenty of alternatives. Or
they can download the windows binary.
It was close call and I'm only just in favour of using LF in .zip so if
the consensus is to use CRLF I'm fine with that too.
> I'd prefer keep the package-zip with CRLF (and ensure CRLF in
> package-deployer-zip too).
That probably needs another patch.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r899395 - /tomcat/trunk/dist.xml
Posted by Rainer Jung <ra...@kippdata.de>.
On 14.01.2010 21:21, markt@apache.org wrote:
> Author: markt
> Date: Thu Jan 14 20:21:23 2010
> New Revision: 899395
>
> URL: http://svn.apache.org/viewvc?rev=899395&view=rev
> Log:
> zip is for non-windows platforms
Hmmm, really?
Until recently we didn't have the individual binary release zips for
Windows, they are new. Previously the zip was for DOS/Windows.
If we encode the package-zip now for Unix, don't we create confusion
w.r.t. package-src-zip (DOS) and package-deployer-zip (undefined until now)?
I'd prefer keep the package-zip with CRLF (and ensure CRLF in
package-deployer-zip too).
Regards,
Rainer
> Modified:
> tomcat/trunk/dist.xml
>
> Modified: tomcat/trunk/dist.xml
> URL: http://svn.apache.org/viewvc/tomcat/trunk/dist.xml?rev=899395&r1=899394&r2=899395&view=diff
> ==============================================================================
> --- tomcat/trunk/dist.xml (original)
> +++ tomcat/trunk/dist.xml Thu Jan 14 20:21:23 2010
> @@ -391,8 +391,8 @@
>
> <!-- Packages the core zip distro -->
> <target name="package-zip">
> -<fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="crlf" encoding="ISO-8859-1" fixlast="false" />
> -<fixcrlf srcdir="${tomcat.dist}/conf" eol="crlf" encoding="ISO-8859-1" fixlast="false" />
> +<fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf" encoding="ISO-8859-1" fixlast="false" />
> +<fixcrlf srcdir="${tomcat.dist}/conf" eol="lf" encoding="ISO-8859-1" fixlast="false" />
> <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}.zip">
> <zipfileset dir="${tomcat.dist}" prefix="${final.name}">
> <include name="bin/**"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org