diff --git a/jenkins-R-dist.sh b/jenkins-R-dist.sh index 0da610cb..137463cb 100644 --- a/jenkins-R-dist.sh +++ b/jenkins-R-dist.sh @@ -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 diff --git a/jenkins-dist.sh b/jenkins-dist.sh index d55d5c01..167a92dd 100755 --- a/jenkins-dist.sh +++ b/jenkins-dist.sh @@ -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" \ diff --git a/src/IPhreeqcLib.cpp b/src/IPhreeqcLib.cpp index df489636..2cd59d89 100644 --- a/src/IPhreeqcLib.cpp +++ b/src/IPhreeqcLib.cpp @@ -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) { diff --git a/src/Version.h b/src/Version.h index 562e2f53..94c88663 100644 --- a/src/Version.h +++ b/src/Version.h @@ -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@"