Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(178)

Side by Side Diff: bootstrap/win/win_tools.bat

Issue 1846633003: Fix extra space on 32bit platforms (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 @echo off 1 @echo off
2 :: Copyright (c) 2012 The Chromium Authors. All rights reserved. 2 :: Copyright (c) 2012 The Chromium Authors. All rights reserved.
3 :: Use of this source code is governed by a BSD-style license that can be 3 :: Use of this source code is governed by a BSD-style license that can be
4 :: found in the LICENSE file. 4 :: found in the LICENSE file.
5 5
6 :: This script will try to find if svn and python are accessible and it not, 6 :: This script will try to find if svn and python are accessible and it not,
7 :: it will try to download it and 'install' it in depot_tools. 7 :: it will try to download it and 'install' it in depot_tools.
8 8
9 :: Sadly, we can't use SETLOCAL here otherwise it ERRORLEVEL is not correctly 9 :: Sadly, we can't use SETLOCAL here otherwise it ERRORLEVEL is not correctly
10 :: returned. 10 :: returned.
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 for /f "tokens=2 delims=[]" %%i in ('ver') do set VERSTR=%%i 62 for /f "tokens=2 delims=[]" %%i in ('ver') do set VERSTR=%%i
63 for /f "tokens=2,3 delims=. " %%i in ("%VERSTR%") do (set VERMAJOR=%%i & set VER MINOR=%%j) 63 for /f "tokens=2,3 delims=. " %%i in ("%VERSTR%") do (set VERMAJOR=%%i & set VER MINOR=%%j)
64 if %VERMAJOR% lss 5 set GIT_VERSION=%GIT_VERSION%-xp 64 if %VERMAJOR% lss 5 set GIT_VERSION=%GIT_VERSION%-xp
65 if %VERMAJOR% equ 5 if %VERMINOR% lss 2 set XP_SUFFIX=-xp 65 if %VERMAJOR% equ 5 if %VERMINOR% lss 2 set XP_SUFFIX=-xp
66 66
67 :: must explicitly use FIND_EXE to prevent this from grabbing e.g. gnuwin32 or 67 :: must explicitly use FIND_EXE to prevent this from grabbing e.g. gnuwin32 or
68 :: msys versions. 68 :: msys versions.
69 set FIND_EXE=%SYSTEMROOT%\System32\find.exe 69 set FIND_EXE=%SYSTEMROOT%\System32\find.exe
70 70
71 :: Check to see if we're on a 32 or 64 bit system 71 :: Check to see if we're on a 32 or 64 bit system
72 reg Query "HKLM\Hardware\Description\System\CentralProcessor\0" | %FIND_EXE% /i "x86" > NUL && set OS_BITS=32 || set OS_BITS=64 72 :: (parens) are necessary, otherwise batch puts an extra space after 32.
73 reg Query "HKLM\Hardware\Description\System\CentralProcessor\0" | %FIND_EXE% /i "x86" > NUL && (set OS_BITS=32) || (set OS_BITS=64)
73 74
74 if not exist "%WIN_TOOLS_ROOT_DIR%\.git_bleeding_edge" goto :GIT_OLD_FLOW 75 if not exist "%WIN_TOOLS_ROOT_DIR%\.git_bleeding_edge" goto :GIT_OLD_FLOW
75 set GIT_PORTABLE_FLOW=1 76 set GIT_PORTABLE_FLOW=1
76 set GIT_VERSION=2.7.4-%OS_BITS% 77 set GIT_VERSION=2.7.4-%OS_BITS%
77 set GIT_FETCH_URL=https://commondatastorage.googleapis.com/chrome-infra/Portable Git-%GIT_VERSION%-bit.7z.exe 78 set GIT_FETCH_URL=https://commondatastorage.googleapis.com/chrome-infra/Portable Git-%GIT_VERSION%-bit.7z.exe
78 set GIT_DOWNLOAD_PATH=%ZIP_DIR%\git.7z.exe 79 set GIT_DOWNLOAD_PATH=%ZIP_DIR%\git.7z.exe
79 set GIT_BIN_DIR=git-%GIT_VERSION%_bin 80 set GIT_BIN_DIR=git-%GIT_VERSION%_bin
80 set GIT_INST_DIR=%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR% 81 set GIT_INST_DIR=%WIN_TOOLS_ROOT_DIR%\%GIT_BIN_DIR%
81 set GIT_EXE_PATH=%GIT_INST_DIR%\bin\git.exe 82 set GIT_EXE_PATH=%GIT_INST_DIR%\bin\git.exe
82 goto :GIT_CLEANUP 83 goto :GIT_CLEANUP
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 goto :END 211 goto :END
211 212
212 213
213 :returncode 214 :returncode
214 set WIN_TOOLS_ROOT_URL= 215 set WIN_TOOLS_ROOT_URL=
215 set WIN_TOOLS_ROOT_DIR= 216 set WIN_TOOLS_ROOT_DIR=
216 exit /b %ERRORLEVEL% 217 exit /b %ERRORLEVEL%
217 218
218 :END 219 :END
219 call :returncode %ERRORLEVEL% 220 call :returncode %ERRORLEVEL%
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698