Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 699385 - Remove support for pre-Windows 7 SDKs. r=ted

Browse Source 
--HG--
extra : rebase_source : 65ad2481c16199bfba9cebe89965d2065e90dd42
This commit is contained in:
Siddharth Agarwal 2012-01-26 22:05:34 +05:30
parent 5101b91ac2
commit f55b83ca01
2 changed files with 9 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
configure.in
View File

@ -669,29 +669,20 @@ WINSDK_TARGETVER=601
MOZ_ARG_WITH_STRING(windows-version,
[ --with-windows-version=WINSDK_TARGETVER
Highest Windows version to target using this SDK
502: Windows Server 2003
600: Windows Vista
601: Windows 7],
WINSDK_TARGETVER=$withval)
case "$WINSDK_TARGETVER" in
502|600|601)
601)
MOZ_WINSDK_TARGETVER=0${WINSDK_TARGETVER}0000
;;
*)
AC_MSG_ERROR([Invalid value for --with-windows-version ($WINSDK_TARGETVER), must be 502, 600 or 601]);
AC_MSG_ERROR([Invalid value for --with-windows-version ($WINSDK_TARGETVER), must be 601]);
;;
esac
if test -n "$COMPILE_ENVIRONMENT"; then
if test "$MOZ_WINSDK_TARGETVER" -lt "06000000"; then
# We can't build parental controls either
MOZ_DISABLE_PARENTAL_CONTROLS=1
fi
fi
case "$target" in
*-mingw*)
if test "$GCC" != "yes"; then
@ -852,15 +843,8 @@ EOF
])
MOZ_WINSDK_MAXVER=${ac_cv_winsdk_maxver}
else
# The Vista SDK is the only one to have sdkddkver.h but not
# WinSDKVer.h
MOZ_CHECK_HEADERS([sdkddkver.h])
if test "$ac_cv_header_sdkddkver_h" = "yes"; then
MOZ_WINSDK_MAXVER=0x06000000
else
# Assume the Server 2003 Platform SDK
MOZ_WINSDK_MAXVER=0x05020000
fi
# Any SDK which doesn't have WinSDKVer.h is too old.
AC_MSG_ERROR([Your SDK does not have WinSDKVer.h. It is probably too old. Please upgrade to a newer SDK or try running the Windows SDK Configuration Tool and selecting a newer SDK. See https://developer.mozilla.org/En/Windows_SDK_versions for more details on fixing this.])
fi
unset _MSVC_VER_FILTER
@ -4664,14 +4648,7 @@ esac
case "$target_os" in
mingw*)
NS_ENABLE_TSF=1
if test -z "$GNU_CC"; then
if test "$MOZ_WINSDK_TARGETVER" -lt "06000000"; then
NS_ENABLE_TSF=
fi
fi
if test -n "$NS_ENABLE_TSF"; then
AC_DEFINE(NS_ENABLE_TSF)
fi
AC_DEFINE(NS_ENABLE_TSF)
;;
esac
@ -7346,8 +7323,7 @@ dnl ========================================================
dnl ETW - Event Tracing for Windows
dnl ========================================================
MOZ_ARG_ENABLE_BOOL(ETW,
[ --enable-ETW Enable ETW (Event Tracing for Windows) event reporting
(needs Windows Vista+ SDK)],
[ --enable-ETW Enable ETW (Event Tracing for Windows) event reporting],
MOZ_ETW=1,
MOZ_ETW= )
if test -n "$MOZ_ETW"; then
@ -7357,8 +7333,6 @@ fi
if test -n "$MOZ_ETW"; then
if test -z "$MOZ_WINSDK_TARGETVER"; then
AC_MSG_ERROR([--enable-ETW is only valid on Windows])
elif test "$MOZ_WINSDK_TARGETVER" -lt "06000000"; then
AC_MSG_ERROR([--enable-ETW requires the Windows Vista SDK or newer])
fi
fi

11
js/src/configure.in
View File

@ -660,18 +660,16 @@ WINSDK_TARGETVER=601
MOZ_ARG_WITH_STRING(windows-version,
[ --with-windows-version=WINSDK_TARGETVER
Highest Windows version to target using this SDK
502: Windows Server 2003
600: Windows Vista
601: Windows 7],
WINSDK_TARGETVER=$withval)
case "$WINSDK_TARGETVER" in
502|600|601)
601)
MOZ_WINSDK_TARGETVER=0${WINSDK_TARGETVER}0000
;;
*)
AC_MSG_ERROR([Invalid value for --with-windows-version ($WINSDK_TARGETVER), must be 502, 600 or 601]);
AC_MSG_ERROR([Invalid value for --with-windows-version ($WINSDK_TARGETVER), must be 601]);
;;
esac
@ -4439,8 +4437,7 @@ dnl ========================================================
dnl ETW - Event Tracing for Windows
dnl ========================================================
MOZ_ARG_ENABLE_BOOL(ETW,
[ --enable-ETW Enable ETW (Event Tracing for Windows) event reporting
(needs Windows Vista+ SDK)],
[ --enable-ETW Enable ETW (Event Tracing for Windows) event reporting],
MOZ_ETW=1,
MOZ_ETW= )
if test -n "$MOZ_ETW"; then
@ -4451,8 +4448,6 @@ fi
if test -n "$MOZ_ETW"; then
if test -z "$MOZ_WINSDK_TARGETVER"; then
AC_MSG_ERROR([--enable-ETW is only valid on Windows])
elif test "$MOZ_WINSDK_TARGETVER" -lt "06000000"; then
AC_MSG_ERROR([--enable-ETW requires the Windows Vista SDK or newer])
fi
fi