Bug 721447 - Remove support for pre-Windows 7 SDKs (comm-central version). r=Standard8
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -118,17 +118,16 @@ MOZ_UNIVERSALCHARDET = @MOZ_UNIVERSALCHA
ACCESSIBILITY = @ACCESSIBILITY@
MOZ_LDAP_XPCOM = @MOZ_LDAP_XPCOM@
MOZ_BRANDING_DIRECTORY = @MOZ_BRANDING_DIRECTORY@
MOZ_INSTALLER = @MOZ_INSTALLER@
MOZ_UPDATER = @MOZ_UPDATER@
MOZ_UPDATE_CHANNEL = @MOZ_UPDATE_CHANNEL@
MOZ_UPDATE_PACKAGING = @MOZ_UPDATE_PACKAGING@
MOZ_NO_ACTIVEX_SUPPORT = @MOZ_NO_ACTIVEX_SUPPORT@
-MOZ_DISABLE_VISTA_SDK_REQUIREMENTS = @MOZ_DISABLE_VISTA_SDK_REQUIREMENTS@
MOZ_SPELLCHECK = @MOZ_SPELLCHECK@
MOZ_PROFILELOCKING = @MOZ_PROFILELOCKING@
MOZ_FEEDS = @MOZ_FEEDS@
MOZ_PLACES = @MOZ_PLACES@
MOZ_PLACES_BOOKMARKS = @MOZ_PLACES_BOOKMARKS@
MOZ_STORAGE = @MOZ_STORAGE@
MOZ_SAFE_BROWSING = @MOZ_SAFE_BROWSING@
MOZ_URL_CLASSIFIER = @MOZ_URL_CLASSIFIER@
--- a/configure.in
+++ b/configure.in
@@ -484,52 +484,30 @@ case "$target" in
esac
dnl Target the Windows 7 SDK by default
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
-dnl Vista SDK specific api (deprecated)
-MOZ_ARG_DISABLE_BOOL(vista-sdk-requirements,
-[ --disable-vista-sdk-requirements
- Do not build Vista SDK specific code],
- MOZ_DISABLE_VISTA_SDK_REQUIREMENTS=1,
- MOZ_DISABLE_VISTA_SDK_REQUIREMENTS=)
-if test -n "$COMPILE_ENVIRONMENT"; then
-if test -n "$MOZ_DISABLE_VISTA_SDK_REQUIREMENTS"; then
- AC_MSG_WARN([--disable-vista-sdk-requirements is deprecated, use --with-windows-version=502 instead])
- MOZ_WINSDK_TARGETVER=05020000
-fi
-
-if test "$MOZ_WINSDK_TARGETVER" -lt "06000000"; then
- MOZ_DISABLE_VISTA_SDK_REQUIREMENTS=1
- AC_DEFINE(MOZ_DISABLE_VISTA_SDK_REQUIREMENTS)
-fi
-fi
-
-AC_SUBST(MOZ_DISABLE_VISTA_SDK_REQUIREMENTS)
-
case "$target" in
*-cygwin*|*-mingw*|*-msvc*|*-mks*|*-wince|*-winmo)
if test "$GCC" != "yes"; then
# Check to see if we are really running in a msvc environemnt
_WIN32_MSVC=1
AC_CHECK_PROGS(MIDL, midl)
# Make sure compilers are valid
@@ -676,25 +654,18 @@ case "$target" in
WINSDK_MAXVER
EOF
ac_cv_winsdk_maxver=`$CPP conftest.h 2>/dev/null | tail -n1`
rm -f conftest.h
])
MOZ_WINSDK_MAXVER=${ac_cv_winsdk_maxver}
else
- # The Vista SDK is the only one to have sdkddkver.h but not
- # WinSDKVer.h
- AC_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
AC_CACHE_CHECK(for std::_Throw, ac_cv_have_std__Throw,
[
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
@@ -790,18 +761,17 @@ EOF
"$_WINDRES_MINOR_VERSION" -lt "$WINDRES_MINOR_VERSION" -o \
"$_WINDRES_MAJOR_VERSION" -eq "$WINDRES_MAJOR_VERSION" -a \
"$_WINDRES_MINOR_VERSION" -eq "$WINDRES_MINOR_VERSION" -a \
"$_WINDRES_RELEASE_VERSION" -lt "$WINDRES_RELEASE_VERSION"
then
AC_MSG_ERROR([windres version $WINDRES_VERSION or higher is required to build.])
fi
- # Server 2003 is the highest version supported
- MOZ_WINSDK_MAXVER=0x05020000
+ MOZ_WINSDK_MAXVER=0x06010000
fi # !GNU_CC
AC_DEFINE_UNQUOTED(WINVER,0x$WINVER)
AC_DEFINE_UNQUOTED(_WIN32_WINNT,0x$WINVER)
# Require OS features provided by IE 6.0 SP2 (XP SP2)
AC_DEFINE_UNQUOTED(_WIN32_IE,0x0603)
# If the maximum version supported by this SDK is lower than the target
--- a/mail/components/search/Makefile.in
+++ b/mail/components/search/Makefile.in
@@ -47,20 +47,18 @@ EXTRA_PP_JS_MODULES = \
SearchIntegration.js \
$(NULL)
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
DIRS += mdimporter
endif
ifneq (,$(filter windows, $(MOZ_WIDGET_TOOLKIT)))
-ifndef MOZ_DISABLE_VISTA_SDK_REQUIREMENTS
DIRS += wsenable
endif
-endif
# If on Mac, build Spotlight integration
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
EXTRA_PP_JS_MODULES += \
SpotlightIntegration.js \
$(NULL)
endif