Skip to content

Commit

Permalink
Merge 8.6
Browse files Browse the repository at this point in the history
  • Loading branch information
jan.nijtmans committed Mar 5, 2024
2 parents 9b8c0ea + f1e9a56 commit 472bc41
Show file tree
Hide file tree
Showing 431 changed files with 19,937 additions and 13,044 deletions.
3 changes: 2 additions & 1 deletion .fossil-settings/crlf-glob
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
compat/zlib/contrib/dotzlib/readme.txt
compat/zlib/contrib/dotzlib/*.cs
compat/zlib/contrib/vstudio/readme.txt
compat/zlib/contrib/vstudio/*/zlib.rc
compat/zlib/contrib/vstudio/*/zlibvc.def
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

# Declare files that will always have CRLF line endings on checkout.
*.bat eol=crlf
*.cs eol=crlf
*.sln eol=crlf
*.vc eol=crlf

Expand Down
34 changes: 29 additions & 5 deletions .github/workflows/linux-build.yml
Original file line number Diff line number Diff line change
@@ -1,54 +1,78 @@
name: Linux
on: [push]
on:
push:
branches:
- "main"
- "core-8-branch"
- "core-8-6-branch"
tags:
- "core-**"
permissions:
contents: read
jobs:
gcc:
runs-on: ubuntu-22.04
strategy:
matrix:
cfgopt:
config:
- ""
- "--disable-shared"
- "--enable-symbols"
- "--enable-symbols=mem"
- "--enable-symbols=all"
- "CFLAGS=-ftrapv"
- "CFLAGS=-DTCL_UTF_MAX=4"
- "CFLAGS=-DTCL_UTF_MAX=6"
# Duplicated below
- "CFLAGS=-m32 CPPFLAGS=-m32 LDFLAGS=-m32 --disable-64bit"
defaults:
run:
shell: bash
working-directory: unix
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
timeout-minutes: 5
- name: Install 32-bit dependencies if needed
# Duplicated from above
if: ${{ matrix.config == 'CFLAGS=-m32 CPPFLAGS=-m32 LDFLAGS=-m32 --disable-64bit' }}
run: |
sudo apt-get update
sudo apt-get install gcc-multilib libc6-dev-i386
- name: Prepare
run: |
touch tclStubInit.c tclOOStubInit.c
working-directory: generic
- name: Configure ${{ matrix.cfgopt }}
- name: Configure ${{ matrix.config }}
run: |
mkdir "${HOME}/install dir"
./configure ${CFGOPT} "--prefix=$HOME/install dir" || (cat config.log && exit 1)
env:
CFGOPT: ${{ matrix.cfgopt }}
CFGOPT: ${{ matrix.config }}
timeout-minutes: 5
- name: Build
run: |
make all
timeout-minutes: 5
- name: Build Test Harness
run: |
make tcltest
timeout-minutes: 5
- name: Run Tests
run: |
make test
env:
ERROR_ON_FAILURES: 1
timeout-minutes: 30
- name: Test-Drive Installation
run: |
make install
timeout-minutes: 5
- name: Create Distribution Package
run: |
make dist
timeout-minutes: 5
- name: Convert Documentation to HTML
run: |
make html-tcl
timeout-minutes: 5
26 changes: 20 additions & 6 deletions .github/workflows/mac-build.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
name: macOS
on: [push]
on:
push:
branches:
- "main"
- "core-8-branch"
- "core-8-6-branch"
tags:
- "core-**"
permissions:
contents: read
jobs:
Expand All @@ -11,23 +18,26 @@ jobs:
working-directory: macosx
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
timeout-minutes: 5
- name: Prepare
run: |
touch tclStubInit.c tclOOStubInit.c
working-directory: generic
- name: Build
run: make all
timeout-minutes: 15
- name: Run Tests
run: make test styles=develop
env:
ERROR_ON_FAILURES: 1
MAC_CI: 1
timeout-minutes: 15
clang:
runs-on: macos-11
strategy:
matrix:
cfgopt:
config:
- ""
- "--disable-shared"
- "--enable-symbols"
Expand All @@ -39,23 +49,27 @@ jobs:
working-directory: unix
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
timeout-minutes: 5
- name: Prepare
run: |
touch tclStubInit.c tclOOStubInit.c
mkdir "$HOME/install dir"
working-directory: generic
- name: Configure ${{ matrix.cfgopt }}
- name: Configure ${{ matrix.config }}
# Note that macOS is always a 64 bit platform
run: ./configure --enable-64bit --enable-dtrace --enable-framework ${CFGOPT} "--prefix=$HOME/install" || (cat config.log && exit 1)
env:
CFGOPT: ${{ matrix.cfgopt }}
CFGOPT: ${{ matrix.config }}
timeout-minutes: 5
- name: Build
run: |
make all tcltest
timeout-minutes: 15
- name: Run Tests
run: |
make test
env:
ERROR_ON_FAILURES: 1
MAC_CI: 1
timeout-minutes: 15
26 changes: 21 additions & 5 deletions .github/workflows/win-build.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
name: Windows
on: [push]
on:
push:
branches:
- "main"
- "core-8-branch"
- "core-8-6-branch"
tags:
- "core-**"
permissions:
contents: read
env:
Expand All @@ -13,7 +20,7 @@ jobs:
working-directory: win
strategy:
matrix:
cfgopt:
config:
- ""
- "--disable-shared"
- "--enable-symbols"
Expand All @@ -26,21 +33,30 @@ jobs:
with:
msystem: MINGW64
install: git mingw-w64-x86_64-toolchain make
timeout-minutes: 10
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
timeout-minutes: 5
- name: Prepare
run: |
touch tclStubInit.c tclOOStubInit.c
mkdir "${HOME}/install dir"
working-directory: generic
- name: Configure ${{ matrix.cfgopt }}
- name: Configure ${{ matrix.config }}
run: |
./configure ${CFGOPT} "--prefix=$HOME/install dir" || (cat config.log && exit 1)
env:
CFGOPT: --enable-64bit ${{ matrix.cfgopt }}
CFGOPT: --enable-64bit ${{ matrix.config }}
timeout-minutes: 5
- name: Build
run: make all
timeout-minutes: 5
- name: Build Test Harness
run: make tcltest
timeout-minutes: 5
- name: Run Tests
run: make test
timeout-minutes: 30

# If you add builds with Wine, be sure to define the environment variable
# CI_USING_WINE when running them so that broken tests know not to run.
12 changes: 6 additions & 6 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -1382,7 +1382,7 @@ a better first place to look now.

2012-05-03 Jan Nijtmans <[email protected]>

* compat/zlib/*: Upgrade to zlib 1.2.7 (pre-built dll is still 1.2.5,
* compat/zlib/*: Upgrade to zlib 1.2.7 (prebuilt dll is still 1.2.5,
will be upgraded as soon as the official build is available)

2012-05-03 Don Porter <[email protected]>
Expand Down Expand Up @@ -5482,7 +5482,7 @@ a better first place to look now.
* generic/tclIORChan.c (ReflectClose, ReflectInput, ReflectOutput,
(ReflectSeekWide, ReflectWatch, ReflectBlock, ReflectSetOption,
(ReflectGetOption, ForwardProc): [Bug 2978773]: Preserve
ReflectedChannel* structures across handler invokations, to avoid
ReflectedChannel* structures across handler invocations, to avoid
crashes when the handler implementation induces nested callbacks and
destruction of the channel deep inside such a nesting.

Expand Down Expand Up @@ -6363,7 +6363,7 @@ a better first place to look now.
2009-12-28 Donal K. Fellows <[email protected]>

* unix/Makefile.in (trace-shell, trace-test): [FRQ 1083288]: Added
targets to allow easier tracing of shell and test invokations.
targets to allow easier tracing of shell and test invocations.

* unix/configure.in: [Bug 942170]: Detect the st_blocks field of
* generic/tclCmdAH.c (StoreStatData): 'struct stat' correctly.
Expand Down Expand Up @@ -6847,7 +6847,7 @@ a better first place to look now.

* unix/tclUnixChan.c (TtyParseMode): Partial undo of Donal's tidy-up
from a few days ago (2009-11-9, not in ChangeLog). It seems that
strchr is apparently a macro on AIX and reacts badly to pre-processor
strchr is apparently a macro on AIX and reacts badly to preprocessor
directives in its arguments.

2009-11-16 Alexandre Ferrieux <[email protected]>
Expand Down Expand Up @@ -7141,7 +7141,7 @@ a better first place to look now.
package-* that were for building Solaris packages. Appears that the
pieces needed for these targets to function have never been present in
the current era of Tcl development and belong completely to Tcl
pre-history.
prehistory.

2009-10-19 Don Porter <[email protected]>

Expand Down Expand Up @@ -8709,7 +8709,7 @@ a better first place to look now.
2009-01-19 David Gravereaux <[email protected]>

* win/build.vc.bat: Improved tools detection and error message
* win/makefile.vc: Reorganized the $(TCLOBJ) file list into seperate
* win/makefile.vc: Reorganized the $(TCLOBJ) file list into separate
parts for easier maintenance. Matched all sources built using -GL to
both $(lib) and $(link) to use -LTCG and avoid a warning message.
Addressed the over-building nature of the htmlhelp target by moving
Expand Down
4 changes: 2 additions & 2 deletions ChangeLog.1999
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@
the beginning of the test run

* tests/basic.test: Use version information defined in tcltest instead
of hardcoded version number
of hard-coded version number

* tests/socket.test: package require tcltest before attempting to use
variable defined in tcltest namespace
Expand Down Expand Up @@ -2596,7 +2596,7 @@

* tclUtf.c: added Unicode character table support

* tclInt.h: added TclUniCharIsWordChar
* tclInt.h: added Tcl_UniCharIsWordChar

* tclCmdMZ.c (Tcl_StringObjCmd): added "totitle" subcommand, changed
"wordend" and "wordstart" to properly handle Unicode word characters
Expand Down
14 changes: 7 additions & 7 deletions ChangeLog.2000
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
119398]

* library/init.tcl (unknown): Added specific level parameters to
all uplevel invokations to boost performance; didn't dare touch
all uplevel invocation to boost performance; didn't dare touch
the "namespace inscope" stuff though, since it looks sensitive
to me! Should fix [Bug 123217], though testing is tricky...

Expand Down Expand Up @@ -348,7 +348,7 @@
makeFile/makeDirectory and removeFile/removeDirectory.

* tests/basic.test: Changed references to tcltest::tclVersion to
hardcoded numbers.
hard-coded numbers.
* generic/tcl.h: Changed reference to tcltest2.tcl and tcltest.tcl in
comments to tests/basic.test.

Expand Down Expand Up @@ -1121,7 +1121,7 @@

2000-06-27 Eric Melski <[email protected]>

* tests/stringObj.test: Tweaked tests to avoid hardcoded high-ASCII
* tests/stringObj.test: Tweaked tests to avoid hard-coded high-ASCII
characters (which will fail in multibyte locales); instead used \uXXXX
syntax. [Bug: 3842].

Expand Down Expand Up @@ -1546,7 +1546,7 @@
* unix/mkLinks: Regen'd with new mkLinks.tcl.

* unix/mkLinks.tcl: Fixed indentation, made link setup more
intelligent (only do one existance test per man page, instead of one
intelligent (only do one existence test per man page, instead of one
per function).

* doc/library.n: Fixed .SH NAME macro to include each function
Expand Down Expand Up @@ -1641,7 +1641,7 @@
2000-04-21 Brent Welch <[email protected]>

* library/http2.1/http.tcl: More thrashing with the "server closes
without reading post data" scenario. Reverted to the previous filevent
without reading post data" scenario. Reverted to the previous fileevent
configuratiuon, which seems to work better with small amounts of post
data.

Expand Down Expand Up @@ -2267,7 +2267,7 @@
* library/auto.tcl: Fixed the regular expression that performs $
escaping before sourcing a file to index. It was erroneously adding \
escapes even to $'s that were already escaped, effectively
"un-escaping" those $'s. (bug #2611).
"unescaping" those $'s. (bug #2611).

2000-01-27 Eric Melski <[email protected]>

Expand Down Expand Up @@ -2378,7 +2378,7 @@

* generic/tclVar.c: Changed behavior of variable command when name
refers to an element in an array (ie, "variable foo(x)") to always
return an error, regardless of existance of that element in the array
return an error, regardless of existence of that element in the array
(now behavior is consistant with docs too) (bug #981).

2000-01-20 Jeff Hobbs <[email protected]>
Expand Down
Loading

0 comments on commit 472bc41

Please sign in to comment.