summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vsproject/build_cargo_minicargo.cmd7
-rw-r--r--vsproject/build_rustc_minicargo.cmd2
-rw-r--r--vsproject/build_std.cmd (renamed from vsproject/build_std_and_hello.cmd)5
-rw-r--r--vsproject/run_hello.cmd8
-rw-r--r--vsproject/run_tests.cmd2
5 files changed, 17 insertions, 7 deletions
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_and_hello.cmd b/vsproject/build_std.cmd
index db8360ac..a9d6b45d 100644
--- a/vsproject/build_std_and_hello.cmd
+++ b/vsproject/build_std.cmd
@@ -5,8 +5,3 @@ x64\Release\minicargo.exe ..\rustc-1.19.0-src\src\libpanic_unwind --script-overr
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\