Commit Graph

1877 Commits

Author SHA1 Message Date
Andrew Johnson f3d0ce0fb9 Merge 3.16 into core/master and submodules 2017-11-18 13:55:24 -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
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
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
Andrew Johnson 79fe79ad56 Merged changes from 3.15 branch into 3.16 2017-06-14 14:55:53 -05:00
Andrew Johnson 105e831442 Merge changes from 3.14 branch into 3.15 2017-06-14 10:17:31 -05:00
Andrew Johnson a1dc16848c configure: Fix include CONFIG_APP_INCLUDE
which needs to happen *after* CONFIG_SITE overrides.
2017-06-14 10:03:43 -05:00
Andrew Johnson 6efe292494 Add EPICS_IOC_IGNORE_SERVERS environment variable
dbServers cannot be registered when their names appear in this
variable, so they should remain inactive. This feature is mainly
intended for debugging, so the crude name search should be OK.
2017-06-13 23:36:30 -05:00
Andrew Johnson d47b1a1854 Reset snapshot to -DEV 2017-06-02 14:57:58 -05:00
Andrew Johnson ee91b29fe0 Clear version snapshot for 3.16.1 final release 2017-06-02 14:54:58 -05:00
Andrew Johnson c670ef0199 Merge 3.15 branch into master 2017-05-19 17:42:40 -05:00
Andrew Johnson 98b0f7e48b Merge 3.14 branch into 3.15 2017-05-19 17:34:49 -05:00
Andrew Johnson 672fd16ec8 Add make targets test-results and clean-tests
These are mainly intended for CI builds.
2017-05-19 15:44:15 -05:00
Andrew Johnson 43ea188385 Merge 3.15 branch into 3.16
# Conflicts:
#	configure/CONFIG_BASE
#	configure/RULES_BUILD
2017-05-18 17:10:40 -05:00
Andrew Johnson 0b3e44747e Merge 3.14 branch into 3.15
# Conflicts:
#	configure/RULES.Db
#	configure/RULES_ARCHS
#	configure/RULES_BUILD
#	documentation/RELEASE_NOTES.html
2017-05-18 17:07:41 -05:00
Andrew Johnson b7b3dd2b37 Support for 'make junitfiles' target.
The Perl XML::Generator module must be installed to use this.
2017-05-18 16:31:43 -05:00
Andrew Johnson ffa7399c71 Merge changes from 3.15 branch 2017-05-11 16:39:52 -05:00
Andrew Johnson cb89710bbd Update comments in the configure/RELEASE file 2017-05-11 14:50:00 -05:00
Andrew Johnson b3bbf67ce8 Add support for a CONFIG_SITE.local file 2017-05-11 14:49:04 -05:00
Andrew Johnson e0dea7ab23 Set snapshot to -rc1-DEV 2017-05-09 14:45:55 -05:00
Andrew Johnson 7aefee6737 Set Base version number for 3.16.1-rc1 2017-05-09 14:00:29 -05:00
Michael Davidsaver 3fbdcdb032 EPICS_CA_AUTO_MAX_ARRAY_BYTES -> EPICS_CA_AUTO_ARRAY_BYTES 2017-05-03 13:59:35 -04:00
Michael Davidsaver f2a1834dc9 add EPICS_CA_MCAST_TTL
may be necessary/helpful for mcast search/beacon usage
across sub-nets.
2017-05-02 20:35:00 -04:00