From c26c22bd973edc48e36cd698800b059ca6d3ff09 Mon Sep 17 00:00:00 2001 From: Michael Herstine Date: Wed, 9 Oct 2024 17:03:23 -0700 Subject: [PATCH] Cut release 0.7.1; fix CI. --- .github/workflows/ci.yml | 55 +++++++++++++++++++++------------------- ChangeLog | 7 +++++ NEWS | 5 ++++ README.org | 6 ++--- admin/boilerplate | 2 +- configure.ac | 4 +-- doc/scribbu-dump.1 | 2 +- doc/scribbu-encodings.1 | 2 +- doc/scribbu-genre.1 | 2 +- doc/scribbu-m3u.1 | 2 +- doc/scribbu-popm.1 | 2 +- doc/scribbu-rename.1 | 2 +- doc/scribbu-report.1 | 2 +- doc/scribbu-split.1 | 2 +- doc/scribbu-text.1 | 2 +- doc/scribbu.1 | 2 +- doc/version.texi | 8 +++--- scribbu/Makefile.am | 2 +- scribbu/scheme.cc | 2 +- 19 files changed, 63 insertions(+), 48 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0c869a4..8cb146b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,25 +25,28 @@ jobs: name: build strategy: matrix: - os: [macos-12, ubuntu-22.04] + # Coming back to this 2024-10-09, I can no longer get 1.75 to build on MacOS-- + # removing it for now. Actually, just giving-up on MacOS for now, + # os: [macos-14, ubuntu-22.04] + os: [ubuntu-22.04] # I moved to C++ 20 2024-01-12-- the earliest version of boost that can compile # under C++ 20 seems to be 1.75. That was released 2020-12-11, over three years # ago so I'm comfortable calling that "oldest", now. Let's call 1.81 (one year ago) # "pinned". boost: [oldest, pinned, latest] include: - - os: macos-12 - boost: oldest - boost-ver: 1_75_0 - boost-dl: https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.bz2 - - os: macos-12 - boost: pinned - boost-ver: 1_81_0 - boost-dl: https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.tar.bz2 - - os: macos-12 - boost: latest - boost-ver: 1_84_0 - boost-dl: https://boostorg.jfrog.io/artifactory/main/release/1.84.0/source/boost_1_84_0.tar.bz2 + # - os: macos-14 + # boost: oldest + # boost-ver: 1_75_0 + # boost-dl: https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.bz2 + # - os: macos-14 + # boost: pinned + # boost-ver: 1_81_0 + # boost-dl: https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.tar.bz2 + # - os: macos-14 + # boost: latest + # boost-ver: 1_84_0 + # boost-dl: https://boostorg.jfrog.io/artifactory/main/release/1.84.0/source/boost_1_84_0.tar.bz2 - os: ubuntu-22.04 boost: oldest boost-ver: 1_75_0 @@ -85,10 +88,10 @@ jobs: run: | set -x sudo apt-get update - sudo apt-get install -y autoconf automake libtool openssl guile-3.0-dev doxygen flex bison graphviz libunistring-dev texlive tzdata locales + sudo apt-get install -y autoconf automake libtool openssl guile-3.0-dev doxygen flex bison graphviz libunistring-dev texlive tzdata locales autoconf-archive - name: Install pre-requisites (MacOS) - if: matrix.os == 'macos-12' + if: matrix.os == 'macos-14' shell: bash run: | set -x @@ -101,7 +104,7 @@ jobs: brew doctor brew update brew upgrade - brew install autoconf automake libtool openssl doxygen flex bison graphviz texinfo + brew install autoconf automake libtool openssl doxygen flex bison graphviz texinfo autoconf-archive brew install --cask basictex type -p guile || brew install guile set -e @@ -116,7 +119,7 @@ jobs: key: ${{ runner.os }}-${{ matrix.boost-ver }} - name: Cache boost (MacOS) - if: matrix.os == 'macos-12' + if: matrix.os == 'macos-14' id: cache-boost-macos uses: actions/cache@v2 with: @@ -145,7 +148,7 @@ jobs: ./b2 && ./b2 install - name: Get boost (MacOS) - if: matrix.os == 'macos-12' && steps.cache-boost-macos.outputs.cache-hit != 'true' + if: matrix.os == 'macos-14' && steps.cache-boost-macos.outputs.cache-hit != 'true' run: | set -ex pwd @@ -158,7 +161,7 @@ jobs: mkdir boost_${{ matrix.boost-ver }}/installdir - name: Patch boost source (MacOS) - if: matrix.os == 'macos-12' && steps.cache-boost-macos.outputs.cache-hit != 'true' && matrix.boost == 'oldest' + if: matrix.os == 'macos-14' && steps.cache-boost-macos.outputs.cache-hit != 'true' && matrix.boost == 'oldest' run: | cd boost_${{ matrix.boost-ver }}/tools/build/src/engine cp build.sh build.sh.bak @@ -194,7 +197,7 @@ jobs: mv darwin.jam.tmp darwin.jam - name: Build boost (MacOS) - if: matrix.os == 'macos-12' && steps.cache-boost-macos.outputs.cache-hit != 'true' + if: matrix.os == 'macos-14' && steps.cache-boost-macos.outputs.cache-hit != 'true' shell: bash run: | pwd @@ -209,7 +212,7 @@ jobs: ./b2 install - name: Patch boost library dependencies (MacOS, non-oldest) - if: matrix.os == 'macos-12' && matrix.boost != 'oldest' # && steps.cache-boost-macos.outputs.cache-hit != 'true' + if: matrix.os == 'macos-14' && matrix.boost != 'oldest' # && steps.cache-boost-macos.outputs.cache-hit != 'true' run: | cd boost_${{ matrix.boost-ver }}/installdir/lib pwd @@ -236,7 +239,7 @@ jobs: echo ================================================ - name: Patch boost library dependencies (MacOS, oldest) - if: matrix.os == 'macos-12' && matrix.boost == 'oldest' # && steps.cache-boost-macos.outputs.cache-hit != 'true' + if: matrix.os == 'macos-14' && matrix.boost == 'oldest' # && steps.cache-boost-macos.outputs.cache-hit != 'true' run: | cd boost_${{ matrix.boost-ver }}/installdir/lib pwd @@ -293,7 +296,7 @@ jobs: ./configure - name: Configure scribbu (MacOS) - if: matrix.os == 'macos-12' + if: matrix.os == 'macos-14' shell: bash run: | autoconf --version @@ -314,7 +317,7 @@ jobs: make -j 4 - name: Make scribbu (MacOS) - if: matrix.os == 'macos-12' + if: matrix.os == 'macos-14' shell: bash run: | set -x @@ -323,7 +326,7 @@ jobs: PATH="/usr/local/opt/bison/bin:/usr/local/opt/texinfo/bin:$PATH" make -j 4 - name: Patch boost binary dependencies (MacOS) - if: matrix.os == 'macos-12' + if: matrix.os == 'macos-14' shell: bash run: | set -x @@ -405,7 +408,7 @@ jobs: fi - name: Test scribbu (MacOS) - if: matrix.os == 'macos-12' + if: matrix.os == 'macos-14' shell: bash run: | set -x diff --git a/ChangeLog b/ChangeLog index 326afad..6e08e61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2024-10-09 Michael Herstine + + Cut release 0.7.1 + + Fix a build error in winamp-genres.cc. + ...by explicitly including ``. + 2024-02-03 Michael Herstine Make pre-release updates. diff --git a/NEWS b/NEWS index 540eb8d..a9fa6fc 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,10 @@ scribbu News -- history of user-visible changes -*- outline -*- +* Changes in scribbu 0.7 + +** Bug Fixes + +*** Fix a build error in `winamp-genres.cc` * Changes in scribbu 0.6 ** Bug Fixes diff --git a/README.org b/README.org index fff0392..209ac3a 100644 --- a/README.org +++ b/README.org @@ -1,6 +1,6 @@ #+TITLE: scribbu #+DESCRIPTION: The extensible tool for tagging your music collection -#+DATE: <2022-12-30 Fri 14:32> +#+DATE: <2024-10-09 Wed 17:00> #+AUTHOR: sp1ff #+EMAIL: sp1ff@pobox.com #+AUTODATE: t @@ -59,7 +59,7 @@ scribbu can be invoked in a few ways: #+BEGIN_EXAMPLE scribbu - scribbu 0.7.0 + scribbu 0.7.1 Copyright (C) 2017-2024 Michael Herstine You are in the Guile REPL; in your shell, type `info scribbu' for documentation. @@ -110,7 +110,7 @@ scribbu is supported on Linux & MacOS. It depends upon: scribbu is distributed as an Autotools source distribution, so installation is accomplished via the usual "configure, make, make install" incantations. General instructions may be found in [[INSTALL]]. -Begining with scribbu 0.7.0, binary packages for Debian & Arch are also available. +Begining with scribbu 0.7.1, binary packages for Debian & Arch are also available. Patches, suggestions & bug reports are welcome. diff --git a/admin/boilerplate b/admin/boilerplate index 7093ca2..4821481 100644 --- a/admin/boilerplate +++ b/admin/boilerplate @@ -1,4 +1,4 @@ # scribbu boilerplate as of release 0.7 -*- text -*- -version: 0.7.0 +version: 0.7.1 author: Michael Herstine email: sp1ff@pobox.com diff --git a/configure.ac b/configure.ac index e3a0918..ce45b5e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([scribbu], [0.7.0], [sp1ff@pobox.com], [scribbu], [https://github.com/sp1ff/scribbu]) +AC_INIT([scribbu], [0.7.1], [sp1ff@pobox.com], [scribbu], [https://github.com/sp1ff/scribbu]) AC_CONFIG_MACRO_DIR([macros]) AC_CONFIG_SRCDIR([src/scribbu.cc]) AC_CONFIG_AUX_DIR([build-aux]) @@ -18,6 +18,7 @@ AC_PROG_CXX # breaks on Autoconf 2.71 (?) # AC_PROG_AR AC_C_VARARRAYS +AM_PROG_AR AC_PROG_AWK AC_PROG_CC AC_PROG_CPP @@ -25,7 +26,6 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_RANLIB -AM_PROG_AR AC_PROG_LIBTOOL AC_PROG_YACC AC_PROG_LEX diff --git a/doc/scribbu-dump.1 b/doc/scribbu-dump.1 index a513ed0..fcf6c7b 100644 --- a/doc/scribbu-dump.1 +++ b/doc/scribbu-dump.1 @@ -1,7 +1,7 @@ .\" Copyright (C) 2018-2024 Michael Herstine .\" You may distribute this file under the terms of the GNU Free .\" Documentation License. -.TH scribbu-dump 1 2024-02-03 "scribbu 0.7.0" "scribbu Manual" +.TH scribbu-dump 1 2024-10-09 "scribbu 0.7.1" "scribbu Manual" .SH NAME scribbu-dump \- dump ID3 tags from one or more files .SH SYNOPSIS diff --git a/doc/scribbu-encodings.1 b/doc/scribbu-encodings.1 index fc9de42..a93e8af 100644 --- a/doc/scribbu-encodings.1 +++ b/doc/scribbu-encodings.1 @@ -1,7 +1,7 @@ .\" Copyright (C) 2021-2024 Michael Herstine .\" You may distribute this file under the terms of the GNU Free .\" Documentation License. -.TH scribbu-encodings 1 2024-02-03 "scribbu 0.7.0" "scribbu Manual" +.TH scribbu-encodings 1 2024-10-09 "scribbu 0.7.1" "scribbu Manual" .SH NAME scribbu encodings \- List the character encodings supported by scribbu .SH SYNOPSIS diff --git a/doc/scribbu-genre.1 b/doc/scribbu-genre.1 index edc1622..46b066e 100644 --- a/doc/scribbu-genre.1 +++ b/doc/scribbu-genre.1 @@ -1,7 +1,7 @@ .\" Copyright (C) 2020-2024 Michael Herstine .\" You may distribute this file under the terms of the GNU Free .\" Documentation License. -.TH scribbu-genre 1 2024-02-03 "scribbu 0.7.0" "scribbu Manual" +.TH scribbu-genre 1 2024-10-09 "scribbu 0.7.1" "scribbu Manual" .SH NAME scribbu genre \- Set the genre for one or more files .SH SYNOPSIS diff --git a/doc/scribbu-m3u.1 b/doc/scribbu-m3u.1 index c7ad74a..a4d979a 100644 --- a/doc/scribbu-m3u.1 +++ b/doc/scribbu-m3u.1 @@ -1,7 +1,7 @@ .\" Copyright (C) 2021-2024 Michael Herstine .\" You may distribute this file under the terms of the GNU Free .\" Documentation License. -.TH scribbu-m3u 1 2024-02-03 "scribbu 0.7.0" "scribbu Manual" +.TH scribbu-m3u 1 2024-10-09 "scribbu 0.7.1" "scribbu Manual" .SH NAME scribbu m3u \- M3U playlists from one or more files .SH SYNOPSIS diff --git a/doc/scribbu-popm.1 b/doc/scribbu-popm.1 index 7fc0a58..cc3db40 100644 --- a/doc/scribbu-popm.1 +++ b/doc/scribbu-popm.1 @@ -1,7 +1,7 @@ .\" Copyright (C) 2019-2024 Michael Herstine .\" You may distribute this file under the terms of the GNU Free .\" Documentation License. -.TH scribbu-popm 1 2024-02-03 "scribbu 0.7.0" "scribbu Manual" +.TH scribbu-popm 1 2024-10-09 "scribbu 0.7.1" "scribbu Manual" .SH NAME scribbu popm \- Manage the play count and/or popularimeter ID3v2 tags .SH SYNOPSIS diff --git a/doc/scribbu-rename.1 b/doc/scribbu-rename.1 index 18be8c9..03b4a77 100644 --- a/doc/scribbu-rename.1 +++ b/doc/scribbu-rename.1 @@ -1,7 +1,7 @@ .\" Copyright (C) 2018-2024 Michael Herstine .\" You may distribute this file under the terms of the GNU Free .\" Documentation License. -.TH scribbu-rename 1 2024-02-03 "scribbu 0.7.0" "scribbu Manual" +.TH scribbu-rename 1 2024-10-09 "scribbu 0.7.1" "scribbu Manual" .SH NAME scribbu rename \- Rename files according to the ID3 tag attributes .SH SYNOPSIS diff --git a/doc/scribbu-report.1 b/doc/scribbu-report.1 index b51991f..ce9677a 100644 --- a/doc/scribbu-report.1 +++ b/doc/scribbu-report.1 @@ -1,7 +1,7 @@ .\" Copyright (C) 2018-2024 Michael Herstine .\" You may distribute this file under the terms of the GNU Free .\" Documentation License. -.TH scribbu 1 2024-02-03 "scribbu 0.7.0" "scribbu Manual" +.TH scribbu 1 2024-10-09 "scribbu 0.7.1" "scribbu Manual" .SH NAME scribbu-report \- generate a report on one or more files' ID3 tags .SH SYNOPSIS diff --git a/doc/scribbu-split.1 b/doc/scribbu-split.1 index 022e5fb..35723d3 100644 --- a/doc/scribbu-split.1 +++ b/doc/scribbu-split.1 @@ -1,7 +1,7 @@ .\" Copyright (C) 2018-2024 Michael Herstine .\" You may distribute this file under the terms of the GNU Free .\" Documentation License. -.TH scribbu 1 2024-02-03 "scribbu 0.7.0" "scribbu Manual" +.TH scribbu 1 2024-10-09 "scribbu 0.7.1" "scribbu Manual" .SH NAME scribbu-split \- split a file into ID3v2, track & ID3v1 pieces .SH SYNOPSIS diff --git a/doc/scribbu-text.1 b/doc/scribbu-text.1 index 02e6bbb..16069af 100644 --- a/doc/scribbu-text.1 +++ b/doc/scribbu-text.1 @@ -1,7 +1,7 @@ .\" Copyright (C) 2019-2024 Michael Herstine .\" You may distribute this file under the terms of the GNU Free .\" Documentation License. -.TH scribbu-text 1 2024-02-03 "scribbu 0.7.0" "scribbu Manual" +.TH scribbu-text 1 2024-10-09 "scribbu 0.7.1" "scribbu Manual" .SH NAME scribbu-text \- Manage ID3v2 text frames .SH SYNOPSIS diff --git a/doc/scribbu.1 b/doc/scribbu.1 index 9ed0b35..192b3e6 100644 --- a/doc/scribbu.1 +++ b/doc/scribbu.1 @@ -1,7 +1,7 @@ .\" Copyright (C) 2018-2024 Michael Herstine .\" You may distribute this file under the terms of the GNU Free .\" Documentation License. -.TH scribbu 1 2024-02-03 "scribbu 0.7.0" "scribbu Manual" +.TH scribbu 1 2024-10-09 "scribbu 0.7.1" "scribbu Manual" .SH NAME scribbu \- The extensible tool for tagging your music collection .SH SYNOPSIS diff --git a/doc/version.texi b/doc/version.texi index b14376e..2c5578e 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 3 February 2024 -@set UPDATED-MONTH February 2024 -@set EDITION 0.7.0 -@set VERSION 0.7.0 +@set UPDATED 10 October 2024 +@set UPDATED-MONTH October 2024 +@set EDITION 0.7.1 +@set VERSION 0.7.1 diff --git a/scribbu/Makefile.am b/scribbu/Makefile.am index 75cc899..97de307 100644 --- a/scribbu/Makefile.am +++ b/scribbu/Makefile.am @@ -65,7 +65,7 @@ libscribbu_la_LIBADD = $(GUILE_LIBS) \ $(BOOST_REGEX_LIB) \ $(BOOST_SYSTEM_LIB) -libscribbu_la_LDFLAGS = -version-info 5:0:0 $(BOOST_LDFLAGS) $(LIBUNISTRING) +libscribbu_la_LDFLAGS = -version-info 5:1:0 $(BOOST_LDFLAGS) $(LIBUNISTRING) # automake will figure out how to make tbt-parser.hh, but we need to tell it how # to make tbt-lexer.h: diff --git a/scribbu/scheme.cc b/scribbu/scheme.cc index fa73e66..c896cc5 100644 --- a/scribbu/scheme.cc +++ b/scribbu/scheme.cc @@ -48,7 +48,7 @@ using scribbu::scheme_serde_dispatcher; // utility code // /////////////////////////////////////////////////////////////////////////////// -#define AUTHOR "Michael Herstine" +#define AUTHOR "Michael Herstine" #define COPYRIGHT "2017-2024" #define READ_ID3V1_TAG "read-id3v1-tag" #define READ_TAGSET "read-tagset"