]> Creatis software - creaToolsTools.git/commitdiff
Merge branch 'vtk9itk5wx3-macos' of ssh://git.creatis.insa-lyon.fr/creaToolsTools...
authordavila <davila@localhost.localdomain>
Fri, 26 May 2023 12:45:23 +0000 (14:45 +0200)
committerdavila <davila@localhost.localdomain>
Fri, 26 May 2023 12:45:23 +0000 (14:45 +0200)
1  2 
Linux/scripts/CreaTools-GenerateBinTGZ.sh

index 2cf3c85d65dcb3185aef71a6db75678035c677fc,172031dfb6f81e95c6cc9eb2788dc281d5174b11..0837e98c0debb87d81d8cee0fc8032bcdc9600cd
@@@ -158,13 -158,14 +158,14 @@@ $(eval $cmd
          
          cp /opt/local/lib/libjpeg.8.dylib          .
          cp /opt/local/lib/libpng16.16.dylib        .
-         cp /opt/local/lib/libtiff.5.dylib            .
+         cp /opt/local/lib/libtiff.6.dylib            .
+         cp /opt/local/lib/libLerc.4.dylib                    .
          cp /opt/local/lib/libz.1.dylib                       .
          cp /opt/local/lib/libzstd.1.dylib            .
                
-         cp /opt/local/lib/libicudata.67.dylib      .
-         cp /opt/local/lib/libicui18n.67.dylib            .
-         cp /opt/local/lib/libicuuc.67.dylib              .
+         cp /opt/local/lib/libicudata.72.dylib      .
+         cp /opt/local/lib/libicui18n.72.dylib            .
+         cp /opt/local/lib/libicuuc.72.dylib              .
  
                mkdir opt
          cp /opt/local/lib/libiconv.2.dylib           opt/.
          echo "   \`getDownloadCommand\` https://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 "   if [ \`getDistrib\` == MacOS ] ; then ">> $filename_BinVersion 
 +        echo "        cd creatoolsTPLaux/lib" >>  $filename_BinVersion
 +        echo "        ln -s libwx_baseu-3.0.0.5.0.dylib libwx_baseu-3.0.dylib" >>  $filename_BinVersion
 +        echo "        ln -s libwx_osx_cocoau_adv-3.0.0.5.0.dylib libwx_osx_cocoau_adv-3.0.dylib" >>  $filename_BinVersion
 +        echo "        ln -s libwx_osx_cocoau_aui-3.0.0.5.0.dylib libwx_osx_cocoau_aui-3.0.dylib" >>  $filename_BinVersion
 +        echo "        ln -s libwx_osx_cocoau_core-3.0.0.5.0.dylib libwx_osx_cocoau_core-3.0.dylib" >>  $filename_BinVersion
 +        echo "        ln -s libwx_osx_cocoau_gl-3.0.0.5.0.dylib libwx_osx_cocoau_gl-3.0.dylib" >>  $filename_BinVersion
 +        echo "        ln -s libwx_osx_cocoau_html-3.0.0.5.0.dylib libwx_osx_cocoau_html-3.0.dylib" >>  $filename_BinVersion
 +#       echo "        ln -s libarchive.dylib libarchive.2.dylib" >>  $filename_BinVersion
 +        echo "        ACTUALDIRLINK=\$(pwd)" >>  $filename_BinVersion
 +        echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_baseu-3.0.dylib" >>  $filename_BinVersion
 +        echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_core-3.0.dylib" >>  $filename_BinVersion
 +        echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_adv-3.0.dylib" >>  $filename_BinVersion
 +        echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_html-3.0.dylib" >>  $filename_BinVersion
 +        echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_aui-3.0.dylib" >>  $filename_BinVersion
 +        echo "        install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_gl-3.0.dylib" >>  $filename_BinVersion
 +        echo "        cd ../.." >>  $filename_BinVersion
 +        echo "   fi ">> $filename_BinVersion 
          
 -        echo "  cd creatoolsTPLaux/lib" >>  $filename_BinVersion
 -        echo "  ln -s libwx_baseu-3.0.0.5.0.dylib libwx_baseu-3.0.dylib" >>  $filename_BinVersion
 -        echo "  ln -s libwx_osx_cocoau_adv-3.0.0.5.0.dylib libwx_osx_cocoau_adv-3.0.dylib" >>  $filename_BinVersion
 -        echo "  ln -s libwx_osx_cocoau_aui-3.0.0.5.0.dylib libwx_osx_cocoau_aui-3.0.dylib" >>  $filename_BinVersion
 -        echo "  ln -s libwx_osx_cocoau_core-3.0.0.5.0.dylib libwx_osx_cocoau_core-3.0.dylib" >>  $filename_BinVersion
 -        echo "  ln -s libwx_osx_cocoau_gl-3.0.0.5.0.dylib libwx_osx_cocoau_gl-3.0.dylib" >>  $filename_BinVersion
 -        echo "  ln -s libwx_osx_cocoau_html-3.0.0.5.0.dylib libwx_osx_cocoau_html-3.0.dylib" >>  $filename_BinVersion
 -#       echo " ln -s libarchive.dylib libarchive.2.dylib" >>  $filename_BinVersion
 -        echo "ACTUALDIRLINK=\$(pwd)" >>  $filename_BinVersion
 -        echo "install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_baseu-3.0.dylib" >>  $filename_BinVersion
 -        echo "install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_core-3.0.dylib" >>  $filename_BinVersion
 -        echo "install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_adv-3.0.dylib" >>  $filename_BinVersion
 -        echo "install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_html-3.0.dylib" >>  $filename_BinVersion
 -        echo "install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_aui-3.0.dylib" >>  $filename_BinVersion
 -        echo "install_name_tool -change /opt/local/lib/libiconv.2.dylib \$ACTUALDIRLINK/opt/libiconv.2.dylib libwx_osx_cocoau_gl-3.0.dylib" >>  $filename_BinVersion
 -        echo "  cd ../.." >>  $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 "echo  Install dir:" >>  $filename_BinVersion
       echo "pwd"    >>  $filename_BinVersion
       echo "echo  " >>  $filename_BinVersion
-      echo "read -p 'Press [Enter] key to continue...'" >>  $filename_BinVersion
#EED     echo "read -p 'Press [Enter] key to continue...'" >>  $filename_BinVersion
       scp $filename_BinVersion $distanceAdress/. 
       rm creatools_install
       rm thirdparty_install