Merge pull request #1334 from CapnBry/z-grid-dest

[clinton/Smoothieware.git] / win_install.cmd

diff --git a/win_install.cmd b/win_install.cmd
index 6fafcbb..edfba5c 100644 (file)
--- a/win_install.cmd
+++ b/win_install.cmd
@@ -27,7 +27,7 @@ set GCC4ARM_MD5=09c19b3248863074f5498a88f31bee16
 set GCC4ARM_MD5_FILENAME=%ROOTDIR%gcc-arm-none-eabi.md5\r
 set GCC4ARM_DIR=%ROOTDIR%gcc-arm-none-eabi\r
 set GCC4ARM_BINDIR=%GCC4ARM_DIR%\bin\r
-set OUR_MAKE=%ROOTDIR%external\win32\make.exe\r
+set OUR_MAKE=%ROOTDIR%build\win32\make.exe\r
 set BUILDENV_CMD=%GCC4ARM_BINDIR%\buildenv.cmd\r
 set BUILDSHELL_CMD=%ROOTDIR%BuildShell.cmd\r
 set BUILDSHELL_DEBUG_CMD=%ROOTDIR%BuildShellDebug.cmd\r
@@ -42,13 +42,13 @@ echo Logging install results to %LOGFILE%
 echo %DATE% %TIME%  Starting %0 %*>%LOGFILE%\r
 \r
 echo Downloading GNU Tools for ARM Embedded Processors...\r
-echo %DATE% %TIME%  Executing external\win32\curl -kL0 %GCC4ARM_URL%>>%LOGFILE%\r
-external\win32\curl -kL0 %GCC4ARM_URL% >%GCC4ARM_TAR%\r
+echo %DATE% %TIME%  Executing build\win32\curl -kL0 %GCC4ARM_URL%>>%LOGFILE%\r
+build\win32\curl -kL0 %GCC4ARM_URL% >%GCC4ARM_TAR%\r
 if errorlevel 1 goto ExitOnError\r
 \r
 echo Validating md5 signature of GNU Tools for ARM Embedded Processors...\r
 echo %GCC4ARM_MD5% *%GCC4ARM_FILENAME%>%GCC4ARM_MD5_FILENAME%\r
-call :RunAndLog external\win32\md5sum --check %GCC4ARM_MD5_FILENAME%\r
+call :RunAndLog build\win32\md5sum --check %GCC4ARM_MD5_FILENAME%\r
 if errorlevel 1 goto ExitOnError\r
 del "%GCC4ARM_MD5_FILENAME%"\r
 \r
@@ -57,7 +57,7 @@ call :RunAndLog rd /s /q %GCC4ARM_DIR%
 call :RunAndLog md %GCC4ARM_DIR%\r
 if errorlevel 1 goto ExitOnError\r
 call :RunAndLog cd %GCC4ARM_DIR%\r
-call :RunAndLog ..\external\win32\bsdtar xf %GCC4ARM_TAR%\r
+call :RunAndLog ..\build\win32\bsdtar xf %GCC4ARM_TAR%\r
 if errorlevel 1 goto ExitOnError\r
 call :RunAndLog cd ..\r
 \r
@@ -66,14 +66,12 @@ echo @echo off>%BUILDENV_CMD%
 echo REM Uncomment next line and set destination drive to match mbed device>>%BUILDENV_CMD%\r
 echo REM SET LPC_DEPLOY=copy PROJECT.bin f:\>>%BUILDENV_CMD%\r
 echo.>>%BUILDENV_CMD%\r
-echo SET PATH=%%~dp0;%%~dp0..\..\external\win32;%%PATH%%>>%BUILDENV_CMD%\r
+echo SET PATH=%%~dp0;%%~dp0..\..\build\win32;%%PATH%%>>%BUILDENV_CMD%\r
 rem\r
 echo @cmd.exe /K %%~dp0\gcc-arm-none-eabi\bin\buildenv.cmd>%BUILDSHELL_CMD%\r
-rem\r
-echo @cmd.exe /K "set GCC4MBED_TYPE=Debug& %%~dp0\gcc-arm-none-eabi\bin\buildenv.cmd">%BUILDSHELL_DEBUG_CMD%\r
 \r
 rem Place GNU Tool for ARM Embedded Processors in the path before building gcc4mbed code.\r
-set path=%GCC4ARM_BINDIR%;%ROOTDIR%external\win32;%PATH%\r
+set path=%GCC4ARM_BINDIR%;%ROOTDIR%build\win32;%PATH%\r
 \r
 echo Performing a clean build of the gcc4mbed samples...\r
 call :RunAndLog %OUR_MAKE% clean\r