Andrew Johnson
cbb13bf6b1
Darwin: Don't link using -flat_namespace
2018-09-18 10:22:29 -05:00
Andrew Johnson
150d764d28
Merge 3.14.12.8 (+ the Travis fix) into 3.15
2018-09-17 16:15:55 -05:00
Andrew Johnson
7dd1ea4cab
GNU Make 3.81 (as used on Travis) doesn't have 'undefine'
2018-09-17 10:24:51 -05:00
Andrew Johnson
922ed30136
Set EPICS_DEV_SNAPSHOT for the final 3.14.12.8 release
2018-09-14 13:44:05 -05:00
Andrew Johnson
4b59476170
Merge branch 'tidy-startup' into 3.14
2018-09-13 16:49:21 -05:00
Andrew Johnson
526b565c6b
configure/CONFIG: Undefine EHA after use
2018-09-10 18:19:03 -05:00
Martin Konrad
46b5d6006e
Fix "make --question" mode
...
Fix for lp:1669891
2018-09-07 18:02:02 -04:00
Andrew Johnson
5c6d275001
Update the linux-x86.linux-arm tool-set used for APS cross-builds
2018-08-06 16:10:57 -05:00
Andrew Johnson
c09b6e2f1b
libCom: Add and use a -o<filename> option to e_flex
...
Note that like the -S option the filename must follow immediately in
the same command-line argument with no space.
2018-07-21 01:47:33 -05:00
Andrew Johnson
2a2a1e54ac
Post-tag version number update
2018-07-19 12:35:40 -05:00
Andrew Johnson
20d2cff501
Update version number to 3.14.12.8-rc1
2018-07-19 12:31:52 -05:00
Andrew Johnson
57c0d26c4d
Drop R3.13 VxWorks-only OBJLIBS build targets and rules
2018-07-14 17:34:11 -05:00
Andrew Johnson
220e404203
Move EpicsHostArch.pl into src/tools, install to lib/perl
2018-06-26 11:23:15 -05:00
Andrew Johnson
7e598c60cc
Merge changes from 3.16 branch into 7.0
2018-06-20 23:27:49 -05:00
Andrew Johnson
ba4c609506
Merge changes from 3.15 into 3.16
2018-05-12 22:39:37 -05:00
Bruce Hill
b84ee89d87
Fix ECHO definition to not match variables in MAKEFLAGS by using MFLAGS instead.
...
Prior ECHO definition strips T_A=XXX command line variable definitions
from MAKEFLAGS but doesn't strip other variable definitions such as
INSTALL_LOCATION. As a result, if you "make INSTALL_LOCATION=XXX"
the ECHO definition erroneously matches if your install location
contains 's'. Changing the ECHO definition to MFLAGS avoids
all command line variable definitions.
2018-04-16 19:11:40 -07:00
Andrew Johnson
3d88316eab
Merge 3.14 into 3.15 (MSVC absolute filenames fix)
2018-03-26 16:49:28 -05:00
Andrew Johnson
b9443f8813
Tell MSVC to use absolute filenames in diagnostics (-FC flag)
2018-03-23 11:39:53 -05:00
Andrew Johnson
0014853b99
Merge 3.16 into core/master
2018-03-22 23:27:26 -05:00
Andrew Johnson
a3c01bbf77
Merge 3.16 into 3.17
2018-03-22 18:07:25 -05:00
Andrew Johnson
086bc961a4
Merge 3.15 into 3.16
2018-03-15 17:53:10 -05:00
Andrew Johnson
7b5b23f6d3
Merge 3.14 into 3.15
2018-03-15 17:11:20 -05:00
Andrew Johnson
c8a7e1597d
VxWorks Timezone updates
...
Remove 2017; fix hour in MET settings
2018-03-15 10:57:55 -05:00
Andrew Johnson
ceaff61c09
Pull in the podToHtml.pl script and rules from 3.15
...
This lets src/cap5 build with Perl installations that lack Perl's
podchecker and pod2html scripts (e.g. Fedora 27).
2018-03-14 14:12:12 -05:00
Andrew Johnson
ea408578e0
Merge 3.15 branch into 3.16
2018-03-12 16:51:23 -05:00
Andrew Johnson
2307e94d1c
Rules for building bootable TESTPROD_RTEMS targets
...
Previously if you wanted a .boot file it had to be installed.
2018-03-12 16:34:54 -05:00
Andrew Johnson
1458f8640e
Merge 3.15 into 3.16
2018-03-04 15:58:26 -06:00
Andrew Johnson
8eb4eec7d2
Corrected fix from Bruce Hill's Github PR#19
2018-03-03 17:17:34 -06:00
Andrew Johnson
d550b9d55c
Merge 3.16 into core/master and related master branches
2018-02-05 13:59:12 -06:00
Andrew Johnson
6603d778cb
Merge 3.16 into 3.17
2018-02-05 12:51:06 -06:00
Andrew Johnson
eef6f3afbb
Merge 3.15 branch into 3.16
2018-02-01 15:05:44 -06:00
Andrew Johnson
f1e5e9689b
Merge 3.14 branch into 3.15
2018-02-01 11:23:29 -06:00
Andrew Johnson
1454f42a27
Config fix for parallel builds with MSVC 2015 and later
...
From Mark Rivers and Freddie Akeroyd.
2018-02-01 11:19:08 -06:00
Andrew Johnson
a5e58829fd
Merge up changes from below
2018-01-20 19:17:35 -06:00
Andrew Johnson
d41f2e6806
Configure command-line interface for VxWorks
...
Add new LEDLIB and OTHER configuration options.
Fix typo in vxWorks/osdReadline.c
Use LEDLIB on VxWorks.
Fixes LP: #1741578
2018-01-08 11:56:37 -06:00
Andrew Johnson
98a2871727
Reset SNAPSHOT to -DEV after tagging 3.14.12.7
2017-12-15 16:09:21 -06:00
Andrew Johnson
5ca1bb3bd5
Set SNAPSHOT for 3.14.12.7 final release
2017-12-15 16:06:08 -06:00
Andrew Johnson
e43c6634d0
Update patch level and snapshot after tagging release
2017-12-15 12:48:28 -06:00
Andrew Johnson
37d103f9cd
Clear SNAPSHOT in Base version for 7.0.1.1
2017-12-15 12:44:20 -06:00
Andrew Johnson
b0f6451c6e
Set SNAPSHOT after tagging release
2017-12-14 19:10:10 -06:00
Andrew Johnson
269f5fc58a
Clear SNAPSHOT in Base version for 7.0.1
2017-12-14 19:07:09 -06:00
Andrew Johnson
f6be3c7f70
Set snapshot to -rc1-DEV
2017-12-08 16:40:08 -06:00
Andrew Johnson
00924dcba0
About to tag 3.14.12.7-rc1
2017-12-08 16:37:03 -06:00
Andrew Johnson
28a8c06075
Set EPICS_HOST_ARCH in the environment, not just locally
...
This is essential for submodules, which now need that value to load
the right modules/RELEASE.<host>.local file which gives them their
path to EPICS_BASE (they can't set it for themselves without knowing
that path because the startup directory is part of core!).
2017-12-07 18:01:09 -06:00
Andrew Johnson
0867af4654
Set snapshot to -rc1-DEV after tagging
2017-11-30 17:56:17 -06:00
Andrew Johnson
8b97e78bc3
Set version snapshot to -rc1
2017-11-30 17:53:14 -06:00
Andrew Johnson
f3d0ce0fb9
Merge 3.16 into core/master and submodules
2017-11-18 13:55:24 -06:00
Andrew Johnson
ab555a280b
Merge 3.16 into 3.17
2017-11-18 13:32:59 -06:00
Andrew Johnson
2d1f1ed2fa
Merge 3.15 into 3.16
2017-11-18 13:30:06 -06:00
Andrew Johnson
db005ac3fe
RULES_TARGET: Define $(lib)_DIR before it is needed
...
TESTLIBRARY products were being installed, because an executable
that was linked to one added a dependency assuming it would be in
the INSTALL_LIB directory. The $(lib)_DIR was being set too late
for test libraries, so the fallback location was used instead.
This fix sets $(lib)_DIR for test libraries before any rules use it.
2017-11-17 14:55:50 -06:00