Skip to content

Commit

Permalink
Remove a lot of stuff meant for macOS < 10.9
Browse files Browse the repository at this point in the history
  • Loading branch information
jan.nijtmans committed Oct 16, 2024
3 parents 0adfda0 + 0bc52e0 + b3cc551 commit 6094261
Show file tree
Hide file tree
Showing 12 changed files with 5 additions and 3,249 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/onefiledist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
path: 1dist/*.tar
macos:
name: macOS
runs-on: macos-12
runs-on: macos-13
defaults:
run:
shell: bash
Expand Down
1 change: 0 additions & 1 deletion generic/tcl.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ extern "C" {
* win/configure.ac (as above)
* win/tcl.m4 (not patchlevel)
* README.md (sections 0 and 2, with and without separator)
* macosx/Tcl-Common.xcconfig (not patchlevel) 1 LOC
* win/README (not patchlevel) (sections 0 and 2)
* unix/tcl.spec (1 LOC patch)
*/
Expand Down
7 changes: 1 addition & 6 deletions library/tm.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -326,18 +326,13 @@ proc ::tcl::tm::Defaults {} {
[file join [file dirname [file dirname $exe]] lib] \
]

if {$tcl_platform(platform) eq "windows"} {
set sep ";"
} else {
set sep ":"
}
for {set n $minor} {$n >= 0} {incr n -1} {
foreach ev [::list \
TCL${major}.${n}_TM_PATH \
TCL${major}_${n}_TM_PATH \
] {
if {![info exists env($ev)]} continue
foreach p [split $env($ev) $sep] {
foreach p [split $env($ev) $::tcl_platform(pathSeparator)] {
# Paths relative to unresolvable home dirs are ignored
if {![catch {file tildeexpand $p} expanded_path]} {
path add $expanded_path
Expand Down
38 changes: 2 additions & 36 deletions macosx/README
Original file line number Diff line number Diff line change
Expand Up @@ -78,40 +78,6 @@ The Mac OS X specific configure flags are --enable-framework and
--disable-corefoundation (which disables CF and notably reverts to the standard
select based notifier).

- It is also possible to build with the Xcode IDE via the projects in
tcl/macosx, take care to use the project matching your DevTools and OS version:
Tcl.xcodeproj: for Xcode 3.2 on 10.6
These have the following targets:
Tcl: calls through to tcl/macosx/GNUMakefile.
tcltest: static build of tcltest for debugging.
tests: build tcltest target and run tcl testsuite.
The following build configurations are available:
Debug: debug build for the active architecture,
with Fix & Continue enabled.
Debug clang: use clang compiler.
Debug llvm-gcc: use llvm-gcc compiler.
Debug gcc40: use gcc 4.0 compiler.
DebugNoFixAndContinue: disable Fix & Continue.
DebugNoCF: disable corefoundation.
DebugMemCompile: enable memory and bytecode debugging.
DebugLeaks: define PURIFY.
DebugGCov: enable generation of gcov data files.
Release: release build for the active architecture.
ReleaseUniversal: 32/64-bit universal build.
ReleaseUniversal clang: use clang compiler.
ReleaseUniversal llvm-gcc: use llvm-gcc compiler.
ReleaseUniversal gcc40: use gcc 4.0 compiler.
ReleaseUniversal10.5SDK: build against the 10.5 SDK (with 10.5
deployment target).
Note that the non-SDK configurations have their deployment target set to
10.6 (Tcl.xcodeproj).
The Xcode projects refer to the toplevel tcl source directory via the
TCL_SRCROOT user build setting, by default this is set to the project-relative
path '../../tcl', if your tcl source directory is named differently, e.g.
'../../tcl8.7', you need to manually change the TCL_SRCROOT setting by editing
your ${USER}.pbxuser file (located inside the Tcl.xcodeproj bundle directory)
with a text editor.

- To build universal binaries outside of the Xcode IDE, set CFLAGS as follows:
export CFLAGS="-arch x86_64 -arch arm64"
This requires Mac OS X 10.6 and Xcode 10.2 and will work on any architecture.
Expand All @@ -130,8 +96,8 @@ Detailed Instructions for building with macosx/GNUmakefile
Setup this shell variable as follows:
ver="8.7"

- Setup environment variables as desired, e.g. for a universal build on 10.5:
CFLAGS="-arch x86_64 -arch arm64 -mmacosx-version-min=10.5"
- Setup environment variables as desired, e.g. for a universal build on 10.9:
CFLAGS="-arch x86_64 -arch arm64 -mmacosx-version-min=10.9"
export CFLAGS

- Change to the directory containing the Tcl source tree and build:
Expand Down
37 changes: 0 additions & 37 deletions macosx/Tcl-Common.xcconfig

This file was deleted.

20 changes: 0 additions & 20 deletions macosx/Tcl-Debug.xcconfig

This file was deleted.

20 changes: 0 additions & 20 deletions macosx/Tcl-Release.xcconfig

This file was deleted.

211 changes: 0 additions & 211 deletions macosx/Tcl.xcodeproj/default.pbxuser

This file was deleted.

Loading

0 comments on commit 6094261

Please sign in to comment.