Skip to content

Commit

Permalink
Fixing bug #237 by making build repeatable (removal of compiler gener…
Browse files Browse the repository at this point in the history
…ated build number) + 1.24 update.
  • Loading branch information
dvorka committed Jan 3, 2018
1 parent 013caed commit 079d8f9
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 16 deletions.
4 changes: 4 additions & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2018-01-03 Martin Dvorak <[email protected]>

* Released v1.24 - Reproducible build and stabilization.

2017-09-30 Martin Dvorak <[email protected]>

* Released v1.23 - WLS (Bash on Ubuntu on Windows 10) support
Expand Down
2 changes: 1 addition & 1 deletion PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Contributor: Filip Szymański <fszymanski at, fedoraproject.org>

pkgname=hstr
pkgver=1.23
pkgver=1.24
pkgrel=1
pkgdesc="A command line utility that brings improved BASH command completion from the history. It aims to make completion easier and more efficient than Ctrl-r."
arch=('any')
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# configure.ac Autoconf configuration file
# process this file with autoconf to produce a configure script
#
# Copyright (C) 2014-2017 Martin Dvorak <[email protected]>
# Copyright (C) 2014-2018 Martin Dvorak <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -17,7 +17,7 @@

AC_PREREQ([2.69])

AC_INIT(hh, 1.23, [email protected])
AC_INIT(hh, 1.24, [email protected])
AC_CONFIG_FILES([Makefile src/Makefile man/Makefile])

# Checks for src dir existence.
Expand Down
2 changes: 1 addition & 1 deletion dist/debian-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Debian release: https://wiki.debian.org/IntroDebianPackaging

export HHVERSION="1.23.0"
export HHVERSION="1.24.0"
#export HHFULLVERSION=${HHVERSION}-1.0 # NMU upload
export HHFULLVERSION=${HHVERSION}-1 # mantainer upload
export HH=hstr_${HHVERSION}
Expand Down
2 changes: 1 addition & 1 deletion dist/github-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ export NOW=`date +%Y-%m-%d--%H-%M-%S`
export GH_RELEASE_DIR=~/p/hstr/release
export GH_DISTRO_DIR=${GH_RELEASE_DIR}/release-${NOW}

export HHVERSION="1.23"
export HHVERSION="1.24"

# eof
2 changes: 1 addition & 1 deletion dist/ubuntu-add-new-distro-base.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# boostrap new OR refresh distribution base for pbuilder
export DISTRO=zesty
export DISTRO=artful

sudo pbuilder --create $DISTRO
rm -vf ~/pbuilder/${DISTRO}-base.tgz
Expand Down
8 changes: 4 additions & 4 deletions dist/ubuntu-make-all-distros.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ then
fi

export HHBZRMSG="Top and bottom prompt."
export VERSION=1.23.
export MINOR=1
export VERSION=1.24.
export MINOR=0

# precise quantal saucy precise utopic vivid wily yakkety / trusty xenial
for DISTRO in zesty
# precise quantal saucy precise utopic vivid wily yakkety / trusty xenial zesty artful
for DISTRO in trustry xenial zesty artful
do

./ubuntu-make-distro.sh ${DISTRO} ${VERSION}${MINOR} "${HHBZRMSG}"
Expand Down
6 changes: 3 additions & 3 deletions pad.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!--
pad.xml PAD file for HSTR
Copyright (C) 2015-2017 Martin Dvorak <[email protected]>
Copyright (C) 2015-2018 Martin Dvorak <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -51,10 +51,10 @@
</Company_Info>
<Program_Info>
<Program_Name>HSTR</Program_Name>
<Program_Version>1.23</Program_Version>
<Program_Version>1.24</Program_Version>
<Program_Release_Month>09</Program_Release_Month>
<Program_Release_Day>30</Program_Release_Day>
<Program_Release_Year>2017</Program_Release_Year>
<Program_Release_Year>2018</Program_Release_Year>
<Program_Cost_Dollars />
<Program_Cost_Other_Code>USD</Program_Cost_Other_Code>
<Program_Cost_Other />
Expand Down
5 changes: 2 additions & 3 deletions src/hstr.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
hstr.c BASH history completion utility
Copyright (C) 2014-2016 Martin Dvorak <[email protected]>
Copyright (C) 2014-2018 Martin Dvorak <[email protected]>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -235,8 +235,7 @@ static const char *HELP_STRING=
"\n";

static const char *VERSION_STRING=
"hh version \"1.23\""
"\n build \""__DATE__" " __TIME__"\""
"hh version \"1.24\" (2018-01-03T12:19:00)"
"\n";

// TODO help screen - curses window (tig)
Expand Down

0 comments on commit 079d8f9

Please sign in to comment.