*** empty log message ***

diff --git a/Linux/menu.sh b/Linux/menu.sh
index daabce14d159a78b5c307c902d5a81614d350ec5..69090bb3804a0d67c5eafc12297cb278f8fb3055 100644 (file)
--- a/Linux/menu.sh
+++ b/Linux/menu.sh
@@ -26,6 +26,7 @@ do
       echo " Get, Compile, Install vtk   .......1.1"                
       echo " Get, Compile, Install gdcm :.. .  .1.2" 
       echo " Get, Compile, Install itk  :.......1.3"
+      echo " Get, Compile, Install Wx (for Mac Users)  :…....1.4"
 
    else
       echo " Install Third Party Libraries :....1 (as root)"   
@@ -436,6 +437,13 @@ docgeneration="OFF"
      bash scripts/ThirdParty-install-ITK.sh
      bash scripts/ThirdParty-install-Finalize.sh         
   ;;
+  1.4)
+    echo "========================== 1.4 "
+     #source scripts/Check-if-root.sh
+     bash scripts/ThirdParty-install-WX.sh     
+     bash scripts/ThirdParty-install-Finalize.sh         
+     read a
+  ;;
 
   2)
      #2.1
@@ -607,3 +615,4 @@ docgeneration="OFF"
 
 done
 
+

diff --git a/Linux/scripts/ThirdParty-install-WX.sh b/Linux/scripts/ThirdParty-install-WX.sh
new file mode 100644 (file)
index 0000000..21b3876
--- /dev/null
+++ b/Linux/scripts/ThirdParty-install-WX.sh
@@ -0,0 +1,115 @@
+#!/bin/bash
+
+ echo  "in ThirdParty-install-WX.sh, source " $PWD/scripts/CreaTools-configure.sh
+ if [ ! -f $PWD/scripts/CreaTools-configure.sh ]
+ then 
+   echo
+   echo "..ERROR.."
+   echo "==================================================="
+   echo "REMEMBER !"
+   echo ""
+   echo "YOU NEED TO RUN 'Configure' (0) First !"
+   echo "==================================================="
+   echo
+   echo
+   exit 0
+fi
+
+source $PWD/scripts/CreaTools-configure.sh
+
+   echo "------"
+   echo $PWD/scripts/CreaTools-configure.sh
+   echo --generationdir--
+   echo $generationdir
+   echo --docgeneration--
+   echo $docgeneration
+   echo --installPrefix--
+   echo $installPrefix
+   echo --installPrefixThird--
+   echo $installPrefixThird
+   echo --buildType--
+   echo $buildType
+   echo --gdcmVersion--
+   echo $gdcmVersion
+#   echo --sourcesFrom--
+#   echo $sourcesFrom
+#   echo --scriptDir--
+#   echo $scriptDir
+#   echo --start_point--
+#   echo $start_point
+   echo "------"
+
+
+scriptDir=$PWD
+sourcesDir=$generationdir/thirdparty_sources
+binDir=$generationdir/thirdparty_bin
+
+if [ ! -e $generationdir ]
+then
+   mkdir $generationdir
+   chown $loginUserName  $generationdir
+   chgrp $loginGroupName $generationdir
+
+fi
+if [ ! -e $sourcesDir ]
+then
+   mkdir $sourcesDir
+   #was : (pb on MacOS?)
+   #chown $loginUserName:$loginGroupName $sourcesDir
+   chown $loginUserName  $sourcesDir
+   chgrp $loginGroupName $sourcesDir
+fi
+
+if [ ! -e $binDir ]
+then
+   mkdir $binDir
+   chown $loginUserName  $binDir
+   chgrp $loginGroupName $binDir
+fi
+
+  echo "we remove old stuff"
+  rm -rf $sourcesDir/Wx*
+  rm -rf $sourcesDir/wx*
+  rm -rf $binDir/Wx*
+
+  cd $sourcesDir
+
+ echo "we download new stuff"
+ if [ $OperatingSystem = "MacOS" ]
+ then
+  curl -O http://biolpc22.york.ac.uk/pub/Daily_HEAD/wxWidgets.tar.gz
+ tar -xvf wxWidgets.tar.gz
+echo "coucou"
+ fi
+
+if [ $buildType = "Debug" ]
+then
+   debug="ON"
+else
+   debug="OFF"
+fi
+
+# the following stupid test is used at debug time; Please don't remove!
+#if [ true = false ]
+if [ true = true ]
+then
+  libname=wxWidgets
+  dirInstall=$installPrefixThird/lib/wx/
+  export WX_DIR=$installPrefixThird/lib/wx/
+  mkdir $dirInstall
+  echo "we prepare directories dirInstall " $dirInstall  " wx_DIR " $installPrefixThird/lib/wx/
+  #cd $dirInstall
+
+# See EED why we have to do this
+  if [ $OperatingSystem = "MacOS" ]
+  then
+       pwd 
+    cd  $libname
+    echo  "pour savoir" $libname/
+    ./configure --with-osx_carbon
+       make  -j $corenumber
+       make install 
+  fi
+  cd ..
+fi
+