Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ cc_library(

new_local_repository(
name = "windows_curl",
path = "C:\\opt\\curl-8.18.0_4-win64-mingw",
path = "C:\\opt\\curl-8.19.0_4-win64-mingw",
build_file_content = """
cc_import(
name = "curl_lib",
Expand Down
2 changes: 1 addition & 1 deletion third_party/libgit2/libgit2_engine.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def _impl(repository_ctx):
"BUILD_EXAMPLES": "OFF",
"BUILD_TESTS": "OFF",
"BUILD_CLI": "OFF",
"CURL_DEPENDENCIES_DIR": "C:/opt/curl-8.18.0_4-win64-mingw",
"CURL_DEPENDENCIES_DIR": "C:/opt/curl-8.19.0_4-win64-mingw",
"""
else:
lib_name = "libgit2"
Expand Down
25 changes: 14 additions & 11 deletions windows_create_package.bat
Original file line number Diff line number Diff line change
Expand Up @@ -124,28 +124,31 @@ if !errorlevel! neq 0 exit /b !errorlevel!
copy %cd%\release_files\thirdparty-licenses\* %license_dest%
if !errorlevel! neq 0 exit /b !errorlevel!

set "curl_version=8.19.0_4"
set "curl_dir=curl-%curl_version%-win64-mingw"

if !errorlevel! neq 0 exit /b !errorlevel!
copy C:\opt\curl-8.18.0_4-win64-mingw\COPYING.txt %license_dest%LICENSE-CURL.txt
copy C:\opt\%curl_dir%\COPYING.txt %license_dest%LICENSE-CURL.txt
if !errorlevel! neq 0 exit /b !errorlevel!
copy C:\opt\curl-8.18.0_4-win64-mingw\dep\brotli\LICENSE.txt %license_dest%LICENSE-BROTIL.txt
copy C:\opt\%curl_dir%\dep\brotli\LICENSE.txt %license_dest%LICENSE-BROTLI.txt
if !errorlevel! neq 0 exit /b !errorlevel!
copy C:\opt\curl-8.18.0_4-win64-mingw\dep\cacert\LICENSE.url %license_dest%LICENSE-CACERT.url
copy C:\opt\%curl_dir%\dep\certdata\LICENSE.url %license_dest%LICENSE-CERTDATA.url
if !errorlevel! neq 0 exit /b !errorlevel!
copy C:\opt\curl-8.18.0_4-win64-mingw\dep\libpsl\COPYING.txt %license_dest%LICENSE-LIBPSL.txt
copy C:\opt\%curl_dir%\dep\libpsl\COPYING.txt %license_dest%LICENSE-LIBPSL.txt
if !errorlevel! neq 0 exit /b !errorlevel!
copy C:\opt\curl-8.18.0_4-win64-mingw\dep\libressl\COPYING.txt %license_dest%LICENSE-LIBRESSL.txt
copy C:\opt\%curl_dir%\dep\libressl\COPYING.txt %license_dest%LICENSE-LIBRESSL.txt
if !errorlevel! neq 0 exit /b !errorlevel!
copy C:\opt\curl-8.18.0_4-win64-mingw\dep\libssh2\COPYING.txt %license_dest%LICENSE-LIBSSH2.txt
copy C:\opt\%curl_dir%\dep\libssh2\COPYING.txt %license_dest%LICENSE-LIBSSH2.txt
if !errorlevel! neq 0 exit /b !errorlevel!
copy C:\opt\curl-8.18.0_4-win64-mingw\dep\nghttp2\COPYING.txt %license_dest%LICENSE-NGHTTP2.txt
copy C:\opt\%curl_dir%\dep\nghttp2\COPYING.txt %license_dest%LICENSE-NGHTTP2.txt
if !errorlevel! neq 0 exit /b !errorlevel!
copy C:\opt\curl-8.18.0_4-win64-mingw\dep\nghttp3\COPYING.txt %license_dest%LICENSE-NGHTTP3.txt
copy C:\opt\%curl_dir%\dep\nghttp3\COPYING.txt %license_dest%LICENSE-NGHTTP3.txt
if !errorlevel! neq 0 exit /b !errorlevel!
copy C:\opt\curl-8.18.0_4-win64-mingw\dep\ngtcp2\COPYING.txt %license_dest%LICENSE-NGTCP2.txt
copy C:\opt\%curl_dir%\dep\ngtcp2\COPYING.txt %license_dest%LICENSE-NGTCP2.txt
if !errorlevel! neq 0 exit /b !errorlevel!
copy C:\opt\curl-8.18.0_4-win64-mingw\dep\zlibng\LICENSE.md %license_dest%LICENSE-ZLIBNG.md
copy C:\opt\%curl_dir%\dep\zlibng\LICENSE.md %license_dest%LICENSE-ZLIBNG.md
if !errorlevel! neq 0 exit /b !errorlevel!
copy C:\opt\curl-8.18.0_4-win64-mingw\dep\zstd\LICENSE.txt %license_dest%LICENSE-ZSTD.txt
copy C:\opt\%curl_dir%\dep\zstd\LICENSE.txt %license_dest%LICENSE-ZSTD.txt

:: Add when CAPI enabled and tested
::mkdir -vp /ovms_release/include && cp /ovms/src/ovms.h /ovms_release/include
Expand Down
2 changes: 1 addition & 1 deletion windows_install_build_dependencies.bat
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ exit /b 0
:install_curl
echo [INFO] Installing curl ...

set "curl_version=8.18.0_4"
set "curl_version=8.19.0_4"
set "curl_dir=curl-%curl_version%-win64-mingw"
set "curl_ver=%curl_dir%.zip"
set "curl_http=https://curl.se/windows/dl-%curl_version%/"
Expand Down
2 changes: 1 addition & 1 deletion windows_setupvars.bat
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
::
@echo on
:: Setting up default OVMS compilation environment variables
set "setPath=C:\opt;C:\opt\Python312\;C:\opt\Python312\Scripts\;C:\opt\msys64\usr\bin\;C:\opt\curl-8.18.0_4-win64-mingw\bin;%PATH%;"
set "setPath=C:\opt;C:\opt\Python312\;C:\opt\Python312\Scripts\;C:\opt\msys64\usr\bin\;C:\opt\curl-8.19.0_4-win64-mingw\bin;%PATH%;"
set "setPythonPath=%cd%\bazel-out\x64_windows-opt\bin\src\python\binding"
set "BAZEL_SH=C:\opt\msys64\usr\bin\bash.exe"

Expand Down
2 changes: 1 addition & 1 deletion windows_test.bat
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ set "runTest=%cd%\bazel-bin\src\ovms_test.exe --gtest_filter=!gtestFilter! > win

:: Setting PATH environment variable based on default windows node settings: Added ovms_windows specific python settings and c:/opt and removed unused Nvidia and OCL specific tools.
:: When changing the values here you can print the node default PATH value and base your changes on it.
set "setPath=C:\opt;C:\opt\Python312\;C:\opt\Python312\Scripts\;C:\opt\msys64\usr\bin\;C:\opt\curl-8.18.0_4-win64-mingw\bin;c:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\;%PATH%;"
set "setPath=C:\opt;C:\opt\Python312\;C:\opt\Python312\Scripts\;C:\opt\msys64\usr\bin\;C:\opt\curl-8.19.0_4-win64-mingw\bin;c:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\;%PATH%;"
set "setPythonPath=%cd%\bazel-out\x64_windows-opt\bin\src\python\binding"
set "BAZEL_SH=C:\opt\msys64\usr\bin\bash.exe"

Expand Down