Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Releasing 1.0.1
  • Loading branch information
ThomasAdam committed Oct 4, 2020
1 parent 44d9c54 commit f8540d8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
10 changes: 5 additions & 5 deletions configure.ac
Expand Up @@ -3,7 +3,7 @@ dnl
AC_PREREQ(2.60)

dnl should be "yes" only within the released distribution
ISRELEASED="no"
ISRELEASED="yes"
if test $ISRELEASED = "no"; then
RELDATELONG=""
RELDATESHORT=""
Expand All @@ -14,7 +14,7 @@ fi
# Silence warning: ar: 'u' modifier ignored since 'D' is the default
AC_SUBST(AR_FLAGS, [cr])

AC_INIT([fvwm3], 1.0.0, [fvwm-workers@fvwm.org])
AC_INIT([fvwm3], 1.0.1, [fvwm-workers@fvwm.org])
AC_CONFIG_AUX_DIR(etc)
AC_CONFIG_LIBOBJ_DIR(libs)
AM_INIT_AUTOMAKE([foreign subdir-objects])
Expand All @@ -26,9 +26,9 @@ VERSIONINFO=m4_esyscmd([./utils/fvwm-version-str.sh])
dnl date of the released version (please zero pad the day in the last 2 dates)
dnl for example: "4 February 2003", "04 Feb 2003", "2003-02-04"
dnl date format strings: "%e %B %Y", "%d-%b-%Y", "%Y-%m-%d"
RELDATELONG="02 September 2020"
RELDATESHORT="02-Sep-2020"
RELDATENUM="2020-09-02"
RELDATELONG="04 October 2020"
RELDATESHORT="04-Oct-2020"
RELDATENUM="2020-10-04"

# constant variable settings
FVWMNAMELONG="F? Virtual Window Manager"
Expand Down
5 changes: 2 additions & 3 deletions utils/fvwm-version-str.sh
Expand Up @@ -10,13 +10,12 @@
#
# Intended to be called from configure.ac (via autogen.sh)

VERSION="1.0.0"
VERSION="released"

[ -d ".git" ] || { echo "$VERSION" && exit 0 ; }

if grep -q -i '^ISRELEASED="yes"' ./configure.ac; then
# A release build. Strip the git information off the tag name.
git describe --tags --abbrev=0 2>/dev/null || echo "released"
echo "$VERSION"
else
git describe --always --long --dirty
fi

0 comments on commit f8540d8

Please sign in to comment.