Skip to content

Commit

Permalink
Change downloads from using wget to using curl.
Browse files Browse the repository at this point in the history
build.sh: remove unecessary / at end of directory name.
setup.py: remove unecessary / at end of dir name.
  • Loading branch information
bradbell committed Mar 19, 2011
1 parent 0caa876 commit 2af5200
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions build.sh
Expand Up @@ -21,7 +21,7 @@ yyyymmdd=`date +%F | sed -e 's|-||g'` # todays year, month, and day
cppad_tarball='cppad-20110101.2.gpl.tgz' # local_cppad_directory.gpl.tgz
cppad_parent_dir=`pwd` # parrent of local_cppad_directory
log_dir=`pwd` # write build.sh logs in here
cppad_download_dir='http://www.coin-or.org/download/source/CppAD/'
cppad_download_dir='http://www.coin-or.org/download/source/CppAD'
omhelp_download_dir='http://www.seanet.com/~bradbell'
# ----------------------------------------------------------------------------
# Update setup.py so it corresponds to current build.sh options above.
Expand Down Expand Up @@ -64,8 +64,8 @@ then
echo "rm OMhelp.unix.tar.gz"
rm OMhelp.unix.tar.gz
fi
echo "wget $omhelp_download_dir/OMhelp.unix.tar.gz"
wget "$omhelp_download_dir/OMhelp.unix.tar.gz"
echo "curl -O $omhelp_download_dir/OMhelp.unix.tar.gz"
curl -O "$omhelp_download_dir/OMhelp.unix.tar.gz"
#
echo "tar -xzf OMhelp.unix.tar.gz"
tar -xzf OMhelp.unix.tar.gz
Expand Down
10 changes: 5 additions & 5 deletions setup.py
Expand Up @@ -24,7 +24,7 @@
# Values in setup.py that are replaced by build.sh
package_version = '20110319'
cppad_tarball = 'cppad-20110101.2.gpl.tgz'
cppad_download_dir = 'http://www.coin-or.org/download/source/CppAD/'
cppad_download_dir = 'http://www.coin-or.org/download/source/CppAD'
# ---------------------------------------------------------------------
import re
import sys
Expand Down Expand Up @@ -71,12 +71,12 @@
if not os.access( cppad_include_dir , os.R_OK ) :
print 'os.getcwd() = ' + os.getcwd()
print 'Please wait while the proper version of CppAD is downloaded'
cmd = 'wget --no-clobber -P ' + cppad_parent_dir
cmd = cmd + ' ' + cppad_download_dir + '/' + cppad_tarball
cmd = '( cd ' + cppad_parent_dir + ';'
cmd = cmd + ' curl -O ' + cppad_download_dir + '/' + cppad_tarball + ')'
print cmd
os.system( cmd )
cmd = 'tar -C ' + cppad_parent_dir
cmd = cmd + ' -xzf ' + cppad_parent_dir + '/' + cppad_tarball
cmd = '( cd ' + cppad_parent_dir + ';'
cmd = cmd + ' tar -xzf ' + cppad_parent_dir + '/' + cppad_tarball + ')'
print cmd
os.system( cmd )
if not os.access( cppad_include_dir , os.R_OK ) :
Expand Down

0 comments on commit 2af5200

Please sign in to comment.