Bug 1360371: Backed out changesets c39e811e3a09 and d4e6fb6fb40a as they are no longer necessary; r=backout

MozReview-Commit-ID: 7QSHmDn828Y

--HG--
rename : browser/app/firefox.exe.64.manifest => browser/app/firefox.exe.manifest
rename : ipc/app/plugin-container.exe.64.manifest => ipc/app/plugin-container.exe.manifest
extra : rebase_source : efded7e1b6cb0cd5875ca53bdddae6e18eff7ce9

browser/app/Makefile.in

@@ -32,22 +32,18 @@ CXXFLAGS += -mno-sse -mno-sse2 -mfpmath=387
 CXX += -march=pentiumpro
 endif
 
+ifeq ($(OS_ARCH),WINNT)
+# Rebuild firefox.exe if the manifest changes - it's included by splash.rc.
+# (this dependency should really be just for firefox.exe, not other targets)
+# Note the manifest file exists in the tree, so we use the explicit filename
+# here.
+EXTRA_DEPS += firefox.exe.manifest
+endif
+
 PROGRAMS_DEST = $(DIST)/bin
 
 include $(topsrcdir)/config/rules.mk
 
-ifeq ($(OS_ARCH),WINNT)
-# Rebuild a .res file if the manifest changes - it's included by splash.rc.
-# (this dependency should really be just for the .res file, not other targets)
-# Note the manifest file exists in the tree, so we use the explicit filename
-# here.
-ifdef HAVE_64BIT_BUILD
-$(RESFILE): firefox.exe.64.manifest
-else
-$(RESFILE): firefox.exe.32.manifest
-endif
-endif
-
 ifneq (,$(filter-out WINNT,$(OS_ARCH)))
 
 ifdef COMPILE_ENVIRONMENT

browser/app/splash.rc

@@ -4,14 +4,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include <windows.h>
-#include "mozilla-config.h"
 #include "nsNativeAppSupportWin.h"
 
-#if defined(HAVE_64BIT_BUILD)
-1 24 "firefox.exe.64.manifest"
-#else
-1 24 "firefox.exe.32.manifest"
-#endif
+1 24 "firefox.exe.manifest"
 
 IDI_APPICON ICON FIREFOX_ICO
 IDI_DOCUMENT ICON DOCUMENT_ICO

ipc/app/Makefile.in

@@ -25,11 +25,7 @@ endif
 ifeq ($(OS_ARCH),WINNT) #{
 # Note the manifest file exists in the tree, so we use the explicit filename
 # here.
-ifdef HAVE_64BIT_BUILD
-$(RESFILE): plugin-container.exe.64.manifest
-else
-$(RESFILE): plugin-container.exe.32.manifest
-endif
+EXTRA_DEPS += plugin-container.exe.manifest
 endif #}
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) #{

ipc/app/moz.build

@@ -53,8 +53,6 @@ if CONFIG['OS_ARCH'] == 'WINNT':
         'xul.dll',
     ]
 
-    RCINCLUDE = 'plugin-container.rc'
-
 if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_TARGET'] == 'Darwin':
     # For sandbox includes and the include dependencies those have
     LOCAL_INCLUDES += [

ipc/app/plugin-container.rc

@@ -1,14 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include <windows.h>
-#include "mozilla-config.h"
-
-#if defined(HAVE_64BIT_BUILD)
-1 RT_MANIFEST "plugin-container.exe.64.manifest"
-#else
-1 RT_MANIFEST "plugin-container.exe.32.manifest"
-#endif