Backout revision 7ad89ff81d2c (bug 693226) due to suspected Windows bustage.
authorRyan VanderMeulen <ryanvm@gmail.com>
Sun, 26 Feb 2012 21:49:50 -0500
changeset 10946 5505c49e115dde46491754bac21a16ec411b81a7
parent 10945 892d4207a0dd153e5c7e4254ddf257396e5d3edb
child 10947 3dd223a8308bc0feb5235cc311d53e1370302486
push id463
push userbugzilla@standard8.plus.com
push dateTue, 24 Apr 2012 17:34:51 +0000
treeherdercomm-beta@e53588e8f7b0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs693226
backs out7ad89ff81d2ceba5ce8992de4eb85b69b97e8530
Backout revision 7ad89ff81d2c (bug 693226) due to suspected Windows bustage.
config/config.mk
configure.in
--- a/config/config.mk
+++ b/config/config.mk
@@ -74,17 +74,16 @@ CHECK_VARS := \
 
 # checks for internal spaces or trailing spaces in the variable
 # named by $x
 check-variable = $(if $(filter-out 0 1,$(words $($(x))z)),$(error Spaces are not allowed in $(x)))
 
 $(foreach x,$(CHECK_VARS),$(check-variable))
 
 core_abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1)))
-core_realpath = $(if $(realpath $(1)),$(realpath $(1)),$(call core_abspath,$(1)))
 
 nullstr :=
 space :=$(nullstr) # EOL
 
 core_winabspath = $(firstword $(subst /, ,$(call core_abspath,$(1)))):$(subst $(space),,$(patsubst %,\\%,$(wordlist 2,$(words $(subst /, ,$(call core_abspath,$(1)))), $(strip $(subst /, ,$(call core_abspath,$(1)))))))
 
 # FINAL_TARGET specifies the location into which we copy end-user-shipped
 # build products (typelibs, components, chrome).
@@ -665,18 +664,18 @@ png2ico = $(PYTHON) $(MOZILLA_DIR)/confi
 # MOZ_UI_LOCALE directly, but use an intermediate variable that can be
 # overridden by the command line. (Besides, AB_CD is prettier).
 AB_CD = $(MOZ_UI_LOCALE)
 
 ifndef L10NBASEDIR
 L10NBASEDIR = $(error L10NBASEDIR not defined by configure)
 endif
 
-EXPAND_LOCALE_SRCDIR = $(if $(filter en-US,$(AB_CD)),$(topsrcdir)/$(1)/en-US,$(call core_realpath,$(L10NBASEDIR))/$(AB_CD)/$(subst /locales,,$(1)))
-EXPAND_MOZLOCALE_SRCDIR = $(if $(filter en-US,$(AB_CD)),$(MOZILLA_SRCDIR)/$(1)/en-US,$(call core_realpath,$(L10NBASEDIR))/$(AB_CD)/$(subst /locales,,$(1)))
+EXPAND_LOCALE_SRCDIR = $(if $(filter en-US,$(AB_CD)),$(topsrcdir)/$(1)/en-US,$(L10NBASEDIR)/$(AB_CD)/$(subst /locales,,$(1)))
+EXPAND_MOZLOCALE_SRCDIR = $(if $(filter en-US,$(AB_CD)),$(MOZILLA_SRCDIR)/$(1)/en-US,$(L10NBASEDIR)/$(AB_CD)/$(subst /locales,,$(1)))
 
 ifdef relativesrcdir
 LOCALE_SRCDIR = $(call EXPAND_LOCALE_SRCDIR,$(relativesrcdir))
 endif
 
 ifdef LOCALE_SRCDIR
 # if LOCALE_MERGEDIR is set, use mergedir first, then the localization,
 # and finally en-US
--- a/configure.in
+++ b/configure.in
@@ -2094,17 +2094,16 @@ ia64*-hpux*)
     ;;
     esac
     ;;
 
 *-wince*|*-winmo*)
     TARGET_COMPILER_ABI=msvc
     MOZ_TOOLS_DIR=`cd $MOZ_TOOLS && pwd -W`
     MOZ_BUILD_ROOT=`cd $MOZ_BUILD_ROOT && pwd -W`
-    L10NBASEDIR=`cd $L10NBASEDIR && pwd -W`
     AR_LIST="$AR -list"
     AR_EXTRACT=
     AR_DELETE="$AR d"
     AR_FLAGS='-OUT:"$@"'
 
     if test "$AS_BIN"; then
         AS="$AS_BIN"
     fi
@@ -2309,17 +2308,16 @@ ia64*-hpux*)
     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`
-	L10NBASEDIR=`cd $L10NBASEDIR && pwd -W`
 	;;
     *-cygwin*|*-msvc*|*-mks*)
 	CYGPATH_W="cygpath -a -w"
 	CYGPATH_S="sed -e s|\\\\|/|g"
 	MOZ_BUILD_ROOT=`$CYGPATH_W $MOZ_BUILD_ROOT | $CYGPATH_S`
 	;;
     esac
     case "$host" in