Bug 1541179 - Part 8: Update and tidy suite/app/ build files. r=frg a=frg
authorIan Neal <iann_cvs@blueyonder.co.uk>
Thu, 11 Apr 2019 20:30:43 +0200
changeset 32168 5195b13590e8
parent 32167 8ea20a66a269
child 32169 5b18ffe2d0be
push id183
push userfrgrahl@gmx.net
push dateThu, 11 Apr 2019 18:31:37 +0000
treeherdercomm-esr60@8e29ae45df19 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfrg, frg
bugs1541179, 1380690
Bug 1541179 - Part 8: Update and tidy suite/app/ build files. r=frg a=frg Port Bug 1380690 Part 1 [Save repo and object dir paths in Mac bundle Info.plist files].
suite/app/Makefile.in
suite/app/macbuild/Contents/Info.plist.in
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -120,17 +120,17 @@ clean clobber repackage::
 	$(RM) -r '$(dist_dest)'
 
 tools:: $(DIST)/bin/$(MOZ_APP_NAME)
 	rm -rf $(dist_dest)
 	mkdir -p '$(dist_dest)/Contents/MacOS'
 	rsync -a --exclude "*.in" $(srcdir)/macbuild/Contents '$(dist_dest)' --exclude English.lproj
 	mkdir -p '$(dist_dest)/$(LPROJ)'
 	rsync -a --exclude "*.in" $(srcdir)/macbuild/Contents/Resources/English.lproj/ '$(dist_dest)/$(LPROJ)'
-	sed -e "s/\@MOZ_APP_NAME\@/$(MOZ_APP_NAME)/" -e "s/\@MAC_APP_NAME\@/$(MAC_APP_NAME)/" -e "s/\@MOZ_APP_DISPLAYNAME\@/$(MOZ_APP_DISPLAYNAME)/" -e "s/\@MOZ_APP_VERSION\@/$(MOZ_APP_VERSION)/" -e "s/\@MOZ_MACBUNDLE_ID\@/$(MOZ_MACBUNDLE_ID)/" $(srcdir)/macbuild/Contents/Info.plist.in > '$(dist_dest)/Contents/Info.plist'
+	sed -e 's/\@MOZ_APP_NAME\@/$(MOZ_APP_NAME)/' -e 's/\@MAC_APP_NAME\@/$(MAC_APP_NAME)/' -e 's/\@MOZ_APP_DISPLAYNAME\@/$(MOZ_APP_DISPLAYNAME)/' -e 's/\@MOZ_APP_VERSION\@/$(MOZ_APP_VERSION)/' -e 's/\@MOZ_MACBUNDLE_ID\@/$(MOZ_MACBUNDLE_ID)/' -e 's|\@MOZ_DEVELOPER_REPO_PATH\@|$(topsrcdir)|' -e 's|\@MOZ_DEVELOPER_OBJ_PATH\@|$(topobjdir)|' $(srcdir)/macbuild/Contents/Info.plist.in > '$(dist_dest)/Contents/Info.plist'
 	sed  -e "s/\@MAC_APP_NAME\@/$(MAC_APP_NAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > '$(dist_dest)/$(LPROJ)/InfoPlist.strings'
 	rsync -a --exclude-from='$(srcdir)/macbuild/Contents/MacOS-files.in' $(DIST)/bin/ '$(dist_dest)/Contents/Resources'
 	rsync -a --include-from='$(srcdir)/macbuild/Contents/MacOS-files.in' --exclude '*' $(DIST)/bin/ '$(dist_dest)/Contents/MacOS'
 	rm -f '$(dist_dest)/Contents/MacOS/$(MOZ_APP_NAME)'
 	rsync -aL $(DIST)/bin/$(MOZ_APP_NAME) '$(dist_dest)/Contents/MacOS'
 	cp -RL $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/seamonkey.icns '$(dist_dest)/Contents/Resources/seamonkey.icns'
 	cp -RL $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/document.icns '$(dist_dest)/Contents/Resources/document.icns'
 	printf APPLMOZZ > '$(dist_dest)/Contents/PkgInfo'
--- a/suite/app/macbuild/Contents/Info.plist.in
+++ b/suite/app/macbuild/Contents/Info.plist.in
@@ -232,10 +232,14 @@
 		</dict>
 	</array>
 	<key>NSSupportsAutomaticGraphicsSwitching</key>
 	<true/>
 	<key>NSDisablePersistence</key>
 	<true/>
 	<key>NSPrincipalClass</key>
 	<string>GeckoNSApplication</string>
+  <key>MozillaDeveloperRepoPath</key>
+  <string>@MOZ_DEVELOPER_REPO_PATH@</string>
+  <key>MozillaDeveloperObjPath</key>
+  <string>@MOZ_DEVELOPER_OBJ_PATH@</string>
 </dict>
 </plist>