epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity
16,977 Commits 8 Branches 204 Tags
66537d01bd9f2f7772e6e4f64918591b6694de26
Commit Graph
2146 Commits
Author SHA1 Message Date
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
Andrew Johnson df4c8b4935 Set snapshot to -pre1-DEV, post-tag 
This seems illogical, shouldn't it now be -rc1-DEV now?
 2017-11-16 12:03:51 -06:00
Andrew Johnson e785d8748f Set version 7.0.1-pre1 in CONFIG_BASE_VERSION 2017-11-16 11:55:09 -06:00
Andrew Johnson b690e5abbd Move tool configs into module cfg/CONFIG* files 2017-11-14 23:41:20 -06:00
Andrew Johnson 716d297c85 Merge development branches into core/master 2017-11-07 21:28:01 -06:00
Andrew Johnson 7fc6639bfa Merged branch 'rsrv-register' into 3.17 2017-11-02 14:45:05 -05:00
Michael Davidsaver d5f74fe006 rtems tests for pc386 2017-10-22 19:11:01 -05:00
Ralph Lange 077ff94f9f Merge from 3.16 branch 2017-10-20 16:55:36 +02:00
Andrew Johnson 7eef48102c Merge changes from 3.15 branch into 3.16 2017-10-10 09:56:31 +02:00
Michael Davidsaver 15b97f65cb src/tools: teach makeTestfile about WINE and QEMU 
Teach makeTestfile host to run test for some cross built
targets.
 2017-09-27 16:21:44 -05:00
Andrew Johnson 169e9f2699 Merged 3.14 changes into 3.15 2017-09-25 15:45:53 -05:00
Andrew Johnson c441cdd5a4 Adjust comments about EPICS_TIMEZONE 2017-09-25 12:14:48 -05:00
Andrew Johnson 10849a0df3 RULES: Expand @TOP@ and @ARCH@ in .plt files 
Use this in Snippets.plt
 2017-09-22 14:05:37 -05:00
Ralph Lange a27d7440f3 Add Perl include path mechanism (by Andrew) 2017-09-19 12:02:14 +02:00
Ralph Lange f2a899b92b configure: no implicit installation (overwrite) of config files 2017-09-19 12:02:14 +02:00
Ralph Lange 53000504d0 configure: remove cas/gdd from EPICS_BASE_HOST_LIBS 2017-09-19 12:02:14 +02:00
Ralph Lange d9515dbabc configure: clean up INSTALL_LOCATION/configure unless installing in TOP 2017-09-19 12:02:14 +02:00
Ralph Lange 80efa20729 configure: set Base version to 7.0.1-DEV 2017-09-19 12:02:14 +02:00
Ralph Lange fa27a9dabb Structural changes to create core module 2017-09-19 12:02:12 +02:00
Andrew Johnson 736b81e044 Merge changes from 3.15 branch 
Includes separate fix for alarm severity regression.
 2017-09-02 23:52:22 -05:00
Andrew Johnson 73f3e76150 Merged 3.14 branch config changes into 3.15 2017-08-18 17:19:05 -05:00
Andrew Johnson 4ab56518a0 Add readline support to linux-xscale_be rules 
Also moves cross-build config to the right host-arch's
 2017-08-18 15:14:42 -05:00
Andrew Johnson 80dbc7aeef Clean up the cross-build rules slightly 2017-08-18 15:10:13 -05:00
Andrew Johnson 238f6772bd Dirk's simpler VxWorks version rules 2017-08-18 15:06:38 -05:00
Andrew Johnson dc9859cee9 Fix RPATH and readline for linux-arm cross-builds 2017-08-18 11:59:17 -05:00
Andrew Johnson 5d5f27a486 Don't set RPATH if STATIC_BUILD=YES 2017-08-18 11:57:50 -05:00
Andrew Johnson ad6a16d7c4 Update EPICS_TIMEZONE settings, extend to 2022 2017-08-18 11:33:17 -05:00
Andrew Johnson 519a75fde6 Merge vpath fix from 3.15 branch 2017-07-26 12:04:25 -05:00
Andrew Johnson f04f17f9bf Remove vpath for %.pl files 
It isn't needed, and in some configurations it causes build failures.
Similar problems could still occur for other file types with a similar
vpath, but it's less likely that other file types would be installed in
an equivalent $(TOP)/../<dir> path.

The original issue with .pl files was caused by an installation of Base
where the parent directory had a bin/<host> soft-link pointing to the
same bin/<host> of a newer installation of the same version of Base, so
it had all the necessary .pl files in it. The vpath allowed the build in
src/tools to search $(TOP)/../bin/<host> when checking the buildInstall
dependency, and since it found those .pl files through the vpath it
didn't bother to install them. When they were run later on in the build
from the $(TOP)/bin/<host>/ path they weren't present so it failed.
 2017-07-26 12:02:24 -05:00
Andrew Johnson db3e79e4b7 Merged changes from 3.15 branch into 3.16 2017-06-22 19:00:51 -05:00
Andrew Johnson 630b4f375d Fix 'make test-results' rule for Windows 2017-06-22 16:42:53 -05:00