Subject: |
Base 3.16 => 7.0 Merge |
From: |
"Johnson, Andrew N. via Core-talk" <[email protected]> |
To: |
EPICS core-talk <[email protected]> |
Date: |
Thu, 25 Oct 2018 23:04:45 +0000 |
Hi Michael (and others),
I am working on resolving the conflicts from merging 3.16.2-rc1 into the
7.0 branch. Please do not push any commits to the 7.0 branch until I'm
finished. This looks like a tricky merge which may take me most of
tomorrow to complete. I hope I will also have time then to announce the
3.16.2-rc1 release.
The Travis RTEMS and QEMU configurations for the 3.16 and 7.0 branches
appear to be significantly different. If you have time could you look at
the travis files and scripts and email me (do NOT commit) the files as
you think they should appear on the merged 7.0 branch.
There are also some things I don't understand in the configuration, why
are we pulling in bison, flex, texinfo and install-info? Should the
BRCORE=... build environment go away? Do we want to add the static
builds to 7.0 that we have apparently only been doing in 3.16?
Thanks,
- Andrew
--
Arguing for surveillance because you have nothing to hide is no
different than making the claim, "I don't care about freedom of
speech because I have nothing to say." -- Edward Snowdon
- Replies:
- Re: Base 3.16 => 7.0 Merge Johnson, Andrew N. via Core-talk
- Navigate by Date:
- Prev:
Jenkins build is back to normal : epics-base-3.16-cyg64 #236 APS Jenkins via Core-talk
- Next:
group PV question Timo Korhonen
- Index:
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
<2018>
2019
2020
2021
2022
2023
2024
- Navigate by Thread:
- Prev:
Jenkins build is back to normal : epics-base-3.16-cyg64 #236 APS Jenkins via Core-talk
- Next:
Re: Base 3.16 => 7.0 Merge Johnson, Andrew N. via Core-talk
- Index:
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
<2018>
2019
2020
2021
2022
2023
2024
|