mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Tighten (add?) tool version checks for win32 builds. 

Allow MIDL to be specified from mozconfig or env since various MS SDKs contain an unsupported version of midl and they insist upon adding their SDK dirs to the beginning of the PATH (bug #178392)
Bug #164646 r=bryner
This commit is contained in:
seawood%netscape.com 2002-11-09 02:16:55 +00:00
Родитель a2f6e2b908
Коммит a21ca257f6
8 изменённых файлов: 871 добавлений и 637 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
config/autoconf.mk.in
Просмотреть файл

@ -188,6 +188,7 @@ USE_SHORT_LIBNAME = @USE_SHORT_LIBNAME@
IMPLIB = @IMPLIB@
FILTER = @FILTER@
BIN_FLAGS = @BIN_FLAGS@
MIDL = @MIDL@
LIB_PREFIX = @LIB_PREFIX@
OBJ_SUFFIX = @OBJ_SUFFIX@

3
config/config.mk
Просмотреть файл

@ -466,8 +466,6 @@ endif
#
CCC = $(CXX)
CCF = $(CC) $(CFLAGS)
LINK_EXE = $(LINK) $(OS_LFLAGS) $(LFLAGS)
LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
NFSPWD = $(CONFIG_TOOLS)/nfspwd
PURIFY = purify $(PURIFYOPTIONS)
QUANTIFY = quantify $(QUANTIFYOPTIONS)
@ -478,7 +476,6 @@ else
XPIDL_COMPILE = $(DIST)/bin/xpidl$(BIN_SUFFIX)
XPIDL_LINK = $(DIST)/bin/xpt_link$(BIN_SUFFIX)
endif
MIDL = midl
ifeq ($(OS_ARCH),OS2)
PATH_SEPARATOR := \;

1341
configure поставляемый
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

155
configure.in
Просмотреть файл

@ -142,18 +142,57 @@ dnl ==============================================================
case "$target" in
*-cygwin*|*-mingw*|*-msvc*|*-mksnt*)
# Check to see if we are really running in a msvc environemnt
_WIN32_MSVC=
_WIN32_MSVC=1
AC_CHECK_PROGS(CC, cl)
if test "$CC" = "cl"; then
echo 'main() { return 0; }' > dummy.c
${CC} -o dummy dummy.c >/dev/null 2>&1
if test $? = 0; then
_WIN32_MSVC=1
CXX=$CC
else
AC_MSG_WARN([$(CC) test failed. Using normal feature tests])
fi
rm -f dummy dummy.o dummy.obj dummy.exe dummy.c
AC_CHECK_PROGS(CXX, cl)
AC_CHECK_PROGS(LD, link)
AC_CHECK_PROGS(MIDL, midl)
# Make sure compilers are valid
CFLAGS="$CFLAGS -TC"
CXXFLAGS="$CXXFLAGS -TP"
AC_LANG_SAVE
AC_LANG_C
AC_TRY_COMPILE([#include <stdio.h>],
[ printf("Hello World\n"); ],,
AC_MSG_ERROR([\$(CC) test failed. You must have MS VC++ in your path to build.]) )
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <iostream.h>],
[ cout << "Hello World" << endl; ],,
AC_MSG_ERROR([\$(CXX) test failed. You must have MS VC++ in your path to build.]) )
AC_LANG_RESTORE
# Determine compiler version
_CC_FULL_VERSION=`"${CC}" -v 2>&1 | grep Version | sed -e 's|.* Version ||' | sed -e 's|[ ]*$||'`
_CC_MAJOR_VERSION=`echo ${_CC_FULL_VERSION} | awk -F\. '{ print $ 1 }'`
_CXX_FULL_VERSION=`"${CXX}" -v 2>&1 | grep Version | sed -e 's|.* Version ||' | sed -e 's|[ ]*$||'`
_CXX_MAJOR_VERSION=`echo ${_CXX_FULL_VERSION} | awk -F\. '{ print $ 1 }'`
if test "$_CC_MAJOR_VERSION" != "$_CXX_MAJOR_VERSION"; then
AC_MSG_ERROR([The major versions of \$CC and \$CXX do not match.])
fi
if test "$_CC_MAJOR_VERSION" = "12"; then
_CC_SUITE=6
elif test "$_CC_MAJOR_VERSION" = "13"; then
_CC_SUITE=7
else
AC_MSG_ERROR([This version of the MSVC compiler, $_CC_FULL_VERSION , is unsupported.])
fi
# Check linker version
_LD_FULL_VERSION=`"${LD}" -v 2>&1 | grep Version | sed -e 's|.* Version ||' | sed -e 's|[ ]*$||'`
_LD_MAJOR_VERSION=`echo ${_LD_FULL_VERSION} | awk -F\. '{ print $ 1 }'`
if test "$_LD_MAJOR_VERSION" != "$_CC_SUITE"; then
AC_MSG_ERROR([The linker major version, $_LD_FULL_VERSION, does not match the compiler suite version, $_CC_SUITE.])
fi
# Check midl version
_MIDL_FULL_VERSION=`"${MIDL}" -v 2>&1 | grep Version | sed -e 's|.* Version ||' | sed -e 's|[ ]*$||'`
_MIDL_MAJOR_VERSION=`echo ${_MIDL_FULL_VERSION} | awk -F\. '{ print $ 1 }'`
_MIDL_MINOR_VERSION=`echo ${_MIDL_FULL_VERSION} | awk -F\. '{ print $ 2 }'`
_MIDL_REV_VERSION=`echo ${_MIDL_FULL_VERSION} | awk -F\. '{ print $ 3 }'`
if test "$_MIDL_MAJOR_VERSION" != "5" -a "$_MIDL_FULL_VERSION" != "6.00.0347"; then
AC_MSG_ERROR([Midl version $_MIDL_FULL_VERSION was found. Midl version must be 5.x.x (VC6*) or 6.00.0347 (VC7).])
fi
;;
esac
@ -914,11 +953,8 @@ case "$target" in
_pwd=`pwd`
CYGWIN_WRAPPER="sh ${_pwd}/${srcdir}/build/cygwin-wrapper"
fi
CC=cl
CXX=cl
HOST_CC=cl
HOST_CXX=cl
LD=link
HOST_CC='$(CC)'
HOST_CXX='$(CXX)'
AR='lib -NOLOGO -OUT:"$@"'
AR_FLAGS=
RANLIB='echo not_ranlib'
@ -989,48 +1025,57 @@ case "$target" in
dnl Remove cygwinism from MOZ_BUILD_ROOT
MOZ_BUILD_ROOT=`cygpath -w $MOZ_BUILD_ROOT | sed -e 's|\\\\|/|g'`
if test "$MOZ_TOOLS"; then
MOZ_TOOLS_DIR=`cd $MOZ_TOOLS && pwd`
if test "$?" != "0" || test -z "$MOZ_TOOLS_DIR"; then
AC_MSG_ERROR([cd \$MOZ_TOOLS failed. MOZ_TOOLS ==? $MOZ_TOOLS])
fi
MOZ_TOOLS_DIR=`cygpath -w $MOZ_TOOLS_DIR | sed -e 's|\\\\|/|g'`
if test -n "$GLIB_PREFIX"; then
_GLIB_PREFIX_DIR=`cd $GLIB_PREFIX && pwd`
if test "$?" = "0"; then
if test `echo ${PATH} | grep -c "$_GLIB_PREFIX_DIR/bin:"` = 0; then
AC_MSG_ERROR([GLIB_PREFIX must be in your \$PATH.])
fi
_GLIB_PREFIX_DIR=`cygpath -w $_GLIB_PREFIX_DIR | sed -e 's|\\\\|/|g'`
GLIB_CFLAGS="-I${_GLIB_PREFIX_DIR}/include"
GLIB_LIBS="${_GLIB_PREFIX_DIR}/lib/glib-1.2.lib"
else
AC_MSG_ERROR([GLIB_PREFIX is set but "${GLIB_PREFIX}" is not a directory.])
fi
else
GLIB_CFLAGS='-I$(MOZ_TOOLS_DIR)/include'
GLIB_LIBS='$(MOZ_TOOLS_DIR)/lib/glib-1.2.lib'
fi
if test -n "$LIBIDL_PREFIX"; then
_LIBIDL_PREFIX_DIR=`cd $LIBIDL_PREFIX && pwd`
if test "$?" = "0"; then
if test `echo ${PATH} | grep -c "$_LIBIDL_PREFIX_DIR/bin:"` = 0; then
AC_MSG_ERROR([LIBIDL_PREFIX must be in your \$PATH.])
fi
_LIBIDL_PREFIX_DIR=`cygpath -w $_LIBIDL_PREFIX_DIR | sed -e 's|\\\\|/|g'`
LIBIDL_CFLAGS="-I${_LIBIDL_PREFIX_DIR}/include"
LIBIDL_LIBS="${_LIBIDL_PREFIX_DIR}/lib/libidl-0.6.lib ${_LIBIDL_PREFIX_DIR}/lib/glib-1.2.lib"
else
AC_MSG_ERROR([LIBIDL_PREFIX is set but "${LIBIDL_PREFIX}" is not a directory.])
fi
else
LIBIDL_CFLAGS='-I$(MOZ_TOOLS_DIR)/include'
LIBIDL_LIBS='$(MOZ_TOOLS_DIR)/lib/libidl-0.6.lib $(MOZ_TOOLS_DIR)/lib/glib-1.2.lib'
fi
else
if test -z "$MOZ_TOOLS"; then
AC_MSG_ERROR([MOZ_TOOLS is not set])
fi
MOZ_TOOLS_DIR=`cd $MOZ_TOOLS && pwd`
if test "$?" != "0" || test -z "$MOZ_TOOLS_DIR"; then
AC_MSG_ERROR([cd \$MOZ_TOOLS failed. MOZ_TOOLS ==? $MOZ_TOOLS])
fi
if test `echo ${PATH} | grep -c "$MOZ_TOOLS_DIR/bin:"` = 0; then
AC_MSG_ERROR([\$MOZ_TOOLS\\bin must be in your path.])
fi
MOZ_TOOLS_DIR=`cygpath -w $MOZ_TOOLS_DIR | sed -e 's|\\\\|/|g'`
if test -n "$GLIB_PREFIX"; then
_GLIB_PREFIX_DIR=`cd $GLIB_PREFIX && pwd`
if test "$?" = "0"; then
if test `echo ${PATH} | grep -c "$_GLIB_PREFIX_DIR/bin:"` = 0; then
AC_MSG_ERROR([GLIB_PREFIX must be in your \$PATH.])
fi
_GLIB_PREFIX_DIR=`cygpath -w $_GLIB_PREFIX_DIR | sed -e 's|\\\\|/|g'`
else
AC_MSG_ERROR([GLIB_PREFIX is set but "${GLIB_PREFIX}" is not a directory.])
fi
else
_GLIB_PREFIX_DIR=$MOZ_TOOLS_DIR
fi
if test ! -f "${_GLIB_PREFIX_DIR}/include/glib.h"; then
AC_MSG_ERROR([Cannot find $_GLIB_PREFIX_DIR/include/glib.h .])
fi
GLIB_CFLAGS="-I${_GLIB_PREFIX_DIR}/include"
GLIB_LIBS="${_GLIB_PREFIX_DIR}/lib/glib-1.2.lib"
if test -n "$LIBIDL_PREFIX"; then
_LIBIDL_PREFIX_DIR=`cd $LIBIDL_PREFIX && pwd`
if test "$?" = "0"; then
if test `echo ${PATH} | grep -c "$_LIBIDL_PREFIX_DIR/bin:"` = 0; then
AC_MSG_ERROR([LIBIDL_PREFIX must be in your \$PATH.])
fi
_LIBIDL_PREFIX_DIR=`cygpath -w $_LIBIDL_PREFIX_DIR | sed -e 's|\\\\|/|g'`
else
AC_MSG_ERROR([LIBIDL_PREFIX is set but "${LIBIDL_PREFIX}" is not a directory.])
fi
else
_LIBIDL_PREFIX_DIR=$MOZ_TOOLS_DIR
fi
if test ! -f "${_LIBIDL_PREFIX_DIR}/include/libIDL/IDL.h"; then
AC_MSG_ERROR([Cannot find $_LIBIDL_PREFIX_DIR/include/libIDL/IDL.h .])
fi
LIBIDL_CFLAGS="-I${_LIBIDL_PREFIX_DIR}/include"
LIBIDL_LIBS="${_LIBIDL_PREFIX_DIR}/lib/libidl-0.6.lib ${_GLIB_PREFIX_DIR}/lib/glib-1.2.lib"
case "$target" in
i?86-*)
AC_DEFINE(_X86_)

2
embedding/browser/activex/src/control/Makefile.in
Просмотреть файл

@ -115,7 +115,7 @@ $(DEFFILE): mkctldef.sh
$(srcdir)/mkctldef.sh $@
done_gen: MozillaControl.idl
$(MIDL) /Oicf /h MozillaControl.h /iid MozillaControl_i.c $(srcdir)/MozillaControl.idl
"$(MIDL)" /Oicf /h MozillaControl.h /iid MozillaControl_i.c $(srcdir)/MozillaControl.idl
touch $@
$(MIDL_GENERATED_FILES): done_gen

2
mailnews/mapi/mapihook/build/Makefile.in
Просмотреть файл

@ -60,7 +60,7 @@ $(MIDL_GENERATED_FILES): done_gen
done_gen: msgMapi.idl
$(RM) $(SRCDIR_CSRCS)
$(MIDL) $(UNICODE_FLAGS) $(srcdir)/msgMapi.idl
"$(MIDL)" $(UNICODE_FLAGS) $(srcdir)/msgMapi.idl
touch $@
copy_csrcs: done_gen

2
widget/src/windows/expose/ISimpleDOMDocument/Makefile.in
Просмотреть файл

@ -69,7 +69,7 @@ $(MIDL_GENERATED_FILES): done_gen
done_gen: ISimpleDOMDocument.idl
$(RM) $(SRCDIR_CSRCS)
$(MIDL) $(srcdir)/ISimpleDOMDocument.idl
"$(MIDL)" $(srcdir)/ISimpleDOMDocument.idl
cp ISimpleDOMDocument.h ../..
cp ISimpleDOMDocument_i.c ../../ISimpleDOMDocument_iid.h
touch $@

2
widget/src/windows/expose/ISimpleDOMNode/Makefile.in
Просмотреть файл

@ -69,7 +69,7 @@ $(MIDL_GENERATED_FILES): done_gen
done_gen: ISimpleDOMNode.idl
$(RM) $(SRCDIR_CSRCS)
$(MIDL) $(srcdir)/ISimpleDOMNode.idl
"$(MIDL)" $(srcdir)/ISimpleDOMNode.idl
cp ISimpleDOMNode.h ../..
cp ISimpleDOMNode_i.c ../../ISimpleDOMNode_iid.h
touch $@