backout Bug 550657, this DID break TB 1.9.2 :(
authorJustin Wood <Callek@gmail.com>
Tue, 30 Mar 2010 01:22:00 -0400
changeset 5322 2637be01051f257a9d56299ecc0db75b8db6e72c
parent 5320 ad08c4e0a3c6b05154ca639d26f7bebec995243e (current diff)
parent 5321 d54fc8aed5af6b962b0e164e672528429c769157 (diff)
child 5324 bebde715d9d75fa08747379a9deca0c09b8e88a8
push id4099
push userCallek@gmail.com
push dateTue, 30 Mar 2010 05:22:08 +0000
treeherdercomm-central@2637be01051f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs550657
backout Bug 550657, this DID break TB 1.9.2 :(
aclocal.m4
build/autoconf/acwinpaths.m4
build/msys-perl-wrapper
config/rules.mk
configure.in
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -8,18 +8,15 @@ builtin(include, mozilla/build/autoconf/
 builtin(include, mozilla/build/autoconf/nspr.m4)dnl
 builtin(include, mozilla/build/autoconf/nss.m4)dnl
 builtin(include, mozilla/build/autoconf/pkg.m4)dnl
 builtin(include, mozilla/build/autoconf/freetype2.m4)dnl
 builtin(include, mozilla/build/autoconf/codeset.m4)dnl
 builtin(include, mozilla/build/autoconf/altoptions.m4)dnl
 builtin(include, mozilla/build/autoconf/mozprog.m4)dnl
 
-dnl use mozilla/build below when we drop support for MOZILLA_1_9_2_BRANCH
-builtin(include, build/autoconf/acwinpaths.m4)dnl
 
 MOZ_PROG_CHECKMSYS()
-
 # Read the user's .mozconfig script.  We can't do this in
 # configure.in: autoconf puts the argument parsing code above anything
 # expanded from configure.in, and we need to get the configure options
 # from .mozconfig in place before that argument parsing code.
 MOZ_READ_MOZCONFIG(mozilla)
deleted file mode 100644
--- a/build/autoconf/acwinpaths.m4
+++ /dev/null
@@ -1,68 +0,0 @@
-dnl ***** BEGIN LICENSE BLOCK *****
-dnl Version: MPL 1.1/GPL 2.0/LGPL 2.1
-dnl
-dnl The contents of this file are subject to the Mozilla Public License Version
-dnl 1.1 (the "License"); you may not use this file except in compliance with
-dnl the License. You may obtain a copy of the License at
-dnl http://www.mozilla.org/MPL/
-dnl
-dnl Software distributed under the License is distributed on an "AS IS" basis,
-dnl WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-dnl for the specific language governing rights and limitations under the
-dnl License.
-dnl
-dnl The Original Code is mozilla.org code.
-dnl
-dnl The Initial Developer of the Original Code is the
-dnl Mozilla Foundation <http://www.mozilla.org>
-dnl
-dnl Portions created by the Initial Developer are Copyright (C) 2009
-dnl the Initial Developer. All Rights Reserved.
-dnl
-dnl Contributor(s):
-dnl   Benjamin Smedberg
-dnl
-dnl Alternatively, the contents of this file may be used under the terms of
-dnl either of the GNU General Public License Version 2 or later (the "GPL"),
-dnl or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-dnl in which case the provisions of the GPL or the LGPL are applicable instead
-dnl of those above. If you wish to allow use of your version of this file only
-dnl under the terms of either the GPL or the LGPL, and not to allow others to
-dnl use your version of this file under the terms of the MPL, indicate your
-dnl decision by deleting the provisions above and replace them with the notice
-dnl and other provisions required by the GPL or the LGPL. If you do not delete
-dnl the provisions above, a recipient may use your version of this file under
-dnl the terms of any one of the MPL, the GPL or the LGPL.
-dnl
-dnl ***** END LICENSE BLOCK *****
-
-dnl this file exists in c-c only for MOZILLA_1_9_2_BRANCH
-dnl and is a mirror of the same file in mozilla-central (1.9.3)
-
-define(GENERATE_SUB_ABS, [
-define([AC_OUTPUT_FILES_SUB1], [
-patsubst($@, [/\*)], [/* | ?:/*)])
-])
-])
-GENERATE_SUB_ABS(defn([AC_OUTPUT_FILES]))
-
-define(GENERATE_SUB_NOSPLIT, [
-define([AC_OUTPUT_FILES], [
-patsubst($@, [-e "s%:% \$ac_given_srcdir/%g"], [])
-])
-])
-GENERATE_SUB_NOSPLIT(defn([AC_OUTPUT_FILES_SUB1]))
-
-define(GENERATE_HEADER_NOSPLIT, [
-define([AC_OUTPUT_HEADER], [
-patsubst($@, [-e "s%:% \$ac_given_srcdir/%g"], [])
-])
-])
-GENERATE_HEADER_NOSPLIT(defn([AC_OUTPUT_HEADER]))
-
-define(GENERATE_SUBDIRS_ABS, [
-define([AC_OUTPUT_SUBDIRS], [
-patsubst($@, [/\*)], [/* | ?:/*)])
-])
-])
-GENERATE_SUBDIRS_ABS(defn([AC_OUTPUT_SUBDIRS]))
deleted file mode 100644
--- a/build/msys-perl-wrapper
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# this file exists in c-c only for MOZILLA_1_9_2_BRANCH
-# and is a mirror of the same file in mozilla-central (1.9.3)
-
-args=""
-
-for i in "${@}"
-do
-    case "$i" in
-    -I?:/*)
-        i="$(echo "${i}" | sed -e 's|^-I\(.\):/|-I/\1/|')"
-	;;
-    esac
-
-    args="${args} '${i}'"
-done
-
-eval "exec perl $args"
--- a/calendar/installer/Makefile.in
+++ b/calendar/installer/Makefile.in
@@ -83,17 +83,17 @@ DEFINES += -DAB_CD=$(AB_CD)
 ifdef MOZ_UPDATER
 DEFINES += -DMOZ_UPDATER=1
 endif
 
 ifdef MOZ_PKG_MANIFEST_P
 MOZ_PKG_MANIFEST = packages-static
 
 $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P)
-	$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $< > $@
+	$(PERL) $(MOZILLA_SRCDIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $< > $@
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 MOZ_PKG_MAC_DSSTORE=branding/dsstore
 MOZ_PKG_MAC_BACKGROUND=branding/background.png
 MOZ_PKG_MAC_ICON=branding/disk.icns
 endif
 
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -76,17 +76,17 @@ endif
 
 ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
 ifndef GNU_CC
 _LIBNAME_RELATIVE_PATHS=1
 endif
 endif
 
 ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
-_VPATH_SRCS = $(abspath $<)
+_VPATH_SRCS = $(if $(filter /%,$<),$<,$(PWD)/$<)
 else
 _VPATH_SRCS = $<
 endif
 
 # Add $(DIST)/lib to VPATH so that -lfoo dependencies are followed
 VPATH += $(DIST)/lib
 ifdef LIBXUL_SDK
 VPATH += $(LIBXUL_SDK)/lib
--- a/configure.in
+++ b/configure.in
@@ -1726,18 +1726,16 @@ case "$host" in
     fi
     HOST_CFLAGS="$HOST_CFLAGS -DXP_WIN32 -DXP_WIN -DWIN32 -D_WIN32 -DNO_X11"
     HOST_NSPR_MDCPUCFG='\"md/_winnt.cfg\"'
     HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O2}"
     HOST_BIN_SUFFIX=.exe
     case "$host" in
     *mingw*)
     dnl MinGW/MSYS does not need CYGWIN_WRAPPER
-        dnl use MOZILLA_SRCDIR when we drop support for MOZILLA_1_9_2_BRANCH
-        PERL="/bin/sh ${srcdir}/build/msys-perl-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
--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@@ -70,17 +70,17 @@ endif
 ifeq (gtk2, $(MOZ_WIDGET_TOOLKIT))
 DEFINES += -DMOZ_GTK2=1
 endif
 
 ifdef MOZ_PKG_MANIFEST_P
 MOZ_PKG_MANIFEST = package-manifest
 
 $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P)
-	$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $< > $@
+	$(PERL) $(MOZILLA_SRCDIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $< > $@
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 MOZ_PKG_MAC_DSSTORE=branding/dsstore
 MOZ_PKG_MAC_BACKGROUND=branding/background.png
 MOZ_PKG_MAC_ICON=branding/disk.icns
 MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
 endif