Added code to record git commit hash

This commit is contained in:
Scott R Charlton 2019-01-28 16:41:11 -07:00
parent 06959712bf
commit a762e6f7ae
4 changed files with 8 additions and 2 deletions

View File

@ -14,8 +14,8 @@ if [ -z "$VER" ]; then
ver_patch=$((ver_patch+1))
VER="${ver_major}.${ver_minor}.${ver_patch}"
fi
HEAD=`svn st -v configure.ac | awk '{print $1}')`
if [ "$REL" = 'HEAD' ]; then
HEAD=`svn st -v configure.ac | awk '{print $1}')`
REL="$HEAD"
fi
export VER

View File

@ -136,9 +136,11 @@ DISTNAME="${NAME}${REPOS_TAG}-${VERSION}${VER_NUMTAG}"
DIST_SANDBOX=.dist_sandbox
#DISTPATH="$DIST_SANDBOX/$DISTNAME"
DISTPATH="."
GIT_COMMIT=`git rev-parse HEAD`
echo "Distribution will be named: $DISTNAME"
echo " release branch's revision: $REVISION"
echo " git commit: $GIT_COMMIT"
echo " executable's revision: $REVISION_SVN"
echo " constructed from path: /$REPOS_PATH"
echo " release date: $RELEASE_DATE"
@ -223,6 +225,7 @@ do
-e "/#define *VER_MINOR/s/[0-9]\+/$ver_minor/" \
-e "/#define *VER_PATCH/s/[0-9]\+/$ver_patch/" \
-e "/#define *VER_REVISION/s/[0-9]\+/$REVISION_SVN/" \
-e "/#define *GIT_COMMIT/s/[0-9a-f]\+/$GIT_COMMIT/" \
-e "s/@RELEASE_DATE@/$RELEASE_DATE/g" \
-e "s/@PHREEQC_VER@/$VER/g" \
-e "s/@PHREEQC_DATE@/$RELEASE_DATE/g" \

View File

@ -781,6 +781,7 @@ SetBasicCallback(int id, double (*fcn)(double x1, double x2, const char *str, vo
}
return IPQ_BADINSTANCE;
}
#if !defined(R_SO)
#ifdef IPHREEQC_NO_FORTRAN_MODULE
IPQ_RESULT
SetBasicFortranCallback(int id, double (*fcn)(double *x1, double *x2, char *str, size_t l))
@ -805,7 +806,8 @@ SetBasicFortranCallback(int id, double (*fcn)(double *x1, double *x2, const char
}
return IPQ_BADINSTANCE;
}
#endif
#endif /* IPHREEQC_NO_FORTRAN_MODULE */
#endif /* !defined(R_SO) */
IPQ_RESULT
SetCurrentSelectedOutputUserNumber(int id, int n)
{

View File

@ -3,6 +3,7 @@
#define VER_MINOR 0
#define VER_PATCH 0
#define VER_REVISION 0
#define GIT_COMMIT 0000000000000000000000000000000000000000
#define RELEASE_DATE "@RELEASE_DATE@"