From 0ecc43fb0db975bb14482d39a8844efb7cf59a27 Mon Sep 17 00:00:00 2001 From: Scott R Charlton Date: Thu, 26 Jan 2012 00:51:12 +0000 Subject: [PATCH] updated for latest include locations git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6134 1feff8c3-07ed-0310-ac33-dd36852eb9cd --- build/build.sh | 20 ++++++++++++++++++-- build/dist.sh | 13 ++++--------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/build/build.sh b/build/build.sh index 53d51f83..daacaddc 100644 --- a/build/build.sh +++ b/build/build.sh @@ -204,9 +204,17 @@ install() { /usr/bin/install -m 755 "${objdir}/src/phreeqcpp/phreeqc/revisions" "${instdir}/${FULLPKG}-vs2005-win32/doc/RELEASE.txt" && \ /usr/bin/install -m 755 "${objdir}/lib/"* "${instdir}/${FULLPKG}-vs2005-win32/lib/." && \ /usr/bin/install -m 755 "${objdir}/dll/"* "${instdir}/${FULLPKG}-vs2005-win32/dll/." && \ - /usr/bin/install -m 755 "${objdir}/include/"* "${instdir}/${FULLPKG}-vs2005-win32/include/." && \ + /usr/bin/install -m 755 "${objdir}/src/IPhreeqc.f.inc" "${instdir}/${FULLPKG}-vs2005-win32/include/." && \ + /usr/bin/install -m 755 "${objdir}/src/IPhreeqc.f90.inc" "${instdir}/${FULLPKG}-vs2005-win32/include/." && \ + /usr/bin/install -m 755 "${objdir}/src/IPhreeqc.h" "${instdir}/${FULLPKG}-vs2005-win32/include/." && \ + /usr/bin/install -m 755 "${objdir}/src/IPhreeqc.hpp" "${instdir}/${FULLPKG}-vs2005-win32/include/." && \ + /usr/bin/install -m 755 "${objdir}/src/IPhreeqcCallbacks.h" "${instdir}/${FULLPKG}-vs2005-win32/include/." && \ + /usr/bin/install -m 755 "${objdir}/src/Var.h" "${instdir}/${FULLPKG}-vs2005-win32/include/." && \ + /usr/bin/install -m 755 "${objdir}/src/phreeqcpp/PHRQ_io.h" "${instdir}/${FULLPKG}-vs2005-win32/include/." && \ + /usr/bin/install -m 755 "${objdir}/src/phreeqcpp/Keywords.h" "${instdir}/${FULLPKG}-vs2005-win32/include/." && \ /usr/bin/install -m 755 "${objdir}/database/"*.dat "${instdir}/${FULLPKG}-vs2005-win32/database/." && \ /usr/bin/install -m 755 "${objdir}/examples/c/advect/"* "${instdir}/${FULLPKG}-vs2005-win32/examples/c/advect/." && \ + /usr/bin/install -m 755 "${objdir}/examples/com/"* "${instdir}/${FULLPKG}-vs2005-x64/examples/com/." && \ /usr/bin/install -m 755 "${objdir}/examples/com/excel/"* "${instdir}/${FULLPKG}-vs2005-win32/examples/com/excel/." && \ /usr/bin/install -m 755 "${objdir}/examples/com/python/"* "${instdir}/${FULLPKG}-vs2005-win32/examples/com/python/." && \ /usr/bin/install -m 755 "${objdir}/examples/fortran/advect/"* "${instdir}/${FULLPKG}-vs2005-win32/examples/fortran/advect/." && \ @@ -230,9 +238,17 @@ install() { /usr/bin/install -m 755 "${objdir}/src/phreeqcpp/phreeqc/revisions" "${instdir}/${FULLPKG}-vs2005-x64/doc/RELEASE.txt" && \ /usr/bin/install -m 755 "${objdir}/libx64/"* "${instdir}/${FULLPKG}-vs2005-x64/libx64/." && \ /usr/bin/install -m 755 "${objdir}/dllx64/"* "${instdir}/${FULLPKG}-vs2005-x64/dllx64/." && \ - /usr/bin/install -m 755 "${objdir}/include/"* "${instdir}/${FULLPKG}-vs2005-x64/include/." && \ + /usr/bin/install -m 755 "${objdir}/src/IPhreeqc.f.inc" "${instdir}/${FULLPKG}-vs2005-x64/include/." && \ + /usr/bin/install -m 755 "${objdir}/src/IPhreeqc.f90.inc" "${instdir}/${FULLPKG}-vs2005-x64/include/." && \ + /usr/bin/install -m 755 "${objdir}/src/IPhreeqc.h" "${instdir}/${FULLPKG}-vs2005-x64/include/." && \ + /usr/bin/install -m 755 "${objdir}/src/IPhreeqc.hpp" "${instdir}/${FULLPKG}-vs2005-x64/include/." && \ + /usr/bin/install -m 755 "${objdir}/src/IPhreeqcCallbacks.h" "${instdir}/${FULLPKG}-vs2005-x64/include/." && \ + /usr/bin/install -m 755 "${objdir}/src/Var.h" "${instdir}/${FULLPKG}-vs2005-x64/include/." && \ + /usr/bin/install -m 755 "${objdir}/src/phreeqcpp/PHRQ_io.h" "${instdir}/${FULLPKG}-vs2005-x64/include/." && \ + /usr/bin/install -m 755 "${objdir}/src/phreeqcpp/Keywords.h" "${instdir}/${FULLPKG}-vs2005-x64/include/." && \ /usr/bin/install -m 755 "${objdir}/database/"*.dat "${instdir}/${FULLPKG}-vs2005-x64/database/." && \ /usr/bin/install -m 755 "${objdir}/examples/c/advect/"* "${instdir}/${FULLPKG}-vs2005-x64/examples/c/advect/." && \ + /usr/bin/install -m 755 "${objdir}/examples/com/"* "${instdir}/${FULLPKG}-vs2005-x64/examples/com/." && \ /usr/bin/install -m 755 "${objdir}/examples/com/excel/"* "${instdir}/${FULLPKG}-vs2005-x64/examples/com/excel/." && \ /usr/bin/install -m 755 "${objdir}/examples/com/python/"* "${instdir}/${FULLPKG}-vs2005-x64/examples/com/python/." && \ /usr/bin/install -m 755 "${objdir}/examples/fortran/advect/"* "${instdir}/${FULLPKG}-vs2005-x64/examples/fortran/advect/." && \ diff --git a/build/dist.sh b/build/dist.sh index 10da8dc6..524bff4a 100644 --- a/build/dist.sh +++ b/build/dist.sh @@ -147,19 +147,14 @@ 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" \ + "http://internalbrr.cr.usgs.gov/svn_GW/IPhreeqc/branches/ErrorHandling" \ "$DISTNAME") (cd "$DIST_SANDBOX" && \ - ${SVN:-svn} export -q $EXTRA_EXPORT_OPTIONS --ignore-externals -r "$REVISION" \ - "http://internalbrr.cr.usgs.gov/svn_GW/phreeqcpp/$REPOS_PATH/src" \ + ${SVN:-svn} export -q $EXTRA_EXPORT_OPTIONS --ignore-externals -r "6109" \ + "http://internalbrr.cr.usgs.gov/svn_GW/phreeqcpp/branches/ErrorHandling/src" \ "$DISTNAME/src/phreeqcpp") - -(cd "$DIST_SANDBOX" && \ - ${SVN:-svn} export -q $EXTRA_EXPORT_OPTIONS --ignore-externals -r "$REVISION" \ - "http://internalbrr.cr.usgs.gov/svn_GW/phreeqc/$REPOS_PATH/src" \ - "$DISTNAME/src/phreeqcpp/phreeqc") - + (cd "$DIST_SANDBOX" && \ ${SVN:-svn} export -q $EXTRA_EXPORT_OPTIONS --ignore-externals -r "$REVISION" \ "http://internalbrr.cr.usgs.gov/svn_GW/phreeqc/$REPOS_PATH/database" \