@@ -171,7 +171,7 @@ if /i [%1] == [DbgWinPy2.7] (
171171
172172:Build
173173:: Install dotnet SDK version, see https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script
174- echo Installing dotnet SDK ...
174+ echo Installing dotnet SDK ...
175175powershell -NoProfile -ExecutionPolicy unrestricted -Command " [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -useb 'https://dot.net/v1/dotnet-install.ps1'))) -Version 2.1.701 -InstallDir ./cli"
176176
177177set _dotnetRoot = %__currentScriptDir% cli
@@ -188,10 +188,10 @@ echo "Building DotNet Bridge ... "
188188echo " #################################"
189189set _dotnet = %_dotnetRoot% \dotnet.exe
190190
191- if " %SkipDotNetBridge% " == " False" (
191+ if " %SkipDotNetBridge% " == " False" (
192192 call " %_dotnet% " build -c %Configuration% -o " %BuildOutputDir%%Configuration% " --force " %__currentScriptDir% src\DotNetBridge\DotNetBridge.csproj"
193193)
194- if " %BuildDotNetBridgeOnly% " == " True" (
194+ if " %BuildDotNetBridgeOnly% " == " True" (
195195 exit /b %ERRORLEVEL%
196196)
197197call " %_dotnet% " build -c %Configuration% --force " %__currentScriptDir% src\Platforms\build.csproj"
@@ -235,19 +235,19 @@ echo "#################################"
235235:: Download & unzip Python
236236if not exist " %PythonRoot% \.done" (
237237 md " %PythonRoot% "
238- echo Downloading python zip ...
238+ echo Downloading python zip ...
239239 powershell -command " & {$wc = New-Object System.Net.WebClient; $wc.DownloadFile('%PythonUrl% ', '%DependenciesDir% python.zip');}"
240- echo Extracting python zip ...
240+ echo Extracting python zip ...
241241 powershell.exe -nologo -noprofile -command " & { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('%DependenciesDir% python.zip', '%PythonRoot% '); }"
242242 echo .> " %PythonRoot% \.done"
243243 del %DependenciesDir% python.zip
244244)
245245:: Download & unzip Boost
246246if not exist " %BoostRoot% \.done" (
247247 md " %BoostRoot% "
248- echo Downloading boost zip ...
248+ echo Downloading boost zip ...
249249 powershell -command " & {$wc = New-Object System.Net.WebClient; $wc.DownloadFile('%BoostUrl% ', '%DependenciesDir% boost.zip');}"
250- echo Extracting boost zip ...
250+ echo Extracting boost zip ...
251251 powershell.exe -nologo -noprofile -command " & { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('%DependenciesDir% boost.zip', '%BoostRoot% '); }"
252252 echo .> " %BoostRoot% \.done"
253253 del %DependenciesDir% boost.zip
@@ -336,7 +336,7 @@ if %PythonVersion% == 3.7 (
336336 echo Generating low-level Python API from mainifest.json ...
337337 call " %PythonExe% " -m pip install --upgrade autopep8 autoflake isort jinja2
338338 cd " %__currentScriptDir% src\python"
339- call " %PythonExe% " tools\entrypoint_compiler.py --check_manual_changes
339+ call " %PythonExe% " tools\entrypoint_compiler.py --check_manual_changes
340340 if errorlevel 1 (
341341 echo Codegen check failed. Try running tools/entrypoint_compiler.py --check_manual_changes to find the problem.
342342 goto :Exit_Error
@@ -367,7 +367,7 @@ if "%DebugBuild%" == "True" (
367367 copy " %BuildOutputDir%%Configuration% \pybridge.pdb" " %__currentScriptDir% src\python\nimbusml\internal\libs\"
368368)
369369
370- call " %PythonExe% " -m pip install --upgrade " wheel>=0.31.0"
370+ call " %PythonExe% " -m pip install --upgrade " wheel>=0.31.0" " setuptools>=44.0.0 "
371371cd " %__currentScriptDir% src\python"
372372call " %PythonExe% " setup.py bdist_wheel --python-tag %PythonTag% --plat-name win_amd64
373373cd " %__currentScriptDir% "
@@ -400,7 +400,7 @@ if "%InstallPythonPackages%" == "True" (
400400 call " %PythonExe% " -m pip install " scikit-learn==0.19.2"
401401)
402402
403- if " %RunTests% " == " False" (
403+ if " %RunTests% " == " False" (
404404 goto :Exit_Success
405405)
406406
@@ -463,4 +463,4 @@ set PrevErrorLevel=%ERRORLEVEL%
463463:: the build script was trying to replace the existing dotnet
464464:: binaries which were sometimes still in use.
465465call " %_dotnet% " build-server shutdown
466- exit /b %PrevErrorLevel%
466+ exit /b %PrevErrorLevel%
0 commit comments