sgraves/cpp-build-system
1
0
Fork 0
Code Issues 2 Pull Requests Releases 1 Activity

script fixes
Some checks failed
sgraves/cpp-build-system/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
sgraves76
2025-10-18 12:02:15 -07:00
parent 5a95bdbdef
commit 85e47f79a8
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/test_msys2.cmd
View File

@@ -4,12 +4,12 @@ setlocal EnableExtensions
set "SED=sed" set "SED=sed"
set "SCRIPTS_DIR=%~dp0%" set "SCRIPTS_DIR=%~dp0"
pushd "%SCRIPTS_DIR%" pushd "%SCRIPTS_DIR%"
set "SCRIPTS_DIR=%CD%" set "SCRIPTS_DIR=%CD%"
popd popd
set "SOURCE_DIR=%~dp0%.." set "SOURCE_DIR=%~dp0.."
pushd "%SOURCE_DIR%" pushd "%SOURCE_DIR%"
set "SOURCE_DIR=%CD%" set "SOURCE_DIR=%CD%"
popd popd
@@ -21,8 +21,8 @@ echo %SOURCE_DIR%
echo %TEST_DIR% echo %TEST_DIR%
set "PLATFORM=msys2" set "PLATFORM=msys2"
set "BUILD_TYPE=%~1" set "BUILD_TYPE=%1"
set "WITH_TYPE=%~2" set "WITH_TYPE=%2"
if /I not "%BUILD_TYPE%"=="shared" if /I not "%BUILD_TYPE%"=="static" ( if /I not "%BUILD_TYPE%"=="shared" if /I not "%BUILD_TYPE%"=="static" (
call :ERROR_EXIT "Must specify 'shared' or 'static'." 1 call :ERROR_EXIT "Must specify 'shared' or 'static'." 1
@@ -46,7 +46,7 @@ if "%WITH_TYPE%"=="7" set "NAME=%NAME%_crypto_no_boost"
if exist "%TEST_DIR%\%NAME%\" rd /s /q "%TEST_DIR%\%NAME%" if exist "%TEST_DIR%\%NAME%\" rd /s /q "%TEST_DIR%\%NAME%"
pushd "%SOURCE_DIR%" pushd "%SOURCE_DIR%"
call ".\create_project.cmd" "%NAME%" "%TEST_DIR%" || ( call .\create_project.cmd %NAME% %TEST_DIR% || (
call :ERROR_EXIT "Failed to create %PLATFORM% project." 2 call :ERROR_EXIT "Failed to create %PLATFORM% project." 2
) )
popd popd
@@ -68,11 +68,11 @@ if /I "%BUILD_TYPE%"=="shared" (
%SED% -i "s/PROJECT_STATIC_LINK=ON/PROJECT_STATIC_LINK=OFF/g" ".\config.sh" %SED% -i "s/PROJECT_STATIC_LINK=ON/PROJECT_STATIC_LINK=OFF/g" ".\config.sh"
) )
call ".\scripts\make_win32.cmd" || ( call .\scripts\make_win32.cmd || (
call :ERROR_EXIT "build %PLATFORM% failed." 3 call :ERROR_EXIT "build %PLATFORM% failed." 3
) )
call ".\scripts\run_tests.cmd" || ( call .\scripts\run_tests.cmd || (
call :ERROR_EXIT "testing %PLATFORM% failed." 3 call :ERROR_EXIT "testing %PLATFORM% failed." 3
) )
popd popd
@@ -82,5 +82,5 @@ if exist "%TEST_DIR%\%NAME%\" rd /s /q "%TEST_DIR%\%NAME%"
exit 0 exit 0
:ERROR_EXIT :ERROR_EXIT
echo "%~1" echo %1
exit %~2 exit %2