Skip to content

Commit 6094261

Browse files
author
jan.nijtmans
committed
Remove a lot of stuff meant for macOS < 10.9
3 parents 0adfda0 + 0bc52e0 + b3cc551 commit 6094261

File tree

12 files changed

+5
-3249
lines changed

12 files changed

+5
-3249
lines changed

.github/workflows/onefiledist.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
path: 1dist/*.tar
4848
macos:
4949
name: macOS
50-
runs-on: macos-12
50+
runs-on: macos-13
5151
defaults:
5252
run:
5353
shell: bash

generic/tcl.h

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ extern "C" {
4242
* win/configure.ac (as above)
4343
* win/tcl.m4 (not patchlevel)
4444
* README.md (sections 0 and 2, with and without separator)
45-
* macosx/Tcl-Common.xcconfig (not patchlevel) 1 LOC
4645
* win/README (not patchlevel) (sections 0 and 2)
4746
* unix/tcl.spec (1 LOC patch)
4847
*/

library/tm.tcl

+1-6
Original file line numberDiff line numberDiff line change
@@ -326,18 +326,13 @@ proc ::tcl::tm::Defaults {} {
326326
[file join [file dirname [file dirname $exe]] lib] \
327327
]
328328

329-
if {$tcl_platform(platform) eq "windows"} {
330-
set sep ";"
331-
} else {
332-
set sep ":"
333-
}
334329
for {set n $minor} {$n >= 0} {incr n -1} {
335330
foreach ev [::list \
336331
TCL${major}.${n}_TM_PATH \
337332
TCL${major}_${n}_TM_PATH \
338333
] {
339334
if {![info exists env($ev)]} continue
340-
foreach p [split $env($ev) $sep] {
335+
foreach p [split $env($ev) $::tcl_platform(pathSeparator)] {
341336
# Paths relative to unresolvable home dirs are ignored
342337
if {![catch {file tildeexpand $p} expanded_path]} {
343338
path add $expanded_path

macosx/README

+2-36
Original file line numberDiff line numberDiff line change
@@ -78,40 +78,6 @@ The Mac OS X specific configure flags are --enable-framework and
7878
--disable-corefoundation (which disables CF and notably reverts to the standard
7979
select based notifier).
8080

81-
- It is also possible to build with the Xcode IDE via the projects in
82-
tcl/macosx, take care to use the project matching your DevTools and OS version:
83-
Tcl.xcodeproj: for Xcode 3.2 on 10.6
84-
These have the following targets:
85-
Tcl: calls through to tcl/macosx/GNUMakefile.
86-
tcltest: static build of tcltest for debugging.
87-
tests: build tcltest target and run tcl testsuite.
88-
The following build configurations are available:
89-
Debug: debug build for the active architecture,
90-
with Fix & Continue enabled.
91-
Debug clang: use clang compiler.
92-
Debug llvm-gcc: use llvm-gcc compiler.
93-
Debug gcc40: use gcc 4.0 compiler.
94-
DebugNoFixAndContinue: disable Fix & Continue.
95-
DebugNoCF: disable corefoundation.
96-
DebugMemCompile: enable memory and bytecode debugging.
97-
DebugLeaks: define PURIFY.
98-
DebugGCov: enable generation of gcov data files.
99-
Release: release build for the active architecture.
100-
ReleaseUniversal: 32/64-bit universal build.
101-
ReleaseUniversal clang: use clang compiler.
102-
ReleaseUniversal llvm-gcc: use llvm-gcc compiler.
103-
ReleaseUniversal gcc40: use gcc 4.0 compiler.
104-
ReleaseUniversal10.5SDK: build against the 10.5 SDK (with 10.5
105-
deployment target).
106-
Note that the non-SDK configurations have their deployment target set to
107-
10.6 (Tcl.xcodeproj).
108-
The Xcode projects refer to the toplevel tcl source directory via the
109-
TCL_SRCROOT user build setting, by default this is set to the project-relative
110-
path '../../tcl', if your tcl source directory is named differently, e.g.
111-
'../../tcl8.7', you need to manually change the TCL_SRCROOT setting by editing
112-
your ${USER}.pbxuser file (located inside the Tcl.xcodeproj bundle directory)
113-
with a text editor.
114-
11581
- To build universal binaries outside of the Xcode IDE, set CFLAGS as follows:
11682
export CFLAGS="-arch x86_64 -arch arm64"
11783
This requires Mac OS X 10.6 and Xcode 10.2 and will work on any architecture.
@@ -130,8 +96,8 @@ Detailed Instructions for building with macosx/GNUmakefile
13096
Setup this shell variable as follows:
13197
ver="8.7"
13298

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

137103
- Change to the directory containing the Tcl source tree and build:

macosx/Tcl-Common.xcconfig

-37
This file was deleted.

macosx/Tcl-Debug.xcconfig

-20
This file was deleted.

macosx/Tcl-Release.xcconfig

-20
This file was deleted.

macosx/Tcl.xcodeproj/default.pbxuser

-211
This file was deleted.

0 commit comments

Comments
 (0)