| author | Wolfgang Rosenauer <wr@rosenauer.org> |
| Mon, 08 Nov 2010 14:30:30 +0100 | |
| changeset 192 | bb4213ee70c8 |
| parent 182 | 55b6eda14b1a |
| permissions | -rw-r--r-- |
|
147
519124a9ad2b
Add symbols txt file to buildsymbol archive (bmo#588129)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1 |
# HG changeset patch |
| 150 | 2 |
# User Wolfgang Rosenauer <wr@rosenauer.org> |
|
182
55b6eda14b1a
Fix buildsymbols zip command and exclude dbg.gz from symbols.txt
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
150
diff
changeset
|
3 |
# Parent 7351fc8754c200b787fd701e7efa5fd2fc5864ff |
|
147
519124a9ad2b
Add symbols txt file to buildsymbol archive (bmo#588129)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
4 |
Bug 588129 - symbols.txt file missing from *.crashreporter-symbols.zip |
|
519124a9ad2b
Add symbols txt file to buildsymbol archive (bmo#588129)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
5 |
|
|
519124a9ad2b
Add symbols txt file to buildsymbol archive (bmo#588129)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
6 |
diff --git a/Makefile.in b/Makefile.in |
|
519124a9ad2b
Add symbols txt file to buildsymbol archive (bmo#588129)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
7 |
--- a/Makefile.in |
|
519124a9ad2b
Add symbols txt file to buildsymbol archive (bmo#588129)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
8 |
+++ b/Makefile.in |
|
182
55b6eda14b1a
Fix buildsymbols zip command and exclude dbg.gz from symbols.txt
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
150
diff
changeset
|
9 |
@@ -183,17 +183,20 @@ ifdef MOZ_CRASHREPORTER |
|
147
519124a9ad2b
Add symbols txt file to buildsymbol archive (bmo#588129)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
10 |
$(DIST)/crashreporter-symbols \ |
|
519124a9ad2b
Add symbols txt file to buildsymbol archive (bmo#588129)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
11 |
$(MAKE_SYM_STORE_PATH) > \ |
|
519124a9ad2b
Add symbols txt file to buildsymbol archive (bmo#588129)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
12 |
$(DIST)/crashreporter-symbols/$(SYMBOL_INDEX_NAME) |
|
519124a9ad2b
Add symbols txt file to buildsymbol archive (bmo#588129)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
13 |
echo packing symbols |
|
519124a9ad2b
Add symbols txt file to buildsymbol archive (bmo#588129)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
14 |
$(NSINSTALL) -D $(DIST)/$(PKG_PATH) |
|
519124a9ad2b
Add symbols txt file to buildsymbol archive (bmo#588129)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
15 |
cd $(DIST)/crashreporter-symbols && \ |
|
519124a9ad2b
Add symbols txt file to buildsymbol archive (bmo#588129)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
16 |
zip -r9D "../$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip" . |
|
519124a9ad2b
Add symbols txt file to buildsymbol archive (bmo#588129)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
17 |
cd $(DIST)/crashreporter-symbols && \ |
|
519124a9ad2b
Add symbols txt file to buildsymbol archive (bmo#588129)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
18 |
- zip -r9D "../$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip" . -i "*.sym" |
|
182
55b6eda14b1a
Fix buildsymbols zip command and exclude dbg.gz from symbols.txt
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
150
diff
changeset
|
19 |
+ grep "sym" $(SYMBOL_INDEX_NAME) > $(SYMBOL_INDEX_NAME).tmp && \ |
|
55b6eda14b1a
Fix buildsymbols zip command and exclude dbg.gz from symbols.txt
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
150
diff
changeset
|
20 |
+ mv $(SYMBOL_INDEX_NAME).tmp $(SYMBOL_INDEX_NAME) |
|
55b6eda14b1a
Fix buildsymbols zip command and exclude dbg.gz from symbols.txt
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
150
diff
changeset
|
21 |
+ cd $(DIST)/crashreporter-symbols && \ |
|
55b6eda14b1a
Fix buildsymbols zip command and exclude dbg.gz from symbols.txt
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
150
diff
changeset
|
22 |
+ zip -r9D "../$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip" . -i "*.sym" -i "*.txt" |
|
147
519124a9ad2b
Add symbols txt file to buildsymbol archive (bmo#588129)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
23 |
else |
|
519124a9ad2b
Add symbols txt file to buildsymbol archive (bmo#588129)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
24 |
ifdef WINCE |
|
519124a9ad2b
Add symbols txt file to buildsymbol archive (bmo#588129)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
25 |
ifdef SYMBOLSTORE_PATH |
|
519124a9ad2b
Add symbols txt file to buildsymbol archive (bmo#588129)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
26 |
echo building symbol store with symstore.exe |
|
519124a9ad2b
Add symbols txt file to buildsymbol archive (bmo#588129)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
27 |
$(RM) -rf $(DIST)/symbols |
|
519124a9ad2b
Add symbols txt file to buildsymbol archive (bmo#588129)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
28 |
$(RM) -f "$(DIST)/$(SYMBOL_ARCHIVE_BASENAME).zip" |
|
519124a9ad2b
Add symbols txt file to buildsymbol archive (bmo#588129)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
29 |
$(NSINSTALL) -D $(DIST)/symbols |
|
519124a9ad2b
Add symbols txt file to buildsymbol archive (bmo#588129)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
30 |
$(SYMBOLSTORE_PATH) add -r -f "$(subst /,\,$(shell pwd -W))\*.PDB" \ |