From 6a8da0d7daa1e00416d9023f3ce6b86b827f1c23 Mon Sep 17 00:00:00 2001
From: Scott R Charlton <charlton@usgs.gov>
Date: Fri, 16 Aug 2013 00:57:55 +0000
Subject: [PATCH] added cpp example to distribution now get databases from
 phreeqc3 trunk overwrite databases used in examples

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7939 1feff8c3-07ed-0310-ac33-dd36852eb9cd
---
 build/build.sh | 20 ++++++++++++++++++++
 build/dist.sh  |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/build/build.sh b/build/build.sh
index 437f62b8..e156b5f9 100644
--- a/build/build.sh
+++ b/build/build.sh
@@ -201,6 +201,8 @@ install() {
   mkdir "${instdir}/${FULLPKG}-vs2005-win32/examples/com" && \
   mkdir "${instdir}/${FULLPKG}-vs2005-win32/examples/com/excel" && \
   mkdir "${instdir}/${FULLPKG}-vs2005-win32/examples/com/python" && \
+  mkdir "${instdir}/${FULLPKG}-vs2005-win32/examples/cpp" && \
+  mkdir "${instdir}/${FULLPKG}-vs2005-win32/examples/cpp/advect" && \
   mkdir "${instdir}/${FULLPKG}-vs2005-win32/examples/fortran" && \
   mkdir "${instdir}/${FULLPKG}-vs2005-win32/examples/fortran/advect" && \
   /usr/bin/install -m 755 "${objdir}/doc/IPhreeqc.chm"                       "${instdir}/${FULLPKG}-vs2005-win32/doc/IPhreeqc.chm" && \
@@ -223,7 +225,15 @@ install() {
   /usr/bin/install -m 755 "${objdir}/examples/com/README.txt"                "${instdir}/${FULLPKG}-vs2005-win32/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/cpp/advect/"*                  "${instdir}/${FULLPKG}-vs2005-win32/examples/cpp/advect/." && \
   /usr/bin/install -m 755 "${objdir}/examples/fortran/advect/"*              "${instdir}/${FULLPKG}-vs2005-win32/examples/fortran/advect/." && \
+  /usr/bin/install -m 755 "${objdir}/database/"phreeqc.dat                   "${instdir}/${FULLPKG}-vs2005-win32/examples/c/advect/." && \
+  /usr/bin/install -m 755 "${objdir}/database/"phreeqc.dat                   "${instdir}/${FULLPKG}-vs2005-win32/examples/com/excel/." && \
+  /usr/bin/install -m 755 "${objdir}/database/"phreeqc.dat                   "${instdir}/${FULLPKG}-vs2005-win32/examples/com/python/." && \
+  /usr/bin/install -m 755 "${objdir}/database/"pitzer.dat                    "${instdir}/${FULLPKG}-vs2005-win32/examples/com/python/." && \
+  /usr/bin/install -m 755 "${objdir}/database/"wateq4f.dat                   "${instdir}/${FULLPKG}-vs2005-win32/examples/com/python/." && \
+  /usr/bin/install -m 755 "${objdir}/database/"phreeqc.dat                   "${instdir}/${FULLPKG}-vs2005-win32/examples/cpp/advect/." && \ 
+  /usr/bin/install -m 755 "${objdir}/database/"phreeqc.dat                   "${instdir}/${FULLPKG}-vs2005-win32/examples/fortran/advect/." && \
   mkdir "${instdir}/${FULLPKG}-vs2005-x64" && \
   mkdir "${instdir}/${FULLPKG}-vs2005-x64/doc" && \
   mkdir "${instdir}/${FULLPKG}-vs2005-x64/clrx64" && \
@@ -237,6 +247,8 @@ install() {
   mkdir "${instdir}/${FULLPKG}-vs2005-x64/examples/com" && \
   mkdir "${instdir}/${FULLPKG}-vs2005-x64/examples/com/excel" && \
   mkdir "${instdir}/${FULLPKG}-vs2005-x64/examples/com/python" && \
+  mkdir "${instdir}/${FULLPKG}-vs2005-x64/examples/cpp" && \
+  mkdir "${instdir}/${FULLPKG}-vs2005-x64/examples/cpp/advect" && \
   mkdir "${instdir}/${FULLPKG}-vs2005-x64/examples/fortran" && \
   mkdir "${instdir}/${FULLPKG}-vs2005-x64/examples/fortran/advect" && \
   /usr/bin/install -m 755 "${objdir}/doc/IPhreeqc.chm"                       "${instdir}/${FULLPKG}-vs2005-x64/doc/IPhreeqc.chm" && \
@@ -259,7 +271,15 @@ install() {
   /usr/bin/install -m 755 "${objdir}/examples/com/README.txt"                "${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/cpp/advect/"*                  "${instdir}/${FULLPKG}-vs2005-x64/examples/cpp/advect/." && \
   /usr/bin/install -m 755 "${objdir}/examples/fortran/advect/"*              "${instdir}/${FULLPKG}-vs2005-x64/examples/fortran/advect/." && \
+  /usr/bin/install -m 755 "${objdir}/database/"phreeqc.dat                   "${instdir}/${FULLPKG}-vs2005-x64/examples/c/advect/." && \
+  /usr/bin/install -m 755 "${objdir}/database/"phreeqc.dat                   "${instdir}/${FULLPKG}-vs2005-x64/examples/com/excel/." && \
+  /usr/bin/install -m 755 "${objdir}/database/"phreeqc.dat                   "${instdir}/${FULLPKG}-vs2005-x64/examples/com/python/." && \
+  /usr/bin/install -m 755 "${objdir}/database/"pitzer.dat                    "${instdir}/${FULLPKG}-vs2005-x64/examples/com/python/." && \
+  /usr/bin/install -m 755 "${objdir}/database/"wateq4f.dat                   "${instdir}/${FULLPKG}-vs2005-x64/examples/com/python/." && \
+  /usr/bin/install -m 755 "${objdir}/database/"phreeqc.dat                   "${instdir}/${FULLPKG}-vs2005-x64/examples/cpp/advect/." && \ 
+  /usr/bin/install -m 755 "${objdir}/database/"phreeqc.dat                   "${instdir}/${FULLPKG}-vs2005-x64/examples/fortran/advect/." && \
   cd "${instdir}" && \
   zip -r ${FULLPKG}-vs2005-win32.zip ${FULLPKG}-vs2005-win32 && \
   zip -r ${FULLPKG}-vs2005-x64.zip ${FULLPKG}-vs2005-x64 && \
diff --git a/build/dist.sh b/build/dist.sh
index 87871e80..f6042c89 100644
--- a/build/dist.sh
+++ b/build/dist.sh
@@ -174,7 +174,7 @@ fi
 	     	     
 (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" \
+	     "http://internalbrr.cr.usgs.gov/svn_GW/phreeqc3/$REPOS_PATH/database" \
 	     "$DISTNAME/database")
 if [ $? != 0 ] ; then
   echo "svn checkout error"