ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/REPOS_ERICCA/magic/linux/instal_magic.bash
(Generate patch)

Comparing magic/linux/instal_magic.bash (file contents):
Revision 574 by francois, Mon Oct 20 16:04:31 2014 UTC vs.
Revision 616 by francois, Mon Dec 1 16:19:58 2014 UTC

# Line 14 | Line 14 | echo $(date)
14   echo ""
15   echo "MAGiC installation"
16   echo "Checking / Installing dependencies"
17 < tabdep=(gmsh gfortran python cmake cmake-curses-gui subversion libopencascade-dev libvtk5-dev g++ gcc python-dev python-numpy python-qt4 tk bison flex libblas-dev liblapack-dev)
17 > tabdep=(gmsh gfortran python cmake cmake-curses-gui subversion libvtk5-dev g++ gcc python-dev python-numpy python-qt4 tk bison flex libblas-dev liblapack-dev)
18 > versionos=$(lsb_release -sr)
19 > if [ "$versionos" \< "13" ];
20 > then
21 > tabdep=( "${tabdep[@]}" "libopencascade-dev")
22 > fi
23 > if [ "$versionos" \> "13" ];
24 > then
25 > tabdep=( "${tabdep[@]}" "liboce-ocaf-dev")
26 > fi
27 > if [ "$2" == "tout" ];
28 > then
29 > tabdep=( "${tabdep[@]}" "kdevelop")
30 > tabdep=( "${tabdep[@]}" "kdesvn")
31 > tabdep=( "${tabdep[@]}" "kile")
32 > tabdep=( "${tabdep[@]}" "doxygen")
33 > fi
34   echo "Dependance a verifier :"${#tabdep[*]}
35   for i in ${!tabdep[*]};
36   do
# Line 23 | Line 39 | dpkg -s $nomdep  >> /dev/null 2>&1
39   if [ $? == 1 ];
40   then
41   echo $nomdep...............FAIL
42 < sudo apt-get install $nomdep  
42 > sudo apt-get -y install $nomdep  
43   else
44   echo $nomdep...............ok
45   fi
# Line 54 | Line 70 | svn up
70   fi
71   cd $__DIR/magic/exe
72   cmake .. -DENABLE_NUTIL=ON -DCMAKE_BUILD_TYPE=Debug -DENABLE_TUTORIEL=ON -DENABLE_TEST=OFF
73 < make $1 $2
73 > make
74   echo "Check target"
75   cd $__DIR/magic/exe/app/mgoperation/
76   if [ -f mgoperation.exe ];
# Line 64 | Line 80 | else
80   echo "installation echouee..................FAIL"
81   fi
82   cd $__DIR
83 < ./magic/linux/instal_aster.bash $1
83 > ./instal_aster.bash $1
84   echo ""
85   echo $(date)
86   echo ""

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines