Skip to content

Commit cf859fa

Browse files
authored
Merge pull request #3436 from pradyunsg/fix-cmd-line-endings
Change line endings for `.cmd` file to CRLF
2 parents 7e8e331 + 2d8c81e commit cf859fa

File tree

1 file changed

+39
-39
lines changed

1 file changed

+39
-39
lines changed

tools/msvc-build-launcher.cmd

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
@echo off
2-
3-
REM Use old Windows SDK 6.1 so created .exe will be compatible with
4-
REM old Windows versions.
5-
REM Windows SDK 6.1 may be downloaded at:
6-
REM http://www.microsoft.com/en-us/download/details.aspx?id=11310
7-
set PATH_OLD=%PATH%
8-
9-
REM The SDK creates a false install of Visual Studio at one of these locations
10-
set PATH=C:\Program Files\Microsoft Visual Studio 9.0\VC\bin;%PATH%
11-
set PATH=C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin;%PATH%
12-
13-
REM set up the environment to compile to x86
14-
call VCVARS32
15-
if "%ERRORLEVEL%"=="0" (
16-
cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /SUBSYSTEM:CONSOLE /out:setuptools/cli-32.exe
17-
cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /SUBSYSTEM:WINDOWS /out:setuptools/gui-32.exe
18-
) else (
19-
echo Windows SDK 6.1 not found to build Windows 32-bit version
20-
)
21-
22-
REM buildout (and possibly other implementations) currently depend on
23-
REM the 32-bit launcher scripts without the -32 in the filename, so copy them
24-
REM there for now.
25-
copy setuptools/cli-32.exe setuptools/cli.exe
26-
copy setuptools/gui-32.exe setuptools/gui.exe
27-
28-
REM now for 64-bit
29-
REM Use the x86_amd64 profile, which is the 32-bit cross compiler for amd64
30-
call VCVARSx86_amd64
31-
if "%ERRORLEVEL%"=="0" (
32-
cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /SUBSYSTEM:CONSOLE /out:setuptools/cli-64.exe
33-
cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /SUBSYSTEM:WINDOWS /out:setuptools/gui-64.exe
34-
) else (
35-
echo Windows SDK 6.1 not found to build Windows 64-bit version
36-
)
37-
38-
set PATH=%PATH_OLD%
39-
1+
@echo off
2+
3+
REM Use old Windows SDK 6.1 so created .exe will be compatible with
4+
REM old Windows versions.
5+
REM Windows SDK 6.1 may be downloaded at:
6+
REM http://www.microsoft.com/en-us/download/details.aspx?id=11310
7+
set PATH_OLD=%PATH%
8+
9+
REM The SDK creates a false install of Visual Studio at one of these locations
10+
set PATH=C:\Program Files\Microsoft Visual Studio 9.0\VC\bin;%PATH%
11+
set PATH=C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin;%PATH%
12+
13+
REM set up the environment to compile to x86
14+
call VCVARS32
15+
if "%ERRORLEVEL%"=="0" (
16+
cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /SUBSYSTEM:CONSOLE /out:setuptools/cli-32.exe
17+
cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x86 /SUBSYSTEM:WINDOWS /out:setuptools/gui-32.exe
18+
) else (
19+
echo Windows SDK 6.1 not found to build Windows 32-bit version
20+
)
21+
22+
REM buildout (and possibly other implementations) currently depend on
23+
REM the 32-bit launcher scripts without the -32 in the filename, so copy them
24+
REM there for now.
25+
copy setuptools/cli-32.exe setuptools/cli.exe
26+
copy setuptools/gui-32.exe setuptools/gui.exe
27+
28+
REM now for 64-bit
29+
REM Use the x86_amd64 profile, which is the 32-bit cross compiler for amd64
30+
call VCVARSx86_amd64
31+
if "%ERRORLEVEL%"=="0" (
32+
cl /D "GUI=0" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /SUBSYSTEM:CONSOLE /out:setuptools/cli-64.exe
33+
cl /D "GUI=1" /D "WIN32_LEAN_AND_MEAN" launcher.c /O2 /link /MACHINE:x64 /SUBSYSTEM:WINDOWS /out:setuptools/gui-64.exe
34+
) else (
35+
echo Windows SDK 6.1 not found to build Windows 64-bit version
36+
)
37+
38+
set PATH=%PATH_OLD%
39+

0 commit comments

Comments
 (0)