X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FCreaTools-compile.sh;h=3cab2f5d72342c7eabcbe7f92a21e5aa0e147013;hb=HEAD;hp=57c9cc4802de0d7bd8284784d3c1cf9d87272f8e;hpb=089783c6b6ea9db046e46c2838aa4c1c78e4c9a9;p=creaToolsTools.git diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh index 57c9cc4..3cab2f5 100644 --- a/Linux/scripts/CreaTools-compile.sh +++ b/Linux/scripts/CreaTools-compile.sh @@ -69,9 +69,9 @@ fi echo $start_point echo "------" -if [ ! -f $installPrefixThird/share/creatools_third_party_library_config.sh ] +if [ ! -f $installPrefixThird/share/creatools/creatools_third_party_library_config.sh ] then - echo missing $installPrefixThird/share/creatools_third_party_library_config.sh + echo missing $installPrefixThird/share/creatools/creatools_third_party_library_config.sh echo echo "..ERROR.." echo "===================================================" @@ -101,9 +101,9 @@ fi fi -if [ ! -f $installPrefixThird/share/creatools_third_party_library_config.sh ] +if [ ! -f $installPrefixThird/share/creatools/creatools_third_party_library_config.sh ] then - echo missing $installPrefixThird/share/creatools_third_party_library_config.sh + echo missing $installPrefixThird/share/creatools/creatools_third_party_library_config.sh echo echo "..ERROR.." echo "===================================================" @@ -121,7 +121,7 @@ fi then rm -rf creatools_bin fi - mkdir creatools_bin + mkdir -p creatools_bin cd $scriptDir @@ -135,6 +135,7 @@ then #if [ true = false ] if [ true = true ] then + bash $scriptDir/cmakemod.sh $creasource $generationdir $installPrefix $buildType bash $scriptDir/creaVariables.sh $creasource $generationdir $docgeneration bash $scriptDir/compilemod.sh $buildType $creasource $generationdir $corenumber @@ -164,8 +165,19 @@ then echo ========================================================= $bbtksource $generationdir $installPrefix $buildType bash $scriptDir/cmakemod.sh $bbtksource $generationdir $installPrefix $buildType bash $scriptDir/bbtkVariables.sh $bbtksource $generationdir $docgeneration $gdcmVersion - bash $scriptDir/compilemod.sh $buildType $bbtksource $generationdir $corenumber - bash $scriptDir/compilemod.sh $buildType $bbtksource $generationdir $corenumber + bash $scriptDir/compilemod.sh $buildType $bbtksource $generationdir $corenumber bbtk + bash $scriptDir/compilemod.sh $buildType $bbtksource $generationdir $corenumber bbi + bash $scriptDir/compilemod.sh $buildType $bbtksource $generationdir $corenumber bbfy + bash $scriptDir/compilemod.sh $buildType $bbtksource $generationdir $corenumber bbStudio + bash $scriptDir/compilemod.sh $buildType $bbtksource $generationdir $corenumber bbPackageBrowser + bash $scriptDir/compilemod.sh $buildType $bbtksource $generationdir $corenumber bbs2cpp + bash $scriptDir/compilemod.sh $buildType $bbtksource $generationdir $corenumber bbRegenerateBoxesLists + bash $scriptDir/compilemod.sh $buildType $bbtksource $generationdir $corenumber bbRegeneratePackageDoc + bash $scriptDir/compilemod.sh $buildType $bbtksource $generationdir $corenumber bbPlugPackage + bash $scriptDir/compilemod.sh $buildType $bbtksource $generationdir $corenumber bbpConfigurator + bash $scriptDir/compilemod.sh $buildType $bbtksource $generationdir $corenumber bbvtk + bash $scriptDir/compilemod.sh $buildType $bbtksource $generationdir $corenumber bbwx + bash $scriptDir/compilemod.sh $buildType $bbtksource $generationdir $corenumber bash $scriptDir/ctestmod.sh $bbtksource $generationdir fi fi @@ -416,5 +428,36 @@ then fi +# ------------------------- +# start_point = 14 : creaVtk +#------------------------- +if [ $start_point -le 14 ] +then + # the following stupid test is used at debug time; Please don't remove! + #if [ true = false ] + if [ true = true ] + then + # creaVtk + bash $scriptDir/cmakemod.sh $creavtksource $generationdir $installPrefix $buildType + bash $scriptDir/creaVtkVariables.sh $creavtksource $generationdir $docgeneration + bash $scriptDir/compilemod.sh $buildType $creavtksource $generationdir $corenumber + bash $scriptDir/ctestmod.sh $creavtksource $generationdir + fi +fi + creavtkdll=$generationdir/creatools_bin/creaVtkBin + +if [ $OperatingSystem = "MacOS" ] +then + #duplicate form creaTools_name.sh?? //FCY + DYLD_LIBRARY_PATH=$creavtkdll:$DYLD_LIBRARY_$PATH +else + LD_LIBRARY_PATH=$creavtkdll:$LD_LIBRARY_$PATH +fi + + export creaVtk_DIR=$generationdir/creatools_bin/creaVtkBin + + + + # shutdown /s # exit /b