Browse Source

[Pale-Moon] Issue MoonchildProductions/UXP#1469 - Copy dylibs to the application bundle instead of symlinks.

pull/24/head
Brian Smith 2 years ago committed by Roy Tam
parent
commit
8da913b5ee
  1. 3
      application/palemoon/app/Makefile.in
  2. 11
      application/palemoon/app/macbuild/Contents/MacOS-files-copy.in
  3. 1
      application/palemoon/app/macbuild/Contents/MacOS-files.in

3
application/palemoon/app/Makefile.in

@ -88,6 +88,9 @@ tools repackage:: $(PROGRAM)
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)/Contents/Resources/$(AB).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/$(PROGRAM)'
rsync -aL $(PROGRAM) '$(dist_dest)/Contents/MacOS'
cp -RL $(DIST)/branding/firefox.icns '$(dist_dest)/Contents/Resources/firefox.icns'

11
application/palemoon/app/macbuild/Contents/MacOS-files-copy.in

@ -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/palemoon/app/macbuild/Contents/MacOS-files.in

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

Loading…
Cancel
Save