From afc5b5178baf01c257a01565e9b58f777c3d4c33 Mon Sep 17 00:00:00 2001 From: John Hodge Date: Sat, 10 Mar 2018 16:33:11 +0800 Subject: VSProject - More scripts! --- vsproject/build_cargo_minicargo.cmd | 7 +++++++ vsproject/build_rustc_minicargo.cmd | 2 +- vsproject/build_std.cmd | 7 +++++++ vsproject/build_std_and_hello.cmd | 12 ------------ vsproject/run_hello.cmd | 8 ++++++++ vsproject/run_tests.cmd | 2 +- 6 files changed, 24 insertions(+), 14 deletions(-) create mode 100644 vsproject/build_cargo_minicargo.cmd create mode 100644 vsproject/build_std.cmd delete mode 100644 vsproject/build_std_and_hello.cmd create mode 100644 vsproject/run_hello.cmd diff --git a/vsproject/build_cargo_minicargo.cmd b/vsproject/build_cargo_minicargo.cmd new file mode 100644 index 00000000..33725f4e --- /dev/null +++ b/vsproject/build_cargo_minicargo.cmd @@ -0,0 +1,7 @@ +@echo off +call build_std.cmd +if %errorlevel% neq 0 exit /b %errorlevel% + +mkdir output\cargo-build +x64\Release\minicargo.exe ..\rustc-1.19.0-src\src\tools\cargo -L output --output-dir output\cargo-build --vendor-dir ..\rustc-1.19.0-src\src\vendor +if %errorlevel% neq 0 exit /b %errorlevel% \ No newline at end of file diff --git a/vsproject/build_rustc_minicargo.cmd b/vsproject/build_rustc_minicargo.cmd index 94373df1..acaadf47 100644 --- a/vsproject/build_rustc_minicargo.cmd +++ b/vsproject/build_rustc_minicargo.cmd @@ -1,5 +1,5 @@ @echo off -call build_std_and_hello.cmd +call build_std.cmd if %errorlevel% neq 0 exit /b %errorlevel% mkdir output\rustc-build diff --git a/vsproject/build_std.cmd b/vsproject/build_std.cmd new file mode 100644 index 00000000..a9d6b45d --- /dev/null +++ b/vsproject/build_std.cmd @@ -0,0 +1,7 @@ +@echo off +x64\Release\minicargo.exe ..\rustc-1.19.0-src\src\libstd --script-overrides ..\script-overrides\stable-1.19.0 +if %errorlevel% neq 0 exit /b %errorlevel% +x64\Release\minicargo.exe ..\rustc-1.19.0-src\src\libpanic_unwind --script-overrides ..\script-overrides\stable-1.19.0 +if %errorlevel% neq 0 exit /b %errorlevel% +x64\Release\minicargo.exe ..\rustc-1.19.0-src\src\libtest --script-overrides ..\script-overrides\stable-1.19.0 +if %errorlevel% neq 0 exit /b %errorlevel% diff --git a/vsproject/build_std_and_hello.cmd b/vsproject/build_std_and_hello.cmd deleted file mode 100644 index db8360ac..00000000 --- a/vsproject/build_std_and_hello.cmd +++ /dev/null @@ -1,12 +0,0 @@ -@echo off -x64\Release\minicargo.exe ..\rustc-1.19.0-src\src\libstd --script-overrides ..\script-overrides\stable-1.19.0 -if %errorlevel% neq 0 exit /b %errorlevel% -x64\Release\minicargo.exe ..\rustc-1.19.0-src\src\libpanic_unwind --script-overrides ..\script-overrides\stable-1.19.0 -if %errorlevel% neq 0 exit /b %errorlevel% -x64\Release\minicargo.exe ..\rustc-1.19.0-src\src\libtest --script-overrides ..\script-overrides\stable-1.19.0 -if %errorlevel% neq 0 exit /b %errorlevel% - -x64\Release\mrustc.exe ..\rustc-1.19.0-src\src\test\run-pass\hello.rs -L output -o output\hello.exe -g -if %errorlevel% neq 0 exit /b %errorlevel% -output\hello.exe -if %errorlevel% neq 0 exit /b %errorlevel% diff --git a/vsproject/run_hello.cmd b/vsproject/run_hello.cmd new file mode 100644 index 00000000..b419bbc1 --- /dev/null +++ b/vsproject/run_hello.cmd @@ -0,0 +1,8 @@ +@echo off +call build_std.cmd +if %errorlevel% neq 0 exit /b %errorlevel% + +x64\Release\mrustc.exe ..\rustc-1.19.0-src\src\test\run-pass\hello.rs -L output -o output\hello.exe -g +if %errorlevel% neq 0 exit /b %errorlevel% +output\hello.exe +if %errorlevel% neq 0 exit /b %errorlevel% \ No newline at end of file diff --git a/vsproject/run_tests.cmd b/vsproject/run_tests.cmd index 7465c145..1ce09b98 100644 --- a/vsproject/run_tests.cmd +++ b/vsproject/run_tests.cmd @@ -1,5 +1,5 @@ @echo off -call build_std_and_hello.cmd +call build_std.cmd if %errorlevel% neq 0 exit /b %errorlevel% mkdir output\tests\ -- cgit v1.2.3