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.
This commit is contained in:
@@ -44,11 +44,12 @@ DIRS += $(subst /Makefile,,$(wildcard $(addsuffix /Makefile, $(SUBMODULES))))
|
||||
|
||||
include $(TOP)/configure/RULES_DIRS
|
||||
|
||||
# Ensure that RELEASE.local exists before doing anything else
|
||||
# Ensure that RELEASE.<host>.local exists before doing anything else
|
||||
all host $(DIRS) $(ARCHS) $(ACTIONS) $(dirActionTargets) $(dirArchTargets) \
|
||||
$(dirActionArchTargets) $(actionArchTargets): | RELEASE.local
|
||||
$(dirActionArchTargets) $(actionArchTargets): \
|
||||
| RELEASE.$(EPICS_HOST_ARCH).local
|
||||
|
||||
RELEASE.local:
|
||||
RELEASE.$(EPICS_HOST_ARCH).local:
|
||||
@echo EPICS_BASE = $(abspath $(INSTALL_LOCATION))> $@
|
||||
realclean:
|
||||
$(RM) RELEASE.local
|
||||
$(RM) RELEASE.$(EPICS_HOST_ARCH).local
|
||||
|
||||
Submodule modules/ca updated: 5dfd1fc0f0...796279cc0d
Submodule modules/database updated: eac8865b7f...f44bfd897e
Submodule modules/libcom updated: 3ca5c20907...90de8efd54
Submodule modules/normativeTypes updated: abd029aa71...a2b635c2fe
Submodule modules/pvAccess updated: 2ca5744bb9...736f7c3ff3
Submodule modules/pvData updated: b194bc05b1...5976eb5186
Submodule modules/pvDatabase updated: 63214b98f6...b26c0ecd71
Submodule modules/pva2pva updated: 0159cdb77d...135286e75c
Submodule modules/pvaClient updated: a21e5b5913...74d381e68c
Reference in New Issue
Block a user