From cd71af94178ef912845e6e3beed69824d967428f Mon Sep 17 00:00:00 2001 From: Mason M Date: Fri, 28 Jun 2024 13:57:48 -0300 Subject: [PATCH 01/11] Update teabase to latest --- teabase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/teabase b/teabase index 5085949..b179fcf 160000 --- a/teabase +++ b/teabase @@ -1 +1 @@ -Subproject commit 508594963a61932ba6a752586f5913e8359de7b5 +Subproject commit b179fcffcb9c5e51951e3c9de794580bc4caa654 From 9f6ea173f0996d4e936e5f24f2dc1c1f69fa0354 Mon Sep 17 00:00:00 2001 From: Mason M Date: Fri, 28 Jun 2024 15:37:25 -0300 Subject: [PATCH 02/11] Update Makefile.in to use teabase targets --- .gitignore | 1 + Makefile.in | 63 ++++++++++++++++++--------------------------- Makefile.teabase.in | 1 + configure.ac | 2 +- 4 files changed, 28 insertions(+), 39 deletions(-) create mode 120000 Makefile.teabase.in diff --git a/.gitignore b/.gitignore index 516b098..2b76a2f 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ tags *~ *.gcda *.gcno +Makefile.teabase diff --git a/Makefile.in b/Makefile.in index 0af0cd2..53b82da 100644 --- a/Makefile.in +++ b/Makefile.in @@ -172,15 +172,8 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) \ GDB = gdb VALGRIND = valgrind -VALGRINDEXTRA = VALGRINDARGS = --tool=memcheck --num-callers=8 --leak-resolution=high \ - --leak-check=yes -v --suppressions=suppressions --keep-debuginfo=yes \ - --trace-children=yes $(VALGRINDEXTRA) - -PGOGEN_BUILD = -fprofile-generate=prof -PGO_BUILD = @PGO_BUILD@ -PGO= -CFLAGS += $(PGO) + --leak-check=yes --show-reachable=yes -v .SUFFIXES: .c .$(OBJEXT) @@ -260,21 +253,9 @@ test: binaries libraries -load "package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION) \ [list load `@CYGPATH@ $(PKG_LIB_FILE)` $(PACKAGE_NAME)]" -benchmark: binaries libraries - $(TCLSH) `@CYGPATH@ $(srcdir)/bench/run.tcl` $(BENCHFLAGS) -load package\ ifneeded\ $(PACKAGE_NAME)\ $(PACKAGE_VERSION)\ [list\ load\ `@CYGPATH@ $(PKG_LIB_FILE)`\ [string\ totitle\ $(PACKAGE_NAME)]] - shell: binaries libraries @$(TCLSH) $(SCRIPT) -vim-gdb: binaries libraries - $(TCLSH_ENV) $(PKG_ENV) vim -c "set number" -c "set mouse=a" -c "set foldlevel=100" -c "Termdebug --args $(TCLSH_PROG) tests/all.tcl $(TESTFLAGS) -singleproc 1 -load package\ ifneeded\ $(PACKAGE_NAME)\ $(PACKAGE_VERSION)\ [list\ load\ `@CYGPATH@ $(PKG_LIB_FILE)`\ [string\ totitle\ $(PACKAGE_NAME)]]" generic/parse_args.c - -vim-core: - $(TCLSH_ENV) $(PKG_ENV) vim -c 'packadd termdebug' -c "set mouse=a" -c "set number" -c "set foldlevel=100" -c "Termdebug -ex layout\ asm -ex layout\ regs -ex focus\ cmd $(TCLSH_PROG) core" -c Winbar generic/main.c - -vim-gdb-benchmark: binaries libraries - $(TCLSH_ENV) $(PKG_ENV) vim -c "set number" -c "set mouse=a" -c "set foldlevel=100" -c "Termdebug --args $(TCLSH_PROG) bench/run.tcl $(TESTFLAGS) -load package\ ifneeded\ $(PACKAGE_NAME)\ $(PACKAGE_VERSION)\ [list\ load\ `@CYGPATH@ $(PKG_LIB_FILE)`\ [string\ totitle\ $(PACKAGE_NAME)]]" generic/parse_args.c - gdb: $(TCLSH_ENV) $(PKG_ENV) $(GDB) $(TCLSH_PROG) $(SCRIPT) @@ -285,14 +266,6 @@ gdb-test: binaries libraries -load "package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION) \ [list load `@CYGPATH@ $(PKG_LIB_FILE)` $(PACKAGE_NAME)]" -pgo: - rm -rf prof - make -C . PGO="$(PGOGEN_BUILD)" clean binaries libraries test benchmark - make -C . PGO="$(PGO_BUILD)" clean binaries libraries - -coverage: - make -C . PGO="--coverage" clean binaries libraries test - valgrind: binaries libraries $(TCLSH_ENV) $(PKG_ENV) $(VALGRIND) $(VALGRINDARGS) $(TCLSH_PROG) \ `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS) @@ -353,7 +326,8 @@ DIST_ROOT = /tmp/dist DIST_DIR = $(DIST_ROOT)/$(PKG_DIR) DIST_INSTALL_DATA = CPPROG='cp -p' $(INSTALL) -m 644 -DIST_INSTALL_SCRIPT = CPPROG='cp -p' $(INSTALL) -m 755 +DIST_INSTALL_SCRIPT = CPPROG='cp -p' $(INSTALL) +DIST_INSTALL_ASIS = cp -a dist-clean: rm -rf $(DIST_DIR) $(DIST_ROOT)/$(PKG_DIR).tar.* @@ -372,16 +346,29 @@ dist: dist-clean $(srcdir)/tclconfig/tcl.m4 $(srcdir)/tclconfig/install-sh \ $(DIST_DIR)/tclconfig/ + $(INSTALL_DATA_DIR) $(DIST_DIR)/teabase + $(DIST_INSTALL_DATA) \ + $(srcdir)/teabase/teabase.m4 \ + $(srcdir)/teabase/ax_cc_for_build.m4 \ + $(srcdir)/teabase/ax_check_compile_flag.m4 \ + $(srcdir)/teabase/ax_gcc_builtin.m4 \ + $(DIST_DIR)/teabase/ + + $(INSTALL_DATA_DIR) $(DIST_DIR)/bench + $(DIST_INSTALL_DATA) \ + $(srcdir)/teabase/teabase_bench-0.1.tm \ + $(DIST_DIR)/bench/ + # Extension files $(DIST_INSTALL_DATA) \ - $(srcdir)/ChangeLog \ - $(srcdir)/README.sha \ - $(srcdir)/license.terms \ - $(srcdir)/README \ + $(srcdir)/README.md \ + $(srcdir)/LICENSE \ $(srcdir)/pkgIndex.tcl.in \ + $(srcdir)/Makefile.teabase.in \ + $(srcdir)/suppressions \ $(DIST_DIR)/ - list='demos doc generic library mac tests unix win'; \ + list='demos doc generic library mac tests unix win bench'; \ for p in $$list; do \ if test -d $(srcdir)/$$p ; then \ $(INSTALL_DATA_DIR) $(DIST_DIR)/$$p; \ @@ -389,6 +376,8 @@ dist: dist-clean fi; \ done + $(DIST_INSTALL_ASIS) $(srcdir)/deps $(DIST_DIR)/deps/ + (cd $(DIST_ROOT); $(COMPRESS);) #======================================================================== @@ -491,12 +480,10 @@ uninstall-binaries: rm -f $(DESTDIR)$(bindir)/$$p; \ done -tags: - ctags-exuberant generic/* - .PHONY: all binaries clean depend distclean doc install libraries test .PHONY: gdb gdb-test valgrind valgrindshell tags -.PHONY: vim-gdb vim-core vim-gdb-benchmark + +include $(top_builddir)/Makefile.teabase # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Makefile.teabase.in b/Makefile.teabase.in new file mode 120000 index 0000000..78c79f5 --- /dev/null +++ b/Makefile.teabase.in @@ -0,0 +1 @@ +teabase/Makefile.in \ No newline at end of file diff --git a/configure.ac b/configure.ac index dd220cd..b461445 100644 --- a/configure.ac +++ b/configure.ac @@ -181,7 +181,7 @@ TEA_MAKE_LIB TEA_PROG_TCLSH #TEA_PROG_WISH -AC_CONFIG_FILES([Makefile pkgIndex.tcl]) +AC_CONFIG_FILES([Makefile pkgIndex.tcl Makefile.teabase]) #AC_CONFIG_FILES([sampleConfig.sh]) #-------------------------------------------------------------------- From 95d4e020e7743625cbb3af2d90a51de8701a6c98 Mon Sep 17 00:00:00 2001 From: Mason M Date: Sun, 30 Jun 2024 21:18:52 -0300 Subject: [PATCH 03/11] add symlinks --- bench/run.tcl | 0 generic/tclstuff.h | 0 generic/tip445.h | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 120000 => 100644 bench/run.tcl mode change 120000 => 100644 generic/tclstuff.h mode change 120000 => 100644 generic/tip445.h diff --git a/bench/run.tcl b/bench/run.tcl deleted file mode 120000 index 4ae89d9..0000000 --- a/bench/run.tcl +++ /dev/null @@ -1 +0,0 @@ -../teabase/run_bench.tcl \ No newline at end of file diff --git a/bench/run.tcl b/bench/run.tcl new file mode 100644 index 0000000..4ae89d9 --- /dev/null +++ b/bench/run.tcl @@ -0,0 +1 @@ +../teabase/run_bench.tcl \ No newline at end of file diff --git a/generic/tclstuff.h b/generic/tclstuff.h deleted file mode 120000 index ade55f1..0000000 --- a/generic/tclstuff.h +++ /dev/null @@ -1 +0,0 @@ -../teabase/tclstuff.h \ No newline at end of file diff --git a/generic/tclstuff.h b/generic/tclstuff.h new file mode 100644 index 0000000..ade55f1 --- /dev/null +++ b/generic/tclstuff.h @@ -0,0 +1 @@ +../teabase/tclstuff.h \ No newline at end of file diff --git a/generic/tip445.h b/generic/tip445.h deleted file mode 120000 index a53b808..0000000 --- a/generic/tip445.h +++ /dev/null @@ -1 +0,0 @@ -../teabase/tip445.h \ No newline at end of file diff --git a/generic/tip445.h b/generic/tip445.h new file mode 100644 index 0000000..a53b808 --- /dev/null +++ b/generic/tip445.h @@ -0,0 +1 @@ +../teabase/tip445.h \ No newline at end of file From 94c690ae1de2930f6204046f2ef04b6ea91c45ca Mon Sep 17 00:00:00 2001 From: Mason M Date: Sun, 30 Jun 2024 21:59:22 -0300 Subject: [PATCH 04/11] Remove symlinks for header files --- .gitignore | 1 + configure.ac | 2 +- generic/tclstuff.h | 1 - generic/tip445.h | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 generic/tclstuff.h delete mode 100644 generic/tip445.h diff --git a/.gitignore b/.gitignore index 2b76a2f..2414013 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *.swp *.o *.so +*.dll pkgIndex.tcl Makefile core diff --git a/configure.ac b/configure.ac index b461445..32d7e7a 100644 --- a/configure.ac +++ b/configure.ac @@ -73,7 +73,7 @@ TEA_SETUP_COMPILER TEA_ADD_SOURCES([parse_args.c]) TEA_ADD_HEADERS([]) -TEA_ADD_INCLUDES([]) +TEA_ADD_INCLUDES([-I$srcdir/teabase]) TEA_ADD_LIBS([]) TEA_ADD_CFLAGS([]) TEA_ADD_STUB_SOURCES([]) diff --git a/generic/tclstuff.h b/generic/tclstuff.h deleted file mode 100644 index ade55f1..0000000 --- a/generic/tclstuff.h +++ /dev/null @@ -1 +0,0 @@ -../teabase/tclstuff.h \ No newline at end of file diff --git a/generic/tip445.h b/generic/tip445.h deleted file mode 100644 index a53b808..0000000 --- a/generic/tip445.h +++ /dev/null @@ -1 +0,0 @@ -../teabase/tip445.h \ No newline at end of file From 264ac9592d32aa9ee8ff58203256fd4f47fe73cc Mon Sep 17 00:00:00 2001 From: Mason M Date: Sun, 30 Jun 2024 22:16:54 -0300 Subject: [PATCH 05/11] Add github workflow --- .github/workflows/makefile.yml | 75 ++++++++++++++++++++++++++++++++++ Makefile.in | 2 - 2 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/makefile.yml diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml new file mode 100644 index 0000000..2d9328d --- /dev/null +++ b/.github/workflows/makefile.yml @@ -0,0 +1,75 @@ +name: Makefile CI + +on: push + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + + - name: Install dependencies + run: | + sudo apt update + sudo apt install pandoc texlive-latex-base texlive-latex-recommended + + - name: Cache Tcl build + id: cache-tcl + uses: actions/cache@v3 + with: + path: /opt/tcl8.7 + key: ${{ runner.os }}-f7629abff2 + + - name: Build Tcl 8.7 + if: steps.cache-tcl.outputs.cache-hit != 'true' + run: | + mkdir -p /tmp/src/tcl + cd /tmp/src/tcl + wget https://core.tcl-lang.org/tcl/tarball/f7629abff2/tcl.tar.gz -O - | tar xz --strip-components=1 + cd unix + ./configure CFLAGS="-DPURIFY" --enable-symbols --enable-testmode --prefix=/opt/tcl8.7 + make -j 8 + sudo make install + + - uses: actions/checkout@v3 + with: + submodules: 'true' + + - name: Build parse_args + run: | + autoconf + ./configure --with-tcl=/opt/tcl8.7/lib --enable-testmode + make + + - name: Run tests + run: make test 2>&1 | tee /tmp/test_results.log + + - name: Upload test results + uses: actions/upload-artifact@v3 + with: + name: test-results + path: /tmp/test_results.log + + - name: Dist + #if: startsWith(github.ref, 'refs/tags/v') + run: | + make dist + - uses: actions/upload-artifact@v4 + with: + name: release-tarball + path: /tmp/dist/parse_args*.tar.gz + + - name: Release + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/v') + with: + draft: false + prerelease: true + files: | + /tmp/dist/parse_args*.tar.gz + +# - name: debug +# if: ${{ failure() }} +# uses: mxschmitt/action-tmate@v3 + diff --git a/Makefile.in b/Makefile.in index 53b82da..ea90f7c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -376,8 +376,6 @@ dist: dist-clean fi; \ done - $(DIST_INSTALL_ASIS) $(srcdir)/deps $(DIST_DIR)/deps/ - (cd $(DIST_ROOT); $(COMPRESS);) #======================================================================== From 08a61193e9377fca572f2bc034bf98e13b89e8b0 Mon Sep 17 00:00:00 2001 From: Mason M Date: Thu, 7 Nov 2024 14:07:56 -0400 Subject: [PATCH 06/11] Upgrade action versions --- .github/workflows/makefile.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 2d9328d..2e9f17c 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -16,7 +16,7 @@ jobs: - name: Cache Tcl build id: cache-tcl - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: /opt/tcl8.7 key: ${{ runner.os }}-f7629abff2 @@ -32,7 +32,7 @@ jobs: make -j 8 sudo make install - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: 'true' @@ -46,7 +46,7 @@ jobs: run: make test 2>&1 | tee /tmp/test_results.log - name: Upload test results - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test-results path: /tmp/test_results.log @@ -61,7 +61,7 @@ jobs: path: /tmp/dist/parse_args*.tar.gz - name: Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 if: startsWith(github.ref, 'refs/tags/v') with: draft: false @@ -72,4 +72,3 @@ jobs: # - name: debug # if: ${{ failure() }} # uses: mxschmitt/action-tmate@v3 - From 2467a77d04fcbfd36135f8f7d3f8b98ab2b75771 Mon Sep 17 00:00:00 2001 From: Mason M Date: Thu, 7 Nov 2024 14:26:10 -0400 Subject: [PATCH 07/11] Update permissions and add token --- .github/workflows/makefile.yml | 107 +++++++++++++++++---------------- 1 file changed, 55 insertions(+), 52 deletions(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 2e9f17c..6fd4b1c 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -4,70 +4,73 @@ on: push jobs: build: - runs-on: ubuntu-latest + permissions: + contents: write + steps: + - name: Install dependencies + run: | + sudo apt update + sudo apt install pandoc texlive-latex-base texlive-latex-recommended - - name: Install dependencies - run: | - sudo apt update - sudo apt install pandoc texlive-latex-base texlive-latex-recommended + - name: Cache Tcl build + id: cache-tcl + uses: actions/cache@v4 + with: + path: /opt/tcl8.7 + key: ${{ runner.os }}-f7629abff2 - - name: Cache Tcl build - id: cache-tcl - uses: actions/cache@v4 - with: - path: /opt/tcl8.7 - key: ${{ runner.os }}-f7629abff2 + - name: Build Tcl 8.7 + if: steps.cache-tcl.outputs.cache-hit != 'true' + run: | + mkdir -p /tmp/src/tcl + cd /tmp/src/tcl + wget https://core.tcl-lang.org/tcl/tarball/f7629abff2/tcl.tar.gz -O - | tar xz --strip-components=1 + cd unix + ./configure CFLAGS="-DPURIFY" --enable-symbols --enable-testmode --prefix=/opt/tcl8.7 + make -j 8 + sudo make install - - name: Build Tcl 8.7 - if: steps.cache-tcl.outputs.cache-hit != 'true' - run: | - mkdir -p /tmp/src/tcl - cd /tmp/src/tcl - wget https://core.tcl-lang.org/tcl/tarball/f7629abff2/tcl.tar.gz -O - | tar xz --strip-components=1 - cd unix - ./configure CFLAGS="-DPURIFY" --enable-symbols --enable-testmode --prefix=/opt/tcl8.7 - make -j 8 - sudo make install + - uses: actions/checkout@v4 + with: + submodules: 'true' - - uses: actions/checkout@v4 - with: - submodules: 'true' + - name: Build parse_args + run: | + autoconf + ./configure --with-tcl=/opt/tcl8.7/lib --enable-testmode + make - - name: Build parse_args - run: | - autoconf - ./configure --with-tcl=/opt/tcl8.7/lib --enable-testmode - make + - name: Run tests + run: make test 2>&1 | tee /tmp/test_results.log - - name: Run tests - run: make test 2>&1 | tee /tmp/test_results.log + - name: Upload test results + uses: actions/upload-artifact@v4 + with: + name: test-results + path: /tmp/test_results.log - - name: Upload test results - uses: actions/upload-artifact@v4 - with: - name: test-results - path: /tmp/test_results.log + - name: Dist + #if: startsWith(github.ref, 'refs/tags/v') + run: | + make dist + - uses: actions/upload-artifact@v4 + with: + name: release-tarball + path: /tmp/dist/parse_args*.tar.gz - - name: Dist - #if: startsWith(github.ref, 'refs/tags/v') - run: | - make dist - - uses: actions/upload-artifact@v4 - with: - name: release-tarball - path: /tmp/dist/parse_args*.tar.gz + - name: Release + uses: softprops/action-gh-release@v2 + if: startsWith(github.ref, 'refs/tags/v') + with: + draft: false + prerelease: true + files: | + /tmp/dist/parse_args*.tar.gz - - name: Release - uses: softprops/action-gh-release@v2 - if: startsWith(github.ref, 'refs/tags/v') - with: - draft: false - prerelease: true - files: | - /tmp/dist/parse_args*.tar.gz + token: ${{ secrets.GITHUB_TOKEN }} # - name: debug # if: ${{ failure() }} From 485f03daab2c0d72d8ddb7d1bc6147938d5877c5 Mon Sep 17 00:00:00 2001 From: Mason M Date: Thu, 7 Nov 2024 15:00:37 -0400 Subject: [PATCH 08/11] Remove Makefile.teabase.in symlink --- Makefile.in | 4 ++-- Makefile.teabase.in | 1 - configure.ac | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) delete mode 120000 Makefile.teabase.in diff --git a/Makefile.in b/Makefile.in index ea90f7c..bff508d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -349,6 +349,7 @@ dist: dist-clean $(INSTALL_DATA_DIR) $(DIST_DIR)/teabase $(DIST_INSTALL_DATA) \ $(srcdir)/teabase/teabase.m4 \ + $(srcdir)/teabase/Makefile.teabase.in \ $(srcdir)/teabase/ax_cc_for_build.m4 \ $(srcdir)/teabase/ax_check_compile_flag.m4 \ $(srcdir)/teabase/ax_gcc_builtin.m4 \ @@ -364,7 +365,6 @@ dist: dist-clean $(srcdir)/README.md \ $(srcdir)/LICENSE \ $(srcdir)/pkgIndex.tcl.in \ - $(srcdir)/Makefile.teabase.in \ $(srcdir)/suppressions \ $(DIST_DIR)/ @@ -481,7 +481,7 @@ uninstall-binaries: .PHONY: all binaries clean depend distclean doc install libraries test .PHONY: gdb gdb-test valgrind valgrindshell tags -include $(top_builddir)/Makefile.teabase +include $(top_builddir)/teabase/Makefile.teabase # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Makefile.teabase.in b/Makefile.teabase.in deleted file mode 120000 index 78c79f5..0000000 --- a/Makefile.teabase.in +++ /dev/null @@ -1 +0,0 @@ -teabase/Makefile.in \ No newline at end of file diff --git a/configure.ac b/configure.ac index 32d7e7a..7a1c9b2 100644 --- a/configure.ac +++ b/configure.ac @@ -181,7 +181,7 @@ TEA_MAKE_LIB TEA_PROG_TCLSH #TEA_PROG_WISH -AC_CONFIG_FILES([Makefile pkgIndex.tcl Makefile.teabase]) +AC_CONFIG_FILES([Makefile pkgIndex.tcl teabase/Makefile.teabase]) #AC_CONFIG_FILES([sampleConfig.sh]) #-------------------------------------------------------------------- From 699c78c5172da933895aeab9a8d36c5e1b0d166b Mon Sep 17 00:00:00 2001 From: Mason M Date: Thu, 7 Nov 2024 15:08:28 -0400 Subject: [PATCH 09/11] Fix file paths --- Makefile.in | 4 ++-- configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index bff508d..f73e756 100644 --- a/Makefile.in +++ b/Makefile.in @@ -349,7 +349,7 @@ dist: dist-clean $(INSTALL_DATA_DIR) $(DIST_DIR)/teabase $(DIST_INSTALL_DATA) \ $(srcdir)/teabase/teabase.m4 \ - $(srcdir)/teabase/Makefile.teabase.in \ + $(srcdir)/teabase/Makefile.in \ $(srcdir)/teabase/ax_cc_for_build.m4 \ $(srcdir)/teabase/ax_check_compile_flag.m4 \ $(srcdir)/teabase/ax_gcc_builtin.m4 \ @@ -481,7 +481,7 @@ uninstall-binaries: .PHONY: all binaries clean depend distclean doc install libraries test .PHONY: gdb gdb-test valgrind valgrindshell tags -include $(top_builddir)/teabase/Makefile.teabase +include $(top_builddir)/teabase/Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/configure.ac b/configure.ac index 7a1c9b2..fbe634f 100644 --- a/configure.ac +++ b/configure.ac @@ -181,7 +181,7 @@ TEA_MAKE_LIB TEA_PROG_TCLSH #TEA_PROG_WISH -AC_CONFIG_FILES([Makefile pkgIndex.tcl teabase/Makefile.teabase]) +AC_CONFIG_FILES([Makefile pkgIndex.tcl teabase/Makefile]) #AC_CONFIG_FILES([sampleConfig.sh]) #-------------------------------------------------------------------- From c81cb7cdc9f1854200ff7050bf012aaf6625e975 Mon Sep 17 00:00:00 2001 From: Mason M Date: Thu, 7 Nov 2024 15:41:09 -0400 Subject: [PATCH 10/11] Add missing headers to distdir --- Makefile.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile.in b/Makefile.in index f73e756..a8cb199 100644 --- a/Makefile.in +++ b/Makefile.in @@ -353,6 +353,9 @@ dist: dist-clean $(srcdir)/teabase/ax_cc_for_build.m4 \ $(srcdir)/teabase/ax_check_compile_flag.m4 \ $(srcdir)/teabase/ax_gcc_builtin.m4 \ + $(srcdir)/teabase/tclstuff.h \ + $(srcdir)/teabase/tip445.h \ + $(srcdir)/teabase/polyfill.h \ $(DIST_DIR)/teabase/ $(INSTALL_DATA_DIR) $(DIST_DIR)/bench From f52db10d7752be905e203c5824979428d4f70ea0 Mon Sep 17 00:00:00 2001 From: Mason M Date: Thu, 7 Nov 2024 15:55:08 -0400 Subject: [PATCH 11/11] No need to ignore non-existent file --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2414013..f540042 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,3 @@ tags *~ *.gcda *.gcno -Makefile.teabase