From 3328f35ca959b5ec24452148d08c5ce80da30e4f Mon Sep 17 00:00:00 2001 From: Marc Culler Date: Fri, 3 May 2024 15:08:03 -0500 Subject: [PATCH] update ci scripts for version 1.1 --- .github/workflows/windows.yml | 4 ++-- ci/linux/linux_configure | 18 +++++++++--------- ci/macOS/mac_configure | 18 +++++++++--------- ci/windows/build_tcltk.bat | 4 ++-- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 22b94d5..308ce44 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -65,8 +65,8 @@ jobs: - name: Assemble the package run: | - mkdir -p dist/TkGL1.0 - cp win/Release*/*.* dist/TkGL1.0 + mkdir -p dist/TkGL1.1 + cp win/Release*/*.* dist/TkGL1.1 shell: bash - name: Save artifacts diff --git a/ci/linux/linux_configure b/ci/linux/linux_configure index 6bda368..ad01eaa 100755 --- a/ci/linux/linux_configure +++ b/ci/linux/linux_configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for Tkgl 1.0. +# Generated by GNU Autoconf 2.71 for Tkgl 1.1. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -608,8 +608,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Tkgl' PACKAGE_TARNAME='tkgl' -PACKAGE_VERSION='1.0' -PACKAGE_STRING='Tkgl 1.0' +PACKAGE_VERSION='1.1' +PACKAGE_STRING='Tkgl 1.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1347,7 +1347,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Tkgl 1.0 to adapt to many kinds of systems. +\`configure' configures Tkgl 1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1409,7 +1409,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Tkgl 1.0:";; + short | recursive ) echo "Configuration of Tkgl 1.1:";; esac cat <<\_ACEOF @@ -1513,7 +1513,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Tkgl configure 1.0 +Tkgl configure 1.1 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1769,7 +1769,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Tkgl $as_me 1.0, which was +It was created by Tkgl $as_me 1.1, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -9789,7 +9789,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Tkgl $as_me 1.0, which was +This file was extended by Tkgl $as_me 1.1, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9844,7 +9844,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -Tkgl config.status 1.0 +Tkgl config.status 1.1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/ci/macOS/mac_configure b/ci/macOS/mac_configure index 6bda368..ad01eaa 100755 --- a/ci/macOS/mac_configure +++ b/ci/macOS/mac_configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for Tkgl 1.0. +# Generated by GNU Autoconf 2.71 for Tkgl 1.1. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -608,8 +608,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Tkgl' PACKAGE_TARNAME='tkgl' -PACKAGE_VERSION='1.0' -PACKAGE_STRING='Tkgl 1.0' +PACKAGE_VERSION='1.1' +PACKAGE_STRING='Tkgl 1.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1347,7 +1347,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Tkgl 1.0 to adapt to many kinds of systems. +\`configure' configures Tkgl 1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1409,7 +1409,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Tkgl 1.0:";; + short | recursive ) echo "Configuration of Tkgl 1.1:";; esac cat <<\_ACEOF @@ -1513,7 +1513,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Tkgl configure 1.0 +Tkgl configure 1.1 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1769,7 +1769,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Tkgl $as_me 1.0, which was +It was created by Tkgl $as_me 1.1, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -9789,7 +9789,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Tkgl $as_me 1.0, which was +This file was extended by Tkgl $as_me 1.1, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9844,7 +9844,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -Tkgl config.status 1.0 +Tkgl config.status 1.1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/ci/windows/build_tcltk.bat b/ci/windows/build_tcltk.bat index 78716c0..25a68c3 100644 --- a/ci/windows/build_tcltk.bat +++ b/ci/windows/build_tcltk.bat @@ -1,4 +1,4 @@ -@echo 0ff +@echo off rem NOTE: github runners use enterprise visual studio set enterprise="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" set community="C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" @@ -14,7 +14,7 @@ if exist %enterprise% goto ent else goto comm %varsall% x86_amd64 cd tcl8\win -nmake INSTAKKDIR=..\..\TclTk8 /f makefile.vc +nmake INSTALLDIR=..\..\TclTk8 /f makefile.vc nmake INSTALLDIR=..\..\TclTk8 /f makefile.vc install cd ..\..\tk8\win nmake INSTALLDIR=..\..\TclTk8 /f makefile.vc