Backed out changeset 4cf8a65eeb24, since it broke the Mac build and possibly wasn't supposed to land yet; rs=bustage-fix

This commit is contained in:
Geoff Lankow 2019-10-01 20:40:19 +13:00
Родитель 0f553b67fa
Коммит 3392bfc99b
3 изменённых файлов: 1 добавлений и 14 удалений

Просмотреть файл

@ -150,9 +150,6 @@ tools repackage:: $(DIST)/bin/$(MOZ_APP_NAME)
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)/$(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'
# MacOS-files-copy.in is a list of files that should be copies rather
# than symlinks and placed in .app/Contents/MacOS.
rsync -aL --include-from='$(srcdir)/macbuild/Contents/MacOS-files-copy.in' --exclude '*' $(DIST)/bin/ '$(dist_dest)/Contents/MacOS'
$(RM) '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(MOZ_APP_NAME)'
rsync -aL $(DIST)/bin/$(MOZ_APP_NAME) '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS'
$(MKDIR) -p '$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Library/Spotlight'

Просмотреть файл

@ -1,11 +0,0 @@
# Specifies files that should be copied (via deep copy, resolving symlinks)
# from dist/bin to the .app/Contents/MacOS directory. Linking is preferred to
# reduce disk I/O during builds, so just include dylibs which need to be in the
# same directory as returned by dladddr(3).
#
# Some of these dylibs load other dylibs which are assumed to be siblings in
# the same directory obtained from dladdr(3). With macOS 10.15, dladdr returns
# absolute resolved paths which breaks this assumption if symlinks are used
# because the symlink targets are in different directories. Hence the need for
# them to be copied to the same directory.
/*.dylib

Просмотреть файл

@ -1,4 +1,5 @@
/*.app/***
/*.dylib
/certutil
/thunderbird-bin
/pingsender