epics/ci-scripts
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

appveyor: add binary locations to PATH for tools and DLLs

Browse Source
This commit is contained in:
Ralph Lange
2020-04-01 19:01:16 +02:00
parent 48832354da
commit a8321aff92
1 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
appveyor/do.py
View File

@@ -313,19 +313,7 @@ def add_dependency(dep):
def setup_for_build():
global make, makeargs
make = os.path.join(toolsdir, 'make.exe')
makeargs = ['-j2', '-Otarget']
# no parallel make for Base 3.14
with open(os.path.join(cachedir, 'RELEASE.local'), 'r') as f:
lines = f.readlines()
for line in lines:
if re.search(r'^EPICS_BASE=', line):
base_place = line.split('=')[1].strip()
break
with open(os.path.join(base_place, 'configure', 'CONFIG_BASE_VERSION')) as myfile:
if 'BASE_3_14=YES' in myfile.read():
makeargs = []
dllpaths = []
# there is no combined static and debug EPICS_HOST_ARCH target,
# so a combined debug and static target will appear to be just static
@@ -362,6 +350,29 @@ def setup_for_build():
os.environ['PATH'] = os.pathsep.join([r'C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin',
os.environ['PATH']])
make = os.path.join(toolsdir, 'make.exe')
makeargs = ['-j2', '-Otarget']
with open(os.path.join(cachedir, 'RELEASE.local'), 'r') as f:
lines = f.readlines()
for line in lines:
(mod, place) = line.strip().split('=')
bindir = os.path.join(place, 'bin', os.environ['EPICS_HOST_ARCH'])
if os.path.isdir(bindir):
dllpaths.append(bindir)
if mod == 'EPICS_BASE':
base_place = place
# no parallel make for Base 3.14
with open(os.path.join(base_place, 'configure', 'CONFIG_BASE_VERSION')) as myfile:
if 'BASE_3_14=YES' in myfile.read():
makeargs = []
bindir = os.path.join(os.getcwd(), 'bin', os.environ['EPICS_HOST_ARCH'])
if os.path.isdir(bindir):
dllpaths.append(bindir)
os.environ['PATH'] = os.pathsep.join(dllpaths + [os.environ['PATH']])
def prepare(args):
host_info()