diff --git a/.gitignore b/.gitignore index c57ae923..107137ec 100644 --- a/.gitignore +++ b/.gitignore @@ -210,6 +210,22 @@ doc/RELEASE /unit/unit.plg /unit/x64 +# backup files +*~ + +# autotools +aclocal.m4 +configure +Makefile.in +autom4te.cache/ +config/ +m4/libtool.m4 +m4/ltoptions.m4 +m4/ltsugar.m4 +m4/ltversion.m4 +m4/lt~obsolete.m4 + + # builds (folders beginning with _ (underscore) **/_*/** **/.vshistory/** diff --git a/bootstrap b/bootstrap index fd20873c..99c07dd1 100755 --- a/bootstrap +++ b/bootstrap @@ -12,8 +12,10 @@ if [ ! -f doc/NOTICE ];then cd .. fi -if [ ! -f doc/phreeqc3.chm ];then - svn export http://internalbrr.cr.usgs.gov/svn_GW/phreeqc3/trunk/HTMLversion/phreeqc3.chm doc/phreeqc3.chm +if [ ! -f /doc/html ];then + cd doc + doxygen + cd .. fi if [ ! -f doc/README ];then diff --git a/configure.ac b/configure.ac index 28fff2f9..66f9dc65 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_PREREQ([2.61]) -AC_INIT([IPhreeqc], [3.3.4-10475], [charlton@usgs.gov]) +AC_PREREQ([2.71]) +AC_INIT([IPhreeqc], [3.7.6-16410], [charlton@usgs.gov]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_MACRO_DIR([m4]) @@ -25,13 +25,12 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) -AC_PROG_LIBTOOL +LT_INIT # Check if the iphreeqc fortran module is enabled AC_MSG_CHECKING([whether to enable the IPhreeqc Fortran module]) AC_ARG_ENABLE([fortran-module], - [AC_HELP_STRING([--enable-fortran-module], - [enable the IPhreeqc Fortran module @<:@default=yes@:>@])], + [AS_HELP_STRING([--enable-fortran-module],[enable the IPhreeqc Fortran module @<:@default=yes@:>@])], [IPQ_FORTRAN_MODULE=$enableval], [IPQ_FORTRAN_MODULE=yes]) @@ -46,8 +45,7 @@ AM_CONDITIONAL([FORTRAN_MODULE], [test "X$IPQ_FORTRAN_MODULE" = "Xyes"]) # Check if the fortran test should be included AC_MSG_CHECKING([whether to enable the IPhreeqc Fortran test]) AC_ARG_ENABLE([fortran-test], - [AC_HELP_STRING([--enable-fortran-test], - [enable the IPhreeqc Fortran test @<:@default=no@:>@])], + [AS_HELP_STRING([--enable-fortran-test],[enable the IPhreeqc Fortran test @<:@default=no@:>@])], [IPQ_FORTRAN=$enableval], [IPQ_FORTRAN=no]) @@ -89,25 +87,22 @@ AC_FUNC_REALLOC AC_FUNC_STRTOD # libc functions -AC_CHECK_FUNCS([memmove], , AC_ERROR([memmove not found in libc])) -AC_CHECK_FUNCS([memset], , AC_ERROR([memset not found in libc])) -AC_CHECK_FUNCS([strchr], , AC_ERROR([strchr not found in libc])) -AC_CHECK_FUNCS([strcspn], , AC_ERROR([strcspn not found in libc])) -AC_CHECK_FUNCS([strtol], , AC_ERROR([strtol not found in libc])) +AC_CHECK_FUNCS([memmove], , AC_MSG_ERROR(memmove not found in libc)) +AC_CHECK_FUNCS([memset], , AC_MSG_ERROR(memset not found in libc)) +AC_CHECK_FUNCS([strchr], , AC_MSG_ERROR(strchr not found in libc)) +AC_CHECK_FUNCS([strcspn], , AC_MSG_ERROR(strcspn not found in libc)) +AC_CHECK_FUNCS([strtol], , AC_MSG_ERROR(strtol not found in libc)) # libm functions -AC_CHECK_FUNCS([floor], , AC_CHECK_LIB(m, floor, , AC_ERROR([cannot find floor])) ) -AC_CHECK_FUNCS([pow], , AC_CHECK_LIB(m, pow, , AC_ERROR([cannot find pow])) ) -AC_CHECK_FUNCS([sqrt], , AC_CHECK_LIB(m, sqrt, , AC_ERROR([cannot find sqrt])) ) +AC_CHECK_FUNCS([floor], , AC_CHECK_LIB(m, floor, , AC_MSG_ERROR(cannot find floor)) ) +AC_CHECK_FUNCS([pow], , AC_CHECK_LIB(m, pow, , AC_MSG_ERROR(cannot find pow)) ) +AC_CHECK_FUNCS([sqrt], , AC_CHECK_LIB(m, sqrt, , AC_MSG_ERROR(cannot find sqrt)) ) # isfinite AC_LANG_PUSH(C++) AC_CACHE_CHECK([for isfinite], ac_cv_isfinite, - [AC_TRY_LINK([#include ], - [double x; int y; y = isfinite(x);], - ac_cv_isfinite=yes, - ac_cv_isfinite=no -)]) + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[double x; int y; y = isfinite(x);]])],[ac_cv_isfinite=yes],[ac_cv_isfinite=no +])]) if test x"$ac_cv_isfinite" = x"yes"; then AC_DEFINE(HAVE_ISFINITE, [], [Has isfinite]) fi @@ -116,11 +111,8 @@ AC_LANG_POP(C++) # finite AC_LANG_PUSH(C++) AC_CACHE_CHECK([for finite], ac_cv_finite, - [AC_TRY_LINK([#include ], - [double x; int y; y = finite(x);], - ac_cv_finite=yes, - ac_cv_finite=no -)]) + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[double x; int y; y = finite(x);]])],[ac_cv_finite=yes],[ac_cv_finite=no +])]) if test x"$ac_cv_finite" = x"yes"; then AC_DEFINE(HAVE_FINITE, [], [Has finite]) fi diff --git a/jenkins-dist.sh b/jenkins-dist.sh index e2fc7fe8..0c9abbd7 100755 --- a/jenkins-dist.sh +++ b/jenkins-dist.sh @@ -129,16 +129,7 @@ if [ -z "$NAME" ]; then NAME="IPhreeqc" fi -REPOS_TAG='' -if [ "$REPOS_PATH" != 'trunk' ]; then - REPOS_TAG="$REPOS_PATH" - REPOS_TAG="`echo $REPOS_TAG | sed 's|branches/|-|'`" - REPOS_TAG="`echo $REPOS_TAG | sed 's|tags/|-|'`" -fi - -DISTNAME="${NAME}${REPOS_TAG}-${VERSION}${VER_NUMTAG}" -DIST_SANDBOX=.dist_sandbox -#DISTPATH="$DIST_SANDBOX/$DISTNAME" +DISTNAME="${NAME}-${VERSION}${VER_NUMTAG}" DISTPATH="." GIT_COMMIT=`git rev-parse HEAD` @@ -146,62 +137,8 @@ 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" -##rm -rf "$DIST_SANDBOX" -##mkdir "$DIST_SANDBOX" -##echo "Removed and recreated $DIST_SANDBOX" -## -##echo "Exporting revision $REVISION of IPhreeqc into sandbox..." -##(cd "$DIST_SANDBOX" && \ -## ${SVN:-svn} export -q $EXTRA_EXPORT_OPTIONS --ignore-externals -r "$REVISION" \ -## "http://internalbrr.cr.usgs.gov/svn_GW/IPhreeqc/$REPOS_PATH" \ -## "$DISTNAME") -## -##echo "Exporting revision $REVISION of external database into sandbox..." -##(cd "$DIST_SANDBOX" && \ -## ${SVN:-svn} export -q $EXTRA_EXPORT_OPTIONS --ignore-externals -r "$REVISION" \ -## "http://internalbrr.cr.usgs.gov/svn_GW/phreeqc3/trunk/database" \ -## "$DISTNAME/database") -## -##echo "Exporting revision $REVISION of external phreeqcpp into sandbox..." -##(cd "$DIST_SANDBOX" && \ -## ${SVN:-svn} export -q $EXTRA_EXPORT_OPTIONS --ignore-externals -r "$REVISION" \ -## "http://internalbrr.cr.usgs.gov/svn_GW/phreeqc3/trunk/src" \ -## "$DISTNAME/src/phreeqcpp") -## -##echo "Exporting revision $REVISION of external examples/c into sandbox..." -##(cd "$DIST_SANDBOX" && \ -## ${SVN:-svn} export -q $EXTRA_EXPORT_OPTIONS --ignore-externals -r "$REVISION" \ -## "http://internalbrr.cr.usgs.gov/svn_GW/phreeqc/trunk/COMManuscript/C&Gfinal/examples/c" \ -## "$DISTNAME/examples/c") -## -##echo "Exporting revision $REVISION of external examples/com into sandbox..." -##(cd "$DIST_SANDBOX" && \ -## ${SVN:-svn} export -q $EXTRA_EXPORT_OPTIONS --ignore-externals -r "$REVISION" \ -## "http://internalbrr.cr.usgs.gov/svn_GW/phreeqc/trunk/COMManuscript/C&Gfinal/examples/com" \ -## "$DISTNAME/examples/com") -## -##echo "Exporting revision $REVISION of external examples/fortran into sandbox..." -##(cd "$DIST_SANDBOX" && \ -## ${SVN:-svn} export -q $EXTRA_EXPORT_OPTIONS --ignore-externals -r "$REVISION" \ -## "http://internalbrr.cr.usgs.gov/svn_GW/phreeqc/trunk/COMManuscript/C&Gfinal/examples/fortran" \ -## "$DISTNAME/examples/fortran") -## -##echo "Exporting revision $REVISION of external phreeqc3-doc into sandbox..." -##(cd "$DIST_SANDBOX" && \ -## ${SVN:-svn} export -q $EXTRA_EXPORT_OPTIONS --ignore-externals -r "$REVISION" \ -## "http://internalbrr.cr.usgs.gov/svn_GW/phreeqc3/trunk/doc" \ -## "$DISTNAME/phreeqc3-doc") -## -##echo "Exporting revision $REVISION of external HTMLversion/phreeqc3.chm into sandbox..." -##(cd "$DIST_SANDBOX" && \ -## ${SVN:-svn} export -q $EXTRA_EXPORT_OPTIONS --ignore-externals -r "$REVISION" \ -## "http://internalbrr.cr.usgs.gov/svn_GW/phreeqc3/trunk/HTMLversion/phreeqc3.chm" \ -## "$DISTNAME/doc/phreeqc3.chm") - - ver_major=`echo $VERSION | cut -d '.' -f 1` ver_minor=`echo $VERSION | cut -d '.' -f 2` ver_patch=`echo $VERSION | cut -d '.' -f 3` @@ -235,7 +172,7 @@ do -e "/#define *VER_REVISION/s/[0-9]\+/$REVISION_SVN/" \ -e "/#define *GIT_COMMIT/s/[0-9a-f]\{40\}/$GIT_COMMIT/" \ -e "s/@RELEASE_DATE@/$RELEASE_DATE/g" \ - -e "s/@PHREEQC_VER@/$VER/g" \ + -e "s/@PHREEQC_VER@/$VERSION/g" \ -e "s/@PHREEQC_DATE@/$RELEASE_DATE/g" \ -e "s/@REVISION_SVN@/$REVISION_SVN/g" \ -e "s/@VERSION@/$VERSION/g" \ @@ -260,50 +197,3 @@ fi if [ -e $DISTPATH/phreeqc3-doc/README.IPhreeqc.TXT ]; then cp $DISTPATH/phreeqc3-doc/README.IPhreeqc.TXT $DISTPATH/doc/README fi - -##(cd "$DISTPATH/doc" && "doxygen") -## -##if [ -n "$WIN" ]; then -## echo "Rolling $DISTNAME.zip ..." -## (cd "$DIST_SANDBOX" > /dev/null && zip -q -r - "$DISTNAME") > \ -## "$DISTNAME.zip" -## -## echo "Removing sandbox..." -## rm -rf "$DIST_SANDBOX" -## -## echo "" -## echo "Done:" -## ls -l "$DISTNAME.zip" -## echo "" -## echo "md5sums:" -## md5sum "$DISTNAME.zip" -## type sha1sum > /dev/null 2>&1 -## if [ $? -eq 0 ]; then -## echo "" -## echo "sha1sums:" -## sha1sum "$DISTNAME.zip" -## fi -##else -## echo "Rolling $DISTNAME.tar ..." -## (cd "$DIST_SANDBOX" > /dev/null && tar c "$DISTNAME") > \ -## "$DISTNAME.tar" -## -## echo "Compressing to $DISTNAME.tar.gz ..." -## gzip -9f "$DISTNAME.tar" -## -## echo "Removing sandbox..." -## rm -rf "$DIST_SANDBOX" -## -## echo "" -## echo "Done:" -## ls -l "$DISTNAME.tar.gz" -## echo "" -## echo "md5sums:" -## md5sum "$DISTNAME.tar.gz" -## type sha1sum > /dev/null 2>&1 -## if [ $? -eq 0 ]; then -## echo "" -## echo "sha1sums:" -## sha1sum "$DISTNAME.tar.gz" -## fi -##fi