Skip to content

Commit

Permalink
Make 1.3.x/win32-static/setup/prep.cmd easier to use in scripts
Browse files Browse the repository at this point in the history
With this patch we no longer open a child cmd.exe a
script that wants to call prep.cmd would get stuck in.
It also removes a pause on error and instead exits with
an error code.
  • Loading branch information
hacst committed Feb 5, 2017
1 parent be25460 commit bfc255c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion buildenv/1.3.x/win32-static/setup/mklinks.wsf
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ lnk = shell.CreateShortcut(mumblePrefix + "\\MumbleBuild - cygwin.lnk");
lnk.Description = "Launches a Mumble Build environment command prompt (cygwin bash)";
lnk.IconLocation = "%WINDIR%\\system32\\cmd.exe";
lnk.TargetPath = "%WINDIR%\\system32\\cmd.exe";
lnk.Arguments = "/k prep.cmd cygwin.cmd";
lnk.Arguments = "/k prep.cmd && cygwin.cmd";
lnk.WindowStyle = 1;
lnk.WorkingDirectory = mumblePrefix;
lnk.Save();
Expand Down
5 changes: 1 addition & 4 deletions buildenv/1.3.x/win32-static/setup/prep.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,7 @@ ECHO.
ECHO Unknown version of Visual Studio detected. (VSVER is set to `%VSVER%`)
ECHO Unable to initialize build environment. Aborting...
ECHO.
PAUSE
EXIT
EXIT /B 1

:VS2010
TITLE MumbleBuild MSVS2010 (v100)
Expand Down Expand Up @@ -227,5 +226,3 @@ SET PATH=%MUMBLE_JOM_PREFIX%\bin;%PATH%
SET PATH=%MUMBLE_PROTOBUF_PREFIX%\vsprojects\%MUMBLE_BUILD_CONFIGURATION%;%PATH%
if "%ARCH%" == "x86" SET PATH=%MUMBLE_ICE_PREFIX%\bin;%PATH%
if "%ARCH%" == "amd64" SET PATH=%MUMBLE_ICE_PREFIX%\bin\x64;%PATH%
cmd /V:ON /K %*
exit /b

0 comments on commit bfc255c

Please sign in to comment.