Skip to content

Commit 75ad843

Browse files
fvogelnew1fvogelnew1
committed
Merge trunk. In branch less_tests_constraints, let's work off trunk from now on.
2 parents 33f0ff3 + ed1abb2 commit 75ad843

File tree

785 files changed

+87171
-95454
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

785 files changed

+87171
-95454
lines changed

‎.fossil-settings/encoding-glob‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
win/buildall.vc.bat
22
win/makefile.vc
3-
win/mkd.bat
4-
win/rmd.bat
53
win/rules-ext.vc
64
win/rules.vc
75
win/targets.vc

‎.fossil-settings/ignore-glob‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
*/libtk.vfs
2727
*/libtk*.zip
2828
*/tkUuid.h
29-
doc/man.macros
3029
html
3130
macosx/configure
3231
win/Debug*

‎.github/workflows/linux-build.yml‎

Lines changed: 40 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
- "clang"
2727
config:
2828
- ""
29+
- "CFLAGS=-DTK_NO_DEPRECATED=1"
2930
- "--disable-shared"
3031
- "--disable-xft"
3132
- "--disable-xss"
@@ -39,14 +40,14 @@ jobs:
3940
uses: actions/checkout@v4
4041
with:
4142
repository: tcltk/tcl
42-
ref: core-8-6-branch
43+
ref: main
4344
path: tcl
4445
- name: Setup Environment (compiler=${{ matrix.compiler }})
4546
run: |
46-
sudo apt-get install tcl8.6-dev libxss-dev libxft-dev
47+
sudo apt-get install libxss-dev libxft-dev
4748
mkdir "$HOME/install dir"
4849
touch tk/doc/man.macros tk/generic/tkStubInit.c
49-
echo "CFGOPT=$CFGOPT --with-tcl=/usr/lib/tcl8.6" >> $GITHUB_ENV
50+
echo "CFGOPT=$CFGOPT" >> $GITHUB_ENV
5051
echo "CC=$COMPILER" >> $GITHUB_ENV
5152
echo "TOOL_DIR=$(cd tcl/tools;pwd)" >> $GITHUB_ENV
5253
echo "BUILD_CONFIG_ID=$OPTS" >> $GITHUB_ENV
@@ -55,9 +56,22 @@ jobs:
5556
CFGOPT: ${{ matrix.config }}
5657
COMPILER: ${{ matrix.compiler }}
5758
OPTS: ${{ matrix.compiler }}${{ matrix.config }}
58-
- name: Configure (opts=${{ matrix.config }})
59+
- name: Configure and Build Tcl
5960
run: |
6061
./configure $CFGOPT "--prefix=$HOME/install dir" || {
62+
cat config.log
63+
echo "::warning::Failure during Tcl Configure"
64+
exit 1
65+
}
66+
make all install || {
67+
echo "::warning::Failure during Tcl Build"
68+
exit 1
69+
}
70+
echo "TCL_CONFIG_PATH=`pwd`" >> $GITHUB_ENV
71+
working-directory: tcl/unix
72+
- name: Configure (opts=${{ matrix.config }})
73+
run: |
74+
./configure $CFGOPT --with-tcl=$TCL_CONFIG_PATH "--prefix=$HOME/install dir" || {
6175
cat config.log
6276
echo "::error::Failure during Configure"
6377
exit 1
@@ -126,20 +140,39 @@ jobs:
126140
uses: actions/checkout@v4
127141
with:
128142
path: tk
143+
- name: Checkout Tcl
144+
uses: actions/checkout@v4
145+
with:
146+
repository: tcltk/tcl
147+
ref: main
148+
path: tcl
129149
- name: Setup Environment (compiler=${{ matrix.compiler }})
130150
run: |
131-
sudo apt-get install tcl8.6-dev libxss-dev libxft-dev xvfb xfonts-75dpi xfonts-100dpi xfonts-scalable libxfont2 unifont
151+
sudo apt-get install libxss-dev libxft-dev xvfb libicu-dev xfonts-75dpi xfonts-100dpi xfonts-scalable libxfont2 unifont
132152
mkdir "$HOME/install dir"
133153
touch tk/doc/man.macros tk/generic/tkStubInit.c
134-
echo "CFGOPT=$CFGOPT --with-tcl=/usr/lib/tcl8.6" >> $GITHUB_ENV
154+
echo "CFGOPT=$CFGOPT" >> $GITHUB_ENV
135155
echo "CC=$COMPILER" >> $GITHUB_ENV
136156
working-directory: "."
137157
env:
138158
CFGOPT: ${{ matrix.config }}
139159
COMPILER: ${{ matrix.compiler }}
140-
- name: Configure ${{ matrix.config }}
160+
- name: Configure and Build Tcl
141161
run: |
142162
./configure $CFGOPT "--prefix=$HOME/install dir" || {
163+
cat config.log
164+
echo "::warning::Failure during Tcl Configure"
165+
exit 1
166+
}
167+
make all install || {
168+
echo "::warning::Failure during Tcl Build"
169+
exit 1
170+
}
171+
echo "TCL_CONFIG_PATH=`pwd`" >> $GITHUB_ENV
172+
working-directory: tcl/unix
173+
- name: Configure ${{ matrix.config }}
174+
run: |
175+
./configure $CFGOPT --with-tcl=$TCL_CONFIG_PATH "--prefix=$HOME/install dir" || {
143176
cat config.log
144177
echo "::error::Failure during Configure"
145178
exit 1

‎.github/workflows/linux-with-tcl8-build.yml‎

Lines changed: 178 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
name: Linux (with Tcl 8.7)
2+
on:
3+
push:
4+
branches:
5+
- "main"
6+
- "core-8-branch"
7+
- "core-8-6-branch"
8+
tags:
9+
- "core-**"
10+
permissions:
11+
contents: read
12+
defaults:
13+
run:
14+
shell: bash
15+
working-directory: tk/unix
16+
env:
17+
ERROR_ON_FAILURES: 1
18+
jobs:
19+
build:
20+
runs-on: ubuntu-22.04
21+
strategy:
22+
matrix:
23+
compiler:
24+
- "gcc"
25+
- "clang"
26+
cfgopt:
27+
- ""
28+
- "CFLAGS=-DTK_NO_DEPRECATED=1"
29+
- "--disable-shared"
30+
- "--disable-xft"
31+
- "--disable-xss"
32+
- "--enable-symbols"
33+
steps:
34+
- name: Checkout
35+
uses: actions/checkout@v4
36+
with:
37+
path: tk
38+
- name: Checkout Tcl
39+
uses: actions/checkout@v4
40+
with:
41+
repository: tcltk/tcl
42+
ref: core-8-branch
43+
path: tcl
44+
- name: Setup Environment (compiler=${{ matrix.compiler }})
45+
run: |
46+
sudo apt-get install libxss-dev libxft-dev
47+
mkdir "$HOME/install dir"
48+
touch tk/doc/man.macros tk/generic/tkStubInit.c
49+
echo "CFGOPT=$CFGOPT" >> $GITHUB_ENV
50+
echo "CC=$COMPILER" >> $GITHUB_ENV
51+
echo "TOOL_DIR=$(cd tcl/tools;pwd)" >> $GITHUB_ENV
52+
echo "BUILD_CONFIG_ID=$OPTS" >> $GITHUB_ENV
53+
working-directory: "."
54+
env:
55+
CFGOPT: ${{ matrix.cfgopt }}
56+
COMPILER: ${{ matrix.compiler }}
57+
OPTS: ${{ matrix.compiler }}${{ matrix.cfgopt }}
58+
- name: Configure and Build Tcl
59+
run: |
60+
./configure $CFGOPT "--prefix=$HOME/install dir" || {
61+
cat config.log
62+
echo "::warning::Failure during Tcl Configure"
63+
exit 1
64+
}
65+
make all install || {
66+
echo "::warning::Failure during Tcl Build"
67+
exit 1
68+
}
69+
echo "TCL_CONFIG_PATH=`pwd`" >> $GITHUB_ENV
70+
working-directory: tcl/unix
71+
- name: Configure (opts=${{ matrix.cfgopt }})
72+
run: |
73+
./configure $CFGOPT --with-tcl=$TCL_CONFIG_PATH "--prefix=$HOME/install dir" || {
74+
cat config.log
75+
echo "::error::Failure during Configure"
76+
exit 1
77+
}
78+
- name: Build
79+
run: |
80+
make binaries libraries || {
81+
echo "::error::Failure during Build"
82+
exit 1
83+
}
84+
- name: Build Test Harness
85+
run: |
86+
make tktest || {
87+
echo "::error::Failure during Build"
88+
exit 1
89+
}
90+
- name: Test-Drive Installation
91+
run: |
92+
make install || {
93+
echo "::error::Failure during Install"
94+
exit 1
95+
}
96+
- name: Create Distribution Package
97+
run: |
98+
make dist || {
99+
echo "::error::Failure during Distribute"
100+
exit 1
101+
}
102+
- name: Convert Documentation to HTML
103+
run: |
104+
make html-tk TOOL_DIR=$TOOL_DIR || {
105+
echo "::error::Failure during Distribute"
106+
exit 1
107+
}
108+
test:
109+
runs-on: ubuntu-22.04
110+
strategy:
111+
matrix:
112+
compiler:
113+
- "gcc"
114+
cfgopt:
115+
- ""
116+
- "--disable-xft"
117+
- "--enable-symbols"
118+
steps:
119+
- name: Checkout
120+
uses: actions/checkout@v4
121+
with:
122+
path: tk
123+
- name: Checkout Tcl
124+
uses: actions/checkout@v4
125+
with:
126+
repository: tcltk/tcl
127+
ref: core-8-branch
128+
path: tcl
129+
- name: Setup Environment (compiler=${{ matrix.compiler }})
130+
run: |
131+
sudo apt-get install libxss-dev libxft-dev xvfb libicu-dev
132+
mkdir "$HOME/install dir"
133+
touch tk/doc/man.macros tk/generic/tkStubInit.c
134+
echo "CFGOPT=$CFGOPT" >> $GITHUB_ENV
135+
echo "CC=$COMPILER" >> $GITHUB_ENV
136+
working-directory: "."
137+
env:
138+
CFGOPT: ${{ matrix.cfgopt }}
139+
COMPILER: ${{ matrix.compiler }}
140+
- name: Configure and Build Tcl
141+
run: |
142+
./configure $CFGOPT "--prefix=$HOME/install dir" || {
143+
cat config.log
144+
echo "::warning::Failure during Tcl Configure"
145+
exit 1
146+
}
147+
make all install || {
148+
echo "::warning::Failure during Tcl Build"
149+
exit 1
150+
}
151+
echo "TCL_CONFIG_PATH=`pwd`" >> $GITHUB_ENV
152+
working-directory: tcl/unix
153+
- name: Configure ${{ matrix.cfgopt }}
154+
run: |
155+
./configure $CFGOPT --with-tcl=$TCL_CONFIG_PATH "--prefix=$HOME/install dir" || {
156+
cat config.log
157+
echo "::error::Failure during Configure"
158+
exit 1
159+
}
160+
- name: Build
161+
run: |
162+
make binaries libraries tktest || {
163+
echo "::error::Failure during Build"
164+
exit 1
165+
}
166+
- name: Run Tests
167+
run: |
168+
xvfb-run --auto-servernum make test-classic | tee out-classic.txt
169+
xvfb-run --auto-servernum make test-ttk | tee out-ttk.txt
170+
grep -q "Failed 0" out-classic.txt || {
171+
echo "::error::Failure during Test"
172+
exit 1
173+
}
174+
grep -q "Failed 0" out-ttk.txt || {
175+
echo "::error::Failure during Test"
176+
exit 1
177+
}
178+
timeout-minutes: 15

0 commit comments

Comments
 (0)