Backed out changeset 8009b44fdab1 (bug 1021214) for build bustages in autobinscope.py on a CLOSED TREE

build/win32/Makefile.in

@@ -0,0 +1,15 @@
+# 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 $(topsrcdir)/config/rules.mk
+
+# run the binscope tool to make sure the binary and all libraries
+# are using all available Windows OS-level security mechanisms
+# XXX this should use a better way of checking all our binaries
+check::
+	$(PYTHON) $(srcdir)/autobinscope.py $(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/crashreporter-symbols/
+	$(PYTHON) $(srcdir)/autobinscope.py $(DIST)/bin/plugin-container.exe $(DIST)/crashreporter-symbols/
+	$(PYTHON) $(srcdir)/autobinscope.py $(DIST)/bin/mozglue.dll $(DIST)/crashreporter-symbols/
+	$(PYTHON) $(srcdir)/autobinscope.py $(DIST)/bin/xul.dll $(DIST)/crashreporter-symbols/
+	$(PYTHON) $(srcdir)/autobinscope.py $(DIST)/bin/nss3.dll $(DIST)/crashreporter-symbols/

build/win32/autobinscope.py

@@ -11,20 +11,26 @@
 # the symbol dir should point to the symbol dir hierarchy created
 # via running make buildsymbols in a windows build's objdir
 
-import os
-import shutil
-import subprocess
 import sys
-import tempfile
+import subprocess
+import os
+
+BINSCOPE_OUTPUT_LOGFILE = r".\binscope_xml_output.log"
 
 # usage
-if len(sys.argv) != 3:
-    print("""usage : autobinscope.by path_to_binary path_to_symbols""")
+if len(sys.argv) < 3:
+    print("""usage : autobinscope.by path_to_binary path_to_symbols [log_file_path]"
+    log_file_path is optional, log will be written to .\binscope_xml_output.log by default""")
     sys.exit(0)
 
 binary_path = sys.argv[1]
 symbol_path = sys.argv[2]
 
+if len(sys.argv) == 4:
+    log_file_path = sys.argv[3]
+else:
+    log_file_path = BINSCOPE_OUTPUT_LOGFILE
+
 # execute binscope against the binary, using the BINSCOPE environment
 # variable as the path to binscope.exe
 try:
@@ -35,11 +41,9 @@ except KeyError:
     sys.exit(1)
 
 try:
-    tmpdir = tempfile.mkdtemp()
     proc = subprocess.Popen([
         binscope_path,
         "/NoLogo",
-        "/OutDir", tmpdir,
         "/Target", binary_path,
         "/SymPath", symbol_path,
         # ATLVersionCheck triggers a crash in msdia120: bug 1525113
@@ -79,8 +83,6 @@ except WindowsError, (errno, strerror):  # noqa
         print("TEST-UNEXPECTED-FAIL | autobinscope.py | Could not locate binscope at location : "
               "%s\n" % binscope_path)
         sys.exit(1)
-finally:
-    shutil.rmtree(tmpdir)
 
 proc.wait()
 

config/rules.mk

@@ -703,11 +703,6 @@ syms:: $(2)
 $(2): $(1)
 ifdef MOZ_CRASHREPORTER
 	$$(call py3_action,dumpsymbols,$$(abspath $$<) $$(abspath $$@) $$(DUMP_SYMBOLS_FLAGS))
-ifeq ($(HOST_OS_ARCH),WINNT)
-ifdef BINSCOPE
-	$$(PYTHON) $$(topsrcdir)/build/win32/autobinscope.py $$< $$(DIST)/crashreporter-symbols
-endif # BINSCOPE
-endif # WINNT
 endif
 endef