Branding & Build Changes

This commit is contained in:
wicknix 2021-04-23 00:08:07 -05:00 committed by GitHub
parent 6fc878d40f
commit 35fc395bc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 31 deletions

View File

@ -12,51 +12,51 @@ if (-e "$ppath/Contents/MacOS/firefox") then
endif
set verbose
cp -RL obj-ff-dbg/dist/TenFourFox.app "$ppath" || cp -RL obj-ff-dbg/dist/TenFourFoxDebug.app "$ppath" || exit
cp -RL obj-ff-dbg/dist/InterWebPPC.app "$ppath" || cp -RL obj-ff-dbg/dist/InterWebPPCDebug.app "$ppath" || exit
cd $ppath/Contents/MacOS || exit
# determine which libgcc got linked (default to /opt/local/lib/gcc48)
# determine which libgcc got linked (default to /opt/macports-tff/lib/gcc48)
set libgcc=gcc48
otool -L XUL | grep stdc | grep --silent /libgcc/ && set libgcc=libgcc
ditto /opt/local/lib/$libgcc/libstdc++.6.dylib ./
ditto /opt/local/lib/$libgcc/libgcc_s.1.dylib ./
ditto /opt/local/lib/$libgcc/libatomic.1.dylib ./
ditto /opt/macports-tff/lib/$libgcc/libstdc++.6.dylib ./
ditto /opt/macports-tff/lib/$libgcc/libgcc_s.1.dylib ./
ditto /opt/macports-tff/lib/$libgcc/libatomic.1.dylib ./
install_name_tool -id @executable_path/libgcc_s.1.dylib libgcc_s.1.dylib
install_name_tool -id @executable_path/libstdc++.6.dylib libstdc++.6.dylib
install_name_tool -id @executable_path/libatomic.1.dylib libatomic.1.dylib
install_name_tool -change /opt/local/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib libstdc++.6.dylib
install_name_tool -change /opt/local/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib libatomic.1.dylib
install_name_tool -change /opt/macports-tff/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib libstdc++.6.dylib
install_name_tool -change /opt/macports-tff/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib libatomic.1.dylib
# fix Firefox and xpcshell
foreach w (XUL firefox firefox-bin xpcshell libfreebl3.dylib libicudata.56.dylib libicui18n.56.dylib libicuuc.56.dylib liblgpllibs.dylib libmozglue.dylib libnss3.dylib libnssckbi.dylib libnssdbm3.dylib libplugin_child_interpose.dylib libsoftokn3.dylib)
install_name_tool -change /opt/local/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/local/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib -change /opt/local/lib/$libgcc/libatomic.1.dylib @executable_path/libatomic.1.dylib $w
install_name_tool -change /opt/macports-tff/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/macports-tff/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib -change /opt/macports-tff/lib/$libgcc/libatomic.1.dylib @executable_path/libatomic.1.dylib $w
end
rm -rf updater.app
rm -rf ../Resources/webapprt-stub
install_name_tool -change /opt/local/lib/$libgcc/libstdc++.6.dylib @executable_path/../../../MacOS/libstdc++.6.dylib -change /opt/local/lib/$libgcc/libgcc_s.1.dylib @executable_path/../../../MacOS/libgcc_s.1.dylib -change /opt/local/lib/$libgcc/libatomic.1.dylib @executable_path/../../../MacOS/libatomic.1.dylib ../Resources/browser/components/libbrowsercomps.dylib
install_name_tool -change /opt/macports-tff/lib/$libgcc/libstdc++.6.dylib @executable_path/../../../MacOS/libstdc++.6.dylib -change /opt/macports-tff/lib/$libgcc/libgcc_s.1.dylib @executable_path/../../../MacOS/libgcc_s.1.dylib -change /opt/macports-tff/lib/$libgcc/libatomic.1.dylib @executable_path/../../../MacOS/libatomic.1.dylib ../Resources/browser/components/libbrowsercomps.dylib
# obsolete??
#install_name_tool -change /opt/local/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/local/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib -change /opt/local/lib/$libgcc/libatomic.1.dylib @executable_path/libatomic.1.dylib libmozalloc.dylib
#install_name_tool -change /opt/local/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/local/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib updater.app/Contents/MacOS/updater
#install_name_tool -change /opt/local/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/local/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib libssl3.dylib
#install_name_tool -change /opt/local/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/local/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib libxpcom.dylib
#install_name_tool -change /opt/local/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/local/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib libsmime3.dylib
#install_name_tool -change /opt/local/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/local/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib libnssutil3.dylib
#install_name_tool -change /opt/local/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/local/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib libplc4.dylib
#install_name_tool -change /opt/local/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/local/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib libplds4.dylib
#install_name_tool -change /opt/local/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/local/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib components/libalerts.dylib
#install_name_tool -change /opt/local/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/local/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib libmozjs.dylib
#install_name_tool -change /opt/local/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/local/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib libmozsqlite3.dylib
#install_name_tool -change /opt/local/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/local/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib libnspr4.dylib
#install_name_tool -change /opt/local/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/local/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib plugin-container.app/Contents/MacOS/plugin-container
#install_name_tool -change /opt/local/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/local/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib crashreporter.app/Contents/MacOS/crashreporter
#install_name_tool -change /opt/local/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/local/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib libsoundtouch.dylib
#install_name_tool -change /opt/local/lib/$libgcc/libstdc++.6.dylib @executable_path/../MacOS/libstdc++.6.dylib -change /opt/local/lib/$libgcc/libgcc_s.1.dylib @executable_path/../MacOS/libgcc_s.1.dylib ../Resources/webapprt-stub
#install_name_tool -change /opt/macports-tff/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/macports-tff/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib -change /opt/macports-tff/lib/$libgcc/libatomic.1.dylib @executable_path/libatomic.1.dylib libmozalloc.dylib
#install_name_tool -change /opt/macports-tff/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/macports-tff/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib updater.app/Contents/MacOS/updater
#install_name_tool -change /opt/macports-tff/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/macports-tff/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib libssl3.dylib
#install_name_tool -change /opt/macports-tff/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/macports-tff/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib libxpcom.dylib
#install_name_tool -change /opt/macports-tff/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/macports-tff/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib libsmime3.dylib
#install_name_tool -change /opt/macports-tff/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/macports-tff/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib libnssutil3.dylib
#install_name_tool -change /opt/macports-tff/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/macports-tff/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib libplc4.dylib
#install_name_tool -change /opt/macports-tff/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/macports-tff/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib libplds4.dylib
#install_name_tool -change /opt/macports-tff/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/macports-tff/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib components/libalerts.dylib
#install_name_tool -change /opt/macports-tff/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/macports-tff/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib libmozjs.dylib
#install_name_tool -change /opt/macports-tff/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/macports-tff/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib libmozsqlite3.dylib
#install_name_tool -change /opt/macports-tff/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/macports-tff/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib libnspr4.dylib
#install_name_tool -change /opt/macports-tff/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/macports-tff/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib plugin-container.app/Contents/MacOS/plugin-container
#install_name_tool -change /opt/macports-tff/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/macports-tff/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib crashreporter.app/Contents/MacOS/crashreporter
#install_name_tool -change /opt/macports-tff/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/macports-tff/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib libsoundtouch.dylib
#install_name_tool -change /opt/macports-tff/lib/$libgcc/libstdc++.6.dylib @executable_path/../MacOS/libstdc++.6.dylib -change /opt/macports-tff/lib/$libgcc/libgcc_s.1.dylib @executable_path/../MacOS/libgcc_s.1.dylib ../Resources/webapprt-stub
# fix JS
mv ../Resources/js . || exit
install_name_tool -change /opt/local/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/local/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib -change /opt/local/lib/$libgcc/libatomic.1.dylib @executable_path/libatomic.1.dylib js
install_name_tool -change /opt/macports-tff/lib/$libgcc/libstdc++.6.dylib @executable_path/libstdc++.6.dylib -change /opt/macports-tff/lib/$libgcc/libgcc_s.1.dylib @executable_path/libgcc_s.1.dylib -change /opt/macports-tff/lib/$libgcc/libatomic.1.dylib @executable_path/libatomic.1.dylib js
echo "(used libraries from /opt/local/lib/$libgcc)"
echo "(used libraries from /opt/macports-tff/lib/$libgcc)"

View File

@ -1,11 +1,15 @@
. $topsrcdir/browser/config/mozconfig
export CC="/opt/local/bin/gcc-mp-4.8 -flax-vector-conversions -O3 -mcpu=G3 -mtune=G3 -read_only_relocs suppress -mdynamic-no-pic"
export CXX="/opt/local/bin/g++-mp-4.8 -flax-vector-conversions -fpermissive -O3 -mcpu=G3 -mtune=G3 -read_only_relocs suppress -mdynamic-no-pic"
export CC="/opt/macports-tff/bin/gcc-mp-4.8 -flax-vector-conversions -O3 -mcpu=G3 -mtune=G3 -read_only_relocs suppress -mdynamic-no-pic"
export CXX="/opt/macports-tff/bin/g++-mp-4.8 -flax-vector-conversions -fpermissive -O3 -mcpu=G3 -mtune=G3 -read_only_relocs suppress -mdynamic-no-pic"
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-ff-dbg
mk_add_options MOZ_MAKE_FLAGS="-s -j2"
mk_add_options AUTOCONF=autoconf213
ac_add_options --disable-tests
ac_add_options --disable-static
ac_add_options --disable-webrtc
ac_add_options --disable-necko-wifi
ac_add_options --disable-pocket
ac_add_options --disable-safe-browsing
ac_add_options --enable-optimize
ac_add_options --disable-cpp-exceptions
ac_add_options --disable-debug
@ -17,6 +21,5 @@ ac_add_options --enable-chrome-format=jar
ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk
ac_add_options --enable-strip
ac_add_options --enable-install-strip
ac_add_options --with-distribution-id=com.floodgap
ac_add_options --enable-webrtc
ac_add_options --with-distribution-id=org.wicknix