diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-02 11:29:52 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-02 11:29:52 (GMT) |
| commit | 15449e71fb0e333a91a7bb2b8e4fabfc1f98f597 (patch) | |
| tree | b4cedd373fa4571b1f7594a50cc0e7762478101a | |
| parent | d9fa72d22a6c7c823f0267fdabce5a9f307a7743 (diff) | |
| parent | 02c730b29850204b02de5c9c1e70c52fd0fd9a65 (diff) | |
| download | tcl-15449e71fb0e333a91a7bb2b8e4fabfc1f98f597.zip tcl-15449e71fb0e333a91a7bb2b8e4fabfc1f98f597.tar.gz tcl-15449e71fb0e333a91a7bb2b8e4fabfc1f98f597.tar.bz2 | |
Merge 8.5
| -rw-r--r-- | .github/workflows/win-build.yml | 19 | ||||
| -rwxr-xr-x | unix/configure | 8 | ||||
| -rw-r--r-- | unix/tcl.m4 | 8 | ||||
| -rwxr-xr-x | win/configure | 8 | ||||
| -rw-r--r-- | win/tcl.m4 | 8 |
5 files changed, 13 insertions, 38 deletions
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml index ea4f8b6..8e35798 100644 --- a/.github/workflows/win-build.yml +++ b/.github/workflows/win-build.yml @@ -7,27 +7,34 @@ jobs: run: shell: powershell working-directory: win + strategy: + matrix: + cfgopt: + - "" + - "OPTS=static,msvcrt" + - "OPTS=symbols" + - "OPTS=memdbg" # Using powershell means we need to explicitly stop on failure steps: - name: Checkout uses: actions/checkout@v2 - name: Init MSVC uses: ilammy/msvc-dev-cmd@v1 - - name: Build + - name: Build ${{ matrix.cfgopt }} run: | - &nmake -f makefile.vc all + &nmake -f makefile.vc ${{ matrix.cfgopt }} all if ($lastexitcode -ne 0) { throw "nmake exit code: $lastexitcode" } - - name: Build Test Harness + - name: Build Test Harness ${{ matrix.cfgopt }} run: | - &nmake -f makefile.vc tcltest + &nmake -f makefile.vc ${{ matrix.cfgopt }} tcltest if ($lastexitcode -ne 0) { throw "nmake exit code: $lastexitcode" } - - name: Run Tests + - name: Run Tests ${{ matrix.cfgopt }} run: | - &nmake -f makefile.vc test + &nmake -f makefile.vc ${{ matrix.cfgopt }} test if ($lastexitcode -ne 0) { throw "nmake exit code: $lastexitcode" } diff --git a/unix/configure b/unix/configure index a6c084e..0d005cb 100755 --- a/unix/configure +++ b/unix/configure @@ -5714,14 +5714,6 @@ if test "${enable_shared+set}" = set; then else tcl_ok=yes fi; - - if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - tcl_ok=$enableval - else - tcl_ok=yes - fi - if test "$tcl_ok" = "yes" ; then echo "$as_me:$LINENO: result: shared" >&5 echo "${ECHO_T}shared" >&6 diff --git a/unix/tcl.m4 b/unix/tcl.m4 index fa027b1..27b7540 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -511,14 +511,6 @@ AC_DEFUN([SC_ENABLE_SHARED], [ AC_HELP_STRING([--enable-shared], [build and link with shared libraries (default: on)]), [tcl_ok=$enableval], [tcl_ok=yes]) - - if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - tcl_ok=$enableval - else - tcl_ok=yes - fi - if test "$tcl_ok" = "yes" ; then AC_MSG_RESULT([shared]) SHARED_BUILD=1 diff --git a/win/configure b/win/configure index dae49d6..a8575ad 100755 --- a/win/configure +++ b/win/configure @@ -3133,14 +3133,6 @@ if test "${enable_shared+set}" = set; then else tcl_ok=yes fi; - - if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - tcl_ok=$enableval - else - tcl_ok=yes - fi - if test "$tcl_ok" = "yes" ; then echo "$as_me:$LINENO: result: shared" >&5 echo "${ECHO_T}shared" >&6 @@ -364,14 +364,6 @@ AC_DEFUN([SC_ENABLE_SHARED], [ AC_ARG_ENABLE(shared, [ --enable-shared build and link with shared libraries (default: on)], [tcl_ok=$enableval], [tcl_ok=yes]) - - if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - tcl_ok=$enableval - else - tcl_ok=yes - fi - if test "$tcl_ok" = "yes" ; then AC_MSG_RESULT([shared]) SHARED_BUILD=1 |