From d52cd965e79a7aada78d905e423c4b4049c844cc Mon Sep 17 00:00:00 2001 From: EReckase Date: Sun, 12 Apr 2015 09:19:17 -0600 Subject: [PATCH 1/2] switched to git version rather than subversion --- Makefile.am | 4 ++-- Makefile.in | 4 ++-- flam3.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 42056e9..5a3ff39 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies -SVN_DEF = -D'SVN_REV="$(shell svnversion -n .)"' -AM_CFLAGS = -g -O3 -std=gnu99 -ffast-math -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" $(SVN_DEF) +GIT_DEF = -D'GIT_REV="$(shell git describe --tags)"' +AM_CFLAGS = -g -O3 -std=gnu99 -ffast-math -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" $(GIT_DEF) ACLOCAL_AMFLAGS = -I m4 diff --git a/Makefile.in b/Makefile.in index 5fcf38e..c5b0d11 100644 --- a/Makefile.in +++ b/Makefile.in @@ -359,8 +359,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies -SVN_DEF = -D'SVN_REV="$(shell svnversion -n .)"' -AM_CFLAGS = -g -O3 -std=gnu99 -ffast-math -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" $(SVN_DEF) +GIT_DEF = -D'GIT_REV="$(shell git describe --tags)"' +AM_CFLAGS = -g -O3 -std=gnu99 -ffast-math -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" $(GIT_DEF) ACLOCAL_AMFLAGS = -I m4 man1_MANS = flam3-animate.man flam3-genome.man flam3-render.man flam3-convert.man lib_LTLIBRARIES = libflam3.la diff --git a/flam3.c b/flam3.c index becef85..6c77639 100644 --- a/flam3.c +++ b/flam3.c @@ -61,8 +61,8 @@ char *flam3_version() { - if (strcmp(SVN_REV, "exported")) - return flam3_os "-" VERSION "." SVN_REV; + if (strcmp(GIT_REV, "")) + return flam3_os "-" VERSION "." GIT_REV; return flam3_os "-" VERSION; } From 8d34fd4c012e9cf1819ee5fcfff26ed64a0d4937 Mon Sep 17 00:00:00 2001 From: EReckase Date: Sun, 12 Apr 2015 09:25:34 -0600 Subject: [PATCH 2/2] added --dirty to indicate the compiled directory has changes that are not checked in --- Makefile.am | 2 +- Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5a3ff39..c3d0f42 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign no-dependencies -GIT_DEF = -D'GIT_REV="$(shell git describe --tags)"' +GIT_DEF = -D'GIT_REV="$(shell git describe --tags --dirty)"' AM_CFLAGS = -g -O3 -std=gnu99 -ffast-math -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" $(GIT_DEF) ACLOCAL_AMFLAGS = -I m4 diff --git a/Makefile.in b/Makefile.in index c5b0d11..8a9afdc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -359,7 +359,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign no-dependencies -GIT_DEF = -D'GIT_REV="$(shell git describe --tags)"' +GIT_DEF = -D'GIT_REV="$(shell git describe --tags --dirty)"' AM_CFLAGS = -g -O3 -std=gnu99 -ffast-math -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" $(GIT_DEF) ACLOCAL_AMFLAGS = -I m4 man1_MANS = flam3-animate.man flam3-genome.man flam3-render.man flam3-convert.man