From 4f9f17bfd98a80e233f9f9e93ea84c92e2aaf7cb Mon Sep 17 00:00:00 2001
From: jean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Date: Wed, 15 Jun 2011 15:23:21 +0000
Subject: [PATCH] missing tar
---
Linux/menu.sh | 6 ++++--
Linux/scripts/ThirdParty-install-ITK.sh | 1 +
Linux/scripts/ThirdParty-install-VTK.sh | 7 ++++++-
Linux/scripts/ThirdParty-install-gdcm.sh | 8 ++++----
4 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/Linux/menu.sh b/Linux/menu.sh
index 8ab4e9a..f3da997 100644
--- a/Linux/menu.sh
+++ b/Linux/menu.sh
@@ -397,8 +397,10 @@ docgeneration="OFF"
1.1)
echo "========================== 1.1 "
- source scripts/Check-if-root.sh
- bash scripts/ThirdParty-install-VTK.sh
+ source scripts/Check-if-root.sh
+ read a
+ bash scripts/ThirdParty-install-VTK.sh
+ read a
bash scripts/ThirdParty-install-Finalize.sh
read a
;;
diff --git a/Linux/scripts/ThirdParty-install-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh
index 3d4e271..1d05c04 100644
--- a/Linux/scripts/ThirdParty-install-ITK.sh
+++ b/Linux/scripts/ThirdParty-install-ITK.sh
@@ -54,6 +54,7 @@ fi
tar -xvf InsightToolkit-3.20.0.tar.gz
else
wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.tar.gz
+ tar -xzvf InsightToolkit-3.20.0.tar.gz
fi
if [ $buildType = "Debug" ]
diff --git a/Linux/scripts/ThirdParty-install-VTK.sh b/Linux/scripts/ThirdParty-install-VTK.sh
index 5d2bf7e..985474d 100644
--- a/Linux/scripts/ThirdParty-install-VTK.sh
+++ b/Linux/scripts/ThirdParty-install-VTK.sh
@@ -1,4 +1,6 @@
#!/bin/bash
+
+echo "in ThirdParty-onstall-VTK.sh, source " $PWD/scripts/CreaTools-configure.sh
if [ ! -f $PWD/scripts/CreaTools-configure.sh ]
then
echo
@@ -13,6 +15,7 @@
exit 0
fi
+source $PWD/scripts/CreaTools-configure.sh
scriptDir=$PWD
sourcesDir=$generationdir/thirdparty_sources
@@ -47,7 +50,8 @@ fi
rm -rf $binDir/VTK*
cd $sourcesDir
-
+
+ echo "we download new stuff"
if [ $OperatingSystem = "MacOS" ]
then
curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz
@@ -55,6 +59,7 @@ fi
tar -xvf VTK-5.6.1.patchCreatis.tar.gz
else
wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/VTK-5.6.1.patchCreatis.tar.gz
+ tar -xzvf VTK-5.6.1.patchCreatis.tar.gz
fi
if [ $buildType = "Debug" ]
diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh b/Linux/scripts/ThirdParty-install-gdcm.sh
index 12efd37..a0d65e4 100644
--- a/Linux/scripts/ThirdParty-install-gdcm.sh
+++ b/Linux/scripts/ThirdParty-install-gdcm.sh
@@ -79,12 +79,12 @@ then
if [ $OperatingSystem = "MacOS" ]
then
- curl http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
+ curl http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
+ tar -xvf gdcm_05_Mai_2011.tar.gz
else
- wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
- fi
-
+ wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
tar -xvzf gdcm_05_Mai_2011.tar.gz
+ fi
fi
--
2.49.0