You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by "David E. Jones" <jo...@undersunconsulting.com> on 2007/01/25 20:02:02 UTC
Re: svn commit: r499759 - /ofbiz/trunk/ant
Jacques,
It might be okay for these files, but in general we don't want to
specify the eol-style for any file in the SVN repository. This is
something that the SVN client will take care of when doing checkouts,
updates, exports, commits, etc.
It does mean that if you checkout on a Windows machine and then copy
the text files to a Unix/Linux machine you'll have a few thousand
files with annoying line endings. You can avoid that (usually) by
using a zip file to move everything over instead of copying verbatim.
-David
On Jan 25, 2007, at 5:20 AM, jleroux@apache.org wrote:
> Author: jleroux
> Date: Thu Jan 25 04:20:05 2007
> New Revision: 499759
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=499759
> Log:
> EOL was wrong since ASL2 headers change yesterday. Thanks to
> Christian Gesisert who noticed it.
> I also forced svn:eol-style=LF for this file. Maybe this change
> should be better made in svn config file ?
> I will check other files
>
> Modified:
> ofbiz/trunk/ant (contents, props changed)
>
> Modified: ofbiz/trunk/ant
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/ant?
> view=diff&rev=499759&r1=499758&r2=499759
> ======================================================================
> ========
> --- ofbiz/trunk/ant (original)
> +++ ofbiz/trunk/ant Thu Jan 25 04:20:05 2007
> @@ -1,30 +1,30 @@
> -#!/bin/sh
> -#####################################################################
> -# Licensed to the Apache Software Foundation (ASF) under one
> -# or more contributor license agreements. See the NOTICE file
> -# distributed with this work for additional information
> -# regarding copyright ownership. The ASF licenses this file
> -# to you under the Apache License, Version 2.0 (the
> -# "License"); you may not use this file except in compliance
> -# with the License. You may obtain a copy of the License at
> -#
> -# http://www.apache.org/licenses/LICENSE-2.0
> -#
> -# Unless required by applicable law or agreed to in writing,
> -# software distributed under the License is distributed on an
> -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> -# KIND, either express or implied. See the License for the
> -# specific language governing permissions and limitations
> -# under the License.
> -#####################################################################
> -
> -# location of java executable
> -if [ -f "$JAVA_HOME/bin/java" ]; then
> - JAVA=$JAVA_HOME/bin/java
> -else
> - JAVA=java
> -fi
> -
> -$JAVA -jar framework/base/lib/ant-launcher.jar $*
> -exit 0
> -
> +#!/bin/sh
> +#####################################################################
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements. See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership. The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# with the License. You may obtain a copy of the License at
> +#
> +# http://www.apache.org/licenses/LICENSE-2.0
> +#
> +# Unless required by applicable law or agreed to in writing,
> +# software distributed under the License is distributed on an
> +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> +# KIND, either express or implied. See the License for the
> +# specific language governing permissions and limitations
> +# under the License.
> +#####################################################################
> +
> +# location of java executable
> +if [ -f "$JAVA_HOME/bin/java" ]; then
> + JAVA=$JAVA_HOME/bin/java
> +else
> + JAVA=java
> +fi
> +
> +$JAVA -jar framework/base/lib/ant-launcher.jar $*
> +exit 0
> +
>
> Propchange: ofbiz/trunk/ant
> ----------------------------------------------------------------------
> --------
> svn:eol-style = LF
>
>
Re: svn:eol-style (was Re: svn commit: r499759 - /ofbiz/trunk/ant)
Posted by Jacques Le Roux <ja...@les7arts.com>.
Yes this make sense. I propose to set eol-style=LF for Unix specific files. Though native would also do it, but to be consistent we
should in this case put native for Windows specific files. Another way is to set native for all files.
Jacques
----- Original Message -----
From: "Christian Geisert" <ch...@isu-gmbh.de>
To: <de...@ofbiz.apache.org>
Sent: Friday, January 26, 2007 9:13 AM
Subject: Re: svn:eol-style (was Re: svn commit: r499759 - /ofbiz/trunk/ant)
> David E. Jones schrieb:
> >
> > On Jan 25, 2007, at 4:37 PM, Christian Geisert wrote:
> >
> >> Jacques Le Roux schrieb:
> >>
> >>> So what happend to Christian ?
> >>
> >> ant had no svn:eol-style property at all which meant my svn client
> >> checked it out as committed by you (windows eol in this case).
> >
> > SVN shouldn't do this. It should be checked out for the default of your
> > platform unless you've specified otherwise in your client, or an
> > eol-style was specified on the server.
>
> If there is *no* eol-style property then subversion shouldn't change the
> file at all. Only when eol-style is set as native the line endings will
> be changed to your platform (if this wouldn't be the case why should we
> set the eol-style property?)
>
> > Was this checked out on a Windows machine? If so, then a Windows EOL is
> > what would be expected.
>
> It was on linux.
>
> --
> Christian
Re: svn:eol-style (was Re: svn commit: r499759 - /ofbiz/trunk/ant)
Posted by Jacques Le Roux <ja...@les7arts.com>.
I finally introduced svn:eol-style=LF for root Unix specific files in svn config file.
BTW I propose to commit http://www.opensourcestrategies.com/downloads/bshcontainer.bsh in OFBiz root if OpenSource Strategy is OK ?
Jacques
----- Original Message -----
From: "Jacques Le Roux" <ja...@les7arts.com>
To: <de...@ofbiz.apache.org>
Sent: Friday, January 26, 2007 10:54 AM
Subject: Re: svn:eol-style (was Re: svn commit: r499759 - /ofbiz/trunk/ant)
> Christian,
>
> >From http://svnbook.red-bean.com/en/1.1/ch07s02.html#svn-ch-7-sect-2.3.5 I see :
>
> The solution to this problem is the svn:eol-style property. When this property is set to a valid value, Subversion uses it to
> determine what special processing to perform on the file so that the file's line ending style isn't flip-flopping with every
commit
> that comes from a different operating system. The valid values are:
>
> native
> This causes the file to contain the EOL markers that are native to the operating system on which Subversion was run. In other
> words, if a user on a Windows machine checks out a working copy that contains a file with an svn:eol-style property set to native,
> that file will contain CRLF EOL markers. ***A Unix user checking out a working copy which contains the same file will see LF EOL
> markers in his copy of the file***.
>
> Note that Subversion will actually store the file in the repository using normalized LF EOL markers regardless of the operating
> system. This is basically transparent to the user, though.
>
> CRLF
> This causes the file to contain CRLF sequences for EOL markers, regardless of the operating system in use.
>
> LF
> This causes the file to contain LF characters for EOL markers, regardless of the operating system in use.
>
> CR
> This causes the file to contain CR characters for EOL markers, regardless of the operating system in use. This line ending style
> is not very common. It was used on older Macintosh platforms (on which Subversion doesn't even run).
>
>
> So it seems that native will do it in any case (who care of .bat on Unix or .sh on Windows ?). For instance
> http://www.apache.org/dev/svn-eol-style.txt is ok with this assertion but
> *.dsp = svn:eol-style=CRLF
> *.dsw = svn:eol-style=CRLF
> any idea why ?
>
> Jacques
>
> From: "Christian Geisert" <ch...@isu-gmbh.de>
>
> > David E. Jones schrieb:
> > >
> > > On Jan 26, 2007, at 1:13 AM, Christian Geisert wrote:
> >
> > [..]
> >
> > >> If there is *no* eol-style property then subversion shouldn't change the
> > >> file at all. Only when eol-style is set as native the line endings will
> > >> be changed to your platform (if this wouldn't be the case why should we
> > >> set the eol-style property?)
> > >
> > > If you don't have the default eol-style in your client set to "native",
> > > then I VERY highly recommend it...
> > >
> > > You might even try the default OFBiz settings:
> > >
> > > http://svn.apache.org/repos/asf/ofbiz/site/svn/config
> > >
> > > I know this is a bit hidden and only really referred to in the "OFBiz
> > > Committers Roles and Responsibilities", here:
> > >
> > > http://docs.ofbiz.org/x/mQ
> >
> > Auto-props settings only effect new files that get checked into the
> > repository. They have no effect on checkouts.
> >
> > --
> > Christian Geisert
Re: svn:eol-style (was Re: svn commit: r499759 - /ofbiz/trunk/ant)
Posted by Jacques Le Roux <ja...@les7arts.com>.
Christian,
>From http://svnbook.red-bean.com/en/1.1/ch07s02.html#svn-ch-7-sect-2.3.5 I see :
The solution to this problem is the svn:eol-style property. When this property is set to a valid value, Subversion uses it to
determine what special processing to perform on the file so that the file's line ending style isn't flip-flopping with every commit
that comes from a different operating system. The valid values are:
native
This causes the file to contain the EOL markers that are native to the operating system on which Subversion was run. In other
words, if a user on a Windows machine checks out a working copy that contains a file with an svn:eol-style property set to native,
that file will contain CRLF EOL markers. ***A Unix user checking out a working copy which contains the same file will see LF EOL
markers in his copy of the file***.
Note that Subversion will actually store the file in the repository using normalized LF EOL markers regardless of the operating
system. This is basically transparent to the user, though.
CRLF
This causes the file to contain CRLF sequences for EOL markers, regardless of the operating system in use.
LF
This causes the file to contain LF characters for EOL markers, regardless of the operating system in use.
CR
This causes the file to contain CR characters for EOL markers, regardless of the operating system in use. This line ending style
is not very common. It was used on older Macintosh platforms (on which Subversion doesn't even run).
So it seems that native will do it in any case (who care of .bat on Unix or .sh on Windows ?). For instance
http://www.apache.org/dev/svn-eol-style.txt is ok with this assertion but
*.dsp = svn:eol-style=CRLF
*.dsw = svn:eol-style=CRLF
any idea why ?
Jacques
From: "Christian Geisert" <ch...@isu-gmbh.de>
> David E. Jones schrieb:
> >
> > On Jan 26, 2007, at 1:13 AM, Christian Geisert wrote:
>
> [..]
>
> >> If there is *no* eol-style property then subversion shouldn't change the
> >> file at all. Only when eol-style is set as native the line endings will
> >> be changed to your platform (if this wouldn't be the case why should we
> >> set the eol-style property?)
> >
> > If you don't have the default eol-style in your client set to "native",
> > then I VERY highly recommend it...
> >
> > You might even try the default OFBiz settings:
> >
> > http://svn.apache.org/repos/asf/ofbiz/site/svn/config
> >
> > I know this is a bit hidden and only really referred to in the "OFBiz
> > Committers Roles and Responsibilities", here:
> >
> > http://docs.ofbiz.org/x/mQ
>
> Auto-props settings only effect new files that get checked into the
> repository. They have no effect on checkouts.
>
> --
> Christian Geisert
Re: svn:eol-style (was Re: svn commit: r499759 - /ofbiz/trunk/ant)
Posted by Christian Geisert <ch...@isu-gmbh.de>.
David E. Jones schrieb:
>
> On Jan 26, 2007, at 1:13 AM, Christian Geisert wrote:
[..]
>> If there is *no* eol-style property then subversion shouldn't change the
>> file at all. Only when eol-style is set as native the line endings will
>> be changed to your platform (if this wouldn't be the case why should we
>> set the eol-style property?)
>
> If you don't have the default eol-style in your client set to "native",
> then I VERY highly recommend it...
>
> You might even try the default OFBiz settings:
>
> http://svn.apache.org/repos/asf/ofbiz/site/svn/config
>
> I know this is a bit hidden and only really referred to in the "OFBiz
> Committers Roles and Responsibilities", here:
>
> http://docs.ofbiz.org/x/mQ
Auto-props settings only effect new files that get checked into the
repository. They have no effect on checkouts.
--
Christian Geisert
Re: svn:eol-style (was Re: svn commit: r499759 - /ofbiz/trunk/ant)
Posted by "David E. Jones" <jo...@hotwaxmedia.com>.
On Jan 26, 2007, at 1:13 AM, Christian Geisert wrote:
> David E. Jones schrieb:
>>
>> On Jan 25, 2007, at 4:37 PM, Christian Geisert wrote:
>>
>>> Jacques Le Roux schrieb:
>>>
>>>> So what happend to Christian ?
>>>
>>> ant had no svn:eol-style property at all which meant my svn client
>>> checked it out as committed by you (windows eol in this case).
>>
>> SVN shouldn't do this. It should be checked out for the default
>> of your
>> platform unless you've specified otherwise in your client, or an
>> eol-style was specified on the server.
>
> If there is *no* eol-style property then subversion shouldn't
> change the
> file at all. Only when eol-style is set as native the line endings
> will
> be changed to your platform (if this wouldn't be the case why
> should we
> set the eol-style property?)
If you don't have the default eol-style in your client set to
"native", then I VERY highly recommend it...
You might even try the default OFBiz settings:
http://svn.apache.org/repos/asf/ofbiz/site/svn/config
I know this is a bit hidden and only really referred to in the "OFBiz
Committers Roles and Responsibilities", here:
http://docs.ofbiz.org/x/mQ
-David
>> Was this checked out on a Windows machine? If so, then a Windows
>> EOL is
>> what would be expected.
>
> It was on linux.
>
> --
> Christian
Re: svn:eol-style (was Re: svn commit: r499759 - /ofbiz/trunk/ant)
Posted by Christian Geisert <ch...@isu-gmbh.de>.
David E. Jones schrieb:
>
> On Jan 25, 2007, at 4:37 PM, Christian Geisert wrote:
>
>> Jacques Le Roux schrieb:
>>
>>> So what happend to Christian ?
>>
>> ant had no svn:eol-style property at all which meant my svn client
>> checked it out as committed by you (windows eol in this case).
>
> SVN shouldn't do this. It should be checked out for the default of your
> platform unless you've specified otherwise in your client, or an
> eol-style was specified on the server.
If there is *no* eol-style property then subversion shouldn't change the
file at all. Only when eol-style is set as native the line endings will
be changed to your platform (if this wouldn't be the case why should we
set the eol-style property?)
> Was this checked out on a Windows machine? If so, then a Windows EOL is
> what would be expected.
It was on linux.
--
Christian
Re: svn:eol-style (was Re: svn commit: r499759 - /ofbiz/trunk/ant)
Posted by "David E. Jones" <jo...@hotwaxmedia.com>.
On Jan 25, 2007, at 4:37 PM, Christian Geisert wrote:
> Jacques Le Roux schrieb:
>> So what happend to Christian ?
>
> ant had no svn:eol-style property at all which meant my svn client
> checked it out as committed by you (windows eol in this case).
SVN shouldn't do this. It should be checked out for the default of
your platform unless you've specified otherwise in your client, or an
eol-style was specified on the server.
Was this checked out on a Windows machine? If so, then a Windows EOL
is what would be expected.
-David
> If it had eol-style = native my client would have converted the
> line endings acording to my platform (LF).
>
> ant.bat already has svn:eol-style CRLF.
>
> I think it's a good idea to set the eol-style for platform specific
> files like shell scripts to the correct value.
>
> Christian
svn:eol-style (was Re: svn commit: r499759 - /ofbiz/trunk/ant)
Posted by Christian Geisert <ch...@isu-gmbh.de>.
Jacques Le Roux schrieb:
> So what happend to Christian ?
ant had no svn:eol-style property at all which meant my svn client
checked it out as committed by you (windows eol in this case).
If it had eol-style = native my client would have converted the line
endings acording to my platform (LF).
ant.bat already has svn:eol-style CRLF.
I think it's a good idea to set the eol-style for platform specific
files like shell scripts to the correct value.
Christian
Re: svn commit: r499759 - /ofbiz/trunk/ant
Posted by Jacques Le Roux <ja...@les7arts.com>.
So what happend to Christian ?
I agree to not change svn config file and not commit any new EOL changes. But why are some specific platforms files like *.bat set
in that way ?
eg:
*.dsp = svn:eol-style=CRLF
*.bat = svn:eol-style=CRLF
*.dsw = svn:eol-style=CRLF
is that inherited from the original (pre-OFBiz I mean) svn config file ?
BTW I will change my Eclipse preferences to use native EOL in text editors like it was before (default). I guess I will not have
anymore sort of "inconsistent EOL" msgs from svn after having edited xml files with Oxygen.
It's only that it makes me wonder now why I had to change that some days ago ? Bah ... if it works like that we will forget it !
Thanks for your help David !
Jacques
----- Original Message -----
From: "David E. Jones" <jo...@hotwaxmedia.com>
To: <de...@ofbiz.apache.org>
Sent: Thursday, January 25, 2007 10:12 PM
Subject: Re: svn commit: r499759 - /ofbiz/trunk/ant
>
> That's a fine approach as some files like these are platform
> specific. In general I guess what I should have said is just don't
> worry about it. When you commit the stuff going into the repository
> will not have the same line ending that you committed with. When
> other checkout from SVN they'll get the line endings for their OS
> without you doing anything.
>
> This is one of the reasons we love SVN!
>
> -David
>
>
> On Jan 25, 2007, at 1:25 PM, Jacques Le Roux wrote:
>
> > David,
> >
> > Ok, so I will only commit this files with their right EOL and let
> > the config files as is but for .sh or such wich are only used on
> > Unix or like.
> >
> > Thanks
> >
> > Jacques
> >
> >
> >>
> >> Jacques,
> >>
> >> It might be okay for these files, but in general we don't want to
> >> specify the eol-style for any file in the SVN repository. This is
> >> something that the SVN client will take care of when doing checkouts,
> >> updates, exports, commits, etc.
> >>
> >> It does mean that if you checkout on a Windows machine and then copy
> >> the text files to a Unix/Linux machine you'll have a few thousand
> >> files with annoying line endings. You can avoid that (usually) by
> >> using a zip file to move everything over instead of copying verbatim.
> >>
> >> -David
> >>
> >>
> >> On Jan 25, 2007, at 5:20 AM, jleroux@apache.org wrote:
> >>
> >>> Author: jleroux
> >>> Date: Thu Jan 25 04:20:05 2007
> >>> New Revision: 499759
> >>>
> >>> URL: http://svn.apache.org/viewvc?view=rev&rev=499759
> >>> Log:
> >>> EOL was wrong since ASL2 headers change yesterday. Thanks to
> >>> Christian Gesisert who noticed it.
> >>> I also forced svn:eol-style=LF for this file. Maybe this change
> >>> should be better made in svn config file ?
> >>> I will check other files
> >>>
> >>> Modified:
> >>> ofbiz/trunk/ant (contents, props changed)
> >>>
> >>> Modified: ofbiz/trunk/ant
> >>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/ant?
> >>> view=diff&rev=499759&r1=499758&r2=499759
> >>> ====================================================================
> >>> ==
> >>> ========
> >>> --- ofbiz/trunk/ant (original)
> >>> +++ ofbiz/trunk/ant Thu Jan 25 04:20:05 2007
> >>> @@ -1,30 +1,30 @@
> >>> -#!/bin/sh
> >>> -
> >>> ####################################################################
> >>> #
> >>> -# Licensed to the Apache Software Foundation (ASF) under one
> >>> -# or more contributor license agreements. See the NOTICE file
> >>> -# distributed with this work for additional information
> >>> -# regarding copyright ownership. The ASF licenses this file
> >>> -# to you under the Apache License, Version 2.0 (the
> >>> -# "License"); you may not use this file except in compliance
> >>> -# with the License. You may obtain a copy of the License at
> >>> -#
> >>> -# http://www.apache.org/licenses/LICENSE-2.0
> >>> -#
> >>> -# Unless required by applicable law or agreed to in writing,
> >>> -# software distributed under the License is distributed on an
> >>> -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> >>> -# KIND, either express or implied. See the License for the
> >>> -# specific language governing permissions and limitations
> >>> -# under the License.
> >>> -
> >>> ####################################################################
> >>> #
> >>> -
> >>> -# location of java executable
> >>> -if [ -f "$JAVA_HOME/bin/java" ]; then
> >>> - JAVA=$JAVA_HOME/bin/java
> >>> -else
> >>> - JAVA=java
> >>> -fi
> >>> -
> >>> -$JAVA -jar framework/base/lib/ant-launcher.jar $*
> >>> -exit 0
> >>> -
> >>> +#!/bin/sh
> >>> +###################################################################
> >>> ##
> >>> +# Licensed to the Apache Software Foundation (ASF) under one
> >>> +# or more contributor license agreements. See the NOTICE file
> >>> +# distributed with this work for additional information
> >>> +# regarding copyright ownership. The ASF licenses this file
> >>> +# to you under the Apache License, Version 2.0 (the
> >>> +# "License"); you may not use this file except in compliance
> >>> +# with the License. You may obtain a copy of the License at
> >>> +#
> >>> +# http://www.apache.org/licenses/LICENSE-2.0
> >>> +#
> >>> +# Unless required by applicable law or agreed to in writing,
> >>> +# software distributed under the License is distributed on an
> >>> +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> >>> +# KIND, either express or implied. See the License for the
> >>> +# specific language governing permissions and limitations
> >>> +# under the License.
> >>> +###################################################################
> >>> ##
> >>> +
> >>> +# location of java executable
> >>> +if [ -f "$JAVA_HOME/bin/java" ]; then
> >>> + JAVA=$JAVA_HOME/bin/java
> >>> +else
> >>> + JAVA=java
> >>> +fi
> >>> +
> >>> +$JAVA -jar framework/base/lib/ant-launcher.jar $*
> >>> +exit 0
> >>> +
> >>>
> >>> Propchange: ofbiz/trunk/ant
> >>> --------------------------------------------------------------------
> >>> --
> >>> --------
> >>> svn:eol-style = LF
> >>>
> >>>
> >>
> >>
> >
>
>
Re: svn commit: r499759 - /ofbiz/trunk/ant
Posted by "David E. Jones" <jo...@hotwaxmedia.com>.
That's a fine approach as some files like these are platform
specific. In general I guess what I should have said is just don't
worry about it. When you commit the stuff going into the repository
will not have the same line ending that you committed with. When
other checkout from SVN they'll get the line endings for their OS
without you doing anything.
This is one of the reasons we love SVN!
-David
On Jan 25, 2007, at 1:25 PM, Jacques Le Roux wrote:
> David,
>
> Ok, so I will only commit this files with their right EOL and let
> the config files as is but for .sh or such wich are only used on
> Unix or like.
>
> Thanks
>
> Jacques
>
>
>>
>> Jacques,
>>
>> It might be okay for these files, but in general we don't want to
>> specify the eol-style for any file in the SVN repository. This is
>> something that the SVN client will take care of when doing checkouts,
>> updates, exports, commits, etc.
>>
>> It does mean that if you checkout on a Windows machine and then copy
>> the text files to a Unix/Linux machine you'll have a few thousand
>> files with annoying line endings. You can avoid that (usually) by
>> using a zip file to move everything over instead of copying verbatim.
>>
>> -David
>>
>>
>> On Jan 25, 2007, at 5:20 AM, jleroux@apache.org wrote:
>>
>>> Author: jleroux
>>> Date: Thu Jan 25 04:20:05 2007
>>> New Revision: 499759
>>>
>>> URL: http://svn.apache.org/viewvc?view=rev&rev=499759
>>> Log:
>>> EOL was wrong since ASL2 headers change yesterday. Thanks to
>>> Christian Gesisert who noticed it.
>>> I also forced svn:eol-style=LF for this file. Maybe this change
>>> should be better made in svn config file ?
>>> I will check other files
>>>
>>> Modified:
>>> ofbiz/trunk/ant (contents, props changed)
>>>
>>> Modified: ofbiz/trunk/ant
>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/ant?
>>> view=diff&rev=499759&r1=499758&r2=499759
>>> ====================================================================
>>> ==
>>> ========
>>> --- ofbiz/trunk/ant (original)
>>> +++ ofbiz/trunk/ant Thu Jan 25 04:20:05 2007
>>> @@ -1,30 +1,30 @@
>>> -#!/bin/sh
>>> -
>>> ####################################################################
>>> #
>>> -# Licensed to the Apache Software Foundation (ASF) under one
>>> -# or more contributor license agreements. See the NOTICE file
>>> -# distributed with this work for additional information
>>> -# regarding copyright ownership. The ASF licenses this file
>>> -# to you under the Apache License, Version 2.0 (the
>>> -# "License"); you may not use this file except in compliance
>>> -# with the License. You may obtain a copy of the License at
>>> -#
>>> -# http://www.apache.org/licenses/LICENSE-2.0
>>> -#
>>> -# Unless required by applicable law or agreed to in writing,
>>> -# software distributed under the License is distributed on an
>>> -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>>> -# KIND, either express or implied. See the License for the
>>> -# specific language governing permissions and limitations
>>> -# under the License.
>>> -
>>> ####################################################################
>>> #
>>> -
>>> -# location of java executable
>>> -if [ -f "$JAVA_HOME/bin/java" ]; then
>>> - JAVA=$JAVA_HOME/bin/java
>>> -else
>>> - JAVA=java
>>> -fi
>>> -
>>> -$JAVA -jar framework/base/lib/ant-launcher.jar $*
>>> -exit 0
>>> -
>>> +#!/bin/sh
>>> +###################################################################
>>> ##
>>> +# Licensed to the Apache Software Foundation (ASF) under one
>>> +# or more contributor license agreements. See the NOTICE file
>>> +# distributed with this work for additional information
>>> +# regarding copyright ownership. The ASF licenses this file
>>> +# to you under the Apache License, Version 2.0 (the
>>> +# "License"); you may not use this file except in compliance
>>> +# with the License. You may obtain a copy of the License at
>>> +#
>>> +# http://www.apache.org/licenses/LICENSE-2.0
>>> +#
>>> +# Unless required by applicable law or agreed to in writing,
>>> +# software distributed under the License is distributed on an
>>> +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
>>> +# KIND, either express or implied. See the License for the
>>> +# specific language governing permissions and limitations
>>> +# under the License.
>>> +###################################################################
>>> ##
>>> +
>>> +# location of java executable
>>> +if [ -f "$JAVA_HOME/bin/java" ]; then
>>> + JAVA=$JAVA_HOME/bin/java
>>> +else
>>> + JAVA=java
>>> +fi
>>> +
>>> +$JAVA -jar framework/base/lib/ant-launcher.jar $*
>>> +exit 0
>>> +
>>>
>>> Propchange: ofbiz/trunk/ant
>>> --------------------------------------------------------------------
>>> --
>>> --------
>>> svn:eol-style = LF
>>>
>>>
>>
>>
>
Re: svn commit: r499759 - /ofbiz/trunk/ant
Posted by Jacques Le Roux <ja...@les7arts.com>.
David,
Ok, so I will only commit this files with their right EOL and let the config files as is but for .sh or such wich are only used on
Unix or like.
Thanks
Jacques
>
> Jacques,
>
> It might be okay for these files, but in general we don't want to
> specify the eol-style for any file in the SVN repository. This is
> something that the SVN client will take care of when doing checkouts,
> updates, exports, commits, etc.
>
> It does mean that if you checkout on a Windows machine and then copy
> the text files to a Unix/Linux machine you'll have a few thousand
> files with annoying line endings. You can avoid that (usually) by
> using a zip file to move everything over instead of copying verbatim.
>
> -David
>
>
> On Jan 25, 2007, at 5:20 AM, jleroux@apache.org wrote:
>
> > Author: jleroux
> > Date: Thu Jan 25 04:20:05 2007
> > New Revision: 499759
> >
> > URL: http://svn.apache.org/viewvc?view=rev&rev=499759
> > Log:
> > EOL was wrong since ASL2 headers change yesterday. Thanks to
> > Christian Gesisert who noticed it.
> > I also forced svn:eol-style=LF for this file. Maybe this change
> > should be better made in svn config file ?
> > I will check other files
> >
> > Modified:
> > ofbiz/trunk/ant (contents, props changed)
> >
> > Modified: ofbiz/trunk/ant
> > URL: http://svn.apache.org/viewvc/ofbiz/trunk/ant?
> > view=diff&rev=499759&r1=499758&r2=499759
> > ======================================================================
> > ========
> > --- ofbiz/trunk/ant (original)
> > +++ ofbiz/trunk/ant Thu Jan 25 04:20:05 2007
> > @@ -1,30 +1,30 @@
> > -#!/bin/sh
> > -#####################################################################
> > -# Licensed to the Apache Software Foundation (ASF) under one
> > -# or more contributor license agreements. See the NOTICE file
> > -# distributed with this work for additional information
> > -# regarding copyright ownership. The ASF licenses this file
> > -# to you under the Apache License, Version 2.0 (the
> > -# "License"); you may not use this file except in compliance
> > -# with the License. You may obtain a copy of the License at
> > -#
> > -# http://www.apache.org/licenses/LICENSE-2.0
> > -#
> > -# Unless required by applicable law or agreed to in writing,
> > -# software distributed under the License is distributed on an
> > -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> > -# KIND, either express or implied. See the License for the
> > -# specific language governing permissions and limitations
> > -# under the License.
> > -#####################################################################
> > -
> > -# location of java executable
> > -if [ -f "$JAVA_HOME/bin/java" ]; then
> > - JAVA=$JAVA_HOME/bin/java
> > -else
> > - JAVA=java
> > -fi
> > -
> > -$JAVA -jar framework/base/lib/ant-launcher.jar $*
> > -exit 0
> > -
> > +#!/bin/sh
> > +#####################################################################
> > +# Licensed to the Apache Software Foundation (ASF) under one
> > +# or more contributor license agreements. See the NOTICE file
> > +# distributed with this work for additional information
> > +# regarding copyright ownership. The ASF licenses this file
> > +# to you under the Apache License, Version 2.0 (the
> > +# "License"); you may not use this file except in compliance
> > +# with the License. You may obtain a copy of the License at
> > +#
> > +# http://www.apache.org/licenses/LICENSE-2.0
> > +#
> > +# Unless required by applicable law or agreed to in writing,
> > +# software distributed under the License is distributed on an
> > +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> > +# KIND, either express or implied. See the License for the
> > +# specific language governing permissions and limitations
> > +# under the License.
> > +#####################################################################
> > +
> > +# location of java executable
> > +if [ -f "$JAVA_HOME/bin/java" ]; then
> > + JAVA=$JAVA_HOME/bin/java
> > +else
> > + JAVA=java
> > +fi
> > +
> > +$JAVA -jar framework/base/lib/ant-launcher.jar $*
> > +exit 0
> > +
> >
> > Propchange: ofbiz/trunk/ant
> > ----------------------------------------------------------------------
> > --------
> > svn:eol-style = LF
> >
> >
>
>