Commit Graph

1801 Commits

Author SHA1 Message Date
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
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
821fb1302b Merged changes from 3.14 branch into 3.15 2017-04-20 16:57:08 -05:00
Andrew Johnson
aca7b44a05 Supress MS warning C4251 2017-04-20 11:42:52 -05:00
Andrew Johnson
f71102982f Fix "make -q" problems with shared library stubs 2017-03-06 18:46:46 -06:00
Andrew Johnson
d6b0c3041e Merged changes from 3.14 branch to revno 12703 2017-03-06 15:40:28 -06:00
Andrew Johnson
214e9534cc Allow 'make -q' to work with CHECK_RELEASE=NO 2017-03-03 18:18:57 -06:00
Andrew Johnson
de698f370a Merged Windows fixes from 3.14 branch, to revno 12699 2017-01-30 14:31:04 -06:00
Andrew Johnson
faf691a5be VS2015 starting to dislike '/' for compiler flags 2017-01-30 12:11:29 -06:00
Andrew Johnson
73eecbb759 Merged ARCH and bind fixes from 3.14 branch, revno 12696 2017-01-23 17:20:51 -06:00
Andrew Johnson
b9ae6c3308 Allow ARCH with trailing spaces 2017-01-18 10:59:36 -06:00
Andrew Johnson
20dda339cc Make *_INC files order-only prerequisites 2017-01-04 16:32:13 -06:00
Ralph Lange
eff44268e9 Set version to 3.15.5-DEV, close 3.15.5 chapter in release notes 2016-12-13 15:33:01 +01:00
Ralph Lange
fd53e175b4 Update CONFIG_BASE_VERSION for 3.15.5, remove "not released" from RELEASE_NOTES 2016-12-13 14:25:23 +01:00
Andrew Johnson
260bc64b59 Set SNAPSHOT back to -DEV 2016-12-09 13:50:17 -06:00
Andrew Johnson
5097ac3230 Set SNAPSHOT for 3.14.12.6 2016-12-09 13:48:55 -06:00
Andrew Johnson
3e0ddbb542 Set snapshot to -rc1-DEV 2016-10-31 18:06:50 -05:00
Ralph Lange
628382d72d Update version to 3.15.5-rc1 2016-10-31 13:48:06 +01:00
Andrew Johnson
33025641fc Update version to 3.15.5-pre1-DEV 2016-10-21 12:16:25 -05:00
Andrew Johnson
9ea2ac7bc1 Update version to 3.15.5-pre1 2016-10-21 12:15:09 -05:00
Andrew Johnson
321e87aabf Merged changes from the 3.14 branch, to revno 12674 2016-10-20 15:32:06 -05:00
Andrew Johnson
ba555ee496 Fix Whole Program opt settings (windows only) 2016-10-20 12:23:06 -05:00
Andrew Johnson
994cf0ff07 Add whole-program optimization control for MSVS
Introduce a new config variable OPT_WHOLE_PROGRAM for
Microsoft builds to control compiler and linker flags.
Static builds with MSVS-2010 don't work properly with
whole-program optimization enabled; this lets the static
targets be built with normal optimization enabled and
just the whole-program flags turned off.

This commit also makes the CONFIG file for Microsoft
builds more like the 3.15 version.
2016-10-18 16:34:25 -05:00
Andrew Johnson
928ebe82bd Build rules: Enable tests only when we can run them 2016-10-06 13:13:59 -05:00
Andrew Johnson
8d6875fe15 Merged changes from the 3.14 branch to revno 12664 2016-10-03 15:21:48 -05:00
Andrew Johnson
6623cb0112 Back-ported 64-bit MinGW cross-build stuff from 3.15 2016-09-28 17:10:38 -05:00
Andrew Johnson
25b3eae1c7 Merged changes from the 3.14 branch to revno 12658 2016-09-02 11:54:23 -05:00
Andrew Johnson
b671d1cc40 mingw: Fix the list of Windows OS libraries to link against 2016-08-25 14:49:29 -05:00
Andrew Johnson
6934f9b4c1 darwin: Add Homebrew settings to CONFIG_SITE 2016-08-25 14:39:05 -05:00
Andrew Johnson
e5d0915b51 MS build config updates, suppress warning C4344 2016-08-17 11:19:15 -05:00
Andrew Johnson
e9abac25bc Merged changes from 3.14 branch to revo 12652 2016-07-21 23:37:54 -05:00
Andrew Johnson
f169781de0 Merged remove-keywords-3.15 branch 2016-07-21 14:12:51 -05:00
Andrew Johnson
3d4d3181de DOS to Unix line-ending conversions 2016-07-21 12:47:48 -05:00
Andrew Johnson
6dda3decf9 Merged remove-keywords-3.14 branch 2016-07-07 16:43:29 -05:00
Andrew Johnson
ddeb0a827c Make EXPAND rule work on all arch's
Fixes build for linux-arm in src/util.
Don't expand files unless specifically requested.
Expanded files are always precious.
2016-07-06 17:05:04 -05:00
Andrew Johnson
203fcecc23 Adjust linux-arm config for Xilinx SDK users 2016-06-20 14:06:42 -05:00
Andrew Johnson
11e98798bb Fix dependency file generation on Windows & Darwin 2016-05-27 23:15:59 +02:00
Ralph Lange
d1e49a97b5 Set version to 3.15.4-DEV, close 3.15.4 chapter in release notes 2016-05-27 09:12:58 +02:00
Ralph Lange
65574b5971 Update CONFIG_BASE_VERSION for 3.15.4, remove "not released" from RELEASE_NOTES 2016-05-27 08:54:04 +02:00
Ralph Lange
22d6ebe7e1 Merge changes from 3.14 branch up to rev 12642 2016-05-26 13:18:38 +02:00
Andrew Johnson
b9f0ef5158 Merge 3.14 version and add 3.15 edits 2016-05-22 14:38:18 +02:00
Andrew Johnson
988614ae8a Reset SNAPSHOT after -rc1 tagged 2016-05-22 06:06:53 +02:00
Andrew Johnson
c03d3eb69a Removed commit date from CONFIG_BASE_VERSION 2016-05-22 05:41:50 +02:00
Andrew Johnson
89c8c78564 Removed Revision-Id from configure; still one Date 2016-05-21 04:27:03 +02:00
Ralph Lange
fe887b4f83 Update CONFIG_BASE_VERSION for 3.15.4-rc1 2016-05-20 16:37:06 +02:00
Andrew Johnson
7be7ad2768 Merge changes from 3.14 branch, to revno 12640 2016-05-18 10:44:16 -05:00
Andrew Johnson
6c9555310a Update EPICS_TIMEZONE with info for 2016-2021 2016-05-18 10:26:04 -05:00
Andrew Johnson
b87f3eaaee Merged changes from 3.14 branch to revno 12636 2016-05-13 13:12:08 -05:00