# HG changeset patch
# User iuc
# Date 1383672263 18000
# Node ID 978287122b91162dbfce1e877426dd68a8d6e092
# Parent  c807cdcad590c15d5e196e7de68eaa61f6317498
Uploaded

diff -r c807cdcad590 -r 978287122b91 tool_dependencies.xml
--- a/tool_dependencies.xml	Mon Nov 04 23:38:35 2013 -0500
+++ b/tool_dependencies.xml	Tue Nov 05 12:24:23 2013 -0500
@@ -5,31 +5,31 @@
 
                 <!-- install perl -->
                 <action type="download_by_url">http://www.cpan.org/src/5.0/perl-5.18.1.tar.gz</action>
-                <action type="shell_command">./Configure -des -Dprefix=$INSTALL_DIR ; make ; make install</action>
+                <action type="shell_command">./Configure -des -Dprefix=$INSTALL_DIR</action>
+                <action type="make_install" />
 
                 <action type="download_file">http://www.cpan.org/authors/id/A/AP/APEIRON/local-lib-1.008009.tar.gz</action>
                 <action type="shell_command">tar xfvz local-lib-1.008009.tar.gz</action>
                 <action type="change_directory">local-lib-1.008009</action>
-                <action type="shell_command">perl Makefile.PL --bootstrap=$INSTALL_DIR/local-lib/ --no-manpages</action>
+                <!-- TODO: Here we need to use the new installed perl binary -->
+                <action type="shell_command">$INSTALL_DIR/bin/perl Makefile.PL --bootstrap=$INSTALL_DIR/local-lib/ --no-manpages</action>
                 <action type="shell_command">make install</action>
-                <action type="shell_command">eval $($INSTALL_DIR/bin/perl -I$INSTALL_DIR/local-lib/perl5 -Mlocal::lib=$INSTALL_DIR/local-lib)</action>
+                <action type="shell_command">eval $(perl -I$INSTALL_DIR/local-lib/perl5 -Mlocal::lib=$INSTALL_DIR/local-lib)</action>
 
-
-                
                 <!-- install cpanminus into our new perl environment -->
                 <action type="download_file">https://raw.github.com/miyagawa/cpanminus/c0c88f71118ecec334d62ba280e883933e7a6d39/cpanm</action>
-
+                <!-- prepanding means that the new install perl binary will be used after the pipe -->
                 <action type="shell_command">export PERL5LIB=$INSTALL_DIR/lib/perl5/:$PERL5LIB ; export PATH=$INSTALL_DIR/bin/:$PATH ; cat cpanm | perl - App::cpanminus</action>
 
-                <!-- Use cpanminus to install some perl packages -->
-                <action type="shell_command">
-                    export PERL5LIB=$INSTALL_DIR/lib/perl5/:$PERL5LIB ; export PATH=$INSTALL_DIR/bin/:$PATH ; cpanm --local-lib=$INSTALL_DIR XML::Parser
+                <!--
+                <action type="chmod">
+                    <file mode="750">cpanm</file>
                 </action>
-                <action type="shell_command">
-                    export PERL5LIB=$INSTALL_DIR/lib/perl5/:$PERL5LIB ; export PATH=$INSTALL_DIR/bin/:$PATH ; cpanm --local-lib=$INSTALL_DIR CGI
+                <action type="move_file">
+                    <source>cpanm</source>
+                    <destination>$INSTALL_DIR/bin/</destination>
                 </action>
-
-
+                -->
                 <action type="set_environment">
                     <environment_variable name="PATH" action="prepend_to">$INSTALL_DIR/bin</environment_variable>
                     <environment_variable name="PERL5LIB" action="prepend_to">$INSTALL_DIR/lib/perl5</environment_variable>
@@ -38,7 +38,11 @@
             </actions>
         </install>
         <readme>
-            Perl installation test.
+            Perl 5 is a highly capable, feature-rich programming language with over 25 years of development.
+            http://www.perl.org/
+            
+            This repository contains local-lib and cpanm in addition.
+            It is recommended to use something like "cpanm --local-lib=$PERL_ROOT_DIR XML::Parser" to install additional perl modules.
         </readme>
     </package>
 </tool_dependency>