Modified the scripts to switch from CVS to Git.

diff --git a/Install/Readme.txt b/Install/Readme.txt
index e5ac1aefaff74dd8fdc0154d354ec2ad78204389..5ed32706bb01ff829badc742f9940ff5f1f46653 100644 (file)
--- a/Install/Readme.txt
+++ b/Install/Readme.txt
@@ -36,7 +36,7 @@ execute All.bat
 
 Not forget to run your ssh key with puttyAgent
 
-All the creatools projects are downloaded from the CVS, compiled and the CTest for the dashboard is run.
+All the creatools projects are downloaded from the GIT repository, compiled and the CTest for the dashboard is run.
 
 
 
@@ -49,7 +49,7 @@ Install
        MikTex 
        Putty
        Graphviz
-       TortoiseCVS
+       TortoiseGIT
        NSIS
         cmake (outside of "Programs Files")
        crea_ThirdParty_Libraries  (outside of "Programs Files")

diff --git a/Install/creatools.bat_TEMPLATE b/Install/creatools.bat_TEMPLATE
index 55e12a4b9f45fc19cad1f14de0edc2e941e2f406..9cd680c3157106fe204665d4c141a79b2f9fd7f3 100644 (file)
--- a/Install/creatools.bat_TEMPLATE
+++ b/Install/creatools.bat_TEMPLATE
@@ -25,13 +25,13 @@ REM ------------------------------------------------------------------------
 set creatoolsGeneration=<directory where you want to generate>
 set installPrefix=%creatoolsGeneration%\creatools_install
 set buildType=<Debug|Release>
-set cvsUser=<USER>
+set gitUser=<USER>
 set docGeneration=<OFF|ON> let it to OFF!
 ::Set the following line ON if you want to force x86 compilation
 set forcex86=OFF
 
 cd scripts
-call All.bat %creatoolsGeneration% %docGeneration% %cvsUser% %installPrefix% %buildType% %forcex86%
+call All.bat %creatoolsGeneration% %docGeneration% %gitUser% %installPrefix% %buildType% %forcex86%
 cd ..
 pause
 exit

diff --git a/Install/scripts/All.bat b/Install/scripts/All.bat
index 7a5fda383de81b1db5fc75c6de094f949719737a..c4b2960d4ec9c4a80f973799a0c79f2008bd424a 100644 (file)
--- a/Install/scripts/All.bat
+++ b/Install/scripts/All.bat
@@ -25,7 +25,7 @@ REM ------------------------------------------------------------------------
 
 set creatoolsGeneration=%1
 set docgeneration=%2
-set cvsUser=%3
+set gitUser=%3
 set installPrefix=%4
 set buildtype=%5
 set forcex86=%6

diff --git a/Linux/README.txt b/Linux/README.txt
index f26a08e54baf9a1bd2a89a77ad22e24508b83cec..bdb5c0cb40cd29c6a5c5ce5f27d63236ab1ac257 100644 (file)
--- a/Linux/README.txt
+++ b/Linux/README.txt
@@ -38,10 +38,10 @@ doc for installscript
 # to configure only
 ./installscript -gdir $HOME/work/creatools/creainstall config
 or
-./installscript -cvs sdika -ncore 4 -gdir $HOME/work/creatools/creainstall config
+./installscript -git sdika -ncore 4 -gdir $HOME/work/creatools/creainstall config
 
 # to configure / compile-install all packages and the creatools themselves 
-./installscript -cvs sdika -ncore 4 -gdir $HOME/work/creatools/creainstall all
+./installscript -git sdika -ncore 4 -gdir $HOME/work/creatools/creainstall all
 
 # compile-install only one part (vtk  for example) ONCE CONFIG HAS BEEN RUN 
 ./installscript 3rd-vtk
@@ -63,7 +63,7 @@ You will be prompted to say what you want to do :
  Install Third Party Libraries :....1 (as root)
  Get and Install the 'CreaTools':...2
  or
- Get the 'CreaTools' source files :.2.1 (CVS : as user!)
+ Get the 'CreaTools' source files :.2.1 (GIT : as user!)
  Compile   the CreaTools :..........2.2
  Install   the CreaTools :..........2.3
  
@@ -85,14 +85,12 @@ You will be prompted to give your preferences :
 "Number of Cores"
 "Name of the Generation Directory"
 "Boolean for Doc Generation : YES/NO"
-"Where do you want to get source files from : CVS/HTML"
+"Where do you want to get source files from : GIT/HTML"
 
--> if you chose CVS: 
+-> if you chose GIT: 
 1/ you must have shared your public key on CREATIS server
-2/ you have to set properly the CVSROOT environment variable
-(see https://www.creatis.insa-lyon.fr/mywiki/Utiliser_CVS_avec_la_ligne_de_commande)
 
-"CVS User name"
+"GIT User name"
 "Login 'User' name"
 "Login 'Group' name"
 "Build type : Release/Debug"

diff --git a/Linux/installscript b/Linux/installscript
index 54aa4dbc9c71a4496bb5670417f49beaf43f41ec..562978342420a9e11ee7ad187c313af4fb9040b3 100755 (executable)
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -119,8 +119,8 @@ function printconfig {
     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 ] ; then
-    echo "  CVS User Name                              : $cvsUserName"
+    if [ $sourcesFrom = GIT ] ; then
+    echo "  GIT User Name                              : $gitUserName"
     fi
     echo "  Login User Name                            : $loginUserName"
     echo "  Login Group Name                           : $loginGroupName"
@@ -152,7 +152,7 @@ installPrefix=
 docgeneration=OFF
 sourcesFrom=HTML
 
-cvsUserName=
+gitUserName=
 loginUserName=$USER
 loginGroupName=`groups | awk '{print $1}'`
 buildType=RelWithDebug
@@ -165,7 +165,7 @@ export ETC_BASHRC=`getbashrc`
 
 
 function usage {
-    echo "installscript [options] command" 
+    echo "menu.sh [options] command" 
     echo "creatools configure/compile/install script" 
     echo "" 
     echo "" 
@@ -204,7 +204,7 @@ function usage {
     echo "        -gdir <dir>           : generation directory (default $generationdir)"
     echo "        -instprefix <dir>     : creatools install prefix" 
     echo "        -instprefix3 <dir>    : 3rd party library install prefix" 
-    echo "        -cvs <cvsusername>    : get creatools from cvs (CREATIS user only)"
+    echo "        -git <gitusername>    : get creatools from git (CREATIS user only)"
     echo "        -build                : build type Release, RelWithDebug or Debug (default RelWithDebug)"
     echo ""
     echo "     experimental configure options (use at your own risk!!):"
@@ -225,7 +225,7 @@ while [ $# -ge 1 ] ; do
         -instprefix)        installPrefix=$2;                          shift 2;;
         -instprefix3)       installPrefixThird=$2;                     shift 2;;
         -doc)               docgeneration=ON;                          shift 1;;
-        -cvs)               sourcesFrom=CVS; cvsUserName=$2;           shift 2;;
+        -git)               sourcesFrom=GIT; gitUserName=$2;           shift 2;;
         -gdcm2)             gdcmVersion=GDCM2;                         shift 1;;
         -itk4)              ITKVersion=ITK4;                           shift 1;;
         -build)             buildType=$2;                              shift 2;;
@@ -289,7 +289,7 @@ fi
 if [ `checkVal $command config all` == true ] ; then
     echo "#!/bin/bash"                            >  $configureFile
     echo                                          >> $configureFile
-    echo "#File generated by 'installscript'"           >> $configureFile
+    echo "#File generated by 'menu.sh'"           >> $configureFile
     echo "#DO NOT edit !"                         >> $configureFile
     echo "#(except if you *do* know what you do)" >> $configureFile
     echo                                          >> $configureFile
@@ -300,7 +300,7 @@ if [ `checkVal $command config all` == true ] ; then
     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

diff --git a/Linux/menu.sh b/Linux/menu.sh
index 680658a20ced04439f061bd526a02d4026b3f35e..6860f65421aec97e49903c20066c0f04a539306b 100644 (file)
--- a/Linux/menu.sh
+++ b/Linux/menu.sh
@@ -58,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"
@@ -245,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
@@ -259,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
@@ -353,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"
@@ -391,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
@@ -414,7 +414,7 @@ docgeneration="OFF"
      bash scripts/ThirdParty-install.sh
      bash scripts/ThirdParty-install-Finalize.sh
 
-     if [ "$sourcesFrom" = "CVS" ]
+     if [ "$sourcesFrom" = "GIT" ]
      then
         echo "----------------------------------------------------------------------"
         echo OK

diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh
index 52a6cfc93b7f27711bc2211de57f2ff5a81ce840..cff47e6da6c5f47a1454817ef67845e3c031e161 100644 (file)
--- a/Linux/scripts/CreaTools-load.sh
+++ b/Linux/scripts/CreaTools-load.sh
@@ -104,19 +104,19 @@ then
    #if [ true = false ]
    then
 #
-      if [ $sourcesFrom = CVS ]
+      if [ $sourcesFrom = GIT ]
       then
-         bash $scriptDir/cvscheckout.sh $creasource                   $generationdir $cvsUserName
-         bash $scriptDir/cvscheckout.sh $bbtksource                   $generationdir $cvsUserName 
-         bash $scriptDir/cvscheckout.sh $creamaracassource            $generationdir $cvsUserName 
-         bash $scriptDir/cvscheckout.sh $creaenvironmentsource        $generationdir $cvsUserName 
-         bash $scriptDir/cvscheckout.sh $creabrukersource             $generationdir $cvsUserName 
-         bash $scriptDir/cvscheckout.sh $creaimagesource              $generationdir $cvsUserName 
-         bash $scriptDir/cvscheckout.sh $creacontourssource           $generationdir $cvsUserName 
-         bash $scriptDir/cvscheckout.sh $crearigidregistrationssource $generationdir $cvsUserName 
-         bash $scriptDir/cvscheckout.sh $bbtkgeditorsource            $generationdir $cvsUserName 
-         bash $scriptDir/cvscheckout.sh $creatoolssource              $generationdir $cvsUserName
-         bash $scriptDir/cvscheckout.sh $creaminitoolssource          $generationdir $cvsUserName
+         bash $scriptDir/gitclone.sh $creasource                   $generationdir $gitUserName
+         bash $scriptDir/gitclone.sh $bbtksource                   $generationdir $gitUserName 
+         bash $scriptDir/gitclone.sh $creamaracassource            $generationdir $gitUserName 
+         bash $scriptDir/gitclone.sh $creaenvironmentsource        $generationdir $gitUserName 
+         bash $scriptDir/gitclone.sh $creabrukersource             $generationdir $gitUserName 
+         bash $scriptDir/gitclone.sh $creaimagesource              $generationdir $gitUserName 
+         bash $scriptDir/gitclone.sh $creacontourssource           $generationdir $gitUserName 
+         bash $scriptDir/gitclone.sh $crearigidregistrationssource $generationdir $gitUserName 
+         bash $scriptDir/gitclone.sh $bbtkgeditorsource            $generationdir $gitUserName 
+         bash $scriptDir/gitclone.sh $creatoolssource              $generationdir $gitUserName
+         bash $scriptDir/gitclone.sh $creaminitoolssource          $generationdir $gitUserName
  #       bash $scriptDir/cvscheckout.sh $libidosource-ESRF            $generationdir $cvsUserName
  #            mv $libidosource-ESRF $libidosource               
       fi

diff --git a/Linux/scripts/CreaTools-names.sh b/Linux/scripts/CreaTools-names.sh
index 12b5e8ede7d5eda0cfbb3a348f29a0ae199a3d1c..28109bcd68671863a6c59d846cfac20886d82946 100644 (file)
--- a/Linux/scripts/CreaTools-names.sh
+++ b/Linux/scripts/CreaTools-names.sh
@@ -31,9 +31,9 @@
 #allow debugger to choose the startpoint
 # start_point : used at debug time : start point of the script
 # ex : if everything is OK, but bbtkGEditor, 
-# cvs upate bbtkGEditor manually, and use :
+# git pull bbtkGEditor manually, and use :
 # start_point=10
-# in order not to 'cvs checkout' everything, nor recompile everything.
+# in order not to 'git clone' everything, nor recompile everything.
 
 start_point=0
 

diff --git a/Linux/scripts/ThirdParty-install-Base-Stuff.sh b/Linux/scripts/ThirdParty-install-Base-Stuff.sh
index d95c2f27d0a5424291f537111f374083c23b48bd..86bf91f9eb21f09b1323aed05bffd32ae57c87bb 100644 (file)
--- a/Linux/scripts/ThirdParty-install-Base-Stuff.sh
+++ b/Linux/scripts/ThirdParty-install-Base-Stuff.sh
@@ -95,7 +95,7 @@ then
      urpmi lib64wxgtk2.8-devel
      urpmi libwxgtk2.8-devel
      urpmi gcc-c++
-     urpmi cvs
+     urpmi git
      urpmi rpm-build
 
      ;;
@@ -115,7 +115,7 @@ then
      yum install gcc                  -y
      yum install gcc-c++              -y
      yum install xerces-c-devel       -y
-     yum install cvs                  -y
+     yum install git                  -y
      yum install qtwebkit-devel       -y
 
      ;;
@@ -145,10 +145,9 @@ then
      ;;
   MacOS)
      port selfupdate
-
      port install cmake                -y
-     port install graphviz             -y
      port install doxygen              -y
+     port install graphviz             -y
     # port install tetex               -y   (replaced by texlive) # cf EED : http://www.creatis.insa-lyon.fr/site/fr/CreatoolsInstallInstructionsv2.0.1MacOsv10.5.6-Developpers
      port install texlive              -y
      port install latex2html           -y

diff --git a/Linux/scripts/gitclone.sh b/Linux/scripts/gitclone.sh
new file mode 100644 (file)
index 0000000..a1d2f35
--- /dev/null
+++ b/Linux/scripts/gitclone.sh
@@ -0,0 +1,9 @@
+#$1 creasource                   
+#$2 generationdir 
+#$3 gitUserName
+
+   
+cd $2/creatools_source 
+git clone ssh://gitolite@git.creatis.insa-lyon.fr/$1
+cd ..
+

diff --git a/README.txt b/README.txt
index b3a0ec3bff4eb1b746eac9007eb2dca409759698..20af5bb703102a8cd8f57045e67861088b3edd0a 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -35,16 +35,17 @@ crea_Developers_tools, crea_ThirdParty_dlls, and VisualStudioExpress2008
 Have a look at :
 http://www.creatis.insa-lyon.fr/site/fr/CreatoolsDownload
 
-Change your CVS user in the file All.bat
+Change your GIT user in the file All.bat
 
 Copy all the .bat files into one directoy where the tests are going to be run
 execute All.bat
 
 Do not forget to run your ssh key with puttyAgent
 
-All the creatools projects are downloaded from the CVS, compiled and the CTest for the dashboard is run.
 
+All the creatools projects are downloaded from the GIT, compiled and the CTest for the dashboard is run.
 
 creaToolsTools
 Version 1.0.0
 (c) CREATIS 2012
+