mirror of https://github.com/tstack/lnav.git
[release] bump version and try to automate some stuff
This commit is contained in:
Tim Stack
parent
4445781038
commit
c49e0787f3
|
|
@ -30,6 +30,7 @@ missing
|
|||
mkinstalldirs
|
||||
test-driver
|
||||
docs/build
|
||||
release/release-NEWS.md
|
||||
release/linux-pkg/
|
||||
release/osx-build-dir/
|
||||
release/osx-pkg/
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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])
|
||||
|
|
|
|||
|
|
@ -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,12 +217,13 @@ class CustSqliteLexer(RegexLexer):
|
|||
def analyse_text(text):
|
||||
return 0.01
|
||||
|
||||
|
||||
lexers['custsqlite'] = CustSqliteLexer(startinline=True)
|
||||
|
||||
# -- General configuration -----------------------------------------------------
|
||||
|
||||
# If your documentation needs a minimal Sphinx version, state it here.
|
||||
#needs_sphinx = '1.0'
|
||||
# needs_sphinx = '1.0'
|
||||
|
||||
# Add any Sphinx extension module names here, as strings. They can be extensions
|
||||
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
|
||||
|
|
@ -240,7 +242,7 @@ templates_path = ['_templates']
|
|||
source_suffix = '.rst'
|
||||
|
||||
# The encoding of source files.
|
||||
#source_encoding = 'utf-8-sig'
|
||||
# source_encoding = 'utf-8-sig'
|
||||
|
||||
# The master toctree document.
|
||||
master_doc = 'index'
|
||||
|
|
@ -256,41 +258,41 @@ 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.
|
||||
#language = None
|
||||
# language = None
|
||||
|
||||
# There are two options for replacing |today|: either, you set today to some
|
||||
# non-false value, then it is used:
|
||||
#today = ''
|
||||
# today = ''
|
||||
# Else, today_fmt is used as the format for a strftime call.
|
||||
#today_fmt = '%B %d, %Y'
|
||||
# today_fmt = '%B %d, %Y'
|
||||
|
||||
# List of patterns, relative to source directory, that match files and
|
||||
# directories to ignore when looking for source files.
|
||||
exclude_patterns = []
|
||||
|
||||
# The reST default role (used for this markup: `text`) to use for all documents.
|
||||
#default_role = None
|
||||
# default_role = None
|
||||
|
||||
# If true, '()' will be appended to :func: etc. cross-reference text.
|
||||
#add_function_parentheses = True
|
||||
# add_function_parentheses = True
|
||||
|
||||
# If true, the current module name will be prepended to all description
|
||||
# unit titles (such as .. function::).
|
||||
#add_module_names = True
|
||||
# add_module_names = True
|
||||
|
||||
# If true, sectionauthor and moduleauthor directives will be shown in the
|
||||
# output. They are ignored by default.
|
||||
#show_authors = False
|
||||
# show_authors = False
|
||||
|
||||
# The name of the Pygments (syntax highlighting) style to use.
|
||||
pygments_style = 'sphinx'
|
||||
|
||||
# A list of ignored prefixes for module index sorting.
|
||||
#modindex_common_prefix = []
|
||||
# modindex_common_prefix = []
|
||||
|
||||
# -- Options for HTML output ---------------------------------------------------
|
||||
|
||||
|
|
@ -305,122 +307,123 @@ html_theme_options = {
|
|||
}
|
||||
|
||||
# Add any paths that contain custom themes here, relative to this directory.
|
||||
#html_theme_path = []
|
||||
# html_theme_path = []
|
||||
|
||||
# The name for this set of Sphinx documents. If None, it defaults to
|
||||
# "<project> v<release> documentation".
|
||||
#html_title = None
|
||||
# html_title = None
|
||||
|
||||
# A shorter title for the navigation bar. Default is the same as html_title.
|
||||
#html_short_title = None
|
||||
# html_short_title = None
|
||||
|
||||
# The name of an image file (relative to this directory) to place at the top
|
||||
# of the sidebar.
|
||||
#html_logo = None
|
||||
# html_logo = None
|
||||
|
||||
# The name of an image file (within the static path) to use as favicon of the
|
||||
# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
|
||||
# pixels large.
|
||||
#html_favicon = None
|
||||
# html_favicon = None
|
||||
|
||||
# Add any paths that contain custom static files (such as style sheets) here,
|
||||
# relative to this directory. They are copied after the builtin static files,
|
||||
# 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 = {
|
||||
|
||||
# html_context = {
|
||||
# 'css_files': [
|
||||
# '_static/theme_overrides.css', # override wide tables in RTD theme
|
||||
# ],
|
||||
#}
|
||||
# }
|
||||
|
||||
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
|
||||
# using the given strftime format.
|
||||
#html_last_updated_fmt = '%b %d, %Y'
|
||||
# html_last_updated_fmt = '%b %d, %Y'
|
||||
|
||||
# If true, SmartyPants will be used to convert quotes and dashes to
|
||||
# typographically correct entities.
|
||||
#html_use_smartypants = True
|
||||
# html_use_smartypants = True
|
||||
|
||||
# Custom sidebar templates, maps document names to template names.
|
||||
#html_sidebars = {}
|
||||
# html_sidebars = {}
|
||||
|
||||
# Additional templates that should be rendered to pages, maps page names to
|
||||
# template names.
|
||||
#html_additional_pages = {}
|
||||
# html_additional_pages = {}
|
||||
|
||||
# If false, no module index is generated.
|
||||
#html_domain_indices = True
|
||||
# html_domain_indices = True
|
||||
|
||||
# If false, no index is generated.
|
||||
#html_use_index = True
|
||||
# html_use_index = True
|
||||
|
||||
# If true, the index is split into individual pages for each letter.
|
||||
#html_split_index = False
|
||||
# html_split_index = False
|
||||
|
||||
# If true, links to the reST sources are added to the pages.
|
||||
#html_show_sourcelink = True
|
||||
# html_show_sourcelink = True
|
||||
|
||||
# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
|
||||
#html_show_sphinx = True
|
||||
# html_show_sphinx = True
|
||||
|
||||
# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
|
||||
#html_show_copyright = True
|
||||
# html_show_copyright = True
|
||||
|
||||
# If true, an OpenSearch description file will be output, and all pages will
|
||||
# contain a <link> tag referring to it. The value of this option must be the
|
||||
# base URL from which the finished HTML is served.
|
||||
#html_use_opensearch = ''
|
||||
# html_use_opensearch = ''
|
||||
|
||||
# This is the file name suffix for HTML files (e.g. ".xhtml").
|
||||
#html_file_suffix = None
|
||||
# html_file_suffix = None
|
||||
|
||||
# Output file base name for HTML help builder.
|
||||
htmlhelp_basename = 'lnavdoc'
|
||||
|
||||
|
||||
# -- Options for LaTeX output --------------------------------------------------
|
||||
|
||||
latex_elements = {
|
||||
# The paper size ('letterpaper' or 'a4paper').
|
||||
#'papersize': 'letterpaper',
|
||||
# The paper size ('letterpaper' or 'a4paper').
|
||||
# 'papersize': 'letterpaper',
|
||||
|
||||
# The font size ('10pt', '11pt' or '12pt').
|
||||
#'pointsize': '10pt',
|
||||
# The font size ('10pt', '11pt' or '12pt').
|
||||
# 'pointsize': '10pt',
|
||||
|
||||
# Additional stuff for the LaTeX preamble.
|
||||
#'preamble': '',
|
||||
# Additional stuff for the LaTeX preamble.
|
||||
# 'preamble': '',
|
||||
}
|
||||
|
||||
# Grouping the document tree into LaTeX files. List of tuples
|
||||
# (source start file, target name, title, author, documentclass [howto/manual]).
|
||||
latex_documents = [
|
||||
('index', 'lnav.tex', u'lnav Documentation',
|
||||
u'Tim Stack', 'manual'),
|
||||
('index', 'lnav.tex', u'lnav Documentation',
|
||||
u'Tim Stack', 'manual'),
|
||||
]
|
||||
|
||||
# The name of an image file (relative to this directory) to place at the top of
|
||||
# the title page.
|
||||
#latex_logo = None
|
||||
# latex_logo = None
|
||||
|
||||
# For "manual" documents, if this is true, then toplevel headings are parts,
|
||||
# not chapters.
|
||||
#latex_use_parts = False
|
||||
# latex_use_parts = False
|
||||
|
||||
# If true, show page references after internal links.
|
||||
#latex_show_pagerefs = False
|
||||
# latex_show_pagerefs = False
|
||||
|
||||
# If true, show URL addresses after external links.
|
||||
#latex_show_urls = False
|
||||
# latex_show_urls = False
|
||||
|
||||
# Documents to append as an appendix to all manuals.
|
||||
#latex_appendices = []
|
||||
# latex_appendices = []
|
||||
|
||||
# If false, no module index is generated.
|
||||
#latex_domain_indices = True
|
||||
# latex_domain_indices = True
|
||||
|
||||
|
||||
# -- Options for manual page output --------------------------------------------
|
||||
|
|
@ -433,7 +436,7 @@ man_pages = [
|
|||
]
|
||||
|
||||
# If true, show URL addresses after external links.
|
||||
#man_show_urls = False
|
||||
# man_show_urls = False
|
||||
|
||||
|
||||
# -- Options for Texinfo output ------------------------------------------------
|
||||
|
|
@ -442,16 +445,16 @@ man_pages = [
|
|||
# (source start file, target name, title, author,
|
||||
# dir menu entry, description, category)
|
||||
texinfo_documents = [
|
||||
('index', 'lnav', u'lnav Documentation',
|
||||
u'Tim Stack', 'lnav', 'One line description of project.',
|
||||
'Miscellaneous'),
|
||||
('index', 'lnav', u'lnav Documentation',
|
||||
u'Tim Stack', 'lnav', 'One line description of project.',
|
||||
'Miscellaneous'),
|
||||
]
|
||||
|
||||
# Documents to append as an appendix to all manuals.
|
||||
#texinfo_appendices = []
|
||||
# texinfo_appendices = []
|
||||
|
||||
# If false, no module index is generated.
|
||||
#texinfo_domain_indices = True
|
||||
# texinfo_domain_indices = True
|
||||
|
||||
# How to display URL addresses: 'footnote', 'no', or 'inline'.
|
||||
#texinfo_show_urls = 'footnote'
|
||||
# texinfo_show_urls = 'footnote'
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue