From 8cfd9fb3579e2c0a1fec4a7ba589f4d1e4ae26a4 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Wed, 16 Mar 2022 15:16:54 +0100 Subject: [PATCH] #3405 vtk8itk5wx3-macos --- Linux/scripts/CreaTools-GenerateBinTGZ.sh | 72 +++++++++++++++++++---- Linux/scripts/LocalFunctions.sh | 18 +++--- 2 files changed, 72 insertions(+), 18 deletions(-) diff --git a/Linux/scripts/CreaTools-GenerateBinTGZ.sh b/Linux/scripts/CreaTools-GenerateBinTGZ.sh index c2b9c1b..8209785 100644 --- a/Linux/scripts/CreaTools-GenerateBinTGZ.sh +++ b/Linux/scripts/CreaTools-GenerateBinTGZ.sh @@ -61,7 +61,6 @@ tar -cvzf $fileTGZ creatools_install/* thirdparty_install/* scp $fileTGZ $distanceAdress/$fileTGZ - #--------CreaTools-Final_User--------------------------------------------------------- creatoolsTPLaux=creatoolsTPLaux @@ -69,16 +68,16 @@ 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 + if [ `getDistrib` == Fedora ] && [ `getDistribVersion` == 31 ] ; then + mkdir lib64 + cd lib64 cp /usr/lib64/libwx*-3.0.so.0 . cp /usr/lib64/libboost_*.so.1.69.0 . cp /usr/lib64/libm.so.6 . @@ -92,7 +91,9 @@ fi # Fedora 28 - if [ `getDistribVersion` == 28 ] ; then + if [ `getDistrib` == Fedora ] && [ `getDistribVersion` == 28 ] ; then + mkdir lib64 + cd lib64 cp /usr/lib64/libwx*-3.0.so.0 . cp /usr/lib64/libboost_*.so.1.66.0 . cp /usr/lib64/libjpeg.so.62 . @@ -106,6 +107,48 @@ cp /usr/lib64/libGLU.so.1 . fi + +# MacOs + if [ `getDistrib` == MacOS ] ; then + mkdir lib + cd lib + cp /opt/local/Library/Frameworks/wxWidgets.framework/Versions/wxWidgets/3.0/lib/libwx_baseu-3.0.0.5.0.dylib . + cp /opt/local/Library/Frameworks/wxWidgets.framework/Versions/wxWidgets/3.0/lib/libwx_osx_cocoau_core-3.0.0.5.0.dylib . + cp /opt/local/Library/Frameworks/wxWidgets.framework/Versions/wxWidgets/3.0/lib/libwx_osx_cocoau_adv-3.0.0.5.0.dylib . + cp /opt/local/Library/Frameworks/wxWidgets.framework/Versions/wxWidgets/3.0/lib/libwx_osx_cocoau_html-3.0.0.5.0.dylib . + cp /opt/local/Library/Frameworks/wxWidgets.framework/Versions/wxWidgets/3.0/lib/libwx_osx_cocoau_aui-3.0.0.5.0.dylib . + cp /opt/local/Library/Frameworks/wxWidgets.framework/Versions/wxWidgets/3.0/lib/libwx_osx_cocoau_gl-3.0.0.5.0.dylib . + + cp /opt/local/libexec/boost/1.76/lib/libboost_filesystem-mt.dylib . + cp /opt/local/libexec/boost/1.76/lib/libboost_system-mt.dylib . + cp /opt/local/libexec/boost/1.76/lib/libboost_date_time-mt.dylib . + cp /opt/local/libexec/boost/1.76/lib/libboost_thread-mt.dylib . + cp /opt/local/libexec/boost/1.76/lib/libboost_regex-mt.dylib . + cp /opt/local/libexec/boost/1.76/lib/libboost_program_options-mt.dylib . + cp /opt/local/libexec/boost/1.76/lib/libboost_chrono-mt.dylib . + cp /opt/local/libexec/boost/1.76/lib/libboost_atomic-mt.dylib . + + 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/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/libiconv.2.dylib . + cp /opt/local/lib/libarchive.dylib . + cp /opt/local/lib/liblzo2.2.dylib . + cp /opt/local/lib/liblzma.5.dylib . + cp /opt/local/lib/liblz4.1.dylib . + cp /opt/local/lib/libcharset.1.dylib . + cp /opt/local/lib/libbz2.1.0.dylib . + cp /opt/local/lib/libxml2.2.dylib . + fi + + cd ../.. fileTGZaux=$creatoolsTPLaux-`getDistrib`-`getDistribVersion`.tgz rm -rf $fileTGZaux @@ -113,8 +156,13 @@ scp $fileTGZaux $distanceAdress/$fileTGZaux - fileTGZf28=CreaTools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion-Fedora-28.tgz - fileTGZauxf28=$creatoolsTPLaux-Fedora-28.tgz +## EED Borrame +## fileTGZf28=CreaTools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion-Fedora-28.tgz +## fileTGZauxf28=$creatoolsTPLaux-Fedora-28.tgz + + fileTGZf28=CreaTools-Bin-Release-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion-'$'FINALUSER.tgz + fileTGZauxf28=$creatoolsTPLaux-'$'VERFINALUSER.tgz + #--------Script de Instalation : creatools-Linux-Bin-x.x.x.sh -------------------------------------------------------- @@ -133,6 +181,12 @@ echo "if [ \"\$1\" = \"FinalUser\" ] ; then" >> $filename_BinVersion + echo " if [ 'getDistrib' = Fedora ] ; then ">> $filename_BinVersion + echo " local VERFINALUSER=Fedora-28 ">> $filename_BinVersion + echo " fi ">> $filename_BinVersion + echo " if [ 'getDistrib' = MacOS ] ; then ">> $filename_BinVersion + echo " local VERFINALUSER=MacOS-10.11 ">> $filename_BinVersion + echo " fi ">> $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 @@ -180,15 +234,13 @@ #----------------------------------------------------------------- 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 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 Install-Creatools-Final_User.sh; ln -s v4.x.x/Install-Creatools-Final_User-$creatoolsMajorVersion.$creatoolsMinorVersion.$creatoolsBuildVersion.sh Install-Creatools-Final_User.sh" echo "" diff --git a/Linux/scripts/LocalFunctions.sh b/Linux/scripts/LocalFunctions.sh index e5e7897..b330d31 100644 --- a/Linux/scripts/LocalFunctions.sh +++ b/Linux/scripts/LocalFunctions.sh @@ -62,25 +62,27 @@ function checkDistrib { function getDistrib { local OS=`uname` - if [ "$OS" == Darwin ] ; then OS=MacOS; + if [ "$OS" == Darwin ] ; then + OS=MacOS; ##EED2016-10-15 ## elif [ "$OS" == Linux ] ; then OS=$(lsb_release -i | awk '{print $3}') - elif [ "$OS" == Linux ] ; then + elif [ ""$OS"" == Linux ] ; then OS=`awk 'NR==1{print $1}' /etc/system-release` - if [ "$OS" == "" ] ; then + if [ $OS == "" ] ; then OS=$(lsb_release -i | awk '{print $3}') fi - else OS="" + else + OS="" fi # checkDistrib $OS - echo $OS + echo $OS } ########################################### function getDistribVersion { local DISTRIB=`getDistrib` - - if [ "$DISTRIB" == MacOS ] ; then OSVesion=VOID_Darwin_EED; + + if [ "$DISTRIB" == MacOS ] ; then OSVersion=`sw_vers | grep ProductVersion | awk '{ print $2 }' `; elif [ "$DISTRIB" == Fedora ] ; then OSVersion=`awk 'NR==1{print $3}' /etc/system-release` elif [ "$DISTRIB" == Ubuntu ] ; then OSVersion=`awk 'NR==1{print $2}' /etc/issue` elif [ "$DISTRIB" == CentOS ] ; then OSVersion=`awk 'NR==1{print $3}' /etc/issue` @@ -94,7 +96,7 @@ function getDistribVersion { function getKernelVersion { local DISTRIB=`getDistrib` - if [ "$DISTRIB" == MacOS ] ; then KernelVesion=VOID_Darwin_EED; + if [ "$DISTRIB" == MacOS ] ; then KernelVersion=VOID_Darwin_EED; elif [ "$DISTRIB" == Fedora ] ; then KernelVersion=$(uname -a | awk '{print $3}') elif [ "$DISTRIB" == Ubuntu ] ; then KernelVersion=$(uname -a | awk '{print $3}') elif [ "$DISTRIB" == CentOS ] ; then KernelVersion=$(uname -a | awk '{print $3}') -- 2.45.1