Skip to content

Commit

Permalink
Make pre-release updates.
Browse files Browse the repository at this point in the history
This patch updates boilerplate throughout, updates the version
number, and so forth.
  • Loading branch information
sp1ff committed Feb 3, 2024
1 parent 2b2a2e6 commit 25e271e
Show file tree
Hide file tree
Showing 112 changed files with 276 additions and 132 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ jobs:
install_name_tool -change @rpath/libboost_system.dylib ${there}/libboost_system.dylib src/.libs/scribbu
there=$(cd scribbu/.libs; pwd)
echo "Changing the load location for scribbu lib to be ${there}."
install_name_tool -change /usr/local/lib/libscribbu.4.dylib ${there}/libscribbu.4.dylib src/.libs/scribbu
install_name_tool -change /usr/local/lib/libscribbu.5.dylib ${there}/libscribbu.5.dylib src/.libs/scribbu
echo "===================================="
otool -L src/.libs/scribbu
src/.libs/scribbu --version
Expand All @@ -371,7 +371,7 @@ jobs:
install_name_tool -change @rpath/libboost_unit_test_framework.dylib ${there}/libboost_unit_test_framework.dylib .libs/unit
there=$(cd ../scribbu/.libs; pwd)
echo "Changing the load location for unit lib to be ${there}."
install_name_tool -change /usr/local/lib/libscribbu.4.dylib ${there}/libscribbu.4.dylib .libs/unit
install_name_tool -change /usr/local/lib/libscribbu.5.dylib ${there}/libscribbu.5.dylib .libs/unit
echo "===================================="
otool -L .libs/unit
.libs/unit --help
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:
name: create-release
runs-on: ubuntu-latest
# Un-comment this for testing
env:
RELEASE_VERSION: 0.6.23
# env:
# RELEASE_VERSION: 0.6.23
steps:
- name: Create artifacts directory
run: mkdir artifacts
Expand Down
144 changes: 143 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
@@ -1,10 +1,152 @@
2022-12-30 Michael Herstine <[email protected]>
2024-02-03 Michael Herstine <[email protected]>

Make pre-release updates.
This patch updates boilerplate throughout, updates the version
number, and so forth.

2024-02-02 Michael Herstine <[email protected]>

pretty-print frames

2024-01-31 Michael Herstine <[email protected]>

Commenting-out flakey test failing on MacOS

2024-01-28 Michael Herstine <[email protected]>

Update class `comments` to be mutable.

2024-01-27 Michael Herstine <[email protected]>

Update scribbu in multiple ways.
This commit has regrettably grown:

- added the `-e` flag to the `scribbu m3u` docs
- updated the scribbu manual generally, especially
the section on scriptiong
- updated the default pretty-printer to display comment language
- replaced `pop-frame` with `popm-frame` in module `(scribbu)`

2024-01-13 Michael Herstine <[email protected]>

Moved from c++ 17 to c++ 20; fix CI.

2024-01-10 Michael Herstine <[email protected]>

Correct docs; remove commented-out code

Cleaned-up compilation warnings

Pretty-print <id3v{1,2}-tag}

Fix the "delete" function in `scribbu text`.
This patch will fix a bug in the `-d` flag to `scribbu text`,
which is supposed to delete text frames. Previously, although
the code would erase the given frame from all lookup tables,
it would neglect to actually delete the frame from the
vector of frames in each tag type. This commit fixes that.

2024-01-04 Michael Herstine <[email protected]>

Cherry-picking a commit to fix CI.

2023-12-26 Michael Herstine <[email protected]>

Introduce PRIV & PRIV_2_4 frames.
This commit introduces ID3v2.3 & v2.4 models for the "PRIV" frame
as well as updates all pretty-printers for their display.

2023-12-22 Michael Herstine <[email protected]>

Improve both the `m3u` sub-command and the Scheme interface.
This patch is an accumulation of a few things:

- change the `m3u` sub-command to make progress on character
encoding failures
- add a new `m3u` option to help userse control character
encoding conversions
- add a check in the Scheme interface (alright-- this was
laying around in my local repo & I'm now picking it up)

2023-09-17 Michael Herstine <michael@lithic>

Place scribbu types & functions in module `(scribbu)`, even when defined in C.
This commit will place the snarfed functions provided by
libscribbu.so into module `(scribbu)` and updates
`scribbu.scm` to load the extension.

This commit also changes the linking between `scribbu` and
`libscribbu`.

I have squashed a number of commits on master-- this is generally
not a good idea, since I'm re-writing git history on a published
branch. That said, this project is obscure enough that I very much
doubt I'm inconveniencing anyone.

2023-07-03 Michael Herstine <[email protected]>

Fix several bugs in `write_id3v1_tag`.
Adds a GOOPS type check ensuring the argument is truly an
`<id3v1-tag>` instance.

Stops calling `scm_null_p()` in favor of `scm_is_null()` which
returns an int.

Changed `emplace_strategy::reduce_padding_evently` to
`only_with_full_padding`. While not strictly a bug, this results
in more intuitive behavior for Scheme callers.

Finally, update the "Continuous Integration" workflow. I think I've
uncovered the correct `brew` incantations: the problem is they
keep exiting with non-zero status. The suggestion here:
<https://github.com/orgs/Homebrew/discussions/4612#discussioncomment-6339258>
is to simply ignore the errors. This allows the job to complete
succesfully, but I can't shake the feeling I'm going to be back
here in a few days fixing the workflow *again*.

2023-06-28 Michael Herstine <[email protected]>

Substantially improve the CI job, tidy the repo & fix two bugs
This commit will complete the CI Github Action by completing the
testing portion (i.e. running `make check` and `make distcheck`),
including certain lints that today I do by hand, and setting it to run
nightly.

Update a few `.gitignore`-s. Fix a typo. Update something in the
`macros` directory (which I don't understand).

Stop the `split` & `report` sub-commands parsing all SCRIBBU env vars

`boost::program_options::parse_environment()`, invoked with just
a prefix (such as "SCRIBBU") will examine _all_ env vars beginning
with that prefix. If any are found, and can't be interpreted as
command-line options, it will fail (with an inscrutable error message).

This commit brings these two commands in line with the rest in that
they either don't examine the environment at all, or they only
look for environment variables that map to valid command-line options.

2022-12-31 Michael Herstine <[email protected]>

Fixing release workflow

Updated boilerplate for 0.6.23

Updated version in .

Merge branch 'fix-issue-7'

2022-12-31 Michael Herstine <[email protected]>

Fixed the same bug in `play_count::reset_counter()`.
Removed test workflow since I got it working on ci.yml

This time, really closes #7.

2022-12-30 Michael Herstine <[email protected]>

Removed test workflow since I got it working on ci.yml

2022-12-30 Michael Herstine <[email protected]>

Fix a bug in `popularimeter::reset_counter()` where any argument greater than 255 would result in an infinite loops that would eventually exhaust memory.
Expand Down
6 changes: 3 additions & 3 deletions README.org
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ scribbu can be invoked in a few ways:

#+BEGIN_EXAMPLE
scribbu
scribbu 0.6.23
Copyright (C) 2017-2022 Michael Herstine <[email protected]>
scribbu 0.7.0
Copyright (C) 2017-2024 Michael Herstine <[email protected]>

You are in the Guile REPL; in your shell, type `info scribbu' for documentation.

Expand Down Expand Up @@ -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.6.23, binary packages for Debian & Arch are also available.
Begining with scribbu 0.7.0, binary packages for Debian & Arch are also available.

Patches, suggestions & bug reports are welcome.

Expand Down
4 changes: 2 additions & 2 deletions admin/boilerplate
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# scribbu boilerplate as of release 0.6 -*- text -*-
version: 0.6.23
# scribbu boilerplate as of release 0.7 -*- text -*-
version: 0.7.0
author: Michael Herstine
email: [email protected]
4 changes: 3 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
AC_INIT([scribbu], [0.6.23], [[email protected]], [scribbu], [https://github.com/sp1ff/scribbu])
AC_INIT([scribbu], [0.7.0], [[email protected]], [scribbu], [https://github.com/sp1ff/scribbu])
AC_CONFIG_MACRO_DIR([macros])
AC_CONFIG_SRCDIR([src/scribbu.cc])
AC_CONFIG_AUX_DIR([build-aux])
Expand All @@ -15,6 +15,8 @@ esac

# Checks for programs.
AC_PROG_CXX
# breaks on Autoconf 2.71 (?)
# AC_PROG_AR
AC_C_VARARRAYS
AC_PROG_AWK
AC_PROG_CC
Expand Down
4 changes: 2 additions & 2 deletions doc/scribbu-dump.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" Copyright (C) 2018-2022 Michael Herstine <[email protected]>
.\" Copyright (C) 2018-2024 Michael Herstine <[email protected]>
.\" You may distribute this file under the terms of the GNU Free
.\" Documentation License.
.TH scribbu-dump 1 2022-12-31 "scribbu 0.6.23" "scribbu Manual"
.TH scribbu-dump 1 2024-02-03 "scribbu 0.7.0" "scribbu Manual"
.SH NAME
scribbu-dump \- dump ID3 tags from one or more files
.SH SYNOPSIS
Expand Down
4 changes: 2 additions & 2 deletions doc/scribbu-encodings.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" Copyright (C) 2021-2022 Michael Herstine <[email protected]>
.\" Copyright (C) 2021-2024 Michael Herstine <[email protected]>
.\" You may distribute this file under the terms of the GNU Free
.\" Documentation License.
.TH scribbu-encodings 1 2022-12-31 "scribbu 0.6.23" "scribbu Manual"
.TH scribbu-encodings 1 2024-02-03 "scribbu 0.7.0" "scribbu Manual"
.SH NAME
scribbu encodings \- List the character encodings supported by scribbu
.SH SYNOPSIS
Expand Down
4 changes: 2 additions & 2 deletions doc/scribbu-genre.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" Copyright (C) 2020-2022 Michael Herstine <[email protected]>
.\" Copyright (C) 2020-2024 Michael Herstine <[email protected]>
.\" You may distribute this file under the terms of the GNU Free
.\" Documentation License.
.TH scribbu-genre 1 2022-12-31 "scribbu 0.6.23" "scribbu Manual"
.TH scribbu-genre 1 2024-02-03 "scribbu 0.7.0" "scribbu Manual"
.SH NAME
scribbu genre \- Set the genre for one or more files
.SH SYNOPSIS
Expand Down
4 changes: 2 additions & 2 deletions doc/scribbu-m3u.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" Copyright (C) 2021-2022 Michael Herstine <[email protected]>
.\" Copyright (C) 2021-2024 Michael Herstine <[email protected]>
.\" You may distribute this file under the terms of the GNU Free
.\" Documentation License.
.TH scribbu-m3u 1 2022-12-31 "scribbu 0.6.23" "scribbu Manual"
.TH scribbu-m3u 1 2024-02-03 "scribbu 0.7.0" "scribbu Manual"
.SH NAME
scribbu m3u \- M3U playlists from one or more files
.SH SYNOPSIS
Expand Down
4 changes: 2 additions & 2 deletions doc/scribbu-popm.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" Copyright (C) 2019-2022 Michael Herstine <[email protected]>
.\" Copyright (C) 2019-2024 Michael Herstine <[email protected]>
.\" You may distribute this file under the terms of the GNU Free
.\" Documentation License.
.TH scribbu-popm 1 2022-12-31 "scribbu 0.6.23" "scribbu Manual"
.TH scribbu-popm 1 2024-02-03 "scribbu 0.7.0" "scribbu Manual"
.SH NAME
scribbu popm \- Manage the play count and/or popularimeter ID3v2 tags
.SH SYNOPSIS
Expand Down
4 changes: 2 additions & 2 deletions doc/scribbu-rename.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" Copyright (C) 2018-2022 Michael Herstine <[email protected]>
.\" Copyright (C) 2018-2024 Michael Herstine <[email protected]>
.\" You may distribute this file under the terms of the GNU Free
.\" Documentation License.
.TH scribbu-rename 1 2022-12-31 "scribbu 0.6.23" "scribbu Manual"
.TH scribbu-rename 1 2024-02-03 "scribbu 0.7.0" "scribbu Manual"
.SH NAME
scribbu rename \- Rename files according to the ID3 tag attributes
.SH SYNOPSIS
Expand Down
4 changes: 2 additions & 2 deletions doc/scribbu-report.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" Copyright (C) 2018-2022 Michael Herstine <[email protected]>
.\" Copyright (C) 2018-2024 Michael Herstine <[email protected]>
.\" You may distribute this file under the terms of the GNU Free
.\" Documentation License.
.TH scribbu 1 2022-12-31 "scribbu 0.6.23" "scribbu Manual"
.TH scribbu 1 2024-02-03 "scribbu 0.7.0" "scribbu Manual"
.SH NAME
scribbu-report \- generate a report on one or more files' ID3 tags
.SH SYNOPSIS
Expand Down
4 changes: 2 additions & 2 deletions doc/scribbu-split.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" Copyright (C) 2018-2022 Michael Herstine <[email protected]>
.\" Copyright (C) 2018-2024 Michael Herstine <[email protected]>
.\" You may distribute this file under the terms of the GNU Free
.\" Documentation License.
.TH scribbu 1 2022-12-31 "scribbu 0.6.23" "scribbu Manual"
.TH scribbu 1 2024-02-03 "scribbu 0.7.0" "scribbu Manual"
.SH NAME
scribbu-split \- split a file into ID3v2, track & ID3v1 pieces
.SH SYNOPSIS
Expand Down
4 changes: 2 additions & 2 deletions doc/scribbu-text.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" Copyright (C) 2019-2022 Michael Herstine <[email protected]>
.\" Copyright (C) 2019-2024 Michael Herstine <[email protected]>
.\" You may distribute this file under the terms of the GNU Free
.\" Documentation License.
.TH scribbu-text 1 2022-12-31 "scribbu 0.6.23" "scribbu Manual"
.TH scribbu-text 1 2024-02-03 "scribbu 0.7.0" "scribbu Manual"
.SH NAME
scribbu-text \- Manage ID3v2 text frames
.SH SYNOPSIS
Expand Down
4 changes: 2 additions & 2 deletions doc/scribbu.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" Copyright (C) 2018-2022 Michael Herstine <[email protected]>
.\" Copyright (C) 2018-2024 Michael Herstine <[email protected]>
.\" You may distribute this file under the terms of the GNU Free
.\" Documentation License.
.TH scribbu 1 2022-12-31 "scribbu 0.6.23" "scribbu Manual"
.TH scribbu 1 2024-02-03 "scribbu 0.7.0" "scribbu Manual"
.SH NAME
scribbu \- The extensible tool for tagging your music collection
.SH SYNOPSIS
Expand Down
2 changes: 1 addition & 1 deletion doc/scribbu.texi
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

@copying

Copyright @copyright{} 2018-2022 Michael Herstine <sp1ff@@pobox.com>
Copyright @copyright{} 2018-2024 Michael Herstine <sp1ff@@pobox.com>

@quotation
Permission is granted to copy, distribute and/or modify this document
Expand Down
6 changes: 3 additions & 3 deletions doc/version.texi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@set UPDATED 1 February 2024
@set UPDATED 3 February 2024
@set UPDATED-MONTH February 2024
@set EDITION 0.6.23
@set VERSION 0.6.23
@set EDITION 0.7.0
@set VERSION 0.7.0
2 changes: 1 addition & 1 deletion scheme/scribbu.scm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;;; scribbu.scm --- Scheme modules for scribbu

;;;; Copyright (C) 2019-2022 Michael Herstine <[email protected]>
;;;; Copyright (C) 2019-2024 Michael Herstine <[email protected]>

;;;; Author: Michael Herstine <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion scribbu/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ libscribbu_la_LIBADD = $(GUILE_LIBS) \
$(BOOST_REGEX_LIB) \
$(BOOST_SYSTEM_LIB)

libscribbu_la_LDFLAGS = -version-info 4:1:0 $(BOOST_LDFLAGS) $(LIBUNISTRING)
libscribbu_la_LDFLAGS = -version-info 5:0: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:
Expand Down
2 changes: 1 addition & 1 deletion scribbu/charsets.cc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* \file charsets.cc
*
* Copyright (C) 2015-2022 Michael Herstine <[email protected]>
* Copyright (C) 2015-2024 Michael Herstine <[email protected]>
*
* This file is part of scribbu.
*
Expand Down
2 changes: 1 addition & 1 deletion scribbu/charsets.hh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* \file charsets.hh
*
* Copyright (C) 2015-2022 Michael Herstine <[email protected]>
* Copyright (C) 2015-2024 Michael Herstine <[email protected]>
*
* This file is part of scribbu.
*
Expand Down
2 changes: 1 addition & 1 deletion scribbu/csv-pprinter.cc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* \file csv-pprinter.cc
*
* Copyright (C) 2015-2022 Michael Herstine <[email protected]>
* Copyright (C) 2015-2024 Michael Herstine <[email protected]>
*
* This file is part of scribbu.
*
Expand Down
2 changes: 1 addition & 1 deletion scribbu/csv-pprinter.hh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* \file csv-pprinter.hh
*
* Copyright (C) 2015-2022 Michael Herstine <[email protected]>
* Copyright (C) 2015-2024 Michael Herstine <[email protected]>
*
* This file is part of scribbu.
*
Expand Down
Loading

0 comments on commit 25e271e

Please sign in to comment.