Mercurial > repos > yhoogstrate > flaimapper

diff tool_dependencies.xml @ 8:c5df479c423b draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author yhoogstrate
date Thu, 19 Mar 2015 10:17:46 -0400
parents 548e7c482077
children ebee07644459
line wrap: on
line diff
--- a/tool_dependencies.xml	Fri Nov 07 10:54:58 2014 -0500
+++ b/tool_dependencies.xml	Thu Mar 19 10:17:46 2015 -0400
@@ -1,19 +1,33 @@
 <?xml version="1.0"?>
 <tool_dependency>
 	<package name="pysam" version="0.7.7">
-		<repository changeset_revision="240d1ad9f207" name="package_pysam_0_7_7" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu" />
+		<repository changeset_revision="ca10c522f37e" name="package_pysam_0_7_7" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
 	</package>
 	
-	<package name="flaimapper" version="1.1.0">
+	<package name="pysam" version="0.8.1">
+		<repository changeset_revision="6b6843e15541" name="package_pysam_0_8_1" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
+	</package>
+	
+	<package name="flaimapper" version="1.1.2">
 		<install version="1.0">
 			<actions>
-				<action type="shell_command">git clone --quiet --recursive https://github.com/yhoogstrate/flaimapper.git ; cd flaimapper ; git reset --hard "109a7ee13cfad6eb4746422a5382a928e141d0a1" ; cd src ; python setup.py build</action><!-- 109a7ee13cfad6eb4746422a5382a928e141d0a1 should be the latest 1.1.0 commit -->
-				<action type="make_directory">$INSTALL_DIR/lib/python</action>
-				<action type="make_directory">$INSTALL_DIR/lib64/python</action>
-				<action type="shell_command">cd src ; pwd ; ls ; export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python:$INSTALL_DIR/lib64/python &amp;&amp; python setup.py install --home $INSTALL_DIR --install-scripts $INSTALL_DIR/bin</action>
+				
+				<action type="set_environment_for_install">
+					<repository changeset_revision="ca10c522f37e" name="package_pysam_0_7_7" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu">
+						<package name="pysam" version="0.7.7" />
+					</repository>
+					<repository changeset_revision="6b6843e15541" name="package_pysam_0_8_1" owner="iuc" toolshed="https://testtoolshed.g2.bx.psu.edu">
+						<package name="pysam" version="0.8.1" />
+					</repository>
+				</action>
+				
+				<action type="make_directory">$INSTALL_DIR</action>
+				<action type="make_directory">$INSTALL_DIR/bin</action>
+				
+				<action type="shell_command">export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR:$INSTALL_DIR"/lib/python":$INSTALL_DIR"/lib64/python":$PYSAM_PATH:$PYSAM_PATH"/lib/python":$PYSAM_PATH"/lib64/python" ; easy_install --prefix=$INSTALL_DIR --install-dir=$INSTALL_DIR --script-dir=$INSTALL_DIR/bin $REPOSITORY_INSTALL_DIR"/egg/flaimapper-1.1.2-py2.7.egg"</action>
 				
 				<action type="set_environment">
-					<environment_variable action="append_to" name="PYTHONPATH">$INSTALL_DIR/lib/python:$INSTALL_DIR/lib64/python</environment_variable>
+					<environment_variable action="append_to" name="PYTHONPATH">$INSTALL_DIR:$INSTALL_DIR/lib/python:$INSTALL_DIR/lib64/python</environment_variable>
 					<environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
 				</action>
 			</actions>