X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Finstallscript;h=9b4bdc081fbcf64502f06fa03d8a6907fb8e3c7e;hb=24003d856ffe0f7d73c987db33e5ca7d26697fd4;hp=851dce2046dae9c5df81dc4c1ca7c72b558f5814;hpb=5eb2abdf96b753be13fd8bb56217f357c066e941;p=creaToolsTools.git
diff --git a/Linux/installscript b/Linux/installscript
index 851dce2..9b4bdc0 100755
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -145,7 +145,7 @@ configureFile="scripts/CreaTools-configure.sh"
# default configuration parameters
OperatingSystem=`getDistrib`
corenumber=`getncore`
-generationdir=$HOME/CreatoolsGenerationDir
+generationdir=$HOME/Creatis/creaTools
installPrefixThird=
installPrefix=
docgeneration=OFF
@@ -159,9 +159,6 @@ ITKVersion=ITK3
export ETC_BASHRC=~/.bashrc
-
-
-
function usage {
echo "installscript [options] command"
echo "creatools configure/compile/install script"
@@ -173,29 +170,31 @@ function usage {
echo " command:"
echo ""
echo " as a normal user:"
- echo " config : set the configuration parameters only"
+ echo " config : set the configuration parameters only"
echo " "
- echo " as root:"
- echo " 3rd : Get, Compile, Install all 3rd party library "
- echo " 3rd-base : Install basic tools (cmake, doxygen...)"
- echo " 3rd-vtk : Get, Compile, Install vtk"
- echo " 3rd-itk : Get, Compile, Install itk"
- echo " 3rd-gdcm : Get, Compile, Install gdcm"
- echo " 3rd-wx : Get, Compile, Install wx widget (for Mac Users)"
+ echo " need root password:"
+ echo " 3rd : Get, Compile, Install all 3rd party library "
+ echo " 3rd-base : Install basic tools (cmake, doxygen...)"
+ echo " 3rd-vtk : Get, Compile, Install vtk"
+ echo " 3rd-itk : Get, Compile, Install itk"
+ echo " 3rd-gdcm : Get, Compile, Install gdcm"
+ echo " 3rd-wx : Get, Compile, Install wx widget (for Mac Users)"
echo " "
echo " as a normal user:"
- echo " creatools : Get Compile and Install the CreaTools"
- echo " creatools-get : Get the CreaTools"
- echo " creatools-cmp : Compile the CreaTools"
- echo " creatools-install : Install the CreaTools"
+ echo " creatools : Get Compile and Install the CreaTools"
+ echo " creatools-get : Get the CreaTools"
+ echo " creatools-cmp : Compile the CreaTools"
+ echo " creatools-install : Install the CreaTools"
echo " "
- echo " uninstall : uninstall the creatools"
+ echo " creatools-generateBinTGZ : generation of CreaTools.tgz (binary version)"
echo " "
- echo " printconfig : print the configuration"
- echo " help : print help"
- echo " env : print some environnement variables"
+ echo " uninstall : uninstall the creatools"
+ echo " "
+ echo " printconfig : print the configuration"
+ echo " help : print help"
+ echo " env : print some environnement variables"
echo ""
- echo " all : configure / compile / install"
+ echo " all : configure / compile / install"
echo " "
echo " "
echo " "
@@ -207,6 +206,7 @@ function usage {
echo " -gdir
: generation directory (default $generationdir)"
echo " -instprefix : creatools install prefix"
echo " -instprefix3 : 3rd party library install prefix"
+ echo " -html : get creatools from HTML"
echo " -git : get creatools from git (CREATIS user only)"
echo " -git-read-only : get creatools from git (anonymously, no write access)"
echo " -build : build type Release, RelWithDebug or Debug (default RelWithDebug)"
@@ -229,6 +229,7 @@ while [ $# -ge 1 ] ; do
-instprefix) installPrefix=$2; shift 2;;
-instprefix3) installPrefixThird=$2; shift 2;;
-doc) docgeneration=ON; shift 1;;
+ -html) sourcesFrom=HTML; shift 1;;
-git) sourcesFrom=GIT; shift 1;;
-git-read-only) sourcesFrom=GIT-READ-ONLY;
shift 1;;
@@ -244,7 +245,7 @@ if [ $# -le 0 ] ; then usage; fi
command=$1
# check that command is valid
-if [ `checkVal $command all config 3rd 3rd-base 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx creatools creatools-get creatools-cmp creatools-install uninstall printconfig help env` == "false" ] ; then
+if [ `checkVal $command all config 3rd 3rd-base 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx creatools creatools-get creatools-cmp creatools-install creatools-generateBinTGZ uninstall printconfig help env` == "false" ] ; then
echo "Unrecognized command: $command"
echo ""
usage
@@ -333,24 +334,24 @@ if [ `checkVal $command config printconfig` == true ] ; then
exit
fi
+################################################################################## creatools
+# download creatools
+if [ `checkVal $command all creatools creatools-get` == true ] ; then
+ bigDisplay "DOWNLOAD CREATOOLS"
+ bash scripts/CreaTools-load.sh
+fi
################################################################################## 3rd library
# install packaged dependencies as root
if [ `checkVal $command all 3rd 3rd-base` == true ] ; then
bigDisplay "INSTALL PACKAGES DEPENDENCIES"
- if [ "`whoami`" == root ] ; then
- echo ThirdParty-install-Base-Stuff
- bash scripts/ThirdParty-install-Base-Stuff.sh
- else
- # must log as root
- echo "Please enter the root passwd to add necessary packages:";
- su -c "bash scripts/ThirdParty-install-Base-Stuff.sh"
- fi
+ source scripts/CreaTools-configure.sh
+ cd scripts
+ source ThirdParty-install-Base-Stuff.sh $OperatingSystem
+ cd ..
bash scripts/ThirdParty-install.sh
fi
-
-
# vtk
if [ `checkVal $command all 3rd 3rd-vtk` == true ] ; then
bigDisplay "INSTALL VTK"
@@ -387,16 +388,11 @@ if [ `checkVal $command all 3rd 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx ` == true ] ; th
fi
################################################################################## creatools
-
-# download creatools
-if [ `checkVal $command all creatools creatools-get` == true ] ; then
- bigDisplay "DOWNLOAD CREATOOLS"
- bash scripts/CreaTools-load.sh
-fi
-
# compile creatools
if [ `checkVal $command all creatools creatools-cmp` == true ] ; then
bigDisplay "COMPILE CREATOOLS"
+echo "EED installscript compile creatools"
+echo $ETC_BASHRC
source $ETC_BASHRC
bash -x scripts/CreaTools-compile.sh
@@ -420,10 +416,23 @@ if [ `checkVal $command all creatools creatools-install` == true ] ; then
source $ETC_BASHRC
bash scripts/CreaTools-install.sh
source $ETC_BASHRC
+ echo " "
+ echo " "
+ echo " "
+ echo " "
+ echo "Open a new terminal to run creatools."
+ echo "(Close this window and continue....) "
+ echo " "
+ echo " "
+ read -p "Press [Enter] key to continue..."
fi
-################################################################################## uninstall
+#generate TGZ version of the bin (Creatools and ThirdParty)
+if [ `checkVal $command creatools-generateBinTGZ` == true ] ; then
+ bash scripts/CreaTools-GenerateBinTGZ.sh
+fi
+################################################################################## uninstall
if [ `checkVal $command uninstall` == true ] ; then
bigDisplay "UNINSTALL CREATOOLS"
bash scripts/CreaTools-uninstall.sh