Skip to content

bpo-30687: Fixes build scripts to find msbuild.exe and stop relying on vcvarsall.bat #2252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zooba merged 15 commits into from
Jun 19, 2017
Merged

bpo-30687: Fixes build scripts to find msbuild.exe and stop relying on vcvarsall.bat #2252

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
6cf00ec
Fixes build scripts to find msbuild.exe and stop relying on vcvarsall…
zooba Jun 16, 2017
8f884e6
Fixes line endings and adds script to fix line endings.
zooba Jun 16, 2017
0e911fa
Fixes line endings and adds script to fix line endings.
zooba Jun 16, 2017
6ed6279
Fixes readme.txt line endings.
zooba Jun 16, 2017
7012dcc
Fixes missing PATH entry for PGO builds.
zooba Jun 16, 2017
6f04251
Removes vs_platf variable and PGO warning from build.bat.
zooba Jun 16, 2017
8d2d7dc
Add NEWS entry.
zooba Jun 16, 2017
502a337
Normalises line endings again.
zooba Jun 16, 2017
1506793
More line ending changes
zooba Jun 17, 2017
c701a70
Merge from master
zooba Jun 17, 2017
277410d
Restores PGO on Win32 check.
zooba Jun 17, 2017
324cc5c
Change line endings in NEWS file
zooba Jun 17, 2017
bae2ad2
Fixes from review
zooba Jun 19, 2017
f169ae4
Fix line endings
zooba Jun 19, 2017
3194ce5
Fix line endings
zooba Jun 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Removes vs_platf variable and PGO warning from build.bat.
  • Loading branch information
@zooba
zooba committed Jun 16, 2017
commit 6f0425175203f1b7744758b893524003d16ca1b0
16 changes: 0 additions & 16 deletions PCbuild/build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ exit /b 127
:Run
setlocal
set platf=Win32
set vs_platf=x86
set conf=Release
set>
set dir=%~dp0
Expand Down Expand Up @@ -95,21 +94,6 @@ if "%IncludeTkinter%"=="" set IncludeTkinter=true

if "%IncludeExternals%"=="true" call "%dir%get_externals.bat"

if "%platf%"=="x64" (
if "%on_64_bit%"=="true" (
rem This ought to always be correct these days...
set vs_platf=amd64
) else (
if "%do_pgo%"=="true" (
echo.ERROR: Cannot cross-compile with PGO
echo. 32bit operating system detected, if this is incorrect,
echo. make sure the ProgramFiles(x86^) environment variable is set
exit /b 1
)
set vs_platf=x86_amd64
)
)

if not exist "%GIT%" where git > "%TEMP%\git.loc" 2> nul && set /P GIT= < "%TEMP%\git.loc" & del "%TEMP%\git.loc"
if exist "%GIT%" set GITProperty=/p:GIT="%GIT%"
if not exist "%GIT%" echo Cannot find Git on PATH & set GITProperty=
Expand Down