Improved standard conformance of private frameworks naming scheme

(cherry picked from commit 5ccb7da134)
This commit is contained in:
Stephan Witt 2020-02-21 09:43:10 +01:00
parent 957192d7f3
commit 794eab134d

View File

@ -741,26 +741,25 @@ private_framework() {
fwvrsn="1" fwvrsn="1"
mkdir -p "${condir}/${fwdir}"/Versions/${fwvrsn}/Headers mkdir -p "${condir}/${fwdir}"/Versions/${fwvrsn}/Headers
mkdir -p "${condir}/${fwdir}"/Versions/${fwvrsn}/Resources mkdir -p "${condir}/${fwdir}"/Versions/${fwvrsn}/Resources
if [ ! -f "${condir}/${fwdir}/Versions/${fwvrsn}/${libnm}" ]; then if [ ! -f "${condir}/${fwdir}/Versions/${fwvrsn}/${fwname}" ]; then
cp -p "${source}" "${condir}/${fwdir}/Versions/${fwvrsn}/${libnm}" cp -p "${source}" "${condir}/${fwdir}/Versions/${fwvrsn}/${fwname}"
for hfile in "$@" ; do for hfile in "$@" ; do
test -f "${hfile}" && cp -p "${hfile}" "${condir}/${fwdir}"/Versions/${fwvrsn}/Headers test -f "${hfile}" && cp -p "${hfile}" "${condir}/${fwdir}"/Versions/${fwvrsn}/Headers
done done
ln -s ${fwvrsn} "${condir}/${fwdir}/Versions/Current" ln -s ${fwvrsn} "${condir}/${fwdir}/Versions/Current"
ln -s Versions/Current/Headers "${condir}/${fwdir}/Headers" ln -s Versions/Current/Headers "${condir}/${fwdir}/Headers"
ln -s Versions/Current/Resources "${condir}/${fwdir}/Resources" ln -s Versions/Current/Resources "${condir}/${fwdir}/Resources"
ln -s Versions/Current/"${libnm}" "${condir}/${fwdir}/${libnm}" ln -s Versions/Current/"${fwname}" "${condir}/${fwdir}/${fwname}"
ln -s Versions/Current/"${libnm}" "${condir}/${fwdir}/${fwname}" installname -id "@executable_path/../${fwdir}/${fwname}" "${condir}/${fwdir}/${fwname}"
installname -id "@executable_path/../${fwdir}/${libnm}" "${condir}/${fwdir}/${libnm}"
if [ -f "${LyxSourceDir}"/development/LyX-Mac-frameworks-template.plist ]; then if [ -f "${LyxSourceDir}"/development/LyX-Mac-frameworks-template.plist ]; then
cat "${LyxSourceDir}"/development/LyX-Mac-frameworks-template.plist | sed \ cat "${LyxSourceDir}"/development/LyX-Mac-frameworks-template.plist | sed \
-e "s/@CFBundleExecutable@/${libnm}/" \ -e "s/@CFBundleExecutable@/${fwname}/" \
-e "s/@CFBundleIdentifier@/${libid}/" \ -e "s/@CFBundleIdentifier@/${libid}/" \
-e "s/@CFBundleShortVersionString@/${svrsn}/" \ -e "s/@CFBundleShortVersionString@/${svrsn}/" \
-e "s/@CFBundleVersion@/${version}/" > "${condir}/${fwdir}"/Resources/Info.plist -e "s/@CFBundleVersion@/${version}/" > "${condir}/${fwdir}"/Resources/Info.plist
fi fi
fi fi
installname -change "${source}" "@executable_path/../${fwdir}/${libnm}" "${target}" installname -change "${source}" "@executable_path/../${fwdir}/${fwname}" "${target}"
} }
deploy_qtlibs() { deploy_qtlibs() {