[release] bump version and try to automate some stuff

.gitignore

@@ -30,6 +30,7 @@ missing
 mkinstalldirs
 test-driver
 docs/build
+release/release-NEWS.md
 release/linux-pkg/
 release/osx-build-dir/
 release/osx-pkg/

CMakeLists.txt

@@ -5,7 +5,7 @@ include(cmake/prelude.cmake)
 set(CMAKE_CXX_STANDARD 14)
 project(
         lnav
-        VERSION 0.11.0
+        VERSION 0.11.1
         DESCRIPTION "An advanced log file viewer for the small-scale."
         HOMEPAGE_URL "https://lnav.org/"
         LANGUAGES CXX C

aminclude_static.am

@@ -1,6 +1,6 @@
 
 # aminclude_static.am generated automatically by Autoconf
-# from AX_AM_MACROS_STATIC on Sat Sep 17 06:59:15 PDT 2022
+# from AX_AM_MACROS_STATIC on Sun Sep 18 15:30:01 PDT 2022
 
 
 # Code coverage

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([lnav],[0.11.0],[lnav@googlegroups.com],[lnav],[http://lnav.org])
+AC_INIT([lnav],[0.11.1],[lnav@googlegroups.com],[lnav],[http://lnav.org])
 AC_CONFIG_SRCDIR([src/lnav.cc])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign subdir-objects])

docs/source/conf.py

@@ -33,6 +33,7 @@ from pygments.token import Punctuation, Whitespace, Text, Comment, Operator, \
     Keyword, Name, String, Literal, Number, Generic
 from sphinx.highlighting import lexers
 
+
 class CustSqliteLexer(RegexLexer):
     name = 'custsqlite'
 
@@ -216,6 +217,7 @@ class CustSqliteLexer(RegexLexer):
     def analyse_text(text):
         return 0.01
 
+
 lexers['custsqlite'] = CustSqliteLexer(startinline=True)
 
 # -- General configuration -----------------------------------------------------
@@ -256,7 +258,7 @@ copyright = u'2022, Tim Stack'
 # The short X.Y version.
 version = '0.11'
 # The full version, including alpha/beta/rc tags.
-release = '0.11.0'
+release = '0.11.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -328,9 +330,11 @@ html_theme_options = {
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
 
+
 def setup(app):
     app.add_css_file('theme_overrides.css')
 
+
 # html_context = {
 #    'css_files': [
 #        '_static/theme_overrides.css',  # override wide tables in RTD theme
@@ -381,7 +385,6 @@ def setup(app):
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'lnavdoc'
 
-
 # -- Options for LaTeX output --------------------------------------------------
 
 latex_elements = {

release/Makefile

@@ -1,5 +1,7 @@
 
-VERSION=0.11.0
+VERSION=0.11.1
+
+VERSION_TAG=v$(VERSION)-test
 
 SRC_VERSION=master
 
@@ -13,14 +15,14 @@ PACKAGE_URLS = \
 	https://www.libarchive.org/downloads/libarchive-3.6.1.tar.gz \
 	https://ftp.gnu.org/gnu/make/make-4.2.1.tar.gz \
 	ftp://ftp.gnu.org/gnu/ncurses/ncurses-6.3.tar.gz \
-	https://sourceforge.net/projects/pcre/files/pcre/8.42/pcre-8.42.tar.gz \
+	https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.40/pcre2-10.40.tar.gz \
 	https://ftp.gnu.org/gnu/readline/readline-6.3.tar.gz \
 	https://zlib.net/zlib-1.2.12.tar.gz \
 	https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz \
 	https://www.sqlite.org/2022/sqlite-autoconf-3390200.tar.gz \
 	https://www.openssl.org/source/openssl-1.0.2n.tar.gz \
 	https://www.libssh2.org/download/libssh2-1.9.0.tar.gz \
-	https://curl.se/download/curl-7.84.0.tar.gz \
+	https://curl.se/download/curl-7.85.0.tar.gz \
 	https://tukaani.org/xz/xz-5.2.5.tar.gz
 
 .PHONY: linux freebsd pkger download-pkgs musl
@@ -43,7 +45,7 @@ download-pkgs:
 	mkdir -p $<-pkg/lnav-${VERSION}
 	cp ../README ../NEWS.md $<-pkg/lnav-${VERSION}
 	mv vagrant-static/lnav $<-pkg/lnav-${VERSION}
-	cd $<-pkg && zip -r ../outbox/lnav-${VERSION}-$<-64bit.zip lnav-${VERSION}
+	cd $<-pkg && zip -r ../outbox/lnav-${VERSION}-x86_64-linux-$<.zip lnav-${VERSION}
 	rm -rf $<-pkg
 
 linux-ospkg: pkger-vm linux-package
@@ -72,14 +74,27 @@ osx-package: clean-outbox osx-build
 	cp osx-build-dir/src/lnav osx-pkg/lnav-${VERSION}
 	cp osx-build-dir/lnav-${VERSION}.tar.gz outbox/
 	cp osx-build-dir/lnav-${VERSION}.tar.bz2 outbox/
-	cd osx-pkg && zip -r ../outbox/lnav-${VERSION}-os-x.zip lnav-${VERSION}
+	cd osx-pkg && zip -r ../outbox/lnav-${VERSION}-x86_64-macos.zip lnav-${VERSION}
 	rm -rf osx-pkg
 
-release: osx-package musl-package
+release-NEWS.md: ../NEWS.md
+	sed -n "/^## lnav v${VERSION}/,/^## /p" $< | sed '$$d' > $@
+
+release-tag: release-NEWS.md
+	gh release create ${VERSION_TAG} \
+		-d \
+		-t "lnav v${VERSION}" \
+		--notes-file release-NEWS.md
+
+release: osx-package musl-package release-NEWS.md
+	gh release edit ${VERSION_TAG} \
+		-t "lnav v${VERSION}" \
+		--notes-file release-NEWS.md
+	gh release upload ${VERSION_TAG} outbox/*
 
 push:
 	env LANG=UTF-8 package_cloud push tstack/lnav/ubuntu/lucid outbox/lnav*.deb
-	env LANG=UTF-8 package_cloud push tstack/lnav/el/5 outbox/lnav-0.11.0-1.x86_64.rpm
+	env LANG=UTF-8 package_cloud push tstack/lnav/el/5 outbox/lnav-0.11.1-1.x86_64.rpm
 
 clean:
 	cd vagrant-static && vagrant destroy -f

release/vagrant-static/provision.sh

@@ -85,11 +85,9 @@ OS=$(uname -s)
      && \
  make && make install)
 
-(cd pcre-* && \
+(cd pcre2-* && \
  ./configure --prefix=${FAKE_ROOT} \
      --enable-jit \
-     --enable-utf \
-     --enable-unicode-properties \
      && \
  make && make install)
 

test/expected/test_sessions.sh_6d87ff483d5785c58fb271a405ff1c35e4f83cd9.out

@@ -3,8 +3,8 @@
 # '|/path/to/this/file' in lnav to execute this file and
 # restore the state of the session.
 
-;SELECT raise_error('This session export was made with a newer version of lnav, please upgrade to ' || '0.11.0' || ' or later')
-   WHERE lnav_version() < '0.11.0' COLLATE naturalcase
+;SELECT raise_error('This session export was made with a newer version of lnav, please upgrade to ' || '0.11.1' || ' or later')
+   WHERE lnav_version() < '0.11.1' COLLATE naturalcase
 
 # The files loaded into the session were: