nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Deleting VERSION and extracting it from I3_VERSION instead (#2419)

This commit is contained in:
eplanet 2016-08-13 22:46:27 +02:00 committed by Michael Stapelberg
parent 012de8cd6f
commit b668d62cfc
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -34,7 +34,6 @@ install: $(INSTALL_TARGETS)
store_git_version: store_git_version:
echo -n ${I3_VERSION} > I3_VERSION echo -n ${I3_VERSION} > I3_VERSION
echo -n ${VERSION} > VERSION
dist: distclean dist: distclean
[ ! -d i3-${VERSION} ] || rm -rf i3-${VERSION} [ ! -d i3-${VERSION} ] || rm -rf i3-${VERSION}
@ -53,7 +52,6 @@ dist: distclean
mkdir i3-${VERSION}/i3-input mkdir i3-${VERSION}/i3-input
find i3-input -maxdepth 1 -type f \( -name "*.c" -or -name "*.mk" -or -name "*.h" -or -name "Makefile" \) -exec cp '{}' i3-${VERSION}/i3-input \; find i3-input -maxdepth 1 -type f \( -name "*.c" -or -name "*.mk" -or -name "*.h" -or -name "Makefile" \) -exec cp '{}' i3-${VERSION}/i3-input \;
cp I3_VERSION i3-${VERSION}/I3_VERSION cp I3_VERSION i3-${VERSION}/I3_VERSION
cp VERSION i3-${VERSION}/VERSION
# Pre-generate a manpage to allow distributors to skip this step and save some dependencies # Pre-generate a manpage to allow distributors to skip this step and save some dependencies
$(MAKE) mans $(MAKE) mans
cp man/*.1 i3-${VERSION}/man/ cp man/*.1 i3-${VERSION}/man/

1
VERSION
View File

@ -1 +0,0 @@
4.12

4
common.mk
View File

@ -21,8 +21,8 @@ endif
# In dist and snapshot tarballs, use the I3_VERSION and VERSION files. Otherwise use git information. # In dist and snapshot tarballs, use the I3_VERSION and VERSION files. Otherwise use git information.
ifeq ($(wildcard .git),) ifeq ($(wildcard .git),)
# not in git repository # not in git repository
VERSION := '$(shell [ -f $(TOPDIR)/VERSION ] && cat $(TOPDIR)/VERSION)' VERSION := $(shell [ -f $(TOPDIR)/I3_VERSION ] && cat $(TOPDIR)/I3_VERSION | cut -d '-' -f 1)
I3_VERSION := '$(shell [ -f $(TOPDIR)/I3_VERSION ] && cat $(TOPDIR)/I3_VERSION)' I3_VERSION := $(shell [ -f $(TOPDIR)/I3_VERSION ] && cat $(TOPDIR)/I3_VERSION)
else else
VERSION := $(shell git describe --tags --abbrev=0) VERSION := $(shell git describe --tags --abbrev=0)
I3_VERSION := '$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1), branch \"$(shell git describe --tags --always --all | sed s:heads/::)\")' I3_VERSION := '$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1), branch \"$(shell git describe --tags --always --all | sed s:heads/::)\")'

3
release.sh
View File

@ -56,9 +56,8 @@ cp "${STARTDIR}/RELEASE-NOTES-${RELEASE_VERSION}" "RELEASE-NOTES-${RELEASE_VERSI
git add RELEASE-NOTES-${RELEASE_VERSION} git add RELEASE-NOTES-${RELEASE_VERSION}
git rm RELEASE-NOTES-${PREVIOUS_VERSION} git rm RELEASE-NOTES-${PREVIOUS_VERSION}
sed -i "s,<refmiscinfo class=\"version\">[^<]*</refmiscinfo>,<refmiscinfo class=\"version\">${RELEASE_VERSION}</refmiscinfo>,g" man/asciidoc.conf sed -i "s,<refmiscinfo class=\"version\">[^<]*</refmiscinfo>,<refmiscinfo class=\"version\">${RELEASE_VERSION}</refmiscinfo>,g" man/asciidoc.conf
echo "${RELEASE_VERSION}" > VERSION
echo "${RELEASE_VERSION} ($(date +%F))" > I3_VERSION echo "${RELEASE_VERSION} ($(date +%F))" > I3_VERSION
git add VERSION I3_VERSION git add I3_VERSION
git commit -a -m "release i3 ${RELEASE_VERSION}" git commit -a -m "release i3 ${RELEASE_VERSION}"
git tag "${RELEASE_VERSION}" -m "release i3 ${RELEASE_VERSION}" --sign --local-user=0x4AC8EE1D git tag "${RELEASE_VERSION}" -m "release i3 ${RELEASE_VERSION}" --sign --local-user=0x4AC8EE1D