diff tool_dependencies.xml @ 2:31643745f30c draft

Uploaded
author iuc
date Wed, 28 Jan 2015 02:49:39 -0500
parents 9fbaadc2f81a
children 8118aacf1600
line wrap: on
line diff
--- a/tool_dependencies.xml	Mon Mar 17 18:20:56 2014 -0400
+++ b/tool_dependencies.xml	Wed Jan 28 02:49:39 2015 -0500
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <tool_dependency>
     <package name="bzlib" version="1.0.6">
-        <repository changeset_revision="e89ba6f88ab2" name="package_bzlib_1_0" owner="iuc" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+        <repository changeset_revision="d971aef661a7" name="package_bzlib_1_0" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="boost" version="1.55.0">
         <install version="1.0">
@@ -10,7 +10,7 @@
 
                 <!-- populate the environment variables from the dependend repos -->
                 <action type="set_environment_for_install">
-                    <repository changeset_revision="e89ba6f88ab2" name="package_bzlib_1_0" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="d971aef661a7" name="package_bzlib_1_0" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu">
                         <package name="bzlib" version="1.0.6" />
                     </repository>
                 </action>
@@ -18,7 +18,8 @@
                 <action type="shell_command">./bootstrap.sh</action>
                 <!-- try to set the right architecture with uname -m -->
                 <action type="shell_command">
-                    ./bjam address-model=64 cflags=-fPIC cxxflags=-fPIC install --prefix=$INSTALL_DIR/boost/ -sBZIP2_INCLUDE=$BZLIB_INCLUDE_DIR -sBZIP2_LIB=$BZLIB_LIB_DIR -sBZIP2_SOURCE=$BZLIB_SOURCE_DIR; 
+                    ./bjam address-model=64 cflags=-fPIC cxxflags=-fPIC install --prefix=$INSTALL_DIR/boost/ -sBZIP2_INCLUDE=$BZLIB_INCLUDE_DIR -sBZIP2_LIB=$BZLIB_LIB_DIR -sBZIP2_SOURCE=$BZLIB_SOURCE_DIR; 2&gt;&amp;1
+                
                 </action>
                 <action type="set_environment">
                     <environment_variable action="set_to" name="BOOST_ROOT_DIR">$INSTALL_DIR/boost</environment_variable>
@@ -29,7 +30,7 @@
             </actions>
         </install>
         <readme>
-        Compiling boost requires a C++ compiler (typically gcc). 
+        Compiling boost requires a C++ compiler (typically gcc).
         You can access the boost root directory through the $BOOST_ROOT_DIR system variable. All modules will be build.
         Development of that wrapper happens in https://github.com/bgruening/galaxytools/.
         </readme>