Commit Graph
2265 Commits
Author SHA1 Message Date
Michael Davidsaver db2cd68ce3 WIN32: osdFindSymbol() use psapi 2020-04-16 07:53:06 -07:00
Ralph Lange cbf917e833 Improve automated testing rules to allow other test frameworks
- make runtests a double-colon rule, so that other test frameworks
  can add their own recipes independently
- only define runtests:: $TESTSCRIPTS rule when there are TESTSCRIPTS
  (to avoid having it run every time when no TESTSCRIPTS are defined)
- $(strip $TAPFILES) inside ifneq to fix trouble when TAPFILES=' '
2020-04-16 12:04:16 +02:00
Andrew Johnson 85d1982890 Merge changes from 3.15 branch into 7.0 2020-04-15 21:39:54 -05:00
zimoch b27d1416b5 install location with patch level 2020-04-07 15:38:05 +02:00
zimoch bbaa207603 Merge remote-tracking branch 'remotes/xiaoqiang/wine_msvc' into PSI-7.0 2020-04-06 14:00:56 +02:00
Xiaoqiang Wang 605937bbac use the msvc from a new location 2020-04-06 11:05:04 +02:00
Xiaoqiang Wang 594fcb9a0d CXXFLAGS from CONFIG_win32-x86.Common 2020-04-03 15:10:46 +02:00
Xiaoqiang Wang e033c0cfb2 use MSVC via WINE to compile for windows 2020-04-01 14:44:38 +02:00
Xiaoqiang Wang 53ebbab941 use MSVC_DIR to pick up MSVC toolchains 2020-04-01 14:42:18 +02:00
Freddie AkeroydandRalph Lange 7f02f8a386 Exclude VS2012 from -FS option
(cherry picked from 7.0 / commit 4aee25e8 and e29a53f0)
2020-03-28 15:55:35 +01:00
Andrew Johnson 5f1b3a5419 Extend RULES_EXPAND to add more features
* Use EXPAND_COMMON for architecture-independent templates,
  generated in the O.Common directory instead of O.$(T_A).
* Add EXPAND_ME to name Makefile variables to be added without
  having to provide a value (permits spaces in value too).
* Comments in RULES_EXPAND describe how to use these rules.
2020-03-20 11:45:20 -05:00
Andrew Johnson eb817ba056 Modify rules to allow multiple API.h libraries to be built 2020-03-10 23:35:03 -05:00
Andrew Johnson 9e7fc1915b Add build rules to generate and install *API.h header files 2020-03-07 01:05:05 -06:00
Andrew Johnson e13b01208b Bump database version to 3.18.0, use in SHRLIB_VERSION 2020-03-06 23:28:57 -06:00
zimoch 86adc529ef Merge remote-tracking branch 'origin' into PSI-7.0
Conflicts:
	configure/os/CONFIG_SITE.Common.linuxCommon
	modules/libcom/src/log/iocLog.c
	modules/libcom/src/log/logClient.c
	modules/pvAccess
	modules/pvData
	modules/pvDatabase
2020-02-06 17:28:40 +01:00
Andrew Johnson 54cd7e7ba1 MinGW: Replace -Wno-format with -D__USE_MINGW_ANSI_STDIO 2020-01-08 17:21:04 -06:00
Andrew Johnson f6d8a1ab6c Sort DIRECTORY_TARGETs to de-duplicate, avoids make warning 2019-11-26 14:31:29 -06:00
Andrew Johnson 578608b1c7 Merge changes from 3.15 branch into 7.0 2019-11-21 12:45:31 -06:00
Andrew Johnson 1d18aa3e6c Disable printf() format warnings on MinGW, they're broken 2019-11-21 12:20:56 -06:00
Andrew Johnson a85967caea Cross-builds of 64-bit MinGW should inherit from 32-bit
Don't duplicate, this file missed an important change as a result.
2019-11-21 12:20:13 -06:00
Andrew Johnson f3d63da77b Remove two long-unused environment parameters 2019-11-15 13:16:35 -06:00
Andrew Johnson 7eee262486 Shorten/simplify uninstall recipes 2019-11-12 16:16:02 -06:00
Andrew Johnson a10379327c Replace broken cleandirs recipe 2019-11-12 16:14:39 -06:00
Andrew Johnson 8734863f69 Incr version and set snapshot/development flags 2019-11-01 14:11:29 -05:00
Andrew Johnson 34834dfe97 Clear development flags for 7.0.3.1 2019-11-01 14:08:44 -05:00
Andrew Johnson db4ad455d2 Update version numbers for 3.15.8-DEV (3.15.7.1-DEV) 2019-10-31 15:23:11 -05:00
Andrew Johnson 74a90d141b Update version numbers
Also contains some reformatting in README.md
2019-10-31 13:00:24 -05:00
Andrew Johnson 3e7e26d8d7 Merge 3.15 branch into 7.0 2019-10-28 01:03:12 -05:00
Andrew Johnson ed9d7550f2 Configure linux targets to detect GNU Readline automatically 2019-10-25 00:20:50 -05:00
Andrew Johnson 3881328f2f Merge branch 'vxworks-tz-support' into 3.15 2019-10-22 15:32:46 -05:00
Andrew Johnson 588fa4f3b2 Trivial formatting changes in configure/ 2019-10-21 22:39:04 -05:00
Andrew Johnson 7bbe528df2 Fix a couple of benign mistakes in RULES files 2019-10-21 22:39:04 -05:00
Freddie AkeroydandMichael Davidsaver edc66418ac WIN32: Add symbol lookup 2019-10-17 20:10:23 -07:00
Andrew Johnson 3128fdb930 Add and use epicsProve.pl script
Some Windows Perl installations don't have a working prove.bat
so 'make test-results' doesn't work properly on them.
2019-10-17 16:14:59 -05:00
Michael Davidsaver 02bec52f0a Merge remote-tracking branch 'lp-make/rpath-origin' into 7.0
* lp-make/rpath-origin:
  makeRPath allow multiple root directories
  redo softIoc to be more c++y
  rpath $ORIGIN doc
  older binutils compat
  travis-ci test rpath $ORIGIN
  epicsGetExecName WIN32, Darwin, solaris, freebsd
  epicsGetExecDir() paths relative to executable
  LINKER_USE_RPATH=ORIGIN

# Conflicts:
#	configure/os/CONFIG.Common.linuxCommon
2019-10-06 20:05:47 -07:00
Michael Davidsaver ddb79a37bc Merge remote-tracking branch 'lp-bhill/shared-rpath-independent-of-static-build' into 7.0
* lp-bhill/shared-rpath-independent-of-static-build:
  Another comment fix
  Fix comment as well
  Also apply rpath change to PRODDIR_RPATH_LDFLAGS
  Shared lib rpath should not depend on whether or not static libs are also being built.
2019-10-06 20:02:00 -07:00
Michael Davidsaver 1b12914ff0 avoid prove executable
On windows prove.bat has the annoying limitations
of a .bat script.  Like a max. of 9 arguments.
2019-10-06 19:59:45 -07:00
Freddie Akeroyd e29a53f01a Formatting 2019-09-30 22:48:54 +01:00
Freddie Akeroyd 4aee25e8e2 Exclude VS2012 from -FS option 2019-09-30 22:37:42 +01:00
Bruce Hill 4f0c9c97c6 Another comment fix 2019-09-26 16:34:21 -07:00
Bruce Hill feb44624a1 Fix comment as well 2019-09-26 16:32:08 -07:00
Bruce Hill 8c5d93d044 Also apply rpath change to PRODDIR_RPATH_LDFLAGS 2019-09-26 16:13:49 -07:00
Bruce Hill 03268bc683 Shared lib rpath should not depend on whether or not static libs are also being built. 2019-09-25 23:09:48 -07:00
zimoch 3a774d37f8 call shell to get EPICS_SITE_VERSION only when compiling EPICS base 2019-09-20 09:02:35 +02:00
Michael Davidsaver 966965c2c1 Merge remote-tracking branch 'lp-Com/make-simple' into 7.0
* main/make-simple:
  restore ModuleDirs in caPerlApp
  simplify e_flex/antelope path compute
  further no need to search for perl modules under bin
  skip RELEASE_TOPS
  configure: Don't hide any perl scripts being run
  missed a TOP
  no need to search for perl modules under bin/
  drop unnecessary *ModuleDirs
  avoided embedded TOP for non sub-modules
2019-09-17 14:57:47 -07:00
zimoch 584caf54b2 don't use space in version string 2019-09-03 09:17:38 +02:00
zimoch 871af36ac5 move -fno-strict-aliasing flag to central place for all Linux version 2019-09-02 16:44:53 +02:00
zimoch 0ad6d2aec9 typo in comment 2019-09-02 13:53:21 +02:00
zimoch 8837d2f275 use perl instead of date in EPICS_SITE_VERSION because of Windows 2019-09-02 10:49:44 +02:00
zimoch 3699c5bc4c fix strict-aliasing warnings 2019-08-26 15:50:07 +02:00