Check-in [9ef1199acb]
Overview
Comment:Added initial support for Win64-amd64 nightly builds
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:9ef1199acbd6d3fe05c04f9fbf1d6c23683a43b2
User & Date: rkeene on 2013-09-30 06:24:48
Other Links: manifest | tags
Context
2013-09-30
06:40
Updated runner for 64-bit Windows builds to use 64-bit Windows emulator check-in: c27f57d4e0 user: rkeene tags: trunk
06:24
Added initial support for Win64-amd64 nightly builds check-in: 9ef1199acb user: rkeene tags: trunk
06:08
Fixed Mk4tcl compiling issue check-in: 3bd068a425 user: rkeene tags: trunk
Changes

Modified build/test/test from [b14ccbc368] to [47564a4663].

    65     65   )"
    66     66   DISPLAY=:31
    67     67   export DISPLAY
    68     68   
    69     69   if [ "${BIGBUILD}" = "1" ]; then
    70     70   	kits="$(echo normal{,-zip,-nomk4}{,-threaded}{,-statictk,-notk} normal{,-threaded}{,-notk}{,-nomk4}{,-debug}-kitdll win32-i586{,-zip,-nomk4}{,-threaded}{,-notk} win32-i586{,-threaded}{,-notk}{,-nomk4}-kitdll min{,-static} {linux-mipsel-min}{,-debug}{,-kitdll} {linux-i386,solaris-i386,solaris-amd64,solaris-sparc,solaris-sparc64,freebsd-amd64,netbsd-amd64}{,-zip,-nomk4}{,-threaded}{,-statictk,-notk}{,debug} {solaris-i386,solaris-amd64,solaris-sparc,solaris-sparc64,freebsd-amd64,netbsd-amd64}{,-threaded}{,-notk}{,-nomk4}{,debug}-kitdll netbsd-i386{,-zip,-nomk4}{,-threaded}{,debug}-notk netbsd-i386{,-threaded}{,-nomk4}{,debug}-notk-kitdll android-arm-notk{,-debug} andoid-arm-notk{,-debug}-kitdll)"
    71     71   else
    72         -	kits="normal normal-zip normal-threaded normal-threaded-zip normal-statictk normal-notk normal-threaded-notk normal-threaded-zip-notk normal-nomk4 normal-debug min min-static normal-kitdll normal-threaded-kitdll normal-notk-kitdll normal-nomk4-kitdll normal-nomk4-notk-kitdll normal-threaded-nomk4-kitdll normal-threaded-notk-nomk4-kitdll normal-debug-kitdll min-kitdll win32-i586 win32-i586-zip win32-i586-threaded win32-i586-threaded-zip win32-i586-notk win32-i586-threaded-notk win32-i586-nomk4 win32-i586-kitdll win32-i586-threaded-kitdll win32-i586-notk-kitdll win32-i586-nomk4-kitdll win32-i586-nomk4-notk-kitdll win32-i586-threaded-nomk4-kitdll win32-i586-threaded-notk-nomk4-kitdll linux-mipsel-notk linux-mipsel-notk-kitdll linux-i386 linux-i386-debug linux-i386-kitdll linux-i386-debug-kitdll linux-i386-notk linux-i386-notk-debug linux-i386-notk-kitdll linux-i386-notk-debug-kitdll solaris-i386 solaris-i386-debug solaris-i386-kitdll solaris-i386-debug-kitdll solaris-amd64 solaris-amd64-debug solaris-amd64-kitdll solaris-amd64-debug-kitdll solaris-sparc solaris-sparc-debug solaris-sparc-kitdll solaris-sparc-debug-kitdll solaris-sparc64 solaris-sparc64-debug solaris-sparc64-kitdll solaris-sparc64-debug-kitdll freebsd-amd64 freebsd-amd64-debug freebsd-amd64-kitdll freebsd-amd64-debug-kitdll netbsd-i386-notk netbsd-i386-notk-debug netbsd-i386-notk-kitdll netbsd-i386-notk-debug-kitdll netbsd-amd64 netbsd-amd64-debug netbsd-amd64-kitdll netbsd-amd64-debug-kitdll android-arm-notk android-arm-notk-debug android-arm-notk-kitdll android-arm-notk-debug-kitdll"
           72  +	kits="normal normal-zip normal-threaded normal-threaded-zip normal-statictk normal-notk normal-threaded-notk normal-threaded-zip-notk normal-nomk4 normal-debug min min-static normal-kitdll normal-threaded-kitdll normal-notk-kitdll normal-nomk4-kitdll normal-nomk4-notk-kitdll normal-threaded-nomk4-kitdll normal-threaded-notk-nomk4-kitdll normal-debug-kitdll min-kitdll win32-i586 win32-i586-zip win32-i586-threaded win32-i586-threaded-zip win32-i586-notk win32-i586-threaded-notk win32-i586-nomk4 win32-i586-kitdll win32-i586-threaded-kitdll win32-i586-notk-kitdll win32-i586-nomk4-kitdll win32-i586-nomk4-notk-kitdll win32-i586-threaded-nomk4-kitdll win32-i586-threaded-notk-nomk4-kitdll win64-amd64 win64-amd64-zip win64-amd64-threaded win64-amd64-threaded-zip win64-amd64-notk win64-amd64-threaded-notk win64-amd64-nomk4 win64-amd64-kitdll win64-amd64-threaded-kitdll win64-amd64-notk-kitdll win64-amd64-nomk4-kitdll win64-amd64-nomk4-notk-kitdll win64-amd64-threaded-nomk4-kitdll win64-amd64-threaded-notk-nomk4-kitdll linux-mipsel-notk linux-mipsel-notk-kitdll linux-i386 linux-i386-debug linux-i386-kitdll linux-i386-debug-kitdll linux-i386-notk linux-i386-notk-debug linux-i386-notk-kitdll linux-i386-notk-debug-kitdll solaris-i386 solaris-i386-debug solaris-i386-kitdll solaris-i386-debug-kitdll solaris-amd64 solaris-amd64-debug solaris-amd64-kitdll solaris-amd64-debug-kitdll solaris-sparc solaris-sparc-debug solaris-sparc-kitdll solaris-sparc-debug-kitdll solaris-sparc64 solaris-sparc64-debug solaris-sparc64-kitdll solaris-sparc64-debug-kitdll freebsd-amd64 freebsd-amd64-debug freebsd-amd64-kitdll freebsd-amd64-debug-kitdll netbsd-i386-notk netbsd-i386-notk-debug netbsd-i386-notk-kitdll netbsd-i386-notk-debug-kitdll netbsd-amd64 netbsd-amd64-debug netbsd-amd64-kitdll netbsd-amd64-debug-kitdll android-arm-notk android-arm-notk-debug android-arm-notk-kitdll android-arm-notk-debug-kitdll"
    73     73   fi
    74     74   
    75     75   failed=""
    76     76   for kit in $kits; do
    77     77   	kitcreator="./kitcreator"
    78     78   	args=""
    79     79   	runnable="1"
................................................................................
   106    106   			;;
   107    107   		win32|win32-*)
   108    108   			kitcreator="./build/make-kit-win32"
   109    109   			xcompile="1"
   110    110   			runnable="1"
   111    111   			kitruncmd="wine"
   112    112   			;;
          113  +		win64|win64-*)
          114  +			kitcreator="./build/make-kit-win32"
          115  +			xcompile="1"
          116  +			runnable="1"
          117  +			kitruncmd="wine"
          118  +			args="${args} --enable-64bit"
          119  +			;;
   113    120   		linux-mipsel-min|linux-mipsel-min-kitdll)
   114    121   			kitcreator="./build/make-kit-linux-mipsel"
   115    122   			runnable="0"
   116    123   			xcompile="1"
   117    124   			notk="1"
   118    125   			iszip="1"
   119    126   			;;
................................................................................
   351    358   
   352    359   			# Verify sanity of created kit
   353    360   			issane=1
   354    361   
   355    362   			## Verify that Win32 builds are of correct type
   356    363   			## Verify that DLL builds are of correct type
   357    364   			case "-${version}-${kit}-" in
   358         -				*-win32-kitdll-*|*-win32-*-kitdll-*)
          365  +				*-win[36][24]-kitdll-*|*-win[36][24]-*-kitdll-*)
   359    366   					if ! file "${createdkit}" | grep 'MS Windows' | grep '(DLL)' >/dev/null; then
   360    367   						issane=0
   361    368   					fi
   362    369   					;;
   363    370   				*-kitdll-*)
   364    371   					if ! file "${createdkit}" | grep 'shared object' >/dev/null; then
   365    372   						issane=0
   366    373   					fi
   367    374   					;;
   368         -				*-win32-notk-*|*-win32-*-notk-*)
          375  +				*-win[36][24]-notk-*|*-win[36][24]-*-notk-*)
   369    376   					if ! file "${createdkit}" | grep 'MS Windows' | grep '(console)' >/dev/null; then
   370    377   						echo "Kit failed sanity check for being a console application" >&2
   371    378   						issane=0
   372    379   					fi
   373    380   					;;
   374         -				*-win32-*)
          381  +				*-win[36][24]-*)
   375    382   					if ! file "${createdkit}" | grep 'MS Windows' | grep '(GUI)' >/dev/null; then
   376    383   						echo "Kit failed sanity check for being a GUI application" >&2
   377    384   						issane=0
   378    385   					fi
   379    386   					;;
   380    387   			esac
   381    388