diff --git a/cmake_modules/tk_macosx.patch b/cmake_modules/tk_macosx.patch new file mode 100644 index 00000000..fbfcd1df --- /dev/null +++ b/cmake_modules/tk_macosx.patch @@ -0,0 +1,58 @@ +diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile +index 02240ed..aac1d4c 100644 +--- a/macosx/GNUmakefile ++++ b/macosx/GNUmakefile +@@ -133,9 +133,7 @@ override EMBEDDED_BUILD := + endif + + INSTALL_TARGETS = install-binaries install-libraries +-ifeq (${EMBEDDED_BUILD},) + INSTALL_TARGETS += install-private-headers install-headers install-demos +-endif + ifeq (${INSTALL_BUILD}_${EMBEDDED_BUILD}_${BUILD_STYLE},1__Deployment) + INSTALL_TARGETS += html-tk + ifneq (${INSTALL_MANPAGES},) +@@ -253,43 +251,6 @@ ifeq (${BUILD_STYLE}_${EMBEDDED_BUILD},Development_) + @cd "${INSTALL_ROOT}${LIBDIR}/${PRODUCT_NAME}.framework/Versions/${VERSION}" && \ + ln -f "${PRODUCT_NAME}" "${PRODUCT_NAME}_debug" + endif +-ifeq (${TK_X11},) +-ifeq (${EMBEDDED_BUILD},) +-# install Wish.app link in APPLICATION_INSTALL_PATH and setup 'Wish Shell' compatibility links +- @cd "${TOP_DIR}" && if [ -n "${APP_DIR}" ]; then mkdir -p "./${APP_DIR}" && rm -rf "./${APP_DIR}/Wish.app" && \ +- ln -fsh "./$$(echo "${APP_DIR}" | sed -e 's#/[^/][^/]*#/..#g')/${FMWK_DIR}/${PRODUCT_NAME}.framework/Resources/Wish.app" "./${APP_DIR}" && \ +- ln -fsh Wish.app "./${APP_DIR}/Wish Shell.app"; fi && \ +- ln -fsh Wish.app "./${TK_FMWK_DIR}/Resources/Wish Shell.app" && \ +- ln -fsh Wish "./${TK_FMWK_DIR}/Resources/Wish.app/Contents/MacOS/Wish Shell" +-else +-# if we are embedding frameworks, move them into the app and fix their install names +- @cd "${TOP_DIR}" && \ +- rm -rf "./${APP_DIR}/Wish.app" && mkdir -p "./${APP_DIR}" && \ +- mv -f "./${TK_FMWK_DIR}/Resources/Wish.app" "./${APP_DIR}" && \ +- ln -fsh Wish.app "./${APP_DIR}/Wish Shell.app" && \ +- rm -rf "./${APP_DIR}/Wish.app/Contents/Frameworks" && \ +- mkdir -p "./${APP_DIR}/Wish.app/Contents/Frameworks" && \ +- ${CPPROG} -RH "./${FMWK_DIR}"/T{cl,k}.framework "./${APP_DIR}/Wish.app/Contents/Frameworks" && \ +- cd "./${APP_DIR}/Wish.app/Contents" && \ +- rm -rf Frameworks/Tcl.framework/{,/Versions/${TCL_VERSION}}/{Headers,PrivateHeaders,*_debug,lib*.a,*Config.sh} && \ +- rm -rf Frameworks/Tk.framework/{,/Versions/${VERSION}}/{Headers,PrivateHeaders,*_debug,lib*.a,*Config.sh} && \ +- fix_install_id ( ) { \ +- chmod -RH a+w "$$1"; \ +- install_name_tool -id $$(otool -L "$$1" | awk "/$$2\.framework.*[^:]\$$/ {sub(\"^.*/Frameworks\",\"@executable_path/../Frameworks\",\$$1); print \$$1}") "$$1"; \ +- chmod -RH a-w "$$1"; \ +- } && \ +- fix_install_name ( ) { \ +- chmod -RH a+w "$$1"; \ +- install_name_tool -change $$(otool -L "$$1" | awk "/$$2\.framework.*[^:]\$$/ {print \$$1; sub(\"^.*/Frameworks\",\"@executable_path/../Frameworks\",\$$1); print \$$1}") "$$1"; \ +- chmod -RH a-w "$$1"; \ +- } && \ +- fix_install_id Frameworks/Tcl.framework/Tcl Tcl && fix_install_id Frameworks/Tk.framework/Tk Tk && \ +- fix_install_name MacOS/Wish Tcl && fix_install_name MacOS/Wish Tk +-ifeq (${INSTALL_BUILD},1) +- @cd "${TOP_DIR}" && rm -rf "./${FMWK_DIR}"/T{cl,k}.framework && rmdir -p "./${FMWK_DIR}" 2>&- || true +-endif +-endif +-endif + + clean-${PROJECT}: %-${PROJECT}: + ${DO_MAKE} diff --git a/external_dependencies/.gitignore b/external_dependencies/.gitignore new file mode 100644 index 00000000..335ec957 --- /dev/null +++ b/external_dependencies/.gitignore @@ -0,0 +1 @@ +*.tar.gz