izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename VERSION to VERSION.stamp

Browse Source 
-I$(top_srcdir) is not usable on macOS due to a conflicting C++ header
 `version`.
This commit is contained in:
Alex Chernyakhovsky
2023-03-05 20:52:52 -05:00
committed by Alex Chernyakhovsky
parent aa742478cb
commit 62869ae55f
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -35,5 +35,6 @@ src/include/config.h.in~
src/include/stamp-h1 src/include/stamp-h1
/test-driver /test-driver
/VERSION /VERSION
/VERSION.stamp
/scripts/mosh /scripts/mosh
src/include/version.h src/include/version.h
Makefile.am
+8 -8
View File
@@ -9,7 +9,7 @@ include $(top_srcdir)/aminclude_static.am
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
SUBDIRS = scripts src man conf SUBDIRS = scripts src man conf
EXTRA_DIST = autogen.sh ocb-license.html README.md COPYING.iOS EXTRA_DIST = autogen.sh ocb-license.html README.md COPYING.iOS
BUILT_SOURCES = VERSION BUILT_SOURCES = VERSION.stamp
AM_DISTCHECK_CONFIGURE_FLAGS += --enable-compile-warnings=distcheck --enable-examples --enable-syslog AM_DISTCHECK_CONFIGURE_FLAGS += --enable-compile-warnings=distcheck --enable-examples --enable-syslog
# AX_CODE_COVERAGE configuration # AX_CODE_COVERAGE configuration
@@ -31,22 +31,22 @@ OCLINT_OPTIONS = -enable-global-analysis -max-priority-2=1000 -max-priority-3=10
-rc SHORT_VARIABLE_NAME=1 \ -rc SHORT_VARIABLE_NAME=1 \
-rc MINIMUM_CASES_IN_SWITCH=2 -rc MINIMUM_CASES_IN_SWITCH=2
.PHONY: VERSION .PHONY: VERSION.stamp
VERSION: VERSION.stamp:
@echo @PACKAGE_STRING@ > VERSION.dist @echo @PACKAGE_STRING@ > VERSION.dist
@set -e; if git describe --dirty --always > VERSION.git 2>&1 && \ @set -e; if git describe --dirty --always > VERSION.git 2>&1 && \
[ -z `git rev-parse --show-prefix` ]; then \ [ -z `git rev-parse --show-prefix` ]; then \
if ! diff -q VERSION.git VERSION > /dev/null 2>&1; then \ if ! diff -q VERSION.git VERSION.stamp > /dev/null 2>&1; then \
mv -f VERSION.git VERSION; \ mv -f VERSION.git VERSION.stamp; \
fi; \ fi; \
elif ! diff -q VERSION.dist VERSION > /dev/null 2>&1; then \ elif ! diff -q VERSION.dist VERSION.stamp > /dev/null 2>&1; then \
mv -f VERSION.dist VERSION; \ mv -f VERSION.dist VERSION.stamp; \
fi fi
@rm -f VERSION.dist VERSION.git @rm -f VERSION.dist VERSION.git
clean-local: clean-local:
@rm -rf VERSION cov-int mosh-coverity.txz compile_commands.json @rm -rf VERSION.stamp cov-int mosh-coverity.txz compile_commands.json
# Linters and static checkers, for development only. Not included in # Linters and static checkers, for development only. Not included in
# build dependencies, and outside of Automake processing. # build dependencies, and outside of Automake processing.
macosx/build.sh
+1 -1
View File
@@ -102,7 +102,7 @@ perl -wlpi -e 's{#!/usr/bin/env perl}{#!/usr/bin/perl}' "$PREFIX/local/bin/mosh"
popd > /dev/null popd > /dev/null
PACKAGE_VERSION=$(cat ../VERSION) PACKAGE_VERSION=$(cat ../VERSION.stamp)
OUTFILE="$PACKAGE_VERSION.pkg" OUTFILE="$PACKAGE_VERSION.pkg"
scripts/Makefile.am
+2 -2
View File
@@ -4,7 +4,7 @@ if BUILD_CLIENT
endif endif
CLEANFILES = $(bin_SCRIPTS) CLEANFILES = $(bin_SCRIPTS)
mosh: mosh.pl ../VERSION Makefile mosh: mosh.pl ../VERSION.stamp Makefile
perl -Mdiagnostics -c $(srcdir)/mosh.pl perl -Mdiagnostics -c $(srcdir)/mosh.pl
@sed -e "s/\@VERSION\@/`cat ../VERSION`/" -e "s/\@PACKAGE_STRING\@/@PACKAGE_STRING@/" $(srcdir)/mosh.pl > mosh @sed -e "s/\@VERSION\@/`cat ../VERSION.stamp`/" -e "s/\@PACKAGE_STRING\@/@PACKAGE_STRING@/" $(srcdir)/mosh.pl > mosh
@chmod a+x mosh @chmod a+x mosh
src/include/Makefile.am
+1 -1
View File
@@ -4,7 +4,7 @@ nodist_INCLUDES = version.h
clean-local: clean-local:
@rm -rf version.h @rm -rf version.h
version.h: ../../VERSION version.h: ../../VERSION.stamp
@test -s $< @test -s $<
@printf '#define BUILD_VERSION "%s"\n' "$$(cat $<)" > $@.new @printf '#define BUILD_VERSION "%s"\n' "$$(cat $<)" > $@.new
@set -e; if ! diff -q $@ $@.new > /dev/null 2>&1; then \ @set -e; if ! diff -q $@ $@.new > /dev/null 2>&1; then \