Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Path translation fixes for msys.

Browse Source 
Thanks to Howard Chu <hyc@symas.com> for the patches.
Bug #294122 r=cls a=shaver
This commit is contained in:
cls%seawood.org 2005-06-02 04:00:37 +00:00
parent 8c6231f128
commit 2f8def85e9
24 changed files with 611 additions and 552 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accessible/public/msaa/Makefile.in
View File

@ -44,7 +44,7 @@ LIBRARY_NAME = AccessibleMarshal
MODULE = accessibility
XPIDL_MODULE = accessibility-msaa
GRE_MODULE = 1
DEFFILE = $(srcdir)/AccessibleMarshal.def
DEFFILE = $(win_srcdir)/AccessibleMarshal.def
include $(DEPTH)/config/autoconf.mk

4
build/unix/modules.mk
View File

@ -41,8 +41,8 @@ BUILD_MODULE_CVS = config build
# client.mk does not have topsrcdir set
ifndef topsrcdir
topsrcdir=$(TOPSRCDIR)
ifdef MOZ_TOOLS
topsrcdir := $(shell cygpath -w $(TOPSRCDIR) | sed -e 's|\\|/|g')
ifdef CYGDRIVE_MOUNT
topsrcdir := $(subst \,/,$(shell cygpath -w $(TOPSRCDIR)))
endif
endif

6
calendar/installer/windows/Makefile.in
View File

@ -42,9 +42,9 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
CONFIG_DIR=$(shell cygpath -a $(srcdir))
OBJ_DIR=$(shell cygpath -a $(DEPTH))
SRC_DIR=$(shell cygpath -a $(topsrcdir))
CONFIG_DIR=$(shell cd $(srcdir) && pwd)
OBJ_DIR=$(shell cd $(DEPTH) && pwd)
SRC_DIR=$(shell cd $(topsrcdir) && pwd)
installer: sunbird.manifest
cd $(topsrcdir)/toolkit/mozapps/installer && perl build_static.pl -config "$(CONFIG_DIR)" -srcDir "$(SRC_DIR)" -objDir "$(OBJ_DIR)"

10
config/Makefile.in
View File

@ -118,13 +118,15 @@ endif
# Copy NSPR to the SDK
ifndef MOZ_NATIVE_NSPR
ABS_DIST = cd $(DIST) && pwd
ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH)))
_ABS_DIST = $(shell cd $(DIST) && cygpath -w `pwd` | sed -e 's|\\|/|g')
else
_ABS_DIST = $(shell cd $(DIST) && pwd)
ifdef CYGDRIVE_MOUNT
ABS_DIST = cygpath -w $(DIST) | sed -e 's|\\\\|/|g'
endif
endif
libs::
$(MAKE) -C $(DEPTH)/nsprpub real_install prefix=$(_ABS_DIST)/sdk exec_prefix=$(_ABS_DIST)/sdk bindir=$(_ABS_DIST)/sdk/dummy includedir=$(_ABS_DIST)/sdk/include libdir=$(_ABS_DIST)/sdk/lib datadir=$(_ABS_DIST)/sdk/dummy DESTDIR=
_ABS_DIST=`$(ABS_DIST)`; \
$(MAKE) -C $(DEPTH)/nsprpub real_install prefix=$$_ABS_DIST/sdk exec_prefix=$$_ABS_DIST/sdk bindir=$$_ABS_DIST/sdk/dummy includedir=$$_ABS_DIST/sdk/include libdir=$$_ABS_DIST/sdk/lib datadir=$$_ABS_DIST/sdk/dummy DESTDIR=
$(RM) -rf $(DIST)/sdk/dummy
ifndef DISABLE_DIST_GRE
$(INSTALL) $(DIST)/sdk/lib/$(DLL_PREFIX)nspr4$(DLL_SUFFIX) $(DIST)/sdk/lib/$(DLL_PREFIX)plc4$(DLL_SUFFIX) $(DIST)/sdk/lib/$(DLL_PREFIX)plds4$(DLL_SUFFIX) $(GRE_DIST)

1
config/autoconf.mk.in
View File

@ -249,6 +249,7 @@ XCFLAGS = @XCFLAGS@
XLDFLAGS = @XLDFLAGS@
XLIBS = @XLIBS@
WIN_TOP_SRC = @WIN_TOP_SRC@
CYGWIN_WRAPPER = @CYGWIN_WRAPPER@
AS_PERL = @AS_PERL@
CYGDRIVE_MOUNT = @CYGDRIVE_MOUNT@

7
config/config.mk
View File

@ -76,7 +76,14 @@ FINAL_TARGET = $(if $(XPI_NAME),$(DIST)/xpi-stage/$(XPI_NAME),$(DIST)/bin)
#
VERSION_NUMBER = 50
ifneq (,$(filter OS2 WINNT WINCE, $(OS_ARCH)))
win_srcdir := $(subst $(topsrcdir),$(WIN_TOP_SRC),$(srcdir))
BUILD_TOOLS = $(WIN_TOP_SRC)/build/unix
else
win_srcdir := $(srcdir)
BUILD_TOOLS = $(topsrcdir)/build/unix
endif
CONFIG_TOOLS = $(MOZ_BUILD_ROOT)/config
AUTOCONF_TOOLS = $(topsrcdir)/build/autoconf

3
config/rules.mk
View File

@ -1104,14 +1104,13 @@ ifndef COMPILER_DEPEND
_MDDEPFILE = $(MDDEPDIR)/$(@F).pp
ifeq (,$(CROSS_COMPILE)$(filter-out WINCE WINNT,$(OS_ARCH)))
_dos_srcdir := $(shell cygpath -w $(srcdir) | sed 's|\\|/|g')
define MAKE_DEPS_AUTO
if test -d $(@D); then \
echo "Building deps for $<"; \
touch $(_MDDEPFILE) && \
$(MKDEPEND) -o'.$(OBJ_SUFFIX)' -f$(_MDDEPFILE) $(DEFINES) $(ACDEFINES) $(INCLUDES) $< >/dev/null 2>&1 && \
mv $(_MDDEPFILE) $(_MDDEPFILE).old && \
cat $(_MDDEPFILE).old | sed -e "s|^$(srcdir)/||" -e "s|^$(_dos_srcdir)/||" > $(_MDDEPFILE) && rm -f $(_MDDEPFILE).old ; \
cat $(_MDDEPFILE).old | sed -e "s|^$(srcdir)/||" -e "s|^$(win_srcdir)/||" > $(_MDDEPFILE) && rm -f $(_MDDEPFILE).old ; \
fi
endef
else

1035
configure vendored
View File

File diff suppressed because it is too large Load Diff

57
configure.in
View File

@ -642,6 +642,7 @@ IMPORT_LIB_SUFFIX=
TARGET_MD_ARCH=unix
DIRENT_INO=d_ino
CYGWIN_WRAPPER=
WIN_TOP_SRC=
MOZ_USER_DIR=".mozilla"
MOZ_JPEG_CFLAGS=
@ -945,15 +946,22 @@ case "$host" in
HOST_NSPR_MDCPUCFG='\"md/_winnt.cfg\"'
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O2}"
HOST_BIN_SUFFIX=.exe
CYGWIN_WRAPPER="${srcdir}/build/cygwin-wrapper"
if test "`echo ${srcdir} | grep -c ^/ 2>/dev/null`" = 0; then
_pwd=`pwd`
CYGWIN_WRAPPER="${_pwd}/${srcdir}/build/cygwin-wrapper"
fi
if test "`${PERL} -v | grep -c cygwin 2>/dev/null`" = 0; then
AS_PERL=1
PERL="${CYGWIN_WRAPPER} $PERL"
fi
case "$host" in
*mingw*)
dnl MinGW/MSYS does not need CYGWIN_WRAPPER
;;
*)
CYGWIN_WRAPPER="${srcdir}/build/cygwin-wrapper"
if test "`echo ${srcdir} | grep -c ^/ 2>/dev/null`" = 0; then
_pwd=`pwd`
CYGWIN_WRAPPER="${_pwd}/${srcdir}/build/cygwin-wrapper"
fi
if test "`${PERL} -v | grep -c cygwin 2>/dev/null`" = 0; then
AS_PERL=1
PERL="${CYGWIN_WRAPPER} $PERL"
fi
;;
esac
;;
*-darwin*)
@ -1401,12 +1409,22 @@ case "$target" in
no_x=yes
AC_DEFINE(NO_X11)
dnl MinGW/MSYS doesn't provide or need cygpath
case "$host" in
*-mingw*)
CYGPATH_W=echo
CYGPATH_S=cat
MOZ_BUILD_ROOT=`cd $MOZ_BUILD_ROOT && pwd -W`
;;
*-cygwin*|*-msvc*|*-mks*)
CYGPATH_W="cygpath -w"
CYGPATH_S="sed -e s|\\\\|/|g"
MOZ_BUILD_ROOT=`$CYGPATH_W $MOZ_BUILD_ROOT | $CYGPATH_S`
;;
esac
case "$host" in
*-mingw*|*-cygwin*|*-msvc*|*-mks*)
dnl Remove cygwinism from MOZ_BUILD_ROOT
MOZ_BUILD_ROOT=`cygpath -w $MOZ_BUILD_ROOT | sed -e 's|\\\\|/|g'`
if test -z "$MOZ_TOOLS"; then
AC_MSG_ERROR([MOZ_TOOLS is not set])
fi
@ -1418,7 +1436,7 @@ case "$target" in
if test `echo ${PATH}: | grep -ic "$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'`
MOZ_TOOLS_DIR=`$CYGPATH_W $MOZ_TOOLS_DIR | $CYGPATH_S`
if test -n "$GLIB_PREFIX"; then
_GLIB_PREFIX_DIR=`cd $GLIB_PREFIX && pwd`
@ -1426,7 +1444,7 @@ case "$target" in
if test `echo ${PATH}: | grep -ic "$_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_PREFIX_DIR=`$CYGPATH_W $_GLIB_PREFIX_DIR | $CYGPATH_S`
else
AC_MSG_ERROR([GLIB_PREFIX is set but "${GLIB_PREFIX}" is not a directory.])
fi
@ -1445,7 +1463,7 @@ case "$target" in
if test `echo ${PATH}: | grep -ic "$_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_PREFIX_DIR=`$CYGPATH_W $_LIBIDL_PREFIX_DIR | $CYGPATH_S`
else
AC_MSG_ERROR([LIBIDL_PREFIX is set but "${LIBIDL_PREFIX}" is not a directory.])
fi
@ -6534,10 +6552,13 @@ done
AC_SUBST(LIBS_PATH)
dnl ========================================================
dnl Use cygwin wrapper for win32 builds
dnl Use cygwin wrapper for win32 builds, except MSYS/MinGW
dnl ========================================================
case "$host_os" in
mingw*|cygwin*|msvc*|mks*)
mingw*)
WIN_TOP_SRC=`cd $srcdir; pwd -W`
;;
cygwin*|msvc*|mks*)
HOST_CC="\$(CYGWIN_WRAPPER) $HOST_CC"
HOST_CXX="\$(CYGWIN_WRAPPER) $HOST_CXX"
CC="\$(CYGWIN_WRAPPER) $CC"
@ -6548,10 +6569,12 @@ mingw*|cygwin*|msvc*|mks*)
RC="\$(CYGWIN_WRAPPER) $RC"
MIDL="\$(CYGWIN_WRAPPER) $MIDL"
CYGDRIVE_MOUNT=`mount -p | awk '{ if (/^\//) { print $1; exit } }'`
WIN_TOP_SRC=`cygpath -w $srcdir | sed -e 's|\\\\|/|g'`
;;
esac
AC_SUBST(CYGDRIVE_MOUNT)
AC_SUBST(WIN_TOP_SRC)
AC_SUBST(MOZILLA_VERSION)
AC_SUBST(MOZILLA_VERSION_MAJOR)

2
embedding/browser/activex/src/control_kicker/Makefile.in
View File

@ -44,7 +44,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = mozctlx
DEFFILE = $(srcdir)/mozctlx.def
DEFFILE = $(win_srcdir)/mozctlx.def
EXPORT_LIBRARY = 1
FORCE_SHARED_LIB= 1
GRE_MODULE = 1

2
mailnews/extensions/palmsync/build/Makefile.in
View File

@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = PalmSyncProxy
LIBRARY_NAME = $(MODULE)
DEFFILE = $(srcdir)/PalmSyncProxy.def
DEFFILE = $(win_srcdir)/PalmSyncProxy.def
MOZILLA_INTERNAL_API = 1
EXPORTS = IPalmSync.h

2
mailnews/mapi/mapiDll/Makefile.in
View File

@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = mozMapi32
EXPORT_LIBRARY = $(MODULE)
LIBRARY_NAME = $(MODULE)
DEFFILE = $(srcdir)/Mapi32.def
DEFFILE = $(win_srcdir)/Mapi32.def
MOZILLA_INTERNAL_API = 1
REQUIRES = MapiProxy \

2
mailnews/mapi/mapihook/build/Makefile.in
View File

@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = MapiProxy
LIBRARY_NAME = $(MODULE)
DEFFILE = $(srcdir)/MapiProxy.def
DEFFILE = $(win_srcdir)/MapiProxy.def
MOZILLA_INTERNAL_API = 1
EXPORTS = msgMapi.h

2
mailnews/mime/cthandlers/calendar/Makefile.in
View File

@ -58,7 +58,7 @@ REQUIRES = xpcom \
ifeq ($(OS_ARCH),WINNT)
MAPFILE = calendar.map
DEFFILE = $(srcdir)/calendar.def
DEFFILE = $(win_srcdir)/calendar.def
endif
LOCAL_INCLUDES = -I$(srcdir)/../glue

2
mailnews/mime/cthandlers/smimestub/Makefile.in
View File

@ -64,7 +64,7 @@ REQUIRES = xpcom \
ifeq ($(OS_ARCH),WINNT)
MAPFILE = smimestb.map
DEFFILE = $(srcdir)/smime.def
DEFFILE = $(win_srcdir)/smime.def
endif
EXTRA_DSO_LIBS = mimecthglue_s

2
mailnews/mime/cthandlers/vcard/Makefile.in
View File

@ -76,7 +76,7 @@ REQUIRES = xpcom \
ifeq ($(OS_ARCH),WINNT)
MAPFILE = vcard.map
DEFFILE = $(srcdir)/vcard.def
DEFFILE = $(win_srcdir)/vcard.def
endif
LOCAL_INCLUDES = -I$(srcdir)/../glue

2
modules/plugin/samples/default/windows/Makefile.in
View File

@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = plugin
LIBRARY_NAME = npnul32
RESFILE = npnul32.res
DEFFILE = $(srcdir)/npnul32.def
DEFFILE = $(win_srcdir)/npnul32.def
GRE_MODULE = 1
PACKAGE_FILE = npnul.pkg

2
modules/plugin/tools/sdk/samples/basic/windows/Makefile.in
View File

@ -55,7 +55,7 @@ CPPSRCS = plugin.cpp
SHARED_LIBRARY_LIBS = ../../common/$(LIB_PREFIX)plugingate_s.$(LIB_SUFFIX)
DEFFILE = $(srcdir)/basic.def
DEFFILE = $(win_srcdir)/basic.def
RESFILE = basic.res
ifdef GNU_CC

2
modules/plugin/tools/sdk/samples/scriptable/windows/Makefile.in
View File

@ -60,7 +60,7 @@ XPIDLSRCS = nsIScriptablePluginSample.idl
SHARED_LIBRARY_LIBS = ../../common/$(LIB_PREFIX)plugingate_s.$(LIB_SUFFIX)
DEFFILE = $(srcdir)/npscriptable.def
DEFFILE = $(win_srcdir)/npscriptable.def
RESFILE = npscriptable.res
ifdef GNU_CC

2
modules/plugin/tools/sdk/samples/simple/Makefile.in
View File

@ -60,7 +60,7 @@ XPIDLSRCS = nsISimplePlugin.idl
SHARED_LIBRARY_LIBS = ../common/$(LIB_PREFIX)plugingate_s.$(LIB_SUFFIX)
ifeq ($(OS_ARCH),WINNT)
DEFFILE = $(srcdir)/npsimple.def
DEFFILE = $(win_srcdir)/npsimple.def
RESFILE = npsimple.res
endif

2
modules/plugin/tools/sdk/samples/winless/windows/Makefile.in
View File

@ -55,7 +55,7 @@ CPPSRCS = plugin.cpp
SHARED_LIBRARY_LIBS = ../../common/$(LIB_PREFIX)plugingate_s.$(LIB_SUFFIX)
DEFFILE = $(srcdir)/npwinless.def
DEFFILE = $(win_srcdir)/npwinless.def
RESFILE = npwinless.res
include $(topsrcdir)/config/rules.mk

2
modules/zlib/src/Makefile.in
View File

@ -38,7 +38,7 @@ ifndef MOZ_ENABLE_LIBXUL
ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
ifndef GNU_CC
MAPFILE = $(LIBRARY_NAME).map
DEFFILE = $(srcdir)/zlib.def
DEFFILE = $(win_srcdir)/zlib.def
endif
endif
endif

6
xpinstall/packager/windows/Makefile.in
View File

@ -41,9 +41,13 @@ DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
OBJDIR = $(shell cygpath -t mixed -ai $(DEPTH))
include $(DEPTH)/config/autoconf.mk
ifdef CYGDRIVE_MOUNT
OBJDIR = $(shell cygpath -t mixed -ai $(DEPTH))
else
OBJDIR = $(shell cd $(DEPTH) && pwd)
endif
MODULE = xpinstall

6
xulrunner/installer/windows/Makefile.in
View File

@ -42,9 +42,9 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
CONFIG_DIR=$(shell cygpath -a $(srcdir))
OBJ_DIR=$(shell cygpath -a $(DEPTH))
SRC_DIR=$(shell cygpath -a $(topsrcdir))
CONFIG_DIR=$(shell cd $(srcdir) && pwd)
OBJ_DIR=$(shell cd $(DEPTH) && pwd)
SRC_DIR=$(shell cd $(topsrcdir) && pwd)
#installer: firefox.manifest
# cd $(topsrcdir)/toolkit/mozapps/installer && perl build_static.pl -config "$(CONFIG_DIR)" -srcDir "$(SRC_DIR)" -objDir "$(OBJ_DIR)"