From 7c12bee3edd40af242d279107adc9dc87b9d2820 Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Sun, 10 Sep 2023 21:32:19 +0000 Subject: [PATCH] Put Info.plist into Resources of .framework FossilOrigin-Name: 6c6601b74f3f9c87b3376582d76fe6beee236bfa00443e527fdda980f54f90d0 --- buildsys.mk.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildsys.mk.in b/buildsys.mk.in index 7f5a247..91c5ea8 100644 --- a/buildsys.mk.in +++ b/buildsys.mk.in @@ -194,7 +194,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK} ${FRAMEWORK_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${LINK_STATUS} out="$@"; \ - if rm -fr $$out && ${MKDIR_P} $$out/Versions/${LIB_MAJOR} && ${LN_S} ${LIB_MAJOR} $@/Versions/Current && ${MAKE} @MAKEFLAGS_SILENT@ COPY_HEADERS_IF_SUBDIR=${includesubdir} COPY_HEADERS_DESTINATION=$$PWD/$@/Versions/${LIB_MAJOR}/Headers copy-headers-into-framework && ${LN_S} Versions/Current/Headers $@/Headers && if test -f Info.plist; then ${INSTALL} -m 644 Info.plist $$out/Info.plist; fi && if test -f module.modulemap; then ${MKDIR_P} $$out/Versions/${LIB_MAJOR}/Modules && ${INSTALL} -m 644 module.modulemap $$out/Versions/${LIB_MAJOR}/Modules/module.modulemap && ${LN_S} Versions/Current/Modules $@/Modules; fi && ${LD} -o $$out/Versions/${LIB_MAJOR}/$${out%.framework} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} ${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${FRAMEWORK_LIBS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} $$out/Versions/${LIB_MAJOR}/$${out%.framework} && ${LN_S} Versions/Current/$${out%.framework} $@/$${out%.framework}; then \ + if rm -fr $@ && ${MKDIR_P} $@/Versions/${LIB_MAJOR} && ${LN_S} ${LIB_MAJOR} $@/Versions/Current && ${MAKE} @MAKEFLAGS_SILENT@ COPY_HEADERS_IF_SUBDIR=${includesubdir} COPY_HEADERS_DESTINATION=$$PWD/$@/Versions/${LIB_MAJOR}/Headers copy-headers-into-framework && ${LN_S} Versions/Current/Headers $@/Headers && if test -f Info.plist; then ${MKDIR_P} $@/Versions/${LIB_MAJOR}/Resources && ${INSTALL} -m 644 Info.plist $@/Versions/${LIB_MAJOR}/Resources/Info.plist && ${LN_S} Versions/Current/Resources $@/Resources; fi && if test -f module.modulemap; then ${MKDIR_P} $@/Versions/${LIB_MAJOR}/Modules && ${INSTALL} -m 644 module.modulemap $@/Versions/${LIB_MAJOR}/Modules/module.modulemap && ${LN_S} Versions/Current/Modules $@/Modules; fi && ${LD} -o $@/Versions/${LIB_MAJOR}/$${out%.framework} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} ${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${FRAMEWORK_LIBS} && ${LN_S} Versions/Current/$${out%.framework} $@/$${out%.framework} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} $@; then \ ${LINK_OK}; \ else \ rm -fr $$out; false; \