Feodor2
/
Mypal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Centaury] Copy dylibs to the application bundle instead of symlinks.

master
Fedor 2020-05-25 08:50:32 +03:00
parent ef4a175c05
commit 7068800c17
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/basilisk/app/Makefile.in
View File

@ -76,6 +76,9 @@ 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_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'
# 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_dest)/Contents/MacOS/$(MOZ_APP_NAME)'
rsync -aL $(DIST)/bin/$(MOZ_APP_NAME) '$(dist_dest)/Contents/MacOS'
cp -RL $(DIST)/branding/firefox.icns '$(dist_dest)/Contents/Resources/firefox.icns'

11
application/basilisk/app/macbuild/Contents/MacOS-files-copy.in Normal file
View File

@ -0,0 +1,11 @@
# 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 dladdr(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
application/basilisk/app/macbuild/Contents/MacOS-files.in
View File

@ -1,5 +1,4 @@
/*.app/***
/*.dylib
/certutil
/firefox-bin
/gtest/***