Mercurial Mercurial > hg > mozilla / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add symbols txt file to buildsymbol archive (bmo#588129)
authorWolfgang Rosenauer <wr@rosenauer.org>
Fri, 27 Aug 2010 08:29:01 +0200
changeset 147 519124a9ad2b
parent 146 cf1c79206520
child 148 a1c91c60ce75
Add symbols txt file to buildsymbol archive (bmo#588129)
mozilla-buildsymbols.patch file | annotate | diff | comparison | revisions
mozilla-xulrunner20/mozilla-buildsymbols.patch file | annotate | diff | comparison | revisions
mozilla-xulrunner20/mozilla-xulrunner20.spec file | annotate | diff | comparison | revisions
series file | annotate | diff | comparison | revisions 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-buildsymbols.patch	Fri Aug 27 08:29:01 2010 +0200
@@ -0,0 +1,27 @@
+# HG changeset patch
+# Parent 6637fa42939971816b5b0163e44cbdc0f7290066
+Bug 588129 - symbols.txt file missing from *.crashreporter-symbols.zip
+
+diff --git a/Makefile.in b/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -186,17 +186,18 @@ ifdef MOZ_CRASHREPORTER
+ 	  $(DIST)/crashreporter-symbols                                   \
+ 	  $(MAKE_SYM_STORE_PATH) >                                        \
+ 	  $(DIST)/crashreporter-symbols/$(SYMBOL_INDEX_NAME)
+ 	echo packing symbols
+ 	$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
+ 	cd $(DIST)/crashreporter-symbols && \
+           zip -r9D "../$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip" .
+ 	cd $(DIST)/crashreporter-symbols && \
+-          zip -r9D "../$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip" . -i "*.sym"
++          zip -r9D "../$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip" . -i "*.sym" \
++	  zip -r9D "../$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip" . -i "*.txt"
+ else
+ ifdef WINCE
+ ifdef SYMBOLSTORE_PATH
+ 	echo building symbol store with symstore.exe
+ 	$(RM) -rf $(DIST)/symbols
+ 	$(RM) -f "$(DIST)/$(SYMBOL_ARCHIVE_BASENAME).zip"
+ 	$(NSINSTALL) -D $(DIST)/symbols
+ 	$(SYMBOLSTORE_PATH) add -r -f "$(subst /,\,$(shell pwd -W))\*.PDB" \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-xulrunner20/mozilla-buildsymbols.patch	Fri Aug 27 08:29:01 2010 +0200
@@ -0,0 +1,1 @@
+../mozilla-buildsymbols.patch
\ No newline at end of file
--- a/mozilla-xulrunner20/mozilla-xulrunner20.spec	Thu Aug 26 22:30:59 2010 +0200
+++ b/mozilla-xulrunner20/mozilla-xulrunner20.spec	Fri Aug 27 08:29:01 2010 +0200
@@ -70,6 +70,7 @@
 Patch13:        toolkit-ui-lockdown.patch
 # ---
 Patch14:        mozilla-cpuid.patch
+Patch15:        mozilla-buildsymbols.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       mozilla-js20 = %{version}
 Requires(post):  update-alternatives coreutils
@@ -213,6 +214,7 @@
 %if %suse_version < 1120
 %patch14 -p1
 %endif
+%patch15 -p1
 
 %build
 kdehelperversion=$(cat toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3)
--- a/series	Thu Aug 26 22:30:59 2010 +0200
+++ b/series	Fri Aug 27 08:29:01 2010 +0200
@@ -10,6 +10,7 @@
 #gecko-lockdown.patch
 #toolkit-ui-lockdown.patch
 mozilla-cpuid.patch
+mozilla-buildsymbols.patch
 #mozilla-cairo-lcd.patch
 
 # Firefox patches
mozilla