diff options
| author | wsoltys <wiso@no.way> | 2013-03-23 11:35:19 +0100 |
|---|---|---|
| committer | wsoltys <wiso@no.way> | 2013-03-23 11:36:22 +0100 |
| commit | a0f7b478798498a8f4a68c5e37b992660ec26c60 (patch) | |
| tree | 22c58330661663baf3732846af2560f37c46f490 | |
| parent | c4d4916e16f2adcfda2e7e2b322cac9e47b4796c (diff) | |
[WIN32] fixed: jenkins doesn't like the rxvt shell so use sh instead. Since sh still crashes often when compiling attended we keep using rxvt there.
| -rw-r--r-- | project/Win32BuildSetup/BuildSetup.bat | 9 | ||||
| -rw-r--r-- | project/Win32BuildSetup/buildmingwlibs.bat | 30 |
2 files changed, 32 insertions, 7 deletions
diff --git a/project/Win32BuildSetup/BuildSetup.bat b/project/Win32BuildSetup/BuildSetup.bat index b3afd93b09..5261af312c 100644 --- a/project/Win32BuildSetup/BuildSetup.bat +++ b/project/Win32BuildSetup/BuildSetup.bat @@ -24,6 +24,7 @@ SET buildmode=ask SET promptlevel=prompt SET buildmingwlibs=true SET exitcode=0 +SET useshell=rxvt FOR %%b in (%1, %2, %3, %4, %5) DO ( IF %%b==vs2010 SET comp=vs2010 IF %%b==dx SET target=dx @@ -32,6 +33,7 @@ FOR %%b in (%1, %2, %3, %4, %5) DO ( IF %%b==noclean SET buildmode=noclean IF %%b==noprompt SET promptlevel=noprompt IF %%b==nomingwlibs SET buildmingwlibs=false + IF %%b==sh SET useshell=sh ) SET buildconfig=Release (DirectX) @@ -147,7 +149,12 @@ IF %comp%==vs2010 ( IF %buildmode%==clean ( ECHO bla>makeclean ) - call buildmingwlibs.bat + rem only use sh to please jenkins + IF %useshell%==sh ( + call buildmingwlibs.bat sh + ) ELSE ( + call buildmingwlibs.bat + ) IF EXIST errormingw ( set DIETEXT="failed to build mingw libs" goto DIE diff --git a/project/Win32BuildSetup/buildmingwlibs.bat b/project/Win32BuildSetup/buildmingwlibs.bat index 2e6206a32c..2bf4313d60 100644 --- a/project/Win32BuildSetup/buildmingwlibs.bat +++ b/project/Win32BuildSetup/buildmingwlibs.bat @@ -4,11 +4,29 @@ rem batch file to compile mingw libs via BuildSetup rem set M$ env call "%VS100COMNTOOLS%..\..\VC\bin\vcvars32.bat" -rem check for mingw env -IF EXIST ..\BuildDependencies\msys\bin\sh.exe ( - rem compiles a bunch of mingw libs and not more +SET opt=sh +IF $%1$==$$ SET opt=rxvt + +rem compiles a bunch of mingw libs and not more +IF %opt%==sh ( + IF EXIST ..\BuildDependencies\msys\bin\sh.exe ( + ECHO starting sh shell + ..\BuildDependencies\msys\bin\sh --login /xbmc/project/Win32BuildSetup/buildmingwlibs.sh + GOTO END + ) ELSE ( + GOTO ENDWITHERROR + ) +) +IF EXIST ..\BuildDependencies\msys\bin\rxvt.exe ( + ECHO starting rxvt shell ..\BuildDependencies\msys\bin\rxvt -backspacekey -sl 2500 -sr -fn Courier-12 -tn msys -geometry 120x25 -title "building mingw dlls" -e /bin/sh --login /xbmc/project/Win32BuildSetup/buildmingwlibs.sh -) ELSE ( + GOTO END +) +GOTO ENDWITHERROR + +:ENDWITHERROR ECHO bla>errormingw - ECHO mingw environment not found -)
\ No newline at end of file + ECHO msys environment not found + +:END + ECHO exiting msys environment
\ No newline at end of file |