From e3395da40517333eb93204a021a6504aa31c16cf Mon Sep 17 00:00:00 2001 From: doylet Date: Thu, 4 Apr 2024 16:06:35 +1100 Subject: [PATCH] Update cmake to 3.29.1, add cmake scripts --- Win/Scripts/cmake-3.24.3_env.bat | 7 +++++++ Win/Scripts/cmake-3.26.4_env.bat | 7 +++++++ Win/Scripts/cmake-3.29.1_env.bat | 7 +++++++ Win/Scripts/llamafile-0.7.bat | 6 ++++++ Win/Scripts/remedybg.bat | 1 - app_manifest_dev.py | 30 ++++++++++++++++++++++++++++++ 6 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 Win/Scripts/cmake-3.24.3_env.bat create mode 100644 Win/Scripts/cmake-3.26.4_env.bat create mode 100644 Win/Scripts/cmake-3.29.1_env.bat create mode 100644 Win/Scripts/llamafile-0.7.bat diff --git a/Win/Scripts/cmake-3.24.3_env.bat b/Win/Scripts/cmake-3.24.3_env.bat new file mode 100644 index 0000000..c08f3d6 --- /dev/null +++ b/Win/Scripts/cmake-3.24.3_env.bat @@ -0,0 +1,7 @@ +@echo off +setlocal + set path_to_add=%devenver_root%\CMake\3.24.3\bin + set path=%path_to_add%;%path% + echo [DEVENVER] "%~dpnx0" is adding to path "%path_to_add%" + call %* +endlocal diff --git a/Win/Scripts/cmake-3.26.4_env.bat b/Win/Scripts/cmake-3.26.4_env.bat new file mode 100644 index 0000000..76b00bf --- /dev/null +++ b/Win/Scripts/cmake-3.26.4_env.bat @@ -0,0 +1,7 @@ +@echo off +setlocal + set path_to_add=%devenver_root%\CMake\3.26.4\bin + set path=%path_to_add%;%path% + echo [DEVENVER] "%~dpnx0" is adding to path "%path_to_add%" + call %* +endlocal diff --git a/Win/Scripts/cmake-3.29.1_env.bat b/Win/Scripts/cmake-3.29.1_env.bat new file mode 100644 index 0000000..f907d16 --- /dev/null +++ b/Win/Scripts/cmake-3.29.1_env.bat @@ -0,0 +1,7 @@ +@echo off +setlocal + set path_to_add=%devenver_root%\CMake\3.29.1\bin + set path=%path_to_add%;%path% + echo [DEVENVER] "%~dpnx0" is adding to path "%path_to_add%" + call %* +endlocal diff --git a/Win/Scripts/llamafile-0.7.bat b/Win/Scripts/llamafile-0.7.bat new file mode 100644 index 0000000..bd48fd2 --- /dev/null +++ b/Win/Scripts/llamafile-0.7.bat @@ -0,0 +1,6 @@ +@echo off +setlocal + set exe=C:\Home\Cloud\PC\Programs\llamafile\llamafile-0.7 + echo [DEVENVER] "%~dpnx0" is executing %exe% + call %exe% %* +endlocal diff --git a/Win/Scripts/remedybg.bat b/Win/Scripts/remedybg.bat index b82a7cd..1a763a8 100644 --- a/Win/Scripts/remedybg.bat +++ b/Win/Scripts/remedybg.bat @@ -2,7 +2,6 @@ setlocal set desired_path=%devenver_root%\RemedyBG\0_3_9_6 set desired_exe=remedybg.exe - set path=%desired_path%;%path% set exe_to_use="" for /f "delims=" %%a in ('where "$desired_path:%desired_exe%"') do ( set "exe_to_use=%%a") diff --git a/app_manifest_dev.py b/app_manifest_dev.py index 3eaf61e..8408be5 100644 --- a/app_manifest_dev.py +++ b/app_manifest_dev.py @@ -79,6 +79,36 @@ def get_manifest(is_windows): checksum = "" symlink = [] + version = "3.29.1" + if is_windows: + exe_path = f"bin/cmake.exe" + download_url = f"https://github.com/Kitware/CMake/releases/download/v{version}/cmake-{version}-windows-x86_64.zip" + download_checksum = "c8cf6ed50551d00ad8cd1f3b232810cd0a8b43b4a1d4f1393f0a575d423884dc" + checksum = "cc6050622336a786b336e22171f72ea178fc215b33d17d89b62a3cf6e98ea165" + symlink = [f"cmake-{version}.exe"] + else: + exe_path = f"bin/cmake" + download_url = f"https://github.com/Kitware/CMake/releases/download/v{version}/cmake-{version}-linux-x86_64.tar.gz" + download_checksum = "751bbe7ccabb78179335a75b88999b1c52afcd4d8a4cd03217d367d8bb2c5100" + checksum = "aaa" + symlink = [f"cmake-{version}"] + + result[-1]['manifests'].append({ + "download_checksum": download_checksum, + "download_url": download_url, + "version": version, + "executables": [ + { + "path": exe_path, + "symlink": symlink, + "add_to_devenv_path": True, + "checksum": checksum, + } + ], + "add_to_devenv_script": [], + }) + + version = "3.26.4" if is_windows: exe_path = f"bin/cmake.exe"