imported patch 9.diff
authorBrian R. Bondy <netzen@gmail.com>
Sun, 15 Feb 2015 13:41:51 -0500
changeset 491374 6abf579b737de5c21a12cdd8e644f244cf08b21b
parent 491373 7971123729315a30703ebe6d099e912746e2bb0a
child 491375 b30b104b271964425a7eaadefafb002b404a2c95
push id47343
push userbmo:dothayer@mozilla.com
push dateWed, 01 Mar 2017 22:58:58 +0000
milestone38.0a1
imported patch 9.diff
toolkit/mozapps/update/updater/moz.build
toolkit/mozapps/update/updater/updater-xpcshell/moz.build
toolkit/mozapps/update/updater/updater.rc
--- a/toolkit/mozapps/update/updater/moz.build
+++ b/toolkit/mozapps/update/updater/moz.build
@@ -1,13 +1,14 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
 Program('updater')
 
+# The define is for includes from updater.rc in particular
 updater_rel_path = ''
 include('updater-common.build')
 
 DIRS += ['updater-xpcshell']
 FAIL_ON_WARNINGS = True
--- a/toolkit/mozapps/update/updater/updater-xpcshell/moz.build
+++ b/toolkit/mozapps/update/updater/updater-xpcshell/moz.build
@@ -1,11 +1,12 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
 Program('updater-xpcshell')
 
+# The define is for includes from updater.rc in particular
 updater_rel_path = '../'
 DEFINES['UPDATER_XPCSHELL_CERT'] = True
 include('../updater-common.build')
--- a/toolkit/mozapps/update/updater/updater.rc
+++ b/toolkit/mozapps/update/updater/updater.rc
@@ -1,15 +1,23 @@
 /* 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/. */
 
 // Microsoft Visual C++ generated resource script.
 //
+#ifdef UPDATER_XPCSHELL_CERT
+#include "../resource.h"
+#define MANIFEST_PATH "../updater.exe.manifest"
+#define ICON_PATH "../updater.ico"
+#else
 #include "resource.h"
+#define MANIFEST_PATH "updater.exe.manifest"
+#define ICON_PATH "updater.ico"
+#endif
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include "winresrc.h"
 
@@ -25,24 +33,24 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
 #pragma code_page(1252)
 #endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // RT_MANIFEST
 //
 
-1                       RT_MANIFEST             "updater.exe.manifest"
+1                       RT_MANIFEST             MANIFEST_PATH
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon
 //
 
-IDI_DIALOG ICON "updater.ico"
+IDI_DIALOG ICON ICON_PATH
 
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Embedded an identifier to uniquely identiy this as a Mozilla updater.
 //
 
 STRINGTABLE