# HG changeset patch # User greg # Date 1447541897 18000 # Node ID cd0e48578c91ce1ba4086da50a57fc5ab7d089d5 # Parent ee534b2a2094bee0f93aa9e30cf877b3078638e4 Uploaded diff -r ee534b2a2094 -r cd0e48578c91 tool_dependencies.xml --- a/tool_dependencies.xml Sat Nov 14 17:03:10 2015 -0500 +++ b/tool_dependencies.xml Sat Nov 14 17:58:17 2015 -0500 @@ -37,7 +37,6 @@ export PATH=$INSTALL_DIR/bin:$PATH && - export PYTHONPATH=$INSTALL_DIR/lib/python2.7/site-packages:$INSTALL_DIR/lib/python2.7:$INSTALL_DIR/lib:$INSTALL_DIR:$PYTHONPATH && export LD_LIBRARY_PATH=$INSTALL_DIR/lib:$LD_LIBRARY_PATH && export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH && $INSTALL_DIR/bin/python setup.py install --prefix=$INSTALL_DIR @@ -52,7 +51,6 @@ export PATH=$INSTALL_DIR/bin:$PATH && - export PYTHONPATH=$INSTALL_DIR/lib/python2.7/site-packages:$INSTALL_DIR/lib/python2.7:$INSTALL_DIR/lib:$INSTALL_DIR:$PYTHONPATH && export LD_LIBRARY_PATH=$INSTALL_DIR/lib:$LD_LIBRARY_PATH && export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH && $INSTALL_DIR/bin/python setup.py install --prefix=$INSTALL_DIR @@ -67,7 +65,6 @@ export PATH=$INSTALL_DIR/bin:$PATH && - export PYTHONPATH=$INSTALL_DIR/lib/python2.7/site-packages:$INSTALL_DIR/lib/python2.7:$INSTALL_DIR/lib:$INSTALL_DIR:$PYTHONPATH && export LD_LIBRARY_PATH=$INSTALL_DIR/lib:$LD_LIBRARY_PATH && cmake -DINSTALL_USER=OFF -DINSTALL_PREFIX=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR @@ -87,13 +84,17 @@ https://3230d63b5fc54e62148e-c95ac804525aac4b6dba79b00b39d1d3.ssl.cf1.rackcdn.com/Anaconda-2.3.0-MacOSX-x86_64.sh + + + + + bash Anaconda-2.3.0-MacOSX-x86_64.sh -b -f -p $INSTALL_DIR export PATH=$INSTALL_DIR/bin:$PATH && - export PYTHONPATH=$INSTALL_DIR/lib/python2.7/site-packages:$INSTALL_DIR/lib/python2.7:$INSTALL_DIR/lib:$INSTALL_DIR:$PYTHONPATH && export DYLD_LIBRARY_PATH=$INSTALL_DIR/lib:$DYLD_LIBRARY_PATH && export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH && conda install -c https://conda.anaconda.org/anaconda vtk --yes @@ -111,7 +112,6 @@ export PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin:$PATH && - export PYTHONPATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib/python2.7/site-packages:$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib/python2.7:pkgs/vtk-6.3.0-py27_0/lib:$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin && export DYLD_LIBRARY_PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib:$DYLD_LIBRARY_PATH && export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH && $INSTALL_DIR/bin/python setup.py install --prefix=$INSTALL_DIR @@ -126,7 +126,6 @@ export PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin:$PATH && - export PYTHONPATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib/python2.7/site-packages:$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib/python2.7:pkgs/vtk-6.3.0-py27_0/lib:$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin && export DYLD_LIBRARY_PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib:$DYLD_LIBRARY_PATH && export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH $INSTALL_DIR/bin/python setup.py install --prefix=$INSTALL_DIR @@ -141,7 +140,6 @@ export PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin:$PATH && - export PYTHONPATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib/python2.7/site-packages:$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib/python2.7:pkgs/vtk-6.3.0-py27_0/lib:$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/bin && export DYLD_LIBRARY_PATH=$INSTALL_DIR/pkgs/vtk-6.3.0-py27_0/lib:$DYLD_LIBRARY_PATH && cmake -DINSTALL_USER=OFF -DINSTALL_PREFIX=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR