File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 209209 - if [[ "$PLATFORM" == "x64" ]]; then export PLATFORM_CPU_ARCH="x86_64"; fi
210210 - export PLATFORM_CPU_ARCH=`uname -m`
211211 - export PLATFORM_OS_VERSION=`sw_vers -productVersion`
212+ - export PLATFORM_OS=$(cat '/System/Library/CoreServices/Setup Assistant.app/Contents/Resources/en.lproj/OSXSoftwareLicense.rtf' |grep 'SOFTWARE LICENSE AGREEMENT FOR ' | awk -F ' FOR ' '{print $2}' | awk -F 'OS X |macOS ' '{print $2}' | tr '[:upper:]' '[:lower:]' | awk -F '\' '{print $1}')
212213 - export PLATFORM_MACHINE=`machine`
213214 - export CONFIGURE_ARGS=""
214215 - export TKDND_HOME=`pwd`
@@ -220,10 +221,12 @@ for:
220221 - brew install gnu-tar
221222 - brew install tcl-tk@9
222223 - cd ${TKDND_HOME}
223- - export OLD_HOME=${HOME}
224- - export HOME=${TKDND_HOME}
225- - bash macosx/wrongbrew.sh install tcl-tk@9
226- - export HOME=${OLD_HOME}
224+ # - export OLD_HOME=${HOME}
225+ # - export HOME=${TKDND_HOME}
226+ # - bash macosx/wrongbrew.sh install tcl-tk@9
227+ # - export HOME=${OLD_HOME}
228+ - brew fetch --force --bottle-tag=arm64_${PLATFORM_OS} tcl-tk@9
229+ - brew install $(brew --cache --bottle-tag=arm64_${PLATFORM_OS} tcl-tk@9)
227230 - export TCL_VERSION=`echo 'puts [info tclversion]' | tclsh`
228231 - export BUILD_FILENAME_TAG="-macOS-tcl${TCL_VERSION}-${PLATFORM_CPU_ARCH}-${PLATFORM}-${PLATFORM_OS_VERSION}"
229232 - export BUILD_FILENAME_TAG_ARM="-macOS-tcl${TCL_VERSION}-arm64-${PLATFORM}-${PLATFORM_OS_VERSION}"
You can’t perform that action at this time.
0 commit comments