From a88300bdd762e9f617f4a746aa024738c6f544d2 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Mon, 23 Mar 2020 14:55:36 +0100 Subject: [PATCH] appveyor: put strawberry perl in the PATH --- appveyor/do.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/appveyor/do.py b/appveyor/do.py index 744e869..d5f1145 100644 --- a/appveyor/do.py +++ b/appveyor/do.py @@ -37,9 +37,6 @@ else: cachedir = os.path.join('.', '.cache') toolsdir = os.path.join('.', '.tools') -# ensure our 'make' found first -os.environ['PATH'] = os.pathsep.join([toolsdir, os.environ['PATH']]) - def modlist(): add_modules = os.environ.get('ADD_MODULES', '').upper().split() @@ -346,6 +343,9 @@ def prepare(*args): cwd=toolsdir) sp.check_call([zip7, 'e', 'make-4.2.1.zip'], cwd=toolsdir) + # put our 'make' in the PATH + os.environ['PATH'] = os.pathsep.join([toolsdir, os.environ['PATH']]) + perlver = '5.30.0.1' if os.environ['CC'] == 'vs2019': print('Installing Strawberry Perl {0}'.format(perlver)) @@ -359,6 +359,11 @@ def prepare(*args): sp.check_call('relocation.pl.bat', shell=True, cwd=os.path.join(toolsdir, 'strawberry')) + # put our strawberry 'perl' in the PATH + os.environ['PATH'] = os.pathsep.join([os.path.join(toolsdir, 'strawberry', 'perl', 'site', 'bin'), + os.path.join(toolsdir, 'strawberry', 'perl', 'bin'), + os.environ['PATH']]) + for mod in modlist(): place = places[setup[mod+"_VARNAME"]] print('Building '+place)