Bug 1606974 - Remove @APPNAME@/ prefix from removed-files.in. r=darktrojan a=mkmelin
authorRob Lemley <rob@thunderbird.net>
Fri, 03 Jan 2020 20:22:10 -0500
changeset 36995 6a6d427d1bd3089991f202b850a1e4481c233ee9
parent 36994 7e2733b1e871d5bcdd4e850889a44a865ff5a92c
child 36996 3ccd1aa54a24f6a6c56edb4c257f87007941b2aa
push id2545
push usergeoff@darktrojan.net
push dateWed, 15 Jan 2020 21:10:47 +0000
treeherdercomm-beta@d7e99ea4d5ce [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdarktrojan, mkmelin
bugs1606974
Bug 1606974 - Remove @APPNAME@/ prefix from removed-files.in. r=darktrojan a=mkmelin removed-files.in does not get prefixed with @APPNAME@ like you would in package-manifest.in. The update manifest files that get generated for the MAR files are incorrectly prefixed with "Thunderbird.app" for these lines. That is not the case with the update commands in the manifests.
mail/installer/removed-files.in
--- a/mail/installer/removed-files.in
+++ b/mail/installer/removed-files.in
@@ -77,14 +77,14 @@
 #else
 @DIR_RESOURCES@distribution/
 @DIR_RESOURCES@distribution/extensions/
 @DIR_RESOURCES@distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/*
 #endif
 
 # Remove erroneous files left over from broken Mac signing process
 #ifdef XP_MACOSX
-@APPNAME@/Contents/Library/Spotlight/thunderbird.mdimporter/Contents/_CodeSignature/._CodeResources
-@APPNAME@/Contents/Library/Spotlight/thunderbird.mdimporter/Contents/._Info.plist
-@APPNAME@/Contents/Library/Spotlight/thunderbird.mdimporter/Contents/Resources/._schema.xml
-@APPNAME@/Contents/Library/Spotlight/thunderbird.mdimporter/Contents/Resources/English.lproj/._InfoPlist.strings
-@APPNAME@/Contents/Library/Spotlight/thunderbird.mdimporter/Contents/Resources/English.lproj/._schema.strings
+Contents/Library/Spotlight/thunderbird.mdimporter/Contents/_CodeSignature/._CodeResources
+Contents/Library/Spotlight/thunderbird.mdimporter/Contents/._Info.plist
+Contents/Library/Spotlight/thunderbird.mdimporter/Contents/Resources/._schema.xml
+Contents/Library/Spotlight/thunderbird.mdimporter/Contents/Resources/English.lproj/._InfoPlist.strings
+Contents/Library/Spotlight/thunderbird.mdimporter/Contents/Resources/English.lproj/._schema.strings
 #endif