Mercurial > repos > brenninc > brenninc_r_sept32105

changeset 3:3ab867976871 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author brenninc
date Wed, 30 Sep 2015 04:16:16 -0400
parents f0ec34556396
children 1d7f08f14e93
files tool_dependencies.xml
diffstat 1 files changed, 31 insertions(+), 46 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Fri Sep 04 08:30:41 2015 -0400
+++ b/tool_dependencies.xml	Wed Sep 30 04:16:16 2015 -0400
@@ -1,68 +1,53 @@
 <?xml version="1.0"?>
 <tool_dependency>
-    <package name="brenninc_R" version="3.2.1">
+    <package name="R" version="3.2.1">
         <install version="1.0">
             <actions>
                 <action type="download_by_url">http://cran.rstudio.com/src/base/R-3/R-3.2.1.tar.gz</action>
                 <package name="atlas" version="3.10.2">
-                    <repository changeset_revision="86b7c19454fa" name="package_atlas_3_10" owner="iuc" prior_installation_required="True" 
-                                toolshed="https://testtoolshed.g2.bx.psu.edu" />
+                    <repository changeset_revision="86b7c19454fa" name="package_atlas_3_10" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
                 </package>
                 <package name="readline" version="6.3">
-                    <repository changeset_revision="40f8ebe365e9" name="package_readline_6_3" owner="iuc" prior_installation_required="True" 
-                                toolshed="https://testtoolshed.g2.bx.psu.edu" />
+                    <repository changeset_revision="40f8ebe365e9" name="package_readline_6_3" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
                 </package>
                 <package name="libpng" version="1.6.7">
-                    <repository changeset_revision="ac6ef08bf0e6" name="package_libpng_1_6_7" owner="iuc" prior_installation_required="True" 
-                                toolshed="https://testtoolshed.g2.bx.psu.edu" />
+                    <repository changeset_revision="ac6ef08bf0e6" name="package_libpng_1_6_7" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
                 </package>
-                <package name="cairo" version="1.12.14">
-                    <repository changeset_revision="980c02545efc" name="brenninc_cairo_4sept2015" owner="brennic" prior_installation_required="True" 
-                                toolshed="https://testtoolshed.g2.bx.psu.edu" />
+                <package name="cairo" version="1.14.2">
+                    <repository changeset_revision="9fe5875b0ede" name="package_cairo_1_14_2" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
                 </package>
-                <package name="pixman" version="0.32.6">i
-                    <repository changeset_revision="2db67636b074" name="package_pixman_0_32_6" owner="iuc" prior_installation_required="True" 
-                                toolshed="https://testtoolshed.g2.bx.psu.edu" />
+                <package name="pixman" version="0.32.6">
+                    <repository changeset_revision="2db67636b074" name="package_pixman_0_32_6" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
                 </package>
                 <package name="freetype" version="2.5.2">
-                    <repository changeset_revision="8999860ddf69" name="package_freetype_2_5_2" owner="iuc" prior_installation_required="True" 
-                                toolshed="https://testtoolshed.g2.bx.psu.edu" />
+                    <repository changeset_revision="55f81025bcb0" name="package_freetype_2_5_2" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
                 </package>
                 <package name="ncurses" version="6.0">
-                    <repository changeset_revision="9331b44bf167" name="package_ncurses_6_0" owner="iuc" prior_installation_required="True" 
-                                toolshed="https://testtoolshed.g2.bx.psu.edu" />
+                    <repository changeset_revision="9331b44bf167" name="package_ncurses_6_0" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
                 </package>
                 <package name="fontconfig" version="2.11.1">
-                    <repository changeset_revision="1db671dd3e91" name="package_fontconfig_2_11_1" owner="iuc" prior_installation_required="True" 
-                                toolshed="https://testtoolshed.g2.bx.psu.edu" />
+                    <repository changeset_revision="e1df54930f90" name="package_fontconfig_2_11_1" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu" />
                 </package>
                 <action type="set_environment_for_install">
-                    <repository changeset_revision="40f8ebe365e9" name="package_readline_6_3" owner="iuc" prior_installation_required="True" 
-                                toolshed="https://testtoolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="40f8ebe365e9" name="package_readline_6_3" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu">
                         <package name="readline" version="6.3" />
                     </repository>
-                    <repository changeset_revision="ac6ef08bf0e6" name="package_libpng_1_6_7" owner="iuc" prior_installation_required="True" 
-                                toolshed="https://testtoolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="ac6ef08bf0e6" name="package_libpng_1_6_7" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu">
                         <package name="libpng" version="1.6.7" />
                     </repository>
-                    <repository changeset_revision="980c02545efc" name="brenninc_cairo_4sept2015" owner="brennic" prior_installation_required="True" 
-                                toolshed="https://testtoolshed.g2.bx.psu.edu">
-                        <package name="cairo" version="1.12.14" />
+                    <repository changeset_revision="9fe5875b0ede" name="package_cairo_1_14_2" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu">
+                        <package name="cairo" version="1.14.2" />
                     </repository>
-                    <repository changeset_revision="2db67636b074" name="package_pixman_0_32_6" owner="iuc" prior_installation_required="True" 
-                                toolshed="https://testtoolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="2db67636b074" name="package_pixman_0_32_6" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu">
                         <package name="pixman" version="0.32.6" />
                     </repository>
-                    <repository changeset_revision="8999860ddf69" name="package_freetype_2_5_2" owner="iuc" prior_installation_required="True" 
-                                toolshed="https://testtoolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="55f81025bcb0" name="package_freetype_2_5_2" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu">
                         <package name="freetype" version="2.5.2" />
                     </repository>
-                    <repository changeset_revision="9331b44bf167" name="package_ncurses_6_0" owner="iuc" prior_installation_required="True" 
-                                toolshed="https://testtoolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="9331b44bf167" name="package_ncurses_6_0" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu">
                         <package name="ncurses" version="6.0" />
                     </repository>
-                    <repository changeset_revision="1db671dd3e91" name="package_fontconfig_2_11_1" owner="iuc" prior_installation_required="True" 
-                                toolshed="https://testtoolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="e1df54930f90" name="package_fontconfig_2_11_1" owner="iuc" prior_installation_required="True" toolshed="https://testtoolshed.g2.bx.psu.edu">
                         <package name="fontconfig" version="2.11.1" />
                     </repository>
                 </action>
@@ -75,20 +60,20 @@
                     export LDFLAGS="$LDFLAGS -Wl,-rpath,$FREETYPE_LIB_PATH" &amp;&amp;
                     export LDFLAGS="$LDFLAGS -Wl,-rpath,$FONTCONFIG_LIB_PATH" &amp;&amp;
                     export LDFLAGS="$LDFLAGS -Wl,-rpath,$CAIRO_LIB_PATH" &amp;&amp;
-                    export CFLAGS="-I$PNG_INCLUDES -I$NCURSES_INCLUDE_PATH -I$READLINE_INCLUDE_PATH -I$LIBPNG_INCLUDE_PATH -I$FONTCONFIG_INCLUDE_PATH -I$CAIRO_INCLUDE_PATH" &amp;&amp;
+                    export# CFLAGS="-I$PNG_INCLUDES -I$NCURSES_INCLUDE_PATH -I$READLINE_INCLUDE_PATH -I$LIBPNG_INCLUDE_PATH -I$FONTCONFIG_INCLUDE_PATH -I$CAIRO_INCLUDE_PATH" &amp;&amp;
                     export CXXFLAGS="-I$PNG_INCLUDES -I$NCURSES_INCLUDE_PATH -I$READLINE_INCLUDE_PATH -I$LIBPNG_INCLUDE_PATH -I$FONTCONFIG_INCLUDE_PATH -I$CAIRO_INCLUDE_PATH" &amp;&amp;
                     export CPPFLAGS="-I$PNG_INCLUDES -I$NCURSES_INCLUDE_PATH -I$READLINE_INCLUDE_PATH -I$LIBPNG_INCLUDE_PATH -I$FONTCONFIG_INCLUDE_PATH -I$CAIRO_INCLUDE_PATH" &amp;&amp;
-                        ./configure --with-tcltk \
-                                    --with-blas \
-                                    --with-lapack \
-                                    --with-readline \
-                                    --with-cairo \
-                                    --with-libpng \
-                                    --without-x \
-                                    --enable-R-shlib \
-                                    --disable-R-framework \
-                                    --libdir=$INSTALL_DIR/lib \
-                                    --prefix=$INSTALL_DIR 
+                    ./configure --with-tcltk \
+                                --with-blas \
+                                --with-lapack \
+                                --with-readline \
+                                --with-cairo \
+                                --with-libpng \
+                                --without-x \
+                                --enable-R-shlib \
+                                --disable-R-framework \
+                                --libdir=$INSTALL_DIR/lib \
+                                --prefix=$INSTALL_DIR 
                 </action>
                 <action type="make_install" />
                 <action type="shell_command">sed -i.bak -e 's;$INSTALL_DIR;\${R_ROOT_DIR};g' $INSTALL_DIR/bin/R</action>