X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fmenu.sh;h=6860f65421aec97e49903c20066c0f04a539306b;hb=b4ac6055e816b0995a665af7747052fb379c0580;hp=7d765e86e34b744622d5177519473f741b35a082;hpb=3202f48ff5769117a50f26d7f2fd30d20d22c7b2;p=creaToolsTools.git

diff --git a/Linux/menu.sh b/Linux/menu.sh
index 7d765e8..6860f65 100644
--- a/Linux/menu.sh
+++ b/Linux/menu.sh
@@ -1,3 +1,27 @@
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------  
+
+
 #!/bin/bash -e
 
   if [ -f scripts/CreaTools-configure.sh ]
@@ -26,6 +50,7 @@ do
       echo " Get, Compile, Install vtk   .......1.1"                
       echo " Get, Compile, Install gdcm :.. .  .1.2" 
       echo " Get, Compile, Install itk  :.......1.3"
+      echo " Get, Compile, Install Wx (for Mac Users)  :…....1.4"
 
    else
       echo " Install Third Party Libraries :....1 (as root)"   
@@ -33,7 +58,7 @@ do
      
    if [ $expanded = "YES" ]
    then
-      echo " Get the 'CreaTools' source files :.2.1 (CVS : as user!)" 
+      echo " Get the 'CreaTools' source files :.2.1 (GIT : as user!)" 
       echo " Compile   the CreaTools :..........2.2"
       # Install creatools as user (no longer as root) // JPR 2/5/2011   
       echo " Install   the CreaTools :..........2.3"
@@ -220,13 +245,13 @@ docgeneration="OFF"
         # ------------------
 
         sourcesFrom="___"
-        while [[ "$sourcesFrom" != "CVS"  && "$sourcesFrom" != "HTML" ]]
+        while [[ "$sourcesFrom" != "GIT"  && "$sourcesFrom" != "HTML" ]]
         do
-           echo "Where do you want to get source files from : CVS/HTML ( CVS : for registered CREATIS users only! )"
+           echo "Where do you want to get source files from : GIT/HTML ( GIT : for registered CREATIS users only! )"
            read sourcesFrom
            if [ "$sourcesFrom" = "" ]
            then
-              sourcesFrom="CVS"
+              sourcesFrom="GIT"
            fi
            echo "you said : [" $sourcesFrom "]"
         done
@@ -234,17 +259,17 @@ docgeneration="OFF"
         echo
         # ------------------
 
-        cvsUserName=""
-        if [ "$sourcesFrom" = "CVS" ]
+        gitUserName=""
+        if [ "$sourcesFrom" = "GIT" ]
         then
-           while [ "$cvsUserName" == "" ]
+           while [ "$gitUserName" == "" ]
            do
-              echo "CVS User Name ( registered CREATIS user : mandatory!)"
-              read cvsUserName
+              echo "GIT User Name ( registered CREATIS user : mandatory!)"
+              read gitUserName
            done
-           echo "you said : [" $cvsUserName "]"
+           echo "you said : [" $gitUserName "]"
         else
-           cvsUserName="ForgetThisOne" 
+           gitUserName="ForgetThisOne" 
         fi
         echo
         echo
@@ -328,9 +353,9 @@ docgeneration="OFF"
         echo "  Install Prefix for CreaTools               : $installPrefix"
         echo "  Boolean for Doc Generation                 : $docgeneration"
         echo "  Where do you want to get source files from : $sourcesFrom"
-        if [ $sourcesFrom = CVS ]
+        if [ $sourcesFrom = GIT ]
         then
-           echo "  CVS User Name                              : $cvsUserName"
+           echo "  GIT User Name                              : $gitUserName"
         fi
         echo "  Login User Name                            : $loginUserName"
         echo "  Login Group Name                           : $loginGroupName"
@@ -366,7 +391,7 @@ docgeneration="OFF"
    echo "installPrefixThird=$installPrefixThird" >> $configureFile
    echo "docgeneration=$docgeneration"           >> $configureFile
    echo "sourcesFrom=$sourcesFrom"               >> $configureFile
-   echo "cvsUserName=$cvsUserName"               >> $configureFile 
+   echo "gitUserName=$gitUserName"               >> $configureFile 
    echo "loginUserName=$loginUserName"           >> $configureFile
    echo "loginGroupName=$loginGroupName"         >> $configureFile
    echo "buildType=$buildType"                   >> $configureFile
@@ -389,17 +414,17 @@ docgeneration="OFF"
      bash scripts/ThirdParty-install.sh
      bash scripts/ThirdParty-install-Finalize.sh
 
-     if [ "$sourcesFrom" = "CVS" ]
+     if [ "$sourcesFrom" = "GIT" ]
      then
         echo "----------------------------------------------------------------------"
         echo OK
         echo "To go on, run again 'bash menu.sh' as '$loginUserName', in a new window"
-        echo "---------------------------------------------------------------------"
+        echo "----------------------------------------------------------------------"
      else
         echo "----------------------------------------------------------------------"
         echo OK
         echo "To go on, run again 'bash menu.sh'  in a new window"
-        echo "---------------------------------------------------------------------"
+        echo "----------------------------------------------------------------------"
      fi
      echo
      echo "==>"
@@ -407,7 +432,6 @@ docgeneration="OFF"
      echo "==>"
      source $ETC_BASHRC
      read a
-     kill -9 $PPID 
   ;;
 
   1.0)
@@ -437,6 +461,13 @@ docgeneration="OFF"
      bash scripts/ThirdParty-install-ITK.sh
      bash scripts/ThirdParty-install-Finalize.sh         
   ;;
+  1.4)
+    echo "========================== 1.4 "
+     #source scripts/Check-if-root.sh
+     bash scripts/ThirdParty-install-WX.sh     
+     bash scripts/ThirdParty-install-Finalize.sh         
+     read a
+  ;;
 
   2)
      #2.1
@@ -608,3 +639,4 @@ docgeneration="OFF"
 
 done
 
+