#3446 vtk8itk5wx3-macos in Linux

diff --git a/Linux/scripts/CreaTools-GenerateBinTGZ.sh b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
index a0bd36d91cf034e6c89a5186d1dfea9fdc1c7e72..c2b9c1be57f510adf37189e15c5c549577d72518 100644 (file)
--- a/Linux/scripts/CreaTools-GenerateBinTGZ.sh
+++ b/Linux/scripts/CreaTools-GenerateBinTGZ.sh
@@ -37,6 +37,13 @@
   if [ -e $generationdir ]
   then
 
+#--------Active SSH agent to the next operations---------------------------------------------------------
+       echo "Active SSH agent to copy files to the Cluster:"
+       ssh-add 
+
+
+#--------CreaTools-Bin  for Package developers---------------------------------------------------------
+
        echo generationdir:
        echo $generationdir
        cd $generationdir
@@ -47,17 +54,73 @@
        ln -s $installPrefixThird thirdparty_install
 
        source creatools_install/share/creatools/Version.sh 
-       distanceAdress=davila@tux.creatis.insa-lyon.fr:creatools/creaTools/v$creatoolsMajorVersion.$creatoolsMinorVersion.x/
-
+#      distanceAdress=davila@tux.creatis.insa-lyon.fr:creatools/creaTools/v$creatoolsMajorVersion.$creatoolsMinorVersion.x/
+       distanceAdress=davila@tux.creatis.insa-lyon.fr:creatools/creaTools/v$creatoolsMajorVersion.x.x/
        fileTGZ=CreaTools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion-`getDistrib`-`getDistribVersion`.tgz
        fileTGZstring=CreaTools-Bin-Release-\$creatoolsMajorVersion.\$creatoolsMinorVersion.\$creatoolsBuildVersion-\`getDistrib\`-\`getDistribVersion\`
+       tar -cvzf $fileTGZ creatools_install/* thirdparty_install/*
+       scp $fileTGZ $distanceAdress/$fileTGZ 
+
+
+#--------CreaTools-Final_User---------------------------------------------------------
+
+       creatoolsTPLaux=creatoolsTPLaux
+       rm -rf $creatoolsTPLaux
+       mkdir $creatoolsTPLaux
+       cd $creatoolsTPLaux
+       mkdir bin
+       mkdir lib64
+       mkdir share
+       mkdir share/creatools
+       echo "export PATH=\$PATH:\$1/bin" > share/creatools/creatools_TPLaux_config.sh
+       echo "export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:\$1/lib64" >> share/creatools/creatools_TPLaux_config.sh
+       cp $scriptDir/TPLaux-bashrc.sh share/creatools/TPLaux-bashrc.sh
+       cd lib64
+
+# Fedora 31 
+       if [ `getDistribVersion` == 31 ] ; then 
+               cp /usr/lib64/libwx*-3.0.so.0 .
+               cp /usr/lib64/libboost_*.so.1.69.0 .
+               cp /usr/lib64/libm.so.6 .
+               cp /usr/lib64/libstdc++.so.6 .
+               cp /usr/lib64/libSDL2-2.0.so.0 .
+               cp /usr/lib64/libmspack.so.0 .
+               cp /usr/lib64/libjpeg.so.62 .
+               cp /usr/lib64/libicudata.so.63 .
+               cp /usr/lib64/libicui18n.so.63 .
+               cp /usr/lib64/libicuuc.so.63 .
+       fi
+
+# Fedora 28
+       if [ `getDistribVersion` == 28 ] ; then 
+               cp /usr/lib64/libwx*-3.0.so.0 .
+               cp /usr/lib64/libboost_*.so.1.66.0 .
+               cp /usr/lib64/libjpeg.so.62 .
+               cp /usr/lib64/libSDL2-2.0.so.0 .
+               cp /usr/lib64/libmspack.so.0 .
+               cp /usr/lib64/libmspack.so.0 .
+               cp /usr/lib64/libicudata.so.60 .
+               cp /usr/lib64/libicui18n.so.60 . 
+               cp /usr/lib64/libicuuc.so.60 . 
+               ## For Fedora 32
+               cp /usr/lib64/libGLU.so.1 . 
+       fi
+
+       cd ../..
+       fileTGZaux=$creatoolsTPLaux-`getDistrib`-`getDistribVersion`.tgz
+       rm -rf $fileTGZaux
+       tar -cvzf $fileTGZaux $creatoolsTPLaux
+       scp $fileTGZaux $distanceAdress/$fileTGZaux
+
+
+       fileTGZf28=CreaTools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion-Fedora-28.tgz
+       fileTGZauxf28=$creatoolsTPLaux-Fedora-28.tgz
 
-     tar -cvzf $fileTGZ creatools_install/* thirdparty_install/*
-
+       
+#--------Script de Instalation :  creatools-Linux-Bin-x.x.x.sh   --------------------------------------------------------
 
-         scp $fileTGZ $distanceAdress/$fileTGZ 
 
-         filename_BinVersion=creatools-Linux-Bin-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh
+       filename_BinVersion=creatools-Linux-Bin-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh
 
          echo "##" > $filename_BinVersion
          echo "## Generated by CreaTools-GeneratedBinTGZ.sh" >> $filename_BinVersion
@@ -66,24 +129,35 @@
          cat creatools_install/share/creatools/Version.sh >> $filename_BinVersion
          cat $scriptDir/LocalFunctions.sh >> $filename_BinVersion
 
-         echo "\`getDownloadCommand\` http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/v\$creatoolsMajorVersion.\$creatoolsMinorVersion.x/$fileTGZstring.tgz" >> $filename_BinVersion 
-         echo "tar -xvzf $fileTGZstring.tgz" >>  $filename_BinVersion
-         echo "rm -f $fileTGZstring.tgz" >>  $filename_BinVersion
+     echo "ETC_BASHRC=\`getbashrc\`" >>  $filename_BinVersion
+
+
+         echo "if [ \"\$1\" = \"FinalUser\" ] ; then" >> $filename_BinVersion
+         echo "   \`getDownloadCommand\` http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/v\$creatoolsMajorVersion.x.x/$fileTGZf28" >> $filename_BinVersion 
+         echo "   tar -xvzf $fileTGZf28" >>  $filename_BinVersion
+         echo "   rm -f $fileTGZf28" >>  $filename_BinVersion
+         echo "   \`getDownloadCommand\` http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/v\$creatoolsMajorVersion.x.x/$fileTGZauxf28" >> $filename_BinVersion 
+         echo "   tar -xvzf $fileTGZauxf28" >>  $filename_BinVersion
+         echo "   rm -f $fileTGZauxf28" >>  $filename_BinVersion
+      echo "   installPrefixTPLaux=\$(pwd)/creatoolsTPLaux #You need this variable in the -barshrc script" >>  $filename_BinVersion
+      echo "   source creatoolsTPLaux/share/creatools/TPLaux-bashrc.sh"  >>  $filename_BinVersion
+
+         echo "else" >> $filename_BinVersion
+         echo "   \`getDownloadCommand\` http://www.creatis.insa-lyon.fr/software/public/creatools/creaTools/v\$creatoolsMajorVersion.x.x/$fileTGZstring.tgz" >> $filename_BinVersion 
+         echo "   tar -xvzf $fileTGZstring.tgz" >>  $filename_BinVersion
+         echo "   rm -f $fileTGZstring.tgz" >>  $filename_BinVersion
+      echo "   OperatingSystem=\`getDistrib\`  #You need this variable in the Base-Stuff script" >>  $filename_BinVersion
+      echo "   cd thirdparty_install/share/creatools/"  >>  $filename_BinVersion
+      echo "   source ThirdParty-install-Base-Stuff.sh \$OperatingSystem"  >>  $filename_BinVersion
+      echo "   cd ../../.."  >>  $filename_BinVersion
+         echo "fi" >> $filename_BinVersion
         
 
 #EED     echo "source creatools_install/share/creatools/LocalFunctions.sh"  >>  $filename_BinVersion
-     echo "ETC_BASHRC=\`getbashrc\`" >>  $filename_BinVersion
      echo "installPrefix=\$(pwd)/creatools_install #You need this variable in the -barshrc script" >>  $filename_BinVersion
      echo "installPrefixThird=\$(pwd)/thirdparty_install #You need this variable in the -barshrc script" >>  $filename_BinVersion
-     echo "OperatingSystem=\`getDistrib\`  #You need this variable in the Base-Stuff script" >>  $filename_BinVersion
-
-     echo "cd thirdparty_install/share/creatools/"  >>  $filename_BinVersion
-     echo "source ThirdParty-install-Base-Stuff.sh \$OperatingSystem"  >>  $filename_BinVersion
-     echo "cd ../../.."  >>  $filename_BinVersion
-
      echo "source thirdparty_install/share/creatools/ThirdParty-bashrc.sh"  >>  $filename_BinVersion
      echo "source creatools_install/share/creatools/CreaTools-bashrc.sh"  >>  $filename_BinVersion
-
      echo "echo $fileTGZstring >> Creatools-Bin-Version.txt " >>  $filename_BinVersion
 
      echo "echo  " >>  $filename_BinVersion
@@ -99,17 +173,22 @@
      echo "echo  " >>  $filename_BinVersion
      echo "read -p 'Press [Enter] key to continue...'" >>  $filename_BinVersion
      scp $filename_BinVersion $distanceAdress/. 
+     rm creatools_install
+     rm thirdparty_install
+
+
+#-----------------------------------------------------------------
 
-      rm creatools_install
-      rm thirdparty_install
+        cat $scriptDir/Install-Creatools-Bin.sh-downloadTool $scriptDir/Install-Creatools-Bin.sh > Install-Creatools-Bin-tmp.sh
+##      cat $scriptDir/Install-Creatools-Bin.sh-downloadTool $scriptDir/Install-Creatools-Final_User.sh > Install-Creatools-Final_User-tmp.sh
 
+     scp Install-Creatools-Bin-tmp.sh $distanceAdress/Install-Creatools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh      
+ ##    scp Install-Creatools-Final_User-tmp.sh $distanceAdress/Install-Creatools-Final_User-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh      
 
-     cd $scriptsDir
-     scp $scriptDir/Install-Creatools-Bin.sh $distanceAdress/Install-Creatools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh
-         
-         ssh davila@tux.creatis.insa-lyon.fr "cd creatools/creaTools;rm Install-Creatools-Bin-Release.sh;  ln -s v2.6.x/Install-Creatools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh  Install-Creatools-Bin-Release.sh"
+        ssh davila@tux.creatis.insa-lyon.fr "cd creatools/creaTools;rm Install-Creatools-Bin-Release.sh;  ln -s v4.x.x/Install-Creatools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh  Install-Creatools-Bin-Release.sh"
+        ssh davila@tux.creatis.insa-lyon.fr "cd creatools/creaTools;rm creatools-Linux-Bin.sh;  ln -s v4.x.x/$filename_BinVersion  creatools-Linux-Bin.sh"
 
-         ssh davila@tux.creatis.insa-lyon.fr "cd creatools/creaTools;rm creatools-Linux-Bin.sh;  ln -s v2.6.x/$filename_BinVersion  creatools-Linux-Bin.sh"
+##      ssh davila@tux.creatis.insa-lyon.fr "cd creatools/creaTools;rm Install-Creatools-Final_User.sh;  ln -s v4.x.x/Install-Creatools-Final_User-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh  Install-Creatools-Final_User.sh"
 
 
      echo ""