зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1128365
- MOZ_TOOLS is unnecessary. r=glandium
This commit is contained in:
Родитель
7947703867
Коммит
125a6e2f73
|
@ -9,9 +9,6 @@ fi
|
|||
## SDK redist ##
|
||||
export WIN32_REDIST_DIR=${_VSPATH}/VC/redist/x86/Microsoft.VC100.CRT
|
||||
|
||||
## moz tools location for 64-bit builders ##
|
||||
export MOZ_TOOLS=C:/mozilla-build/moztools
|
||||
|
||||
## includes: win8 sdk includes, winrt headers for metro, msvc 10 std library, directx sdk for d3d9 ##
|
||||
export INCLUDE=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/include/shared:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/include/um:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/include/winrt:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/include/winrt/wrl:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.0/include/winrt/wrl/wrappers:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include
|
||||
|
||||
|
@ -32,5 +29,3 @@ mk_export_correct_style LIBPATH
|
|||
mk_export_correct_style PATH
|
||||
mk_export_correct_style INCLUDE
|
||||
mk_export_correct_style WIN32_REDIST_DIR
|
||||
|
||||
mk_add_options "export MOZ_TOOLS=$MOZ_TOOLS"
|
||||
|
|
|
@ -1,9 +1,6 @@
|
|||
_VSPATH="/c/tools/vs2013"
|
||||
export WIN32_REDIST_DIR=${_VSPATH}/VC/redist/x86/Microsoft.VC120.CRT
|
||||
|
||||
## moz tools location for 64-bit builders ##
|
||||
export MOZ_TOOLS=C:/mozilla-build/moztools
|
||||
|
||||
## includes: win8.1 sdk includes, winrt headers for metro, msvc std library, directx sdk for d3d9 ##
|
||||
export INCLUDE=/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/shared:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/um:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/winrt:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/winrt/wrl:/c/Program\ Files\ \(x86\)/Windows\ Kits/8.1/include/winrt/wrl/wrappers:${_VSPATH}/vc/include:${_VSPATH}/vc/atlmfc/include:/c/tools/sdks/dx10/include
|
||||
|
||||
|
@ -24,5 +21,3 @@ mk_export_correct_style LIBPATH
|
|||
mk_export_correct_style PATH
|
||||
mk_export_correct_style INCLUDE
|
||||
mk_export_correct_style WIN32_REDIST_DIR
|
||||
|
||||
mk_add_options "export MOZ_TOOLS=$MOZ_TOOLS"
|
||||
|
|
17
configure.in
17
configure.in
|
@ -2347,22 +2347,6 @@ ia64*-hpux*)
|
|||
;;
|
||||
esac
|
||||
|
||||
case "$host" in
|
||||
*-mingw*)
|
||||
if test -z "$MOZ_TOOLS"; then
|
||||
AC_MSG_ERROR([MOZ_TOOLS is not set])
|
||||
fi
|
||||
MOZ_TOOLS_DIR=`cd $MOZ_TOOLS && pwd -W`
|
||||
if test "$?" != "0" -o -z "$MOZ_TOOLS_DIR"; then
|
||||
AC_MSG_ERROR([cd \$MOZ_TOOLS failed. MOZ_TOOLS ==? $MOZ_TOOLS])
|
||||
fi
|
||||
MOZ_TOOLS_BIN_DIR="$(cd "$MOZ_TOOLS_DIR/bin" && pwd)"
|
||||
if test `echo ${PATH}: | grep -ic "$MOZ_TOOLS_BINDIR:"` = 0; then
|
||||
AC_MSG_ERROR([\$MOZ_TOOLS\\bin must be in your path.])
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
case "$host_os" in
|
||||
cygwin*|msvc*|mks*)
|
||||
AC_MSG_ERROR([Using a Cygwin build environment is unsupported. Configure cannot check for presence of necessary headers. Please upgrade to MozillaBuild; see https://developer.mozilla.org/en/Windows_Build_Prerequisites.])
|
||||
|
@ -8687,7 +8671,6 @@ fi
|
|||
|
||||
dnl win32 options
|
||||
AC_SUBST(MOZ_BROWSE_INFO)
|
||||
AC_SUBST(MOZ_TOOLS_DIR)
|
||||
AC_SUBST(WIN32_REDIST_DIR)
|
||||
AC_SUBST(MAKENSISU)
|
||||
|
||||
|
|
|
@ -1842,22 +1842,6 @@ ia64*-hpux*)
|
|||
no_x=yes
|
||||
AC_DEFINE(NO_X11)
|
||||
|
||||
case "$host" in
|
||||
*-mingw*)
|
||||
if test -z "$MOZ_TOOLS"; then
|
||||
AC_MSG_ERROR([MOZ_TOOLS is not set])
|
||||
fi
|
||||
MOZ_TOOLS_DIR=`cd $MOZ_TOOLS && pwd -W`
|
||||
if test "$?" != "0" -o -z "$MOZ_TOOLS_DIR"; then
|
||||
AC_MSG_ERROR([cd \$MOZ_TOOLS failed. MOZ_TOOLS ==? $MOZ_TOOLS])
|
||||
fi
|
||||
MOZ_TOOLS_BIN_DIR="$(cd "$MOZ_TOOLS_DIR/bin" && pwd)"
|
||||
if test `echo ${PATH}: | grep -ic "$MOZ_TOOLS_BINDIR:"` = 0; then
|
||||
AC_MSG_ERROR([\$MOZ_TOOLS\\bin must be in your path.])
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
case "$host_os" in
|
||||
cygwin*|msvc*|mks*)
|
||||
AC_MSG_ERROR([Using a Cygwin build environment is unsupported. Configure cannot check for presence of necessary headers. Please upgrade to MozillaBuild; see https://developer.mozilla.org/en/Windows_Build_Prerequisites.])
|
||||
|
@ -3723,7 +3707,6 @@ AC_SUBST(MOZILLA_OFFICIAL)
|
|||
|
||||
dnl win32 options
|
||||
AC_SUBST(MOZ_BROWSE_INFO)
|
||||
AC_SUBST(MOZ_TOOLS_DIR)
|
||||
|
||||
dnl Echo the CFLAGS to remove extra whitespace.
|
||||
CFLAGS=`echo \
|
||||
|
|
Загрузка…
Ссылка в новой задаче