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
This commit is contained in:
Scott R Charlton 2013-08-16 00:57:55 +00:00
parent 7e9e36af4e
commit 6a8da0d7da
2 changed files with 21 additions and 1 deletions

View File

@ -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 && \

View File

@ -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"