Mercurial > repos > greg > package_icqsol_1_0

changeset 6:50b81c1d4294 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author greg
date Fri, 08 Jul 2016 14:06:52 -0400
parents 70c2d4e3a34b
children 94ea1b21697c
files tool_dependencies.xml
diffstat 1 files changed, 6 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Wed Jan 13 08:03:14 2016 -0500
+++ b/tool_dependencies.xml	Fri Jul 08 14:06:52 2016 -0400
@@ -18,7 +18,7 @@
 
                     <action type="shell_command">bash Anaconda-2.3.0-Linux-x86_64.sh -b -f -p $INSTALL_DIR</action>
 
-                    <!-- Install VTK 6.2.0 into the above Python -->
+                    <!-- Install VTK 6.3.0 into the above Python -->
                     <action type="make_directory">$TMP_WORK_DIR/vtk</action>
                     <action type="change_directory">$TMP_WORK_DIR/vtk</action>
                     <action target_filename="VTK-6.3.0.tar.gz" type="download_file">http://www.vtk.org/files/release/6.3/VTK-6.3.0.tar.gz</action>
@@ -114,15 +114,15 @@
 
                     <action type="shell_command">bash Anaconda-2.3.0-MacOSX-x86_64.sh -b -f -p $INSTALL_DIR</action>
 
-                    <!-- Install and compile VTK 6.2.0 as a package in the above Python -->
+                    <!-- Install and compile VTK 6.3.0 as a package in the above Python -->
                     <action type="make_directory">$TMP_WORK_DIR/vtk</action>
                     <action type="change_directory">$TMP_WORK_DIR/vtk</action>
-                    <action target_filename="VTK-6.2.0.tar.gz" type="download_file">http://www.vtk.org/files/release/6.2/VTK-6.2.0.tar.gz</action>
-                    <action type="shell_command">tar xfvz VTK-6.2.0.tar.gz</action>
-                    <action type="change_directory">VTK-6.2.0</action>
+                    <action target_filename="VTK-6.3.0.tar.gz" type="download_file">http://www.vtk.org/files/release/6.3/VTK-6.3.0.tar.gz</action>
+                    <action type="shell_command">tar xfvz VTK-6.3.0.tar.gz</action>
+                    <action type="change_directory">VTK-6.3.0</action>
                     <action type="shell_command">
                         
-                            export PATH=$INSTALL_DIR/bin:$INSTALL_DIR/bin:$PATH &amp;&amp;
+                            export PATH=$INSTALL_DIR/bin:$PATH &amp;&amp;
                             export PKG_CONFIG_PATH=$INSTALL_DIR/lib/pkgconfig:$PKG_CONFIG_PATH &amp;&amp;
                             cmake \
                             -DCMAKE_BUILD_TYPE:STRING=Release \
@@ -158,18 +158,6 @@
                             make install
                         
                     </action>
-                     <action type="move_directory_files">
-                         <source_directory>../build/bin</source_directory>
-                         <destination_directory>$INSTALL_DIR/bin</destination_directory>
-                     </action>
-                     <action type="move_directory_files">
-                         <source_directory>../build/include</source_directory>
-                         <destination_directory>$INSTALL_DIR/include</destination_directory>
-                     </action>
-                     <action type="move_directory_files">
-                         <source_directory>../build/lib</source_directory>
-                         <destination_directory>$INSTALL_DIR/lib</destination_directory>
-                     </action>
 
                     <!-- Install and compile icqsol version 1.0 as a package in the above Python -->
                     <action type="make_directory">$TMP_WORK_DIR/icqsol</action>