From e67ce322921ece56f4c108ceec6397e19325d928 Mon Sep 17 00:00:00 2001 From: Mooneer Salem Date: Tue, 12 Dec 2023 20:52:19 -0800 Subject: Reenable documentation ctest. --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 7e76b65..f843282 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -50,7 +50,7 @@ jobs: - name: Run ctests working-directory: ${{github.workspace}}/build_linux shell: bash - run: ctest --output-on-failure -E test_codec2_doc + run: ctest --output-on-failure - name: Test library installation working-directory: ${{github.workspace}}/build_linux -- cgit v1.2.3 From d9f3ca774bf7922bc8adb29983570d5a81a47bd3 Mon Sep 17 00:00:00 2001 From: Mooneer Salem Date: Tue, 12 Dec 2023 21:01:35 -0800 Subject: Install missing packages. --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index f843282..c84a024 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -21,7 +21,7 @@ jobs: shell: bash run: | sudo apt-get update - sudo apt-get install octave octave-common octave-signal liboctave-dev gnuplot sox p7zip-full python3-numpy valgrind clang-format + sudo apt-get install octave octave-common octave-signal liboctave-dev gnuplot sox p7zip-full python3-numpy valgrind clang-format texlive-latex-base texlive-fonts-recommended texlive-fonts-extra texlive-latex-extra - name: Create Build Directory shell: bash -- cgit v1.2.3 From 7f41d0aaa84cb8897f8eea6c0f5fe4d4e05c787f Mon Sep 17 00:00:00 2001 From: Mooneer Salem Date: Tue, 12 Dec 2023 21:11:34 -0800 Subject: Add missed packages. --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index c84a024..df02ee2 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -21,7 +21,7 @@ jobs: shell: bash run: | sudo apt-get update - sudo apt-get install octave octave-common octave-signal liboctave-dev gnuplot sox p7zip-full python3-numpy valgrind clang-format texlive-latex-base texlive-fonts-recommended texlive-fonts-extra texlive-latex-extra + sudo apt-get install octave octave-common octave-signal liboctave-dev gnuplot sox p7zip-full python3-numpy valgrind clang-format texlive-latex-base texlive-fonts-recommended texlive-fonts-extra texlive-latex-extra texlive-science texmaker texlive-bibtex-extra - name: Create Build Directory shell: bash -- cgit v1.2.3 From 8c3fda08d0cd4956bd71067dac4c3f690308a707 Mon Sep 17 00:00:00 2001 From: Mooneer Salem Date: Tue, 12 Dec 2023 21:22:32 -0800 Subject: Experiment: use array package. --- doc/codec2.tex | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/codec2.tex b/doc/codec2.tex index 27181a2..7e6640f 100644 --- a/doc/codec2.tex +++ b/doc/codec2.tex @@ -8,6 +8,7 @@ \usepackage{xstring} \usepackage{catchfile} \usepackage{siunitx} +\usepackage{array} \CatchFileDef{\headfull}{../.git/HEAD}{} \StrGobbleRight{\headfull}{1}[\head] -- cgit v1.2.3 From f6d40396e506ce57e04db62c4332520e4cfcbdc6 Mon Sep 17 00:00:00 2001 From: Mooneer Salem Date: Tue, 12 Dec 2023 21:30:18 -0800 Subject: Revert "Experiment: use array package." This reverts commit 8c3fda08d0cd4956bd71067dac4c3f690308a707. --- doc/codec2.tex | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/codec2.tex b/doc/codec2.tex index 7e6640f..27181a2 100644 --- a/doc/codec2.tex +++ b/doc/codec2.tex @@ -8,7 +8,6 @@ \usepackage{xstring} \usepackage{catchfile} \usepackage{siunitx} -\usepackage{array} \CatchFileDef{\headfull}{../.git/HEAD}{} \StrGobbleRight{\headfull}{1}[\head] -- cgit v1.2.3 From c41a3a23aef6364e80a3fcfd49f18fb4af65932d Mon Sep 17 00:00:00 2001 From: Mooneer Salem Date: Tue, 12 Dec 2023 21:32:45 -0800 Subject: Try Ubuntu 20.04 and see if those tex packages work better. --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index df02ee2..731bc9f 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -12,7 +12,7 @@ jobs: # well on Windows or Mac. You can convert this to a matrix build if you need # cross-platform coverage. # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 -- cgit v1.2.3 From 984b50ffd9b07b41b8fc6c98f9c2eb58b3325d2a Mon Sep 17 00:00:00 2001 From: Mooneer Salem Date: Tue, 12 Dec 2023 22:17:57 -0800 Subject: Revert "Try Ubuntu 20.04 and see if those tex packages work better." This reverts commit c41a3a23aef6364e80a3fcfd49f18fb4af65932d. --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 731bc9f..df02ee2 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -12,7 +12,7 @@ jobs: # well on Windows or Mac. You can convert this to a matrix build if you need # cross-platform coverage. # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 -- cgit v1.2.3 From a560830c4655ccfd9b9f182e229680f141027531 Mon Sep 17 00:00:00 2001 From: Mooneer Salem Date: Tue, 12 Dec 2023 22:19:10 -0800 Subject: Add additional debugging. --- doc/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 659d4f6..3907251 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -20,10 +20,10 @@ PATH := $(PATH):$(CODEC2_BINARY)/src PLOT_FILES := hts2a_37_sn.tex hts2a_37_sw.tex hts2a_37_lpc_lsp.tex hts2a_37_lpc_pf.tex $(DOCNAME).pdf: $(PLOT_FILES) $(DOCNAME).tex $(DOCNAME)_refs.bib - pdflatex -jobname=$(JOBNAME) $(DOCNAME).tex + pdflatex -file-line-error -jobname=$(JOBNAME) $(DOCNAME).tex bibtex $(JOBNAME).aux - pdflatex -jobname=$(JOBNAME) $(DOCNAME).tex - pdflatex -jobname=$(JOBNAME) $(DOCNAME).tex + pdflatex -file-line-error -jobname=$(JOBNAME) $(DOCNAME).tex + pdflatex -file-line-error -jobname=$(JOBNAME) $(DOCNAME).tex $(PLOT_FILES): echo $(PATH) -- cgit v1.2.3 From d7212c5ec442ba798f2a98beeb101fd18a74b2cd Mon Sep 17 00:00:00 2001 From: Mooneer Salem Date: Tue, 12 Dec 2023 22:27:26 -0800 Subject: Try disabling maketitle just to see what happens. --- doc/codec2.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/codec2.tex b/doc/codec2.tex index 27181a2..c3538ea 100644 --- a/doc/codec2.tex +++ b/doc/codec2.tex @@ -53,7 +53,7 @@ pinstyle/.style = {pin edge={to-,thin,black}} \draw (#1,#2-0.25) -- (#1,#2+0.25); } -\maketitle +%\maketitle \section{Introduction} -- cgit v1.2.3 From ecbeb0aa47f8a1e29bb462cea9d90e5eb2cb6978 Mon Sep 17 00:00:00 2001 From: Mooneer Salem Date: Tue, 12 Dec 2023 22:55:58 -0800 Subject: Try alternate approach for getting Git branch/commit info. --- doc/Makefile | 6 +++--- doc/codec2.tex | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 3907251..5d05ea4 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -20,10 +20,10 @@ PATH := $(PATH):$(CODEC2_BINARY)/src PLOT_FILES := hts2a_37_sn.tex hts2a_37_sw.tex hts2a_37_lpc_lsp.tex hts2a_37_lpc_pf.tex $(DOCNAME).pdf: $(PLOT_FILES) $(DOCNAME).tex $(DOCNAME)_refs.bib - pdflatex -file-line-error -jobname=$(JOBNAME) $(DOCNAME).tex + pdflatex -shell-escape -file-line-error -jobname=$(JOBNAME) $(DOCNAME).tex bibtex $(JOBNAME).aux - pdflatex -file-line-error -jobname=$(JOBNAME) $(DOCNAME).tex - pdflatex -file-line-error -jobname=$(JOBNAME) $(DOCNAME).tex + pdflatex -shell-escape -file-line-error -jobname=$(JOBNAME) $(DOCNAME).tex + pdflatex -shell-escape -file-line-error -jobname=$(JOBNAME) $(DOCNAME).tex $(PLOT_FILES): echo $(PATH) diff --git a/doc/codec2.tex b/doc/codec2.tex index c3538ea..89218fa 100644 --- a/doc/codec2.tex +++ b/doc/codec2.tex @@ -9,14 +9,14 @@ \usepackage{catchfile} \usepackage{siunitx} -\CatchFileDef{\headfull}{../.git/HEAD}{} -\StrGobbleRight{\headfull}{1}[\head] -\StrBehind[2]{\head}{/}[\branch] -\IfFileExists{../.git/refs/heads/\branch}{% - \CatchFileDef{\commit}{../.git/refs/heads/\branch}{}}{% - \newcommand{\commit}{\dots~(in \emph{packed-refs})}} \newcommand{\gitrevision}{% - \StrLeft{\commit}{7}% + \immediate\write18{git log -n1 --oneline | awk '{print $1;}' > gitrevision.txt} + \input{gitrevision.txt} +} + +\newcommand{\branch}{% + \immediate\write18{git branch --show-current > gitbranch.txt} + \input{gitbranch.txt} } \title{Codec 2} @@ -53,7 +53,7 @@ pinstyle/.style = {pin edge={to-,thin,black}} \draw (#1,#2-0.25) -- (#1,#2+0.25); } -%\maketitle +\maketitle \section{Introduction} -- cgit v1.2.3