]> Creatis software - creaToolsTools.git/commitdiff
Add creaMiniTools (for LINUX)
authorjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Mon, 11 Apr 2011 21:13:21 +0000 (21:13 +0000)
committerjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Mon, 11 Apr 2011 21:13:21 +0000 (21:13 +0000)
Linux/menu.sh
Linux/scripts/CreaTools-compile.sh
Linux/scripts/CreaTools-install.sh
Linux/scripts/CreaTools-load.sh
Linux/scripts/CreaTools-names.sh

index a8a50ac8bc113c57f293239bf06dd6a5da413452..74acab218461ddddaeff29ce0f982009f815f182 100644 (file)
@@ -318,7 +318,7 @@ do
    echo                                          >> $configureFile
    echo "#File generated by 'menu.sh'"           >> $configureFile
    echo "#DO NOT edit !"                         >> $configureFile
-   echo "#(except if you *know* what you do)"    >> $configureFile
+   echo "#(except if you *do* know what you do)" >> $configureFile
    echo                                          >> $configureFile
    echo "OperatingSystem=$OperatingSystem"       >> $configureFile
    echo "generationdir=$generationdir"           >> $configureFile
@@ -531,7 +531,7 @@ do
         echo "creaRigidRegistration_DIR :" $creaRigidRegistration_DIR
         echo "bbtkGEditor_DIR :          " $bbtkGEditor_DIR
         echo "creaTools_DIR :            " $creaTools_DIR
-                                   
+        echo "creaMiniTools_DIR :        " $creaMiniTools_DIR                              
         echo "==================================="
         echo
         echo "Press any key to continue"
@@ -544,6 +544,7 @@ do
     ;;
 
   10)
+  # Hiden option, usefull at debug time
     bash scripts/ThirdParty-install_no_compile.sh  
     ;;
       
index 03cd8c675d0d874ba7b9b78feea4e0c53df8789b..e8fd9eaa58477e0b00a477940f9d6ca4447c295a 100644 (file)
@@ -298,5 +298,23 @@ fi
 #  creatoolsdll=$generationdir/creatools_bin/creatoolsBin
 #  LD_LIBRARY_PATH=$creatoolssdll:$LD_LIBRARY_PATH
 
+
+# -------------------------
+#        start_point =  12 : creaMiniTools
+#-------------------------
+if [ $start_point -le 12 ]
+then
+# the following stupid test is used at debug time; Please don't remove!
+#if [ true = false ]
+if [ true = true ]
+then
+# creaMiniTools
+ bash $scriptDir/cmakemod.sh                $creaminitoolssource $generationdir $installPrefix $buildType 
+ bash $scriptDir/creaToolsVariables.sh      $creaminitoolssource $generationdir $docgeneration
+ bash $scriptDir/compilemod.sh   $buildType $creaminitoolssource $generationdir
+fi
+fi
+
+
 # shutdown /s
 # exit /b
index c851520a4ff32d4007e657fb829a1265342c8266..9ddde0464f1bc550c44177a22228558ed15fb503 100644 (file)
@@ -71,7 +71,8 @@ export ETC_BASHRC=$HOME/.bashrc
   bash installmod.sh $buildType $crearigidregistrationssource $generationdir  $installPrefix
   bash installmod.sh $buildType $bbtkgeditorsource            $generationdir  $installPrefix
   bash installmod.sh $buildType $creatoolssource              $generationdir  $installPrefix
-  
+  bash installmod.sh $buildType $creaminitoolssource          $generationdir  $installPrefix
+   
   #should be nice to add bbwx, too. (?) // JPR
   //bash installmod.sh $buildType bbwx              $generationdir  $installPrefix
   
index 1dcc13ad2dd6f4e9b1ee04661c89551b1c9d5e3a..4dd0700cbe71245513ac545798efb83857f2419a 100644 (file)
@@ -89,7 +89,8 @@ then
          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 $creatoolssource              $generationdir $cvsUserName
+         bash $scriptDir/cvscheckout.sh $creaminitoolssource          $generationdir $cvsUserName       
       fi
 
       if [ $sourcesFrom = HTML ]
@@ -107,7 +108,8 @@ then
          wget $wwwtargz/creaRigidRegistration.tgz
          wget $wwwtargz/bbtkGEditor.tgz
          wget $wwwtargz/creaTools.tgz
-                        
+         wget $wwwtargz/creaMiniTools.tgz
+                                
          tar xvzf crea.tgz
          tar xvzf bbtk.tgz
          tar xvzf creaMaracasVisu.tgz
@@ -118,6 +120,7 @@ then
          tar xvzf creaRigidRegistration.tgz
          tar xvzf bbtkGEditor.tgz
          tar xvzf creaTools.tgz
+         tar xvzf creaMiniTools.tgz
 
          rm -f *.tgz
       fi
index cf14c8028db9e96784e0f8591b9018818aaf04ba..0559586aa364cc4beeb6bf1adcade243266c9dd5 100644 (file)
@@ -25,7 +25,7 @@ scriptDir=$PWD/scripts
  crearigidregistrationssource=creaRigidRegistration
  bbtkgeditorsource=bbtkGEditor
  creatoolssource=creaTools
+ creaminitoolssource=creaMiniTools 
 
   creadll=$generationdir/creatools_bin/creaBin
 LD_LIBRARY_PATH=$creadll:LD_LIBRARY_$PATH
@@ -47,4 +47,5 @@ LD_LIBRARY_PATH=$crearigidregistrationdll:$LD_LIBRARY_PATH
 LD_LIBRARY_PATH=$bbtkgeditordll:$LD_LIBRARY_PATH
   creatoolsdll=$generationdir/creatools_bin/creatoolsBin
 LD_LIBRARY_PATH=$creatoolssdll:$LD_LIBRARY_PATH
-
+  creaminitoolsdll=$generationdir/creatools_bin/creaMiniToolsBin
+LD_LIBRARY_PATH=$creaminitoolssdll:$LD_LIBRARY_PATH