changes to git info in makefile

hokru · May 13, 2018 · 4366d8e · 4366d8e
1 parent d06aa30
commit 4366d8e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -102,13 +102,22 @@ OFPP= $(foreach dir, $(FPPSOURCES), $(addprefix $(SOURCEDIR)/, $(dir)))
 OF= $(foreach dir, $(FSOURCES), $(addprefix $(SOURCEDIR)/, $(dir)))
 OBJ := $(subst $(SOURCEDIR),$(BUILDDIR),$(OFPP:%.F90=%.o)) $(subst $(SOURCEDIR),$(BUILDDIR),$(OF:%.f90=%.o))
 
+# check git
+EXIST=$(shell if [ -d .git ]; then echo "yes"; else echo "no"; fi)
+#$(info I AM GIT? $(EXIST))
 
 # build and git info
 BUILID:=$(shell date)
+ifeq ($(EXIST),yes))
 GIT_VERSION := $(shell git describe --abbrev=4 --dirty --always --tags)
+else
+#GIT_VERSION := $(shell cat zip.version)
+GIT_VERSION := "2.0-dev"
+endif
 $(info Building: $(GIT_VERSION))
 
 
+
 #####  INTEL COMPILER  ##########
 ifeq ($(USE_INTEL),yes)
 FC = ifort # -check all -fpe0 -warn -traceback -debug extended

diff --git a/tools/place.sh b/tools/place.sh
@@ -6,7 +6,7 @@
 x=$1
 
 HEAD="!**************************************************************************************
-!    Copyright 2013-2017 Holger Kruse                                                 *
+!    Copyright 2013-2018 Holger Kruse                                                 *
 !                                                                                     *
 !    This file is part of Xopt.                                                       *
 !                                                                                     *