Skip to content

Commit

Permalink
Update location of LLVM repo.
Browse files Browse the repository at this point in the history
  • Loading branch information
dtarditi committed Nov 26, 2023
1 parent d471985 commit 21d558e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions test_scripts/automation/Windows/run-cmake.bat
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
rem Create directories and sync files

if "%TEST_TARGET_ARCH%"=="AMD64" (
set CMAKE_GENERATOR=-G "Visual Studio 15 2017 Win64"
set CMAKE_GENERATOR=-G "Visual Studio 17 2022"
) else (
rem There is intentionally a blank space after the equal here, to force this to be
rem an empty string.
Expand All @@ -23,7 +23,7 @@ set OLD_DIR=%CD%
cd %LLVM_OBJ_DIR%
rem This generates a build system that supports multiple configurations. Don't try setting CMAKE_BUILD_TYPE here
rem because it is ignored.
cmake %CMAKE_GENERATOR% -T "host=x64" %EXTRA_FLAGS% -DLLVM_ENABLE_PROJECTS=clang -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON %BUILD_SOURCESDIRECTORY%\checkedc-clang\llvm
cmake %CMAKE_GENERATOR% -T "host=x64" %EXTRA_FLAGS% -DLLVM_ENABLE_PROJECTS=clang -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON %BUILD_SOURCESDIRECTORY%\checkedc-llvm-project\llvm
if ERRORLEVEL 1 (goto cmdfailed)

:succeeded
Expand Down
8 changes: 4 additions & 4 deletions test_scripts/automation/Windows/setup-files.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ if "%BUILD_CHECKEDC_CLEAN%"=="Yes" (
)

if not exist %BUILD_SOURCESDIRECTORY%\checkedc-clang\.git (
git clone -c core.autocrlf=false https://github.com/Microsoft/checkedc-clang %BUILD_SOURCESDIRECTORY%\checkedc-clang
git clone -c core.autocrlf=false https://github.com/checkedc/checkedc-llvm-project %BUILD_SOURCESDIRECTORY%\checkedc-llvm-project
if ERRORLEVEL 1 (goto cmdfailed)
)

if not exist %BUILD_SOURCESDIRECTORY%\checkedc-clang\llvm\projects\checkedc-wrapper\checkedc\.git (
git clone https://github.com/Microsoft/checkedc %BUILD_SOURCESDIRECTORY%\checkedc-clang\llvm\projects\checkedc-wrapper\checkedc
git clone https://github.com/checkedc/checkedc %BUILD_SOURCESDIRECTORY%\checkedc-llvm-project\llvm\projects\checkedc-wrapper\checkedc
if ERRORLEVEL 1 (goto cmdfailed)
)

Expand All @@ -34,7 +34,7 @@ if "%SIGN_INSTALLER%" NEQ "No" (
)

rem Set up clang sources
cd %BUILD_SOURCESDIRECTORY%\checkedc-clang
cd %BUILD_SOURCESDIRECTORY%\checkedc-llvm-project
if ERRORLEVEL 1 (goto cmdfailed)
git fetch origin
if ERRORLEVEL 1 (goto cmdfailed)
Expand All @@ -52,7 +52,7 @@ if not exist %LLVM_OBJ_DIR% (
)

rem set up Checked C sources
cd %BUILD_SOURCESDIRECTORY%\checkedc-clang\llvm\projects\checkedc-wrapper\checkedc
cd %BUILD_SOURCESDIRECTORY%\checkedc-llvm-project\llvm\projects\checkedc-wrapper\checkedc
if ERRORLEVEL 1 (goto cmdfailed)
git fetch origin
if ERRORLEVEL 1 (goto cmdfailed)
Expand Down

0 comments on commit 21d558e

Please sign in to comment.