Bug 1496047 - Remove obsolete mangle/shlibsign copy steps and cvs references from SeaMonkey macOS make section. r=IanN
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Sat, 27 Oct 2018 23:21:58 +0200
changeset 33596 2393af223e83121fc707dfbb852d91da48c04ca5
parent 33595 b44fb89ce5da72077d5d0ebf5ef12efcd9945a5f
child 33597 b9ca6e1d8ca97f51ab10265623caa1c032878c67
push id388
push userclokep@gmail.com
push dateMon, 28 Jan 2019 20:54:56 +0000
reviewersIanN
bugs1496047, 704576, 726975
Bug 1496047 - Remove obsolete mangle/shlibsign copy steps and cvs references from SeaMonkey macOS make section. r=IanN See Bug 704576 [Remove CVS cruft from browser/app/Makefile.in]. See Bug 726975 [Tidy up browser/app/Makefile.in and skip a shell execution] item 5.
suite/app/Makefile.in
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -127,25 +127,21 @@ LPROJ_ROOT := $(firstword $(subst -, ,$(
 endif
 LPROJ := Contents/Resources/$(LPROJ_ROOT).lproj
 
 clean clobber repackage::
 	$(RM) -r '$(DIST)/$(MOZ_MACBUNDLE_NAME)'
 
 tools:: $(PROGRAM)
 	mkdir -p '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS'
-	rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents '$(DIST)/$(MOZ_MACBUNDLE_NAME)' --exclude English.lproj
+	rsync -a --exclude "*.in" $(srcdir)/macbuild/Contents '$(DIST)/$(MOZ_MACBUNDLE_NAME)' --exclude English.lproj
 	mkdir -p '$(DIST)/$(MOZ_MACBUNDLE_NAME)/$(LPROJ)'
-	rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents/Resources/English.lproj/ '$(DIST)/$(MOZ_MACBUNDLE_NAME)/$(LPROJ)'
+	rsync -a --exclude "*.in" $(srcdir)/macbuild/Contents/Resources/English.lproj/ '$(DIST)/$(MOZ_MACBUNDLE_NAME)/$(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)/" $(srcdir)/macbuild/Contents/Info.plist.in > '$(DIST)/$(MOZ_MACBUNDLE_NAME)/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)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > '$(DIST)/$(MOZ_MACBUNDLE_NAME)/$(LPROJ)/InfoPlist.strings'
 	rsync -a --exclude-from='$(srcdir)/macbuild/Contents/MacOS-files.in' $(DIST)/bin/ '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources'
 	rsync -a --include-from='$(srcdir)/macbuild/Contents/MacOS-files.in' --exclude '*' $(DIST)/bin/ '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS'
-	rm -f '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)/mangle' '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)/shlibsign'
 	rm -f '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(PROGRAM)'
 	rsync -aL $(PROGRAM) '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS'
 	cp -RL $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/seamonkey.icns '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/seamonkey.icns'
 	cp -RL $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/document.icns '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources/document.icns'
-	-cp -L $(DIST)/bin/mangle $(DIST)/bin/shlibsign '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)'
 	printf APPLMOZZ > '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/PkgInfo'
-#	remove CVS dirs from packaged app
-	find '$(DIST)/$(MOZ_MACBUNDLE_NAME)' -type d -name "CVS" -prune -exec rm -rf {} \;
 endif