Diff

Differences From Artifact [090941e14e]:

To Artifact [cdcc7c93e0]:


   103    103   			iszip="1"
   104    104   			notk="1"
   105    105   			kit="${os}-${cpu}-min-static"
   106    106   			;;
   107    107   		win32|win32-*)
   108    108   			kitcreator="./build/make-kit-win32"
   109    109   			xcompile="1"
   110         -			kitruncmd="wine"
          110  +			# XXX: Disabled for now, since I don't have WINE installed
          111  +			#kitruncmd="wine"
   111    112   			;;
   112    113   		linux-mipsel-min|linux-mipsel-min-kitdll)
   113    114   			kitcreator="./build/make-kit-linux-mipsel"
   114    115   			runnable="0"
   115    116   			xcompile="1"
   116    117   			notk="1"
   117    118   			iszip="1"
................................................................................
   348    349   			# Verify sanity of created kit
   349    350   			issane=1
   350    351   
   351    352   			## Verify that Win32 builds are of correct type
   352    353   			## Verify that DLL builds are of correct type
   353    354   			case "-${version}-${kit}-" in
   354    355   				*-win32-kitdll-*|*-win32-*-kitdll-*)
   355         -					if ! file "${createdkit}" | grep 'MS Windows (DLL)' >/dev/null; then
          356  +					if ! file "${createdkit}" | grep 'MS Windows' | grep '(DLL)' >/dev/null; then
   356    357   						issane=0
   357    358   					fi
   358    359   					;;
   359    360   				*-kitdll-*)
   360    361   					if ! file "${createdkit}" | grep 'shared object' >/dev/null; then
   361    362   						issane=0
   362    363   					fi
   363    364   					;;
   364    365   				*-win32-notk-*|*-win32-*-notk-*)
   365         -					if ! file "${createdkit}" | grep 'MS Windows (console)' >/dev/null; then
          366  +					if ! file "${createdkit}" | grep 'MS Windows' | grep '(console)' >/dev/null; then
   366    367   						echo "Kit failed sanity check for being a console application" >&2
   367    368   						issane=0
   368    369   					fi
   369    370   					;;
   370    371   				*-win32-*)
   371         -					if ! file "${createdkit}" | grep 'MS Windows (GUI)' >/dev/null; then
          372  +					if ! file "${createdkit}" | grep 'MS Windows' | grep '(GUI)' >/dev/null; then
   372    373   						echo "Kit failed sanity check for being a GUI application" >&2
   373    374   						issane=0
   374    375   					fi
   375    376   					;;
   376    377   			esac
   377    378   
   378    379   			## Verify the build completed without warnings