You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by ie...@apache.org on 2009/05/13 15:49:20 UTC
svn commit: r774369 -
/incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml
Author: ieb
Date: Wed May 13 13:49:19 2009
New Revision: 774369
URL: http://svn.apache.org/viewvc?rev=774369&view=rev
Log:
Removed unix line endings from the php artifact as this incorrectly modifies binary files, and would not be any better on windows platform if built ona unix platform.
Modified:
incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml
Modified: incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml?rev=774369&r1=774368&r2=774369&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml Wed May 13 13:49:19 2009
@@ -64,7 +64,6 @@
<exclude>NOTICE</exclude>
<exclude>README</exclude>
</excludes>
- <lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
<outputDirectory>shindig-${pom.version}-php</outputDirectory>
@@ -97,7 +96,6 @@
<exclude>*.sh</exclude>
<exclude>*.bat</exclude>
</excludes>
- <lineEnding>unix</lineEnding>
</fileSet>
<!-- Using the temp container.php created by Maven using Antrun plugin to rewrite
default configuration to release structure -->
@@ -109,7 +107,6 @@
<exclude>**/.git/**</exclude>
<exclude>**/.svn/**</exclude>
</excludes>
- <lineEnding>unix</lineEnding>
</fileSet>
</fileSets>
</assembly>
Re: svn commit: r774369 - /incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml
Posted by Ian Boston <ie...@tfd.co.uk>.
On 13 May 2009, at 16:49, Chris Chabot wrote:
>>
>> If you really do just want tar c shindig/php | gzip >
>> release.tar.gz then I
>> am happy to leave it as post 774369 and assume a Shindig release
>> will not be
>> cut on a windows box.
>>
>
> Works for me,
>
> Thanks for taking the time to follow up on this Ian!
>
> -- Chris
Chris, thanks
I will also assume that for the source assembly is *not* going to mess
with any line endings and it will be released from a unix box.
So when someone comes to test it, and compare it against the svn
checkout of the tag (as will happen probably during the vote), they
will find line ending differences if they use a windows box.
If anyone can see a reason why this isnt ok, shout.
Ian
(why do releases have to be so mind numbingly boring to do :))
Re: svn commit: r774369 - /incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml
Posted by Chris Chabot <ch...@google.com>.
On Wed, May 13, 2009 at 4:59 PM, Ian Boston <ie...@tfd.co.uk> wrote:
> Chris the problem isnt maven (this time)
> I have excluded *all* eol editing so after 774369 the php assembly *is*
> identical to the tar pipe you mentioned.
>
Awesome! :)
>
> What I am trying to find out is:
>
> Should release artifacts be identical regardless of if they are built on
> windows or unix (ie unix line endings regardless)?
> or
> Is it Ok for the artifact to have the line ending of the box it was checked
> out from SVN and built on (php files are svn-eol:native) ?
>
Preferably they should always have unix style line endings, however the
chances that php developers will run maven to package php files are rather
low, so if the above is not the case, I think it's safe to ignore for now
>
> You have already identified one area of concern with the php tests.
> With the svn-eol setting as native for php, which will result in dos line
> endings when checked out on a dos machine do the tests still work?
>
We got a couple of guys in Beijing who work primarily on windows machines,
and the tests seem to work well for them even though they did a svn checkout
on windows. When I tried the original mvn php archive that was produced in
the first release cut, it did make tests fail... so while it's all just
anecdotal evidence, it seems to work out well as-is.
>
> If you really do just want tar c shindig/php | gzip > release.tar.gz then I
> am happy to leave it as post 774369 and assume a Shindig release will not be
> cut on a windows box.
>
Works for me,
Thanks for taking the time to follow up on this Ian!
-- Chris
Re: svn commit: r774369 - /incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml
Posted by Ian Boston <ie...@tfd.co.uk>.
Chris the problem isnt maven (this time)
I have excluded *all* eol editing so after 774369 the php assembly
*is* identical to the tar pipe you mentioned.
What I am trying to find out is:
Should release artifacts be identical regardless of if they are built
on windows or unix (ie unix line endings regardless)?
or
Is it Ok for the artifact to have the line ending of the box it was
checked out from SVN and built on (php files are svn-eol:native) ?
You have already identified one area of concern with the php tests.
With the svn-eol setting as native for php, which will result in dos
line endings when checked out on a dos machine do the tests still work?
If you really do just want tar c shindig/php | gzip > release.tar.gz
then I am happy to leave it as post 774369 and assume a Shindig
release will not be cut on a windows box.
Ian
On 13 May 2009, at 15:35, Chris Chabot wrote:
> The 'problem' is that the \n's that php-shindig produced (and it
> only adds
> those when formatting the responses, which it only does when
> debugging =
> true ie the default configuration) and the unit tests test against
> the same.
>
> Another issue with releasing a package with windows line endings is
> that if
> someone would ever want to do a patch against a svn checkout, we
> might risk
> getting --entire file ++entire file with windows line endings patches
>
> Sigh, why is it so hard to do tar c shindig/php | gzip >
> release.tar.gz in
> maven, sure makes life more complicated ;/ Please some one find a
> 'don't
> touch php files' switch before I regret conceding to using maven for
> building releases :)
>
> On Wed, May 13, 2009 at 4:10 PM, Ian Boston <ie...@tfd.co.uk> wrote:
>
>>
>> On 13 May 2009, at 15:01, Chris Chabot wrote:
>>
>> is there really no
>>> exclude_rewrite=*.php flag that can be set somewhere in that
>>> mysterious
>>> maven configuration?
>>>
>>
>> mysterious or magical, hard to tell sometimes :),
>> we could split the package into text and non text and put the php
>> in the
>> non text to exclude the php files.
>>
>> But that would make the php files in the release depend on the
>> platform the
>> release was built on.
>>
>> What is the eol-style in svn for these files ?
>> Ian
>>
>>
Re: svn commit: r774369 - /incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml
Posted by Chris Chabot <ch...@google.com>.
The 'problem' is that the \n's that php-shindig produced (and it only adds
those when formatting the responses, which it only does when debugging =
true ie the default configuration) and the unit tests test against the same.
Another issue with releasing a package with windows line endings is that if
someone would ever want to do a patch against a svn checkout, we might risk
getting --entire file ++entire file with windows line endings patches
Sigh, why is it so hard to do tar c shindig/php | gzip > release.tar.gz in
maven, sure makes life more complicated ;/ Please some one find a 'don't
touch php files' switch before I regret conceding to using maven for
building releases :)
On Wed, May 13, 2009 at 4:10 PM, Ian Boston <ie...@tfd.co.uk> wrote:
>
> On 13 May 2009, at 15:01, Chris Chabot wrote:
>
> is there really no
>> exclude_rewrite=*.php flag that can be set somewhere in that mysterious
>> maven configuration?
>>
>
> mysterious or magical, hard to tell sometimes :),
> we could split the package into text and non text and put the php in the
> non text to exclude the php files.
>
> But that would make the php files in the release depend on the platform the
> release was built on.
>
> What is the eol-style in svn for these files ?
> Ian
>
>
Re: svn commit: r774369 - /incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml
Posted by Ian Boston <ie...@tfd.co.uk>.
On 13 May 2009, at 15:01, Chris Chabot wrote:
> is there really no
> exclude_rewrite=*.php flag that can be set somewhere in that
> mysterious
> maven configuration?
mysterious or magical, hard to tell sometimes :),
we could split the package into text and non text and put the php in
the non text to exclude the php files.
But that would make the php files in the release depend on the
platform the release was built on.
What is the eol-style in svn for these files ?
Ian
Re: svn commit: r774369 - /incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml
Posted by Chris Chabot <ch...@google.com>.
Changing the line endings will make lots of social rest/rpc end point tests
fail since they do a text blob match, is there really no
exclude_rewrite=*.php flag that can be set somewhere in that mysterious
maven configuration?
On Wed, May 13, 2009 at 3:55 PM, Ian Boston <ie...@tfd.co.uk> wrote:
> Chris,
> you might want to look at this,
> If the assemblies are built on a unix platform, png gif etc files were
> getting modified.
> On a windows platform all files were getting modified.
> IMHO there isn't much point in changing line endings unless we are going to
> do a dos bundle and a separate unix bundle.
>
> The only downside is that if built on a windows machine the release will
> have windows line endings.
>
> WDYT?
> Ian
>
>
> BTW, same goes for the source bundle where I have opted to keep the same
> line endings.
>
>
> On 13 May 2009, at 14:49, ieb@apache.org wrote:
>
> Author: ieb
>> Date: Wed May 13 13:49:19 2009
>> New Revision: 774369
>>
>> URL: http://svn.apache.org/viewvc?rev=774369&view=rev
>> Log:
>> Removed unix line endings from the php artifact as this incorrectly
>> modifies binary files, and would not be any better on windows platform if
>> built ona unix platform.
>>
>> Modified:
>>
>> incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml
>>
>> Modified:
>> incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml
>> URL:
>> http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml?rev=774369&r1=774368&r2=774369&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml
>> (original)
>> +++
>> incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml
>> Wed May 13 13:49:19 2009
>> @@ -64,7 +64,6 @@
>> <exclude>NOTICE</exclude>
>> <exclude>README</exclude>
>> </excludes>
>> - <lineEnding>unix</lineEnding>
>> </fileSet>
>> <fileSet>
>> <outputDirectory>shindig-${pom.version}-php</outputDirectory>
>> @@ -97,7 +96,6 @@
>> <exclude>*.sh</exclude>
>> <exclude>*.bat</exclude>
>> </excludes>
>> - <lineEnding>unix</lineEnding>
>> </fileSet>
>> <!-- Using the temp container.php created by Maven using Antrun plugin
>> to rewrite
>> default configuration to release structure -->
>> @@ -109,7 +107,6 @@
>> <exclude>**/.git/**</exclude>
>> <exclude>**/.svn/**</exclude>
>> </excludes>
>> - <lineEnding>unix</lineEnding>
>> </fileSet>
>> </fileSets>
>> </assembly>
>>
>>
>>
>
Re: svn commit: r774369 - /incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml
Posted by Ian Boston <ie...@tfd.co.uk>.
Chris,
you might want to look at this,
If the assemblies are built on a unix platform, png gif etc files were
getting modified.
On a windows platform all files were getting modified.
IMHO there isn't much point in changing line endings unless we are
going to do a dos bundle and a separate unix bundle.
The only downside is that if built on a windows machine the release
will have windows line endings.
WDYT?
Ian
BTW, same goes for the source bundle where I have opted to keep the
same line endings.
On 13 May 2009, at 14:49, ieb@apache.org wrote:
> Author: ieb
> Date: Wed May 13 13:49:19 2009
> New Revision: 774369
>
> URL: http://svn.apache.org/viewvc?rev=774369&view=rev
> Log:
> Removed unix line endings from the php artifact as this incorrectly
> modifies binary files, and would not be any better on windows
> platform if built ona unix platform.
>
> Modified:
> incubator/shindig/branches/1.0.x-incubating/assembly/src/main/
> assembly/php.xml
>
> Modified: incubator/shindig/branches/1.0.x-incubating/assembly/src/
> main/assembly/php.xml
> URL: http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/assembly/src/main/assembly/php.xml?rev=774369&r1=774368&r2=774369&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- incubator/shindig/branches/1.0.x-incubating/assembly/src/main/
> assembly/php.xml (original)
> +++ incubator/shindig/branches/1.0.x-incubating/assembly/src/main/
> assembly/php.xml Wed May 13 13:49:19 2009
> @@ -64,7 +64,6 @@
> <exclude>NOTICE</exclude>
> <exclude>README</exclude>
> </excludes>
> - <lineEnding>unix</lineEnding>
> </fileSet>
> <fileSet>
> <outputDirectory>shindig-${pom.version}-php</outputDirectory>
> @@ -97,7 +96,6 @@
> <exclude>*.sh</exclude>
> <exclude>*.bat</exclude>
> </excludes>
> - <lineEnding>unix</lineEnding>
> </fileSet>
> <!-- Using the temp container.php created by Maven using Antrun
> plugin to rewrite
> default configuration to release structure -->
> @@ -109,7 +107,6 @@
> <exclude>**/.git/**</exclude>
> <exclude>**/.svn/**</exclude>
> </excludes>
> - <lineEnding>unix</lineEnding>
> </fileSet>
> </fileSets>
> </assembly>
>
>