diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-27 11:19:07 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-27 11:19:07 (GMT) |
| commit | a2c547e12a910f3475ac28fe344ac4760bde521a (patch) | |
| tree | fc5ddd92b844910fa59b69e70f9563ea0d379897 | |
| parent | 6ad60f8b3b06f698cc20a5f8b6becb499ee9ecd7 (diff) | |
| parent | 2ed258bb674b5894ae0d21fe8405234b97731dbe (diff) | |
| download | tcl-a2c547e12a910f3475ac28fe344ac4760bde521a.zip tcl-a2c547e12a910f3475ac28fe344ac4760bde521a.tar.gz tcl-a2c547e12a910f3475ac28fe344ac4760bde521a.tar.bz2 | |
Merge 8.5
| -rw-r--r-- | .github/workflows/linux-build.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/mac-build.yml | 20 | ||||
| -rw-r--r-- | .github/workflows/win-build.yml | 13 |
3 files changed, 17 insertions, 18 deletions
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index a7b62dd..bf0a4cb 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -10,6 +10,8 @@ jobs: - "--disable-shared" - "--enable-symbols" - "--enable-symbols=mem" + - "CFLAGS=-DTCL_UTF_MAX=4" + - "CFLAGS=-DTCL_UTF_MAX=6" defaults: run: shell: bash diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml index 0063b9d..3302265 100644 --- a/.github/workflows/mac-build.yml +++ b/.github/workflows/mac-build.yml @@ -24,12 +24,11 @@ jobs: runs-on: macos-11.0 strategy: matrix: - symbols: - - "no" - - "mem" - dtrace: - - "no" - - "yes" + cfgopt: + - "" + - "--disable-shared" + - "--enable-symbols" + - "--enable-symbols=mem" defaults: run: shell: bash @@ -42,11 +41,11 @@ jobs: touch tclStubInit.c tclOOStubInit.c mkdir "$HOME/install dir" working-directory: generic - - name: Configure (symbols=${{ matrix.symbols }} dtrace=${{ matrix.dtrace }}) + - name: Configure ${{ matrix.cfgopt }} # Note that macOS is always a 64 bit platform - run: ./configure --enable-64bit --enable-framework ${CFGOPT} "--prefix=$HOME/install dir" || (cat config.log && exit 1) + run: ./configure --enable-64bit --enable-dtrace --enable-framework ${CFGOPT} "--prefix=$HOME/install" || (cat config.log && exit 1) env: - CFGOPT: --enable-symbols=${{ matrix.symbols }} --enable-dtrace=${{ matrix.dtrace }} + CFGOPT: ${{ matrix.cfgopt }} - name: Build run: | make all tcltest @@ -56,6 +55,3 @@ jobs: env: ERROR_ON_FAILURES: 1 MAC_CI: 1 - - name: Trial Installation - run: | - make install diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml index 59f00be..4f6819f 100644 --- a/.github/workflows/win-build.yml +++ b/.github/workflows/win-build.yml @@ -41,10 +41,11 @@ jobs: working-directory: win strategy: matrix: - symbols: - - "no" - - "mem" - - "all" + cfgopt: + - "" + - "--disable-shared" + - "--enable-symbols" + - "--enable-symbols=mem" # Using powershell means we need to explicitly stop on failure steps: - name: Checkout @@ -56,11 +57,11 @@ jobs: touch tclStubInit.c tclOOStubInit.c mkdir "${HOME}/install dir" working-directory: generic - - name: Configure (symbols=${{ matrix.symbols }}) + - name: Configure (symbols=${{ matrix.cfgopt }}) run: | ./configure ${CFGOPT} "--prefix=$HOME/install dir" || (cat config.log && exit 1) env: - CFGOPT: --enable-64bit --enable-symbols=${{ matrix.symbols }} + CFGOPT: --enable-64bit ${{ matrix.cfgopt }} - name: Build run: make all - name: Build Test Harness |