>> There are a few scenarios where that would help (running off the same build dir on different VMs) but it feels like enough of an edge case that it probably isn't worth it. Thanks for the writeup Mark. I agree that it is an edge case and the build process should not be changed.
>>If my ramblings below make sense, it would be great if you could turn them into a patch for the website - probably this page (part of the main wbesite): I will try to come up with something. On Fri, Nov 4, 2016 at 3:34 PM, Mark Thomas <ma...@apache.org> wrote: > On 04/11/2016 20:58, Andrew Carr wrote: > > My apologies if I am missing the point of what you are trying to explain. > > No problem. I seem to recall a fairly long thread when we were trying to > figure out how to set this up. > > > I am not trying to argue the point here, just trying to understand if I > did > > something wrong, and if so, how to correct it. > > I think you did make an invalid assumption, but because we (and by that > we I mean the community so you still get to share some of the blame) > haven't clearly documented how we handle line endings. If my ramblings > below make sense, it would be great if you could turn them into a patch > for the website - probably this page (part of the main wbesite): > http://tomcat.apache.org/svn.html > and/or this file (part of the docs): > http://tomcat.apache.org/tomcat-9.0-doc/building.html > > The idea is that if you check out from svn, then you get the line ending > appropriate for your platform for all files. The thinking is that if you > need to fix a typo in the .bat file from MacOS, it is easier if the .bat > file as MacOS line-endings. > > When you build locally, line-endings are not changed. The expectation is > that the source has the correct line-endings for your platform so all > the files that matter on your platform will have the correct line > endings. When you are on Windows it doesn't matter if the .sh files have > Windows line-endings since you'll never use them on Windows. > > Finally, when we build a release, we make sure that the files all have > the correct line endings for the target platform: > zip -> CRLF > tar.gz -> LF > > So it doesn't matter which platform you build a release on, the result > is the same. Personally, I always build releases on Windows as I find it > easier to build the Windows installer if I don't have to mess about with > cygwin. > > So if you build locally, you need to make sure the .bat/.sh files start > with the right line-endings else what you build will still have the > wrong endings. > > On MacOS, you want to start with the -src.tar.gz archive > > We could change the build process so that line endings for the scripts > are always correct for local builds. There are a few scenarios where > that would help (running off the same build dir on different VMs) but it > feels like enough of an edge case that it probably isn't worth it. > > HTH, > > Mark > > > > > > On Fri, Nov 4, 2016 at 2:57 PM, Andrew Carr <andrewlanec...@gmail.com> > > wrote: > > > >> So what did I do wrong? Building from src-zip on mac is not the right > >> thing to do? I mean, in the past I have just checked out the source or > >> updated trunk, is this the way it is meant to be? > >> > >> On Fri, Nov 4, 2016 at 2:30 PM, Mark Thomas <ma...@apache.org> wrote: > >> > >>> On 04/11/2016 20:28, Andrew Carr wrote: > >>>> Violeta, (Violeta is what my mother calls my daughter "Violet"), I can > >>> do > >>>> that and will when I have a few minutes, but shouldn't the src.zip > have > >>> the > >>>> correct line formatting in it? > >>> > >>> CRLF is the correct line ending for the src zip. > >>> > >>> The src archives are set up for editing the source on the associated > >>> platform. The build script will ensure that the correct line endings > are > >>> configured in the release archives. > >>> > >>> Mark > >>> > >>> > >>>> > >>>> On Fri, Nov 4, 2016 at 12:34 PM, Violeta Georgieva < > >>> violet...@apache.org> > >>>> wrote: > >>>> > >>>>> Hi, > >>>>> > >>>>> 2016-11-04 19:45 GMT+02:00 Andrew Carr <andrewlanec...@gmail.com>: > >>>>>> > >>>>>> In short: > >>>>>> > >>>>>>> The proposed 9.0.0.M13 release is: > >>>>>>> [ ] Broken - do not release > >>>>>>> [X] Alpha - go ahead and release as 9.0.0.M13 > >>>>>> > >>>>>> However, on mac I ran into an issue with the ^M character being in > the > >>>>> .sh > >>>>>> files. I would receive interpreter errors. I have to remove all of > >>> the > >>>>> ^M > >>>>>> characters from the .sh files in the bin folder, see below: > >>>>>> > >>>>>> *ACARR2:bin andrew.carr$ uname -a* > >>>>>> > >>>>>> *Darwin ACARR2.local 15.4.0 Darwin Kernel Version 15.4.0: Fri Feb 26 > >>>>>> 22:08:05 PST 2016; root:xnu-3248.40.184~3/RELEASE_X86_64 x86_64* > >>>>>> > >>>>>> *ACARR2:apache-tomcat-9.0.0.M13-src andrew.carr$ > >>>>>> output/build/bin/catalina.sh start* > >>>>> > >>>>> I can see that you are using the sources. > >>>>> > >>>>> I checked the sources and the binaries > >>>>> The file catalina.sh from apache-tomcat-9.0.0.M13.zip > >>>>> <https://dist.apache.org/repos/dist/dev/tomcat/tomcat- > >>>>> 9/v9.0.0.M13/bin/apache-tomcat-9.0.0.M13.zip> > >>>>> has > >>>>> LF as expected, but the catalina.sh from > apache-tomcat-9.0.0.M13-src.zi > >>> p > >>>>> <https://dist.apache.org/repos/dist/dev/tomcat/tomcat- > >>>>> 9/v9.0.0.M13/src/apache-tomcat-9.0.0.M13-src.zip> > >>>>> has > >>>>> CRLF. > >>>>> > >>>>> Can you turn the file format to UNIX and check whether you will see > the > >>>>> issue? > >>>>> > >>>>> Regards, > >>>>> Violeta > >>>>> > >>>>>> *-bash: output/build/bin/catalina.sh: /bin/sh^M: bad interpreter: No > >>> such > >>>>>> file or directory* > >>>>>> > >>>>>> *ACARR2:apache-tomcat-9.0.0.M13-src andrew.carr$ perl -i -pe > >>> 'y|\r||d' > >>>>>> output/build/bin/*.sh* > >>>>>> > >>>>>> *ACARR2:apache-tomcat-9.0.0.M13-src andrew.carr$ > >>>>>> output/build/bin/catalina.sh start* > >>>>>> > >>>>>> *....Tomcat started.* > >>>>>> So, is this an issue or is this the way my mac is configured? > >>>>>> > >>>>>> --- > >>>>>> I also built on CentOS - > >>>>>> > >>>>>> *[root@andrewtest1 build]# uname -a* > >>>>>> > >>>>>> *Linux andrewtest1.openlogic.local 3.10.0-123.el7.x86_64 #1 SMP Mon > >>> Jun > >>>>> 30 > >>>>>> 12:09:22 UTC 2014 x86_64 x86_64 x86_64 GNU/Linux* > >>>>>> > >>>>>> *[root@andrewtest1 build]# cat /etc/redhat-release * > >>>>>> > >>>>>> *CentOS Linux release 7.0.1406 (Core) * > >>>>>> And everything was good. > >>>>>> > >>>>>> > >>>>>> -- > >>>>>> With Regards, > >>>>>> Andrew Carr > >>>>>> > >>>>>> e. andrewlanec...@gmail.com > >>>>>> w. andrew.c...@openlogic.com > >>>>>> h. 4235255668 > >>>>>> c. 4239489206 > >>>>>> a. P.O. Box 1231, Greeneville, TN, 37744 > >>>>>> > >>>>>> On Fri, Nov 4, 2016 at 8:53 AM, Violeta Georgieva < > miles...@gmail.com > >>>> > >>>>>> wrote: > >>>>>> > >>>>>>> Hi, > >>>>>>> > >>>>>>> 2016-11-03 23:40 GMT+02:00 Mark Thomas <ma...@apache.org>: > >>>>>>>> > >>>>>>>> The proposed Apache Tomcat 9.0.0.M13 release is now available for > >>>>> voting. > >>>>>>>> > >>>>>>>> This is a milestone release for the 9.0.x branch. It should be > >>>>>>>> noted that, as a milestone release: > >>>>>>>> - Servlet 4.0 is not finalised > >>>>>>>> - The EGs have not started work on JSP 2.4, EL 3.1 or WebSocket > >>>>> 1.2/2.0 > >>>>>>>> > >>>>>>>> 9.0.0.M13 corrects a regression reported in 9.0.0.M12. > >>>>>>>> > >>>>>>>> The major changes compared to the 9.0.0.M11 release are: > >>>>>>>> > >>>>>>>> - Implement header limits for HTTP/2 > >>>>>>>> > >>>>>>>> - Improve handling of I/O errors with async processing > >>>>>>>> > >>>>>>>> - Fail earlier on invalid HTTP requests > >>>>>>>> > >>>>>>>> Along with lots of other bug fixes and improvements > >>>>>>>> > >>>>>>>> For full details, see the changelog: > >>>>>>>> > >>>>> http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/ch > >>> angelog.xml > >>>>>>>> > >>>>>>>> It can be obtained from: > >>>>>>>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0. > 0.M13/ > >>>>>>>> The Maven staging repo is: > >>>>>>>> > >>>>> https://repository.apache.org/content/repositories/orgapache > >>> tomcat-1103/ > >>>>>>>> The svn tag is: > >>>>>>>> http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_0_M13/ > >>>>>>>> > >>>>>>>> The proposed 9.0.0.M13 release is: > >>>>>>>> [ ] Broken - do not release > >>>>>>>> [X] Alpha - go ahead and release as 9.0.0.M13 > >>>>>>> > >>>>>>> +1 my tests passed > >>>>>>> > >>>>>>> Regards, > >>>>>>> Violeta > >>>>>>> > >>>>>>>> ------------------------------------------------------------ > >>>>> --------- > >>>>>>>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > >>>>>>>> For additional commands, e-mail: dev-h...@tomcat.apache.org > >>>>>>>> > >>>>>>> > >>>>> > >>>> > >>>> > >>>> > >>> > >>> > >>> --------------------------------------------------------------------- > >>> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > >>> For additional commands, e-mail: dev-h...@tomcat.apache.org > >>> > >>> > >> > >> > >> -- > >> With Regards, > >> Andrew Carr > >> > >> e. andrewlanec...@gmail.com > >> w. andrew.c...@openlogic.com > >> h. 4235255668 > >> c. 4239489206 > >> a. P.O. Box 1231, Greeneville, TN, 37744 > >> > > > > > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > -- With Regards, Andrew Carr e. andrewlanec...@gmail.com w. andrew.c...@openlogic.com h. 4235255668 c. 4239489206 a. P.O. Box 1231, Greeneville, TN, 37744
