added HTMLversion/phreeqc3.chm to dist

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8263 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2013-11-27 08:22:00 +00:00
parent 23ab6c55e5
commit 0fff43f00c
3 changed files with 16 additions and 5 deletions

View File

@ -206,6 +206,7 @@ install() {
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" && \
/usr/bin/install -m 755 "${objdir}/doc/phreeqc3.chm" "${instdir}/${FULLPKG}-vs2005-win32/doc/phreeqc3.chm" && \
/usr/bin/install -m 755 "${objdir}/doc/IPhreeqc.pdf" "${instdir}/${FULLPKG}-vs2005-win32/doc/IPhreeqc.pdf" && \
/usr/bin/install -m 755 "${objdir}/phreeqc3-doc/NOTICE.TXT" "${instdir}/${FULLPKG}-vs2005-win32/doc/NOTICE.txt" && \
/usr/bin/install -m 755 "${objdir}/phreeqc3-doc/RELEASE.TXT" "${instdir}/${FULLPKG}-vs2005-win32/doc/RELEASE.txt" && \
@ -252,6 +253,7 @@ install() {
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" && \
/usr/bin/install -m 755 "${objdir}/doc/phreeqc3.chm" "${instdir}/${FULLPKG}-vs2005-x64/doc/phreeqc3.chm" && \
/usr/bin/install -m 755 "${objdir}/doc/IPhreeqc.pdf" "${instdir}/${FULLPKG}-vs2005-x64/doc/IPhreeqc.pdf" && \
/usr/bin/install -m 755 "${objdir}/phreeqc3-doc/NOTICE.TXT" "${instdir}/${FULLPKG}-vs2005-x64/doc/NOTICE.txt" && \
/usr/bin/install -m 755 "${objdir}/phreeqc3-doc/RELEASE.TXT" "${instdir}/${FULLPKG}-vs2005-x64/doc/RELEASE.txt" && \

View File

@ -208,6 +208,17 @@ if [ $? != 0 ] ; then
exit $?;
fi
(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")
if [ $? != 0 ] ; then
echo "svn checkout error"
exit $?;
fi
ver_major=`echo $VERSION | cut -d '.' -f 1`
ver_minor=`echo $VERSION | cut -d '.' -f 2`
ver_patch=`echo $VERSION | cut -d '.' -f 3`

View File

@ -179,11 +179,11 @@ echo "Exporting revision $REVISION of external phreeqc3-doc into sandbox..."
"http://internalbrr.cr.usgs.gov/svn_GW/phreeqc3/trunk/doc" \
"$DISTNAME/phreeqc3-doc")
echo "Exporting revision $REVISION of external HTMLversion into sandbox..."
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" \
"$DISTNAME/HTMLversion")
"http://internalbrr.cr.usgs.gov/svn_GW/phreeqc3/trunk/HTMLversion/phreeqc3.chm" \
"$DISTNAME/doc")
ver_major=`echo $VERSION | cut -d '.' -f 1`
@ -224,8 +224,6 @@ done
cp $DISTPATH/phreeqc3-doc/RELEASE.TXT $DISTPATH/doc/RELEASE
cp $DISTPATH/phreeqc3-doc/NOTICE.TXT $DISTPATH/doc/NOTICE
cp $DISTPATH/HTMLversion/phreeqc3.chm $DISTPATH/doc/phreeqc3.chm
rm -rf $DISTPATH/HTMLversion
(cd "$DISTPATH/doc" && "doxygen")