diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2015-04-13 16:59:54 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2015-04-13 16:59:54 (GMT) |
| commit | 4c9c848159b63fac440c29ffc2b437e055d355cc (patch) | |
| tree | f3cdb4dcbaeb5a36d2122502be07e2fa40f4a45b /Tools/buildbot/buildmsi.bat | |
| parent | f3b990e48c698154fb2eaa990ee22a6962e041ac (diff) | |
| download | cpython-4c9c848159b63fac440c29ffc2b437e055d355cc.zip cpython-4c9c848159b63fac440c29ffc2b437e055d355cc.tar.gz cpython-4c9c848159b63fac440c29ffc2b437e055d355cc.tar.bz2 | |
Issue #17202: Add .bat to .hgeol to force them to CRLF.
Using LF can a script to fail if it tries to use a label that is
split across 512 byte blocks. Who knows why.
Diffstat (limited to 'Tools/buildbot/buildmsi.bat')
| -rw-r--r-- | Tools/buildbot/buildmsi.bat | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/Tools/buildbot/buildmsi.bat b/Tools/buildbot/buildmsi.bat index ae93e67..4ca5604 100644 --- a/Tools/buildbot/buildmsi.bat +++ b/Tools/buildbot/buildmsi.bat @@ -1,21 +1,21 @@ -@rem Used by the buildbot "buildmsi" step. - -cmd /c Tools\buildbot\external.bat -@rem build release versions of things -call "%VS100COMNTOOLS%vsvars32.bat" - -@rem build Python -msbuild /p:useenv=true PCbuild\pcbuild.sln /p:Configuration=Release /p:Platform=Win32 - -@rem build the documentation -bash.exe -c 'cd Doc;make PYTHON=python2.5 update htmlhelp' -"%ProgramFiles%\HTML Help Workshop\hhc.exe" Doc\build\htmlhelp\python26a3.hhp - -@rem build the MSI file -cd PC -nmake /f icons.mak -cd ..\Tools\msi -del *.msi -nmake /f msisupport.mak -%HOST_PYTHON% msi.py - +@rem Used by the buildbot "buildmsi" step.
+
+cmd /c Tools\buildbot\external.bat
+@rem build release versions of things
+call "%VS100COMNTOOLS%vsvars32.bat"
+
+@rem build Python
+msbuild /p:useenv=true PCbuild\pcbuild.sln /p:Configuration=Release /p:Platform=Win32
+
+@rem build the documentation
+bash.exe -c 'cd Doc;make PYTHON=python2.5 update htmlhelp'
+"%ProgramFiles%\HTML Help Workshop\hhc.exe" Doc\build\htmlhelp\python26a3.hhp
+
+@rem build the MSI file
+cd PC
+nmake /f icons.mak
+cd ..\Tools\msi
+del *.msi
+nmake /f msisupport.mak
+%HOST_PYTHON% msi.py
+
|