Commit Graph

22 Commits

Author SHA1 Message Date
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
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
53dd61b80a merged with R7.0.3 2019-08-09 11:31:43 +02:00
Andrew Johnson
f0f7a1ef06 Move rules from modules/Makefile to new RULES_MODULES file 2019-04-10 16:16:12 -05:00
Andrew Johnson
e92a9ae426 Make submodule builds more generic
Adds PARENT_MODULE to detect when building a submodule.
RULES_TOP uses that to disable uninstall rules and abort instead of
deleting the parent's configure/ directory.
2019-04-10 12:13:33 -05:00
de378eec34 also build pcas 2019-04-03 15:14:34 +02:00
Michael Davidsaver
49b323b93c avoided embedded TOP for non sub-modules 2019-01-03 20:17:58 -08:00
Andrew Johnson
a8fdf2efeb realclean rule must delete all RELEASE.<host>.local files 2018-12-18 15:43:18 -06:00
Andrew Johnson
c9ca39ce70 Display rule activity in modules/Makefile 2017-12-07 14:44:26 -06:00
Andrew Johnson
008ac76313 Fixes for sharing a build tree between Windows + Unix
Rename modules/RELEASE.local to RELEASE.<host>.local
Modify all submodule configure/RELEASE files to include that, and
update the template configure/RELEASE file to match.

Install Perl *ModuleDirs.pm files into bin/<host> since they contain
absolute paths which may be different on different host arch's.
Scripts that need a ModuleDirs module have been adjusted to look in
their bin/<host> directory for it.

Some additional submodule updates were also incorporated.
2017-12-06 23:27:38 -06:00
Andrew Johnson
09328e42c9 Allow for a modules/Makefile.local
This permits other submodules to be integrated into a build
without having to edit the Makefile itself.
2017-11-29 17:22:48 -06:00
Andrew Johnson
260d43b9bc Adjust RELEASE.local generation for Windows
On Windows, neither the shell nor echo will strip double-quote
characters from the command-line, so just leave them out.
2017-11-15 10:30:14 -06:00
Andrew Johnson
33852b1e90 Adjust pvAccess dependencies 2017-11-14 21:36:40 -06:00
Andrew Johnson
202fbe4ffb Submodule build configuration fixes
Remove modules/RELEASE.local from repository,
create it at run-time instead of RELEASE.base.
2017-11-14 20:49:54 -06:00
Andrew Johnson
e569730acc modules/Makefile fix: Replace spaces with tab character
Also adds modules/RELEASE.base to .gitignore
2017-11-03 11:00:49 -05:00
Ralph Lange
75479e1a10 modules: fix creation of absolute EPICS_BASE (d7cda55d) 2017-11-03 09:26:28 +01:00
Ralph Lange
d7cda55d80 modules: make RELEASE.local use an absolute Base path 2017-10-02 09:36:43 +02:00
Ralph Lange
63cd93a5a4 modules: add pva2pva, example 2017-09-28 15:13:37 +02:00
Ralph Lange
d71262b458 modules: add normativeTypes, pvaClient, pvDatabase 2017-09-27 15:16:00 +02:00
Ralph Lange
b27cd36e41 travis-ci: add ca and database as dependencies for pvAccess 2017-09-26 15:42:43 +02:00
Ralph Lange
e7a8ac6c38 modules: add pvData, pvAccess 2017-09-26 13:39:04 +02:00
Ralph Lange
6bf805c420 Add submodule context 2017-09-20 14:39:32 +02:00