From a11d15c226aed12c633d963aca162aec44ac6f03 Mon Sep 17 00:00:00 2001 From: "sayrer@gmail.com" Date: Tue, 1 May 2007 17:03:35 -0700 Subject: [PATCH] backout patch for bug 378463 due to bustage --- Makefile.in | 34 ++------- build/macosx/universal/flight.mk | 4 +- toolkit/airbag/Makefile.in | 9 +-- toolkit/airbag/airbag/src/common/Makefile.in | 65 ----------------- .../airbag/airbag/src/common/mac/Makefile.in | 29 ++++---- .../src/tools/mac/dump_syms/Makefile.in | 68 ------------------ toolkit/airbag/tools/make_symbol_store.pl | 64 ++++++----------- toolkit/airbag/tools/win32/dump_syms.exe | Bin 18432 -> 17408 bytes toolkit/xre/Makefile.in | 1 - 9 files changed, 44 insertions(+), 230 deletions(-) delete mode 100644 toolkit/airbag/airbag/src/common/Makefile.in delete mode 100644 toolkit/airbag/airbag/src/tools/mac/dump_syms/Makefile.in diff --git a/Makefile.in b/Makefile.in index 77eab666b39..8b50fda8766 100644 --- a/Makefile.in +++ b/Makefile.in @@ -134,39 +134,16 @@ ifdef MOZ_PROFILE /bin/find $(DIST) -name "*.dbg" -exec mv {} $(DIST)/$(BUILDID) \; endif # MOZ_PROFILE endif # MOZILLA_OFFICIAL -endif # WINNT - -ifeq ($(OS_ARCH),WINNT) -SYM_FIND_CMD := /bin/find . -path dist -prune -o -name "*.exe" \ - -o -name "*.dll" -o -name "*.EXE" | sed "s/\.[^\.]*$$/\.pdb/" -# we want to copy PDB files on Windows -MAKE_SYM_STORE_ARGS := -c -DUMP_SYMS_BIN := $(topsrcdir)/toolkit/airbag/tools/win32/dump_syms.exe -endif -ifeq ($(OS_ARCH),Darwin) -# need to pass arch flags for universal builds -ifdef UNIVERSAL_BINARY -MAKE_SYM_STORE_ARGS := -a "ppc i386" -SYM_DIST := $(DIST)/universal -else -MAKE_SYM_STORE_ARGS := -a $(OS_TEST) -SYM_DIST := $(DIST) -endif -# |file| is stupid on universal binaries, it produces one line of output -# for the file, and one line of output for each architecture contained within. -SYM_FIND_CMD := find -L $(SYM_DIST) -type f -a -perm -100 -o -name "*.dylib" \ - | xargs file -L | grep "Mach-O" | grep -v "for architecture" | cut -f1 -d':' -DUMP_SYMS_BIN := $(DIST)/host/bin/dump_syms -endif buildsymbols: ifdef MOZ_DEBUG_SYMBOLS ifdef MOZ_AIRBAG echo building symbol store mkdir -p $(DIST)/crashreporter-symbols/$(BUILDID) - $(SYM_FIND_CMD) | \ - xargs $(topsrcdir)/toolkit/airbag/tools/make_symbol_store.pl \ - $(MAKE_SYM_STORE_ARGS) $(DUMP_SYMS_BIN) \ + /bin/find . -path "./dist" -prune -o -name "*.exe" \ + -o -name "*.dll" -o -name "*.EXE" | sed "s/\.[^\.]*$$/\.pdb/" | \ + xargs $(topsrcdir)/toolkit/airbag/tools/make_symbol_store.pl -c \ + $(topsrcdir)/toolkit/airbag/tools/win32/dump_syms.exe \ $(DIST)/crashreporter-symbols/$(BUILDID) > \ $(DIST)/crashreporter-symbols/$(BUILDID)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_ARCH)-$(BUILDID)-symbols.txt echo packing symbols @@ -185,7 +162,6 @@ ifdef MOZ_AIRBAG endif endif -ifeq ($(OS_ARCH),WINNT) signnss: ifdef MOZILLA_OFFICIAL echo signing NSS libs @@ -193,8 +169,8 @@ ifdef MOZILLA_OFFICIAL cd $(DIST)/bin; ./shlibsign.exe -v -i freebl3.dll endif # MOZILLA_OFFICIAL +BUILDID = $(shell cat $(DEPTH)/config/build_number) deliver: splitsymbols rebase signnss endif # WINNT -BUILDID = $(shell cat $(DEPTH)/config/build_number) diff --git a/build/macosx/universal/flight.mk b/build/macosx/universal/flight.mk index de1216224a1..4cfe5844da2 100644 --- a/build/macosx/universal/flight.mk +++ b/build/macosx/universal/flight.mk @@ -86,9 +86,9 @@ postflight_all: # a universal binary too early, before the unified bits have been staged. # Set SIGN_NSS= to skip shlibsign. $(MAKE) -C $(OBJDIR_PPC)/$(INSTALLER_DIR) \ - UNIVERSAL_BINARY= SIGN_NSS= PKG_SKIP_STRIP=1 stage-package + UNIVERSAL_BINARY= SIGN_NSS= stage-package $(MAKE) -C $(OBJDIR_X86)/$(INSTALLER_DIR) \ - UNIVERSAL_BINARY= SIGN_NSS= PKG_SKIP_STRIP=1 stage-package + UNIVERSAL_BINARY= SIGN_NSS= stage-package # Remove .chk files that may have been copied from the NSS build. These will # cause unify to warn or fail if present. New .chk files that are # appropriate for the merged libraries will be generated when the universal diff --git a/toolkit/airbag/Makefile.in b/toolkit/airbag/Makefile.in index ae4050f5cdf..82cda6748fe 100644 --- a/toolkit/airbag/Makefile.in +++ b/toolkit/airbag/Makefile.in @@ -61,12 +61,9 @@ ifeq ($(OS_ARCH),WINNT) endif ifeq ($(OS_ARCH),Darwin) -DIRS += \ - airbag/src/common/ \ - airbag/src/common/mac \ - airbag/src/client/mac/handler \ - airbag/src/tools/mac/dump_syms \ - $(NULL) + DIRS += airbag/src/common/mac \ + airbag/src/client/mac/handler \ + $(NULL) endif DIRS += client diff --git a/toolkit/airbag/airbag/src/common/Makefile.in b/toolkit/airbag/airbag/src/common/Makefile.in deleted file mode 100644 index c8f74195f1f..00000000000 --- a/toolkit/airbag/airbag/src/common/Makefile.in +++ /dev/null @@ -1,65 +0,0 @@ -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is Mozilla Breakpad integration -# -# The Initial Developer of the Original Code is -# Ted Mielczarek -# Portions created by the Initial Developer are Copyright (C) 2007 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -DEPTH = ../../../../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -MODULE = breakpad_common -LIBRARY_NAME = breakpad_common_s -HOST_LIBRARY_NAME = host_breakpad_common_s - -LOCAL_INCLUDES = -I$(srcdir)/.. - -CPPSRCS = \ - string_conversion.cc \ - $(NULL) - -CSRCS = \ - convert_UTF.c \ - $(NULL) - -HOST_CPPSRCS = $(CPPSRCS) - -HOST_CSRCS = $(CSRCS) - -# need static lib -FORCE_STATIC_LIB = 1 - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/airbag/airbag/src/common/mac/Makefile.in b/toolkit/airbag/airbag/src/common/mac/Makefile.in index 2976798eab5..d01df8f766e 100644 --- a/toolkit/airbag/airbag/src/common/mac/Makefile.in +++ b/toolkit/airbag/airbag/src/common/mac/Makefile.in @@ -43,29 +43,24 @@ include $(DEPTH)/config/autoconf.mk MODULE = breakpad_mac_common LIBRARY_NAME = breakpad_mac_common_s -HOST_LIBRARY_NAME = host_breakpad_mac_common_s LOCAL_INCLUDES = -I$(srcdir)/../.. -# This is a little weird, but we're building a host and a target lib here. -# The host lib is used for dump_syms, and the target lib for the -# crash reporter client. Therefore, we don't need all the srcs in both. -CPPSRCS = \ - file_id.cc \ - macho_id.cc \ - macho_walker.cc \ - string_utilities.cc \ - $(NULL) +CPPSRCS = \ + file_id.cc \ + macho_id.cc \ + macho_walker.cc \ + string_utilities.cc \ + ../string_conversion.cc \ + $(NULL) -CMSRCS = \ - HTTPMultipartUpload.m \ - $(NULL) +CMSRCS = \ + HTTPMultipartUpload.m \ + $(NULL) -HOST_CPPSRCS = $(CPPSRCS) +CSRCS = \ + ../convert_UTF.c -HOST_CMMSRCS = \ - dump_syms.mm \ - $(NULL) # need static lib FORCE_STATIC_LIB = 1 diff --git a/toolkit/airbag/airbag/src/tools/mac/dump_syms/Makefile.in b/toolkit/airbag/airbag/src/tools/mac/dump_syms/Makefile.in deleted file mode 100644 index 2524b23ce23..00000000000 --- a/toolkit/airbag/airbag/src/tools/mac/dump_syms/Makefile.in +++ /dev/null @@ -1,68 +0,0 @@ -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is Mozilla Breakpad integration -# -# The Initial Developer of the Original Code is -# Ted Mielczarek -# Portions created by the Initial Developer are Copyright (C) 2007 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -DEPTH = ../../../../../../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -HOST_PROGRAM = dump_syms - -LOCAL_INCLUDES = \ - -I$(srcdir)/../../.. \ - -I$(srcdir)/../../../common/mac \ - $(NULL) - -HOST_CMSRCS = \ - dump_syms_tool.m \ - $(NULL) - -HOST_LIBS += \ - $(DEPTH)/toolkit/airbag/airbag/src/common/mac/$(LIB_PREFIX)host_breakpad_mac_common_s.$(LIB_SUFFIX) \ - $(DEPTH)/toolkit/airbag/airbag/src/common/$(LIB_PREFIX)host_breakpad_common_s.$(LIB_SUFFIX) \ - $(NULL) - -HOST_LDFLAGS += \ - -framework Foundation \ - -lcrypto \ - $(NULL) - -# force C++ linking -CPP_PROG_LINK = 1 - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/airbag/tools/make_symbol_store.pl b/toolkit/airbag/tools/make_symbol_store.pl index 553dc6170e3..d76dd8f82a6 100755 --- a/toolkit/airbag/tools/make_symbol_store.pl +++ b/toolkit/airbag/tools/make_symbol_store.pl @@ -35,33 +35,27 @@ # # ***** END LICENSE BLOCK ***** # -# Usage: make_symbol_store.pl -# -# Runs dump_syms on each debug info file specified on the command line, +# Usage: make_symbol_store.pl +# Runs dump_syms on each pdb file specified on the command line, # then places the resulting symbol file in the proper directory -# structure in the symbol store path. Accepts multiple files +# structure in the symbol store path. Accepts multiple pdb files # on the command line, so can be called as part of a pipe using -# find | xargs make_symbol_store.pl +# find -name "*.pdb" | xargs make_symbol_store.pl # Parameters accepted: -# -c : Copy debug info files to the same directory structure -# as sym files -# -a "" : Run dump_syms -a for each space separated -# cpu architecture in (only on OS X) +# -c : Copy pdb files to the same directory structure as sym files use FileHandle; use File::Path; use File::Copy; use File::Basename; -print "Usage: make_symbol_store.pl " . - " \n" - and exit if scalar @ARGV < 3; +print "Usage: make_symbol_store.pl >\n" and exit if scalar @ARGV < 3; # Given a symbol file generated by dump_syms, # and a directory to store the resulting symbol path, # move the symbol file into the directory structure -# expected by the breakpad processor. For details, see: -# http://google-breakpad.googlecode.com/svn/trunk/src/processor/simple_symbol_supplier.h +# expected by the airbag processor: +# file.pdb/GUID+age/file.sym sub rename_symbol_file { my ($symbol_file, $dest_path) = @_; @@ -69,15 +63,13 @@ sub rename_symbol_file return "" unless $fh; my $line = <$fh>; - return "" unless $line; $line =~ s/\s*$//; $fh->close(); return "" unless $line =~ m/^MODULE/; - # the first line of a sym file looks like: - # MODULE os cpu identifier debug_file - my ($guid,$dbgfile) = (split(/ +/, $line))[3..4]; - my $newpath = $dest_path . "/" . $dbgfile . "/" . $guid; + my ($guid,$age,$dbgfile) = (split(/ +/, $line))[1..3]; + $guid =~ s/\-//g; + my $newpath = $dest_path . "/" . $dbgfile . "/" . uc($guid . $age); eval { mkpath($newpath) }; return "" if $@; @@ -93,36 +85,24 @@ sub rename_symbol_file return ""; } -my $copy_dbg = 0; -my @archs = (''); -while (@ARGV && $ARGV[0] =~ m/^-/) { - my $arg = shift; - if ($arg eq '-c') { - $copy_dbg = 1; - } - elsif ($arg eq '-a') { - @archs = (split(/\s+/, shift)); - } +my $copy_pdbs = 0; +if($ARGV[0] eq '-c') { + $copy_pdbs = 1; + shift; } - my $dump_syms = shift; my $symbol_path = shift; -foreach my $dbgfile (@ARGV) { - next unless -f $dbgfile; - # get filename without path or .pdb extension, if it exists - my ($sf) = fileparse($dbgfile, ".pdb"); +foreach my $pdbfile (@ARGV) { + next unless -f $pdbfile; + my ($sf) = fileparse($pdbfile, ".pdb"); my $symfile = $symbol_path . "/" . $sf . ".sym"; - foreach my $arch (@archs) { - my $a = ''; - $a = "-a $arch" if $arch ne ''; - system("${dump_syms} ${a} ${dbgfile} > ${symfile}"); - my $newpath = rename_symbol_file $symfile, $symbol_path; - if ($copy_dbg && $newpath ne "") { + system("$dump_syms $pdbfile > $symfile"); + my $newpath = rename_symbol_file $symfile, $symbol_path; + if($copy_pdbs && $newpath ne "") { my $out = $newpath; $out =~ s/^$symbol_path//; $out =~ s|^/||; print "$out/${sf}.pdb\n"; - copy($dbgfile, $newpath); - } + copy($pdbfile, $newpath); } } diff --git a/toolkit/airbag/tools/win32/dump_syms.exe b/toolkit/airbag/tools/win32/dump_syms.exe index d7eeca4c07e6c7ae4f7c208e6d11454e0872cb6e..0705ac8b07a62d55cb4bb3baa66e2f3854727a24 100755 GIT binary patch delta 7516 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 jvVZBe&s60i9#_w4@ybYygG delta 8776 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 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in index 15d6e8dcbed..10091d9e5a1 100644 --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in @@ -200,7 +200,6 @@ endif ifeq ($(OS_ARCH),Darwin) SHARED_LIBRARY_LIBS += \ $(DEPTH)/toolkit/airbag/airbag/src/client/mac/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \ - $(DEPTH)/toolkit/airbag/airbag/src/common/$(LIB_PREFIX)breakpad_common_s.$(LIB_SUFFIX) \ $(DEPTH)/toolkit/airbag/airbag/src/common/mac/$(LIB_PREFIX)breakpad_mac_common_s.$(LIB_SUFFIX) endif endif