From: eplanet Date: Sat, 13 Aug 2016 20:46:27 +0000 (+0200) Subject: Deleting VERSION and extracting it from I3_VERSION instead (#2419) X-Git-Tag: 4.13~53 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b668d62cfcd04a3a0ea1da5ad06a2e57187f6058;p=i3%2Fi3 Deleting VERSION and extracting it from I3_VERSION instead (#2419) --- diff --git a/Makefile b/Makefile index d62db5d0..c08f2777 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,6 @@ install: $(INSTALL_TARGETS) store_git_version: echo -n ${I3_VERSION} > I3_VERSION - echo -n ${VERSION} > VERSION dist: distclean [ ! -d i3-${VERSION} ] || rm -rf i3-${VERSION} @@ -53,7 +52,6 @@ dist: distclean 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 \; 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 $(MAKE) mans cp man/*.1 i3-${VERSION}/man/ diff --git a/VERSION b/VERSION deleted file mode 100644 index f5885845..00000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -4.12 diff --git a/common.mk b/common.mk index 0215d35b..e99f93c8 100644 --- a/common.mk +++ b/common.mk @@ -21,8 +21,8 @@ endif # In dist and snapshot tarballs, use the I3_VERSION and VERSION files. Otherwise use git information. ifeq ($(wildcard .git),) # not in git repository - VERSION := '$(shell [ -f $(TOPDIR)/VERSION ] && cat $(TOPDIR)/VERSION)' - I3_VERSION := '$(shell [ -f $(TOPDIR)/I3_VERSION ] && cat $(TOPDIR)/I3_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) else 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/::)\")' diff --git a/release.sh b/release.sh index 61b3c444..cc59d6a2 100755 --- a/release.sh +++ b/release.sh @@ -56,9 +56,8 @@ cp "${STARTDIR}/RELEASE-NOTES-${RELEASE_VERSION}" "RELEASE-NOTES-${RELEASE_VERSI git add RELEASE-NOTES-${RELEASE_VERSION} git rm RELEASE-NOTES-${PREVIOUS_VERSION} sed -i "s,[^<]*,${RELEASE_VERSION},g" man/asciidoc.conf -echo "${RELEASE_VERSION}" > 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 tag "${RELEASE_VERSION}" -m "release i3 ${RELEASE_VERSION}" --sign --local-user=0x4AC8EE1D