then
if [ ! -e $generationdir/creatools_install ]
then
- mkdir $generationdir/creatools_install
+ mkdir -p $generationdir/creatools_install
fi
else
echo
fi
cd $scriptDir
+ export baseLibraryCreatoolsDir=$installPrefix/share/creatools
+ mkdir -p $baseLibraryCreatoolsDir
+ cp CreaTools-bashrc.sh $baseLibraryCreatoolsDir/.
+ cp LocalFunctions.sh $baseLibraryCreatoolsDir/.
#create creatools_base_library_config.sh at the very begining, so we can write "export xxx_BIN=..." inside installmod.sh. JPRx 3 mars 2011
+ echo '## This file is call from .bashrc' > $baseLibraryCreatoolsDir/creatools_base_library_config.sh
+ bash installmodBash.sh $installPrefix
- if [ -f $installPrefix/share/creatools_base_library_config.sh ]
- then
- rm $installPrefix/share/creatools_base_library_config.sh
- fi
- touch $installPrefix/share/creatools_base_library_config.sh
- chmod 755 $installPrefix/share/creatools_base_library_config.sh
-
- echo export PATH='$'PATH:$installPrefix/bin >> $installPrefix/share/creatools_base_library_config.sh
- if [ $OperatingSystem = "MacOS" ]
- then
- echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$installPrefix/lib/creatools >> $installPrefix/share/creatools_base_library_config.sh
- else
- echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib/creatools >> $installPrefix/share/creatools_base_library_config.sh
- echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib64/creatools >> $installPrefix/share/creatools_base_library_config.sh
- fi
-
- # Install creatools as user (no longer as root) // JPR 2/5/2011
-
- # - remove line 'bash $installPrefix/creatools_install/share/creatools_base_library_config.sh' if any
- sed -i -e '/.*creatools_base_library_config.*/ d' $ETC_BASHRC
- sed -i -e '/installPrefixtmp*/ d' $ETC_BASHRC
-
# JPR 2/5/2011
# modify /etc/bashrc (we cannot modify .bashrc, since we switched as root)
# - add line 'bash $installPrefix/creatools_install/share/creatools_base_library_config.sh'
- bash installmod.sh $buildType $creasource $generationdir $installPrefix
- bash installmod.sh $buildType $bbtksource $generationdir $installPrefix
- bash installmod.sh $buildType $creamaracassource $generationdir $installPrefix
- bash installmod.sh $buildType $creaenvironmentsource $generationdir $installPrefix
- bash installmod.sh $buildType $creabrukersource $generationdir $installPrefix
- bash installmod.sh $buildType $creaimagesource $generationdir $installPrefix
- bash installmod.sh $buildType $creacontourssource $generationdir $installPrefix
- bash installmod.sh $buildType $crearigidregistrationssource $generationdir $installPrefix
- bash installmod.sh $buildType $bbtkgeditorsource $generationdir $installPrefix
- bash installmod.sh $buildType $creatoolssource $generationdir $installPrefix
- bash installmod.sh $buildType $creaminitoolssource $generationdir $installPrefix
+ bash installmod.sh $buildType $creasource $generationdir $installPrefix $corenumber
+ bash installmod.sh $buildType $bbtksource $generationdir $installPrefix $corenumber
+ bash installmod.sh $buildType $creavtksource $generationdir $installPrefix $corenumber
+ bash installmod.sh $buildType $creamaracassource $generationdir $installPrefix $corenumber
+ bash installmod.sh $buildType $creaenvironmentsource $generationdir $installPrefix $corenumber
+ bash installmod.sh $buildType $creabrukersource $generationdir $installPrefix $corenumber
+ bash installmod.sh $buildType $creaimagesource $generationdir $installPrefix $corenumber
+ bash installmod.sh $buildType $creacontourssource $generationdir $installPrefix $corenumber
+ bash installmod.sh $buildType $crearigidregistrationssource $generationdir $installPrefix $corenumber
+ bash installmod.sh $buildType $bbtkgeditorsource $generationdir $installPrefix $corenumber
+ bash installmod.sh $buildType $creatoolssource $generationdir $installPrefix $corenumber
+ bash installmod.sh $buildType $creaminitoolssource $generationdir $installPrefix $corenumber
# bash installmod.sh $buildType $libidosource $generationdir $installPrefix
#export as well bbPackages_DIR // JPR 25 Mai 2011
bash installmodNomake.sh $buildType wx $generationdir $installPrefix
bash installmodNomake.sh $buildType wxvtk $generationdir $installPrefix
-#EED I don't know why this works here and not after the chmod 755
-echo export PATH='$'PATH:$installPrefix/bin >> $installPrefix/share/creatools_base_library_config.sh
-if [ $OperatingSystem = "MacOS" ]
-then
- echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$installPrefix/lib/creatools >> $installPrefix/share/creatools_base_library_config.sh
-else
- echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib/creatools >> $installPrefix/share/creatools_base_library_config.sh
- echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$installPrefix/lib64/creatools >> $installPrefix/share/creatools_base_library_config.sh
-fi
-
-echo "===================================================in CreaTools-install.sh ETC_BASHRC : " $ETC_BASHRC
-echo installPrefixtmp=$installPrefix >> $ETC_BASHRC
-echo '[ -f "$installPrefixtmp/share/creatools_base_library_config.sh" ] && source $installPrefixtmp/share/creatools_base_library_config.sh' >> $ETC_BASHRC
+ source CreaTools-bashrc.sh
+ source $ETC_BASHRC
-source $installPrefix/share/creatools_base_library_config.sh
-echo "==================================================="
-echo " Regenerate Package doc"
-$installPrefix/bin/bbRegeneratePackageDoc -a -q
-echo " Regenerate Boxes list"
-$installPrefix/bin/bbRegenerateBoxesLists -q
-echo "==================================================="
+##EED 21/12/2014
+##EED echo "==================================================="
+##EED echo " Regenerate Package doc"
+##EED $installPrefix/bin/bbRegeneratePackageDoc -a -q
+##EED echo " Regenerate Boxes list"
+##EED $installPrefix/bin/bbRegenerateBoxesLists -q
+##EED echo "==================================================="
# JPR 2/5/2011
#else