Fix comment;

re indent

diff --git a/Install/scripts/All.bat b/Install/scripts/All.bat
index 5500bee31daa1966233a84a5efc6267e3301b59c..8690acba7b5f010df98826c98475b240757f8357 100644 (file)
--- a/Install/scripts/All.bat
+++ b/Install/scripts/All.bat
@@ -21,8 +21,6 @@ set creatoolssource=creaTools
 set creaminitoolssource=creaMiniTools
 
 set currentdir=%~dp0
-
-
 call %currentdir%\cleangeneral.bat %creatoolsGeneration% %installPrefix%
 
 

diff --git a/Install/scripts/creaMiniToolsVariables.bat b/Install/scripts/creaMiniToolsVariables.bat
index 67a11da8d1b1aba0b5c90d8ecdd00ff90ff6fded..bccc933ac36d4b3ad20c2c7f87c7aa0d2caf33b3 100644 (file)
--- a/Install/scripts/creaMiniToolsVariables.bat
+++ b/Install/scripts/creaMiniToolsVariables.bat
@@ -5,7 +5,6 @@ REM %3 = <docgeneration>
 set binfolder=%1\creatools_bin\%2Bin
 cd %binfolder%
 
-
 cmake -D crea_DIR:PATH=%1\creatools_install\crea CMakeCache.txt
 cmake -D BBTK_DIR:PATH=%1\creatools_install\bbtk CMakeCache.txt
 

diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.bat b/Install_ThirdParty/scripts/install_thirdparty_all.bat
index 2204fc2c2838c4d17780e6835c5ddac5a6730699..6d049861accd8d6759f406eb8d256c11a8f1bfee 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_all.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_all.bat
@@ -54,9 +54,6 @@ cd wxWidgets
 %zipPath%\7z.exe x ..\wxWidgets-2.9.1.7z
 
 
-
-
-
 rem -------------  vtk  --------------------
 cd  %binpath%
 mkdir %vtk%Bin
@@ -67,7 +64,7 @@ cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:
 cmake CMakeCache.txt
 call %vcvarsall%
 FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType%
-msbuild /p:Configuration=%buildType% INSTALL.vcxproj 
+msbuild /p:Configuration=%buildType% INSTALL.vcxproj
 
 
 
@@ -85,7 +82,6 @@ msbuild /p:Configuration=%buildType% INSTALL.vcxproj
 
 
 
-
 :next
 
 
@@ -96,6 +92,4 @@ FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType%
 REM msbuild /p:Configuration=%buildType% INSTALL.vcxproj
 
 
-
-
 pause

diff --git a/Linux/menu.sh b/Linux/menu.sh
index 618a633fa0875960c59c8a5c72d0380150422cb1..7c1a0a10ba73b3397a4687488868590a0aa15ec4 100644 (file)
--- a/Linux/menu.sh
+++ b/Linux/menu.sh
@@ -60,7 +60,7 @@ do
 
   case $i in
   0)
-  
+
   # Do it, while we are under user, not under root! # JPR
              if [ -f $HOME/.bashrc ]
              then
@@ -75,7 +75,7 @@ do
                        read a # just to let the user time enough to read the message...
                     fi
           fi
-         
+
   clear
   suitable=XXX
   #ls -l  scripts/CreaTools-configure.sh
@@ -101,7 +101,7 @@ do
         then
            echo WARNING
            echo "the curently used Third Party libraries are NOT in $installPrefixThird but ... in :"
-           grep "installPrefixThird=" $ETC_BASHRC 
+           grep "installPrefixThird=" $ETC_BASHRC
            echo "VTK_DIR  : " $VTK_DIR
            echo "ITK_DIR  : " $ITK_DIR
            echo "GDCM_DIR : " $GDCM_DIR
@@ -210,9 +210,9 @@ then
               docgeneration="OFF"
            fi
            echo "you said : [" $docgeneration "]"
-         done
-         echo
-         echo
+        done
+        echo
+        echo
 fi
 
 docgeneration="OFF"
@@ -379,7 +379,7 @@ docgeneration="OFF"
   fi 
   ;;
   
-  1)    
+  1)
      echo "===================================at begin 1) ======ETC_BASHRC : " $ETC_BASHRC
      read a
      echo "========================== 1 "

diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh
index 084e39db633e35faa4109d7ab5041c4a93ef47f3..aa10f438bba74aaf798f51ed1c3ca3bd8e31aa9e 100644 (file)
--- a/Linux/scripts/CreaTools-compile.sh
+++ b/Linux/scripts/CreaTools-compile.sh
@@ -36,7 +36,7 @@ fi
    echo --gdcmVersion--
    echo $gdcmVersion
    echo "--ETC_BASHRC--"
-   echo $ETC_BASHRC  
+   echo $ETC_BASHRC
    echo --sourcesFrom--
    echo $sourcesFrom
    echo --scriptDir--
@@ -137,12 +137,12 @@ then
    if [ true = true ]
    then
    # BBTK
-     echo ========================================================= $bbtksource $generationdir $installPrefix $buildType
-     bash $scriptDir/cmakemod.sh               $bbtksource $generationdir $installPrefix $buildType
-     bash $scriptDir/bbtkVariables.sh          $bbtksource $generationdir $docgeneration $gdcmVersion
-     bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber
-     bash $scriptDir/ctestmod.sh               $bbtksource $generationdir
-   fi
+   echo ========================================================= $bbtksource $generationdir $installPrefix $buildType
+   bash $scriptDir/cmakemod.sh               $bbtksource $generationdir $installPrefix $buildType
+   bash $scriptDir/bbtkVariables.sh          $bbtksource $generationdir $docgeneration $gdcmVersion
+   bash $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir $corenumber
+   bash $scriptDir/ctestmod.sh               $bbtksource $generationdir
+ fi
 fi
 
 bbtkdll=$generationdir/creatools_bin/bbtkBin

diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh
index 430b0b6a2809cd581b0304b898b2284358f28810..776d170c7859a415796209e8dd236d16e494f75b 100644 (file)
--- a/Linux/scripts/CreaTools-install.sh
+++ b/Linux/scripts/CreaTools-install.sh
@@ -29,7 +29,7 @@
   
   cd $scriptDir
 
-#create creatools_base_library_config.sh  at the very begining, so we can write "export xxx_BIN=..." inside installmod.sh. JPRx 3 mars 2011
+  #create creatools_base_library_config.sh  at the very begining, so we can write "export xxx_BIN=..." inside installmod.sh. JPRx 3 mars 2011
 
   if [ -f $installPrefix/share/creatools_base_library_config.sh ]
   then
@@ -39,17 +39,8 @@
   chmod 755 $installPrefix/share/creatools_base_library_config.sh
 
   
-# Install creatools as user (no longer as root) // JPR 2/5/2011 
- 
-#            if [ ! -f /etc/bashrc ]
-#            then
-#               export ETC_BASHRC="/etc/bash.bashrc"
-#             else
-#                 export ETC_BASHRC="/etc/bashrc"
-#             fi
-
-# export ETC_BASHRC=$HOME/.bashrc
-             
+  # Install creatools as user (no longer as root) // JPR 2/5/2011 
+      
   # - remove line 'bash $installPrefix/creatools_install/share/creatools_base_library_config.sh' if any
   sed -i -e '/.*creatools_base_library_config.*/ d' $ETC_BASHRC
   sed -i -e '/installPrefixtmp*/ d' $ETC_BASHRC
@@ -91,13 +82,13 @@
 if [ $OperatingSystem = "MacOS" ]
 then
   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$installPrefix/lib/creatools   >> $installPrefix/share/creatools_base_library_config.sh
-else  
+else
   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib/creatools   >> $installPrefix/share/creatools_base_library_config.sh
   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib64/creatools >> $installPrefix/share/creatools_base_library_config.sh
 fi
 
-
 echo "===================================================in CreaTools-install.sh ETC_BASHRC : "  $ETC_BASHRC 
+
 echo installPrefixtmp=$installPrefix >> $ETC_BASHRC
 echo '[ -f "$installPrefixtmp/share/creatools_base_library_config.sh" ] &&  source $installPrefixtmp/share/creatools_base_library_config.sh' >> $ETC_BASHRC 
 

diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh
index 1f53ddeb0a494a4ed1eef7131795f4af7f066cbd..1d9ac3b4cccffdba89666f94214133f4e56ae175 100644 (file)
--- a/Linux/scripts/CreaTools-load.sh
+++ b/Linux/scripts/CreaTools-load.sh
@@ -18,9 +18,9 @@
    echo --buildType--
    echo $buildType
    echo --gdcmVersion--
-   echo $gdcmVersion 
+   echo $gdcmVersion
    echo "--ETC_BASHRC--"
-   echo $ETC_BASHRC  
+   echo $ETC_BASHRC 
    echo --sourcesFrom--
    echo $sourcesFrom
    echo --scriptDir--

diff --git a/Linux/scripts/ThirdParty-install-Finalize.sh b/Linux/scripts/ThirdParty-install-Finalize.sh
index b1e24bafc7b4039238897fe4865380e6f9625ac4..04de94d85b70da8e0a2339bf23362ba93141e731 100644 (file)
--- a/Linux/scripts/ThirdParty-install-Finalize.sh
+++ b/Linux/scripts/ThirdParty-install-Finalize.sh
@@ -55,19 +55,6 @@ else
    echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$VTK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
 fi
 
-#                                 done in scripts/CreaTools-configure.sh // JPR
-#  case "$OperatingSystem" in
-#  Fedora)
-#     export ETC_BASHRC=$HOME/.bashrc
-#     ;;
-#  Ubuntu)
-#     export ETC_BASHRC=$HOME/.bashrc
-#     ;;
-#  MacOS)
-#     export ETC_BASHRC=$HOME/.profile
-#     ;;
-#  esac
-
    sed -i -e '/.*installPrefixThird*/ d' $ETC_BASHRC
    sed -i -e '/.*creatools_third_party_library_config.*/ d' $ETC_BASHRC
 

diff --git a/Linux/scripts/ThirdParty-install-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh
index 17af67160f11614daa9cfb2c1e66aa745de64a6b..d4ef1474665ea22941dcea07a8a68e862d265b13 100644 (file)
--- a/Linux/scripts/ThirdParty-install-ITK.sh
+++ b/Linux/scripts/ThirdParty-install-ITK.sh
@@ -14,7 +14,10 @@
    echo
    exit 0
 fi
-
+echo $PWD/scripts/CreaTools-configure.sh
+echo --- beg
+more $PWD/scripts/CreaTools-configure.sh
+echo --- end
 source $PWD/scripts/CreaTools-configure.sh
 
    echo "------"
@@ -31,6 +34,8 @@ source $PWD/scripts/CreaTools-configure.sh
    echo $buildType
    echo --gdcmVersion--
    echo $gdcmVersion
+   echo --ITKVersion--
+   echo $ITKVersion
 #   echo --sourcesFrom--
 #   echo $sourcesFrom
 #   echo --scriptDir--

diff --git a/Linux/scripts/ThirdParty-install.sh b/Linux/scripts/ThirdParty-install.sh
index 1db579a4e854aa3a577158071a53ee929aa28f2d..b9b32e141239f3e0067d69012f5ae44f773509c6 100644 (file)
--- a/Linux/scripts/ThirdParty-install.sh
+++ b/Linux/scripts/ThirdParty-install.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+
  if [ ! -f $PWD/scripts/CreaTools-configure.sh ]
  then 
    echo
@@ -11,7 +12,7 @@
    echo
    echo
    exit 0
-fi 
+fi
 echo $loginGroupName
 
 source $PWD/scripts/CreaTools-configure.sh
@@ -21,7 +22,7 @@ source $PWD/scripts/CreaTools-configure.sh
    echo --generationdir--
    echo $generationdir
    echo --corenumber--
-   echo $corenumber   
+   echo $corenumber
    echo --docgeneration--
    echo $docgeneration
    echo --installPrefix--
@@ -42,7 +43,6 @@ source $PWD/scripts/CreaTools-configure.sh
 #   echo $start_point
    echo "------"
 
-
 scriptDir=$PWD
 sourcesDir=$generationdir/thirdparty_sources
 binDir=$generationdir/thirdparty_bin
@@ -53,7 +53,6 @@ then
    chown $loginUserName  $generationdir
    chgrp $loginGroupName $generationdir
 fi
-
 if [ ! -e $sourcesDir ]
 then
    mkdir $sourcesDir
@@ -71,23 +70,19 @@ then
 fi
 
 
-
 # Third Party base stuff is now installed by ThirdParty-install-Base-Stuff.sh   JPR
 
 
-
-
 # the following stupid test is used at debug time; Please don't remove!
 #if [ true = false ]
 if [ true = true ]
 then
-
   rm -rf $sourcesDir/tth*
 
   cd $sourcesDir
 
- if [ $OperatingSystem = "MacOS" ]
-   then          
+  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
     # curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_05_Mai_2011.tar.gz
     # curl -O http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.tar.gz
@@ -117,7 +112,6 @@ else
    debug="OFF"
 fi
 
-
 #if [ true = false ]
 if [ true = true ]
 then

diff --git a/Linux/scripts/ThirdParty-install_no_compile.sh b/Linux/scripts/ThirdParty-install_no_compile.sh
index 56c6c1e8ec5cdf6d9bdfffc5671e0198ae70f9ea..16f6e5e5de2c99890980f0dbacb686b10d5501da 100644 (file)
--- a/Linux/scripts/ThirdParty-install_no_compile.sh
+++ b/Linux/scripts/ThirdParty-install_no_compile.sh
@@ -20,6 +20,8 @@ source $PWD/scripts/CreaTools-configure.sh
    echo $PWD/scripts/CreaTools-configure.sh
    echo --generationdir--
    echo $generationdir
+   echo --corenumber--
+   echo $corenumber
    echo --docgeneration--
    echo $docgeneration
    echo --installPrefix--
@@ -31,7 +33,7 @@ source $PWD/scripts/CreaTools-configure.sh
    echo --gdcmVersion--
    echo $gdcmVersion
    echo "--ETC_BASHRC--"
-   echo $ETC_BASHRC  
+   echo $ETC_BASHRC
 #   echo --sourcesFrom--
 #   echo $sourcesFrom
 #   echo --scriptDir--
@@ -39,7 +41,7 @@ source $PWD/scripts/CreaTools-configure.sh
 #   echo --start_point--
 #   echo $start_point
    echo "------"
-   
+
 scriptDir=$PWD
 sourcesDir=$generationdir/thirdparty_sources
 binDir=$generationdir/thirdparty_bin

diff --git a/Linux/scripts/installmod.sh b/Linux/scripts/installmod.sh
index d28ccc4503628a069a3ef26b609f14390354c97d..447316a45a9e51745b7827837d1993b1c285a5bb 100644 (file)
--- a/Linux/scripts/installmod.sh
+++ b/Linux/scripts/installmod.sh
@@ -41,10 +41,10 @@ else
          echo "export $2_DIR=$installPrefix/lib/creatools/$2"     >> $installPrefix/share/creatools_base_library_config.sh
          echo "export bb$2_DIR=$installPrefix/lib/creatools/bb$2" >> $installPrefix/share/creatools_base_library_config.sh    
       fi
-   
    else
       echo "============================= NEITHER $installPrefix/lib64 NOR $installPrefix/lib EXIST ?!?"
    fi
+
 fi
 cd ../..
 pwd