Permalink
Browse files

mingw: add -q support

Fixes #1005
  • Loading branch information...
austin987 committed Aug 14, 2018
1 parent 4488201 commit be279f3e77531eddfbdbf0c492c4435836427453
Showing with 31 additions and 3 deletions.
  1. +30 −2 src/winetricks
  2. +1 −1 tests/winetricks-test
View
@@ -12340,8 +12340,36 @@ load_mingw()
{
w_download "$WINETRICKS_SOURCEFORGE/mingw/files/mingw-get-setup.exe" aab27bd5547d35dc159288f3b5b8760f21b0cfec86e8f0032b49dd0410f232bc
w_try_cd "$W_CACHE/mingw"
w_try "$WINE" "$file1"
if test "$W_OPT_UNATTENDED"; then
w_info "FYI: Quiet mode will install these mingw packages: 'gcc msys-base'"
fi
w_try_cd "$W_CACHE/$W_PACKAGE"
w_ahk_do "
run, $file1
WinWait, MinGW Installation Manager Setup Tool
if ( w_opt_unattended > 0 ) {
WinActivate
Sleep, 1000
ControlClick, Button1 ; Install
; Window title is blank
WinWait, , Step 1: Specify Installation Preferences
Sleep, 1000
ControlClick, Button10 ; Continue
Sleep, 1000
WinWait, , Step 2: Download and Set Up MinGW Installation Manager
; This takes a while
WinWait, , Catalogue update completed
Sleep, 1000
ControlClick, Button4 ; Continue
; This window appears in background, but isn't active because of another popup
; We may need to wait for that to disappear first
WinWait, MinGW Installation Manager
Sleep, 1000
WinClose, MinGW Installation Manager
}
WinWaitClose, MinGW Installation Manager
"
w_append_path 'C:\MinGW\bin'
w_try "$WINE" mingw-get update
View
@@ -85,7 +85,7 @@ WINETRICKS_SUPER_QUIET=1
export WINETRICKS_SUPER_QUIET
# verbs known to not work in -q mode yet
BLACKLIST="dx8sdk|kde|mingw|psdk2003|psdkwin7"
BLACKLIST="dx8sdk|kde|psdk2003|psdkwin7"
# verbs that hang in -q because of simple problem we should work around soon
BLACKLIST="$BLACKLIST|vc2005trial"
# verbs that are too slow

0 comments on commit be279f3

Please sign in to comment.