Galaxy |

Changeset 16:cee17b592b17 (2016-07-12)

Previous changeset 15:37a6491da3ed (2016-07-12) Next changeset 17:8ce91708b876 (2016-07-12)

Commit message:
Uploaded

modified:
tool_dependencies.xml

diff -r 37a6491da3ed -r cee17b592b17 tool_dependencies.xml
--- a/tool_dependencies.xml Tue Jul 12 09:36:46 2016 -0400
+++ b/tool_dependencies.xml Tue Jul 12 10:03:21 2016 -0400

b'@@ -16,7 +16,7 @@\n </repository>\n </action>\n \n- <action type="shell_command">bash Anaconda-2.3.0-Linux-x86_64.sh -b -f -p $INSTALL_DIR</action>\n+ <action type="shell_command">bash Anaconda-2.3.0-Linux-x86_64.sh -b -f -p $INSTALL_DIR/anaconda</action>\n \n \n <action type="make_directory">$TMP_WORK_DIR/vtk</action>\n@@ -26,9 +26,9 @@\n <action type="change_directory">VTK-6.3.0</action>\n <action type="shell_command">\n \n- export PATH=$INSTALL_DIR/bin:$PATH &&\n- export PYTHONPATH=$INSTALL_DIR:$PYTHONPATH &&\n- export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH &&\n+ export PATH=$INSTALL_DIR/anaconda/bin:$PATH &&\n+ export PYTHONPATH=$INSTALL_DIR/anaconda:$PYTHONPATH &&\n+ export PKG_CONFIG_PATH=$INSTALL_DIR/anaconda/lib/pkgconfig:$PKG_CONFIG_PATH &&\n cmake \\\n -DCMAKE_BUILD_TYPE:STRING=Release \\\n -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_DIR/vtk \\\n@@ -55,10 +55,10 @@\n -DModule_vtkIOLegacy:BOOL=ON \\\n -DModule_vtkWrappingPythonCore:BOOL=ON \\\n -DModule_vtkIOPLY:BOOL=ON \\\n- -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=$INSTALL_DIR/lib/python2.7/site-packages \\\n- -DPYTHON_EXECUTABLE:PATH=$INSTALL_DIR/bin/python \\\n- -DPYTHON_LIBRARY:PATH=$INSTALL_DIR/lib/libpython2.7.so \\\n- -DPYTHON_INCLUDE_DIR:PATH=$INSTALL_DIR/include/python2.7 . &&\n+ -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=$INSTALL_DIR/anaconda/lib/python2.7/site-packages \\\n+ -DPYTHON_EXECUTABLE:PATH=$INSTALL_DIR/anaconda/bin/python \\\n+ -DPYTHON_LIBRARY:PATH=$INSTALL_DIR/anaconda/lib/libpython2.7.so \\\n+ -DPYTHON_INCLUDE_DIR:PATH=$INSTALL_DIR/anaconda/include/python2.7 . &&\n make -j 8 &&\n make install\n \n@@ -71,11 +71,14 @@\n <action type="change_directory">icqsol</action>\n <action type="shell_command">\n \n- export PATH=$INSTALL_DIR/vtk/bin:$PATH &&\n+ export PATH=$INSTALL_DIR/anaconda/bin:$INSTALL_DIR/vtk/bin:$PATH &&\n export VTK_INCLUDE_DIR=$INSTALL_DIR/vtk/include/vtk-6.3 &&\n+ export C_INCLUDE_PATH=$INSTALL_DIR/vtk/include/vtk-6.3 &&\n+ export CPLUS_INCLUDE_PATH=$INSTALL_DIR/vtk/include/vtk-6.3 &&\n export VTK_LIBRARY_DIR=$INSTALL_DIR/vtk/lib &&\n- $INSTALL_DIR/bin/python setup.py develop --prefix=$INSTALL_DIR\n- $INSTALL_DIR/bin/python setup.py install --prefix=$INSTALL_DIR\n+ export LD_LIBRARY_PATH=$INSTALL_DIR/vtk/lib &&\n+ $INSTALL_DIR/anaconda/bin/python setup.py develop --prefix=$INSTALL_DIR/anaconda\n+ $INSTALL_DIR/anaconda/bin/python setup.py install --prefix=$INSTALL_DIR/anaconda\n \n </action>\n \n@@ -84,8 +87,8 @@\n Only the PATH environment variable needs to be modified for an Anaconda environment so that it gets\n the right Python from the environment bin directory.\n '..b'b/pkgconfig:$PKG_CONFIG_PATH &&\n+ export PATH=$INSTALL_DIR/anaconda/bin:$PATH &&\n+ export PKG_CONFIG_PATH=$INSTALL_DIR/anaconda/lib/pkgconfig:$PKG_CONFIG_PATH &&\n cmake \\\n -DCMAKE_BUILD_TYPE:STRING=Release \\\n- -DCMAKE_INSTALL_PREFIX:PATH==$INSTALL_DIR/vtk \\\n+ -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_DIR/vtk \\\n -DVTK_WRAP_PYTHON:BOOL=ON \\\n -DVTK_Group_StandAlone:BOOL=OFF \\\n -DVTK_Group_Rendering:BOOL=OFF \\\n@@ -138,10 +141,10 @@\n -DModule_vtkIOLegacy:BOOL=ON \\\n -DModule_vtkWrappingPythonCore:BOOL=ON \\\n -DModule_vtkIOPLY:BOOL=ON \\\n- -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=$INSTALL_DIR/lib/python2.7/site-packages \\\n- -DPYTHON_EXECUTABLE:PATH=$INSTALL_DIR/bin/python \\\n- -DPYTHON_LIBRARY:PATH=$INSTALL_DIR/lib/libpython2.7.dylib \\\n- -DPYTHON_INCLUDE_DIR:PATH=$INSTALL_DIR/include/python2.7 . &&\n+ -DVTK_INSTALL_PYTHON_MODULE_DIR:PATH=$INSTALL_DIR/anaconda/lib/python2.7/site-packages \\\n+ -DPYTHON_EXECUTABLE:PATH=$INSTALL_DIR/anaconda/bin/python \\\n+ -DPYTHON_LIBRARY:PATH=$INSTALL_DIR/anaconda/lib/libpython2.7.dylib \\\n+ -DPYTHON_INCLUDE_DIR:PATH=$INSTALL_DIR/anaconda/include/python2.7 . &&\n make -j 8 &&\n make install\n \n@@ -154,11 +157,14 @@\n <action type="change_directory">icqsol</action>\n <action type="shell_command">\n \n- export PATH=$INSTALL_DIR/vtk/bin:$PATH &&\n+ export PATH=$INSTALL_DIR/anaconda/bin:$INSTALL_DIR/vtk/bin:$PATH &&\n export VTK_INCLUDE_DIR=$INSTALL_DIR/vtk/include/vtk-6.3 &&\n+ export C_INCLUDE_PATH=$INSTALL_DIR/vtk/include/vtk-6.3 &&\n+ export CPLUS_INCLUDE_PATH=$INSTALL_DIR/vtk/include/vtk-6.3 &&\n export VTK_LIBRARY_DIR=$INSTALL_DIR/vtk/lib &&\n- $INSTALL_DIR/bin/python setup.py develop --prefix=$INSTALL_DIR &&\n- $INSTALL_DIR/bin/python setup.py install --prefix=$INSTALL_DIR\n+ export DYLD_LIBRARY_PATH=$INSTALL_DIR/vtk/lib &&\n+ $INSTALL_DIR/anaconda/bin/python setup.py develop --prefix=$INSTALL_DIR/anaconda\n+ $INSTALL_DIR/anaconda/bin/python setup.py install --prefix=$INSTALL_DIR/anaconda\n \n </action>\n \n@@ -172,8 +178,8 @@\n binary in the environment already searches the site-packages in the environment, and the lib of the\n environment, and so on.\n -->\n- <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>\n- <environment_variable action="prepend_to" name="DYLD_LIBRARY_PATH">$INSTALL_DIR/lib</environment_variable>\n+ <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/anaconda/bin</environment_variable>\n+ <environment_variable action="prepend_to" name="DYLD_LIBRARY_PATH">$INSTALL_DIR/vtk/lib</environment_variable>\n <environment_variable action="set_to" name="ICQSOL_ROOT_DIR">$INSTALL_DIR</environment_variable>\n </action>\n </actions>\n'