]> Creatis software - creaToolsTools.git/commitdiff
git://git.creatis.insa-lyon.fr / creaToolsTools.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f82028 ad62528)
#3133 creaToolsTools Feature New Normal - branch vtk7itk4wx3 wxWidgets3
authorEduardo DAVILA <davila@localhost.localdomain>
Tue, 3 Oct 2017 11:58:39 +0000 (13:58 +0200)
committerEduardo DAVILA <davila@localhost.localdomain>
Tue, 3 Oct 2017 11:58:39 +0000 (13:58 +0200)
1  2 
Linux/scripts/CreaTools-load.sh patch | diff1 | diff2 | blob | history
Linux/scripts/ThirdParty-install-Finalize.sh patch | diff1 | diff2 | blob | history

diff --cc Linux/scripts/CreaTools-load.sh
index ab1395163b048cbb8431a3cb13eb665a85fc758e,0b4e67d5b00c71f0f0c224905b7539770110eef7..90a9d4c657497a8554a0a2ae003a78ff91a4bc55
--- 1/Linux/scripts/CreaTools-load.sh
--- 2/Linux/scripts/CreaTools-load.sh
+++ b/Linux/scripts/CreaTools-load.sh
@@@ -121,28 -121,21 +121,28 @@@ the
           bash $scriptDir/gitclone.sh $creaminitoolssource          $generationdir     $sourcesFrom
           bash $scriptDir/gitclone.sh $creatoolstoolssource         $generationdir     $sourcesFrom
   #       bash $scriptDir/cvscheckout.sh $libidosource-ESRF         $generationdir   $cvsUserName
-  #         mv $libidosource-ESRF $libidosource                 
 - #           mv $libidosource-ESRF $libidosource               
 -
 -              cd $generationdir/creatools_source/$creasource
 -              git checkout changeWx28to30
 -              cd $generationdir/creatools_source/$bbtksource
 -              git checkout changeWx28to30
 -              cd $generationdir/creatools_source/$creamaracassource
 -              git checkout changeWx28to30
 -              cd $generationdir/creatools_source/$creaimagesource
 -              git checkout changeWx28to30
 -              cd $generationdir/creatools_source/$creacontourssource
 -              git checkout changeWx28to30
 -              cd $generationdir/creatools_source/$bbtkgeditorsource
 -              git checkout changeWx28to30
 -
++ #     mv $libidosource-ESRF $libidosource             
 +          
 +         cd $generationdir/creatools_source/$creasource
 +               git checkout vtk7itk4wx3
 +         cd $generationdir/creatools_source/$bbtksource
 +               git checkout vtk7itk4wx3
 +         cd $generationdir/creatools_source/$creavtksource
 +               git checkout vtk7itk4wx3
 +         cd $generationdir/creatools_source/$creamaracassource
 +               git checkout vtk7itk4wx3
 +         cd $generationdir/creatools_source/$creaimagesource
 +               git checkout vtk7itk4wx3
 +         cd $generationdir/creatools_source/$creacontourssource
 +               git checkout vtk7itk4wx3
 +         cd $generationdir/creatools_source/$crearigidregistrationssource
 +               git checkout vtk7itk4wx3
 +         cd $generationdir/creatools_source/$bbtkgeditorsource
 +               git checkout vtk7itk4wx3
 +         cd $generationdir/creatools_source/$creatoolssource
 +               git checkout vtk7itk4wx3
 +               cd $generationdir/creatools_source/$creabrukersource
 +               git checkout vtk7itk4wx3
        fi
  
        if [ $sourcesFrom = HTML ]
diff --cc Linux/scripts/ThirdParty-install-Finalize.sh
index 7a7e683fde008c6b70772fa4580662ee5428a4f8,8ed620908a12d53970a1ca6a51fdc4b46d07f366..5dca330a39b87b6830e8a901ed1cf60d523746c5
--- 1/Linux/scripts/ThirdParty-install-Finalize.sh
--- 2/Linux/scripts/ThirdParty-install-Finalize.sh
+++ b/Linux/scripts/ThirdParty-install-Finalize.sh
@@@ -65,11 -65,12 +65,12 @@@ f
  touch     $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
  chmod 755 $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
  
 -
+ echo export GDK_BACKEND=x11                                                           >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 +echo export MESA_GL_VERSION_OVERRIDE=3.2                              >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
  echo installPrefixThird='$1'                                                                          >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 -echo export PATH='$'PATH:'$'installPrefixThird/bin            >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 -echo export VTK_DIR='$'installPrefixThird/lib/vtk-5.10                >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 -echo export ITK_DIR='$'installPrefixThird/lib/InsightToolkit  >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 +echo export PATH='$'PATH:'$'installPrefixThird/bin                            >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 +echo export VTK_DIR='$'installPrefixThird/lib                                 >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
- echo export ITK_DIR='$'installPrefixThird/lib                         >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
++echo export ITK_DIR='$'installPrefixThird/lib                                 >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
  echo export GDCM_DIR='$'installPrefixThird/lib/gdcm           >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
  echo export WT_DIR='$'installPrefixThird/lib/wt-3.3.4                 >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
  echo export TTH='$'installPrefixThird/bin/tth                 >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
@@@ -79,12 -80,12 +80,12 @@@ the
     echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'GDCM_DIR   >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
     echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'ITK_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
     echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'VTK_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 -   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'WT_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 +   echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:'$'WT_DIR       >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
  else
--   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'GDCM_DIR   >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
--   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'ITK_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
--   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'VTK_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
-    echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'WT_DIR           >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
 -   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'WT_DIR    >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
++   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'GDCM_DIR         >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
++   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'ITK_DIR          >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
++   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'VTK_DIR          >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
++   echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:'$'WT_DIR                   >> $baseLibraryThirdPartyDir/creatools_third_party_library_config.sh
  fi
  
  cd $PWD/scripts
Basic tools for creaTools installation