From a67c22faf349e4976b8d60a39401932739df7155 Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Mon, 3 Jan 2011 16:17:58 +0000 Subject: [PATCH] Fix new way --- Install/scripts/installmod.sh | 6 ++++-- Install/scripts/make-install.sh | 22 ++++++++++++---------- Install/scripts/make.sh | 4 ++-- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/Install/scripts/installmod.sh b/Install/scripts/installmod.sh index 7ad8a81..cdb0576 100644 --- a/Install/scripts/installmod.sh +++ b/Install/scripts/installmod.sh @@ -3,7 +3,10 @@ # $3 : generationdir ex : /tmp/myGenerationDir cd $3/creatools_bin/$2Bin -echo "--------------------------------------in compilemod-- $2 ------------" +echo +echo +echo +echo "------------------------------------------in installmod-- $2 ------------" echo $1 echo $2 echo $3 @@ -18,4 +21,3 @@ sudo make install cd ../.. pwd -echo "--------------------------------------out compilemod--------------" diff --git a/Install/scripts/make-install.sh b/Install/scripts/make-install.sh index 13d043b..475cebd 100644 --- a/Install/scripts/make-install.sh +++ b/Install/scripts/make-install.sh @@ -16,16 +16,18 @@ source $PWD/configure.sh cd $scriptDir - sh installmod.sh $buildType $creasource $generationdir - sh installmod.sh $buildType $bbtksource $generationdir - sh installmod.sh $buildType $creamaracassource $generationdir - sh installmod.sh $buildType $creaenvironmentsource $generationdir - sh installmod.sh $buildType $creabrukersource $generationdir - sh installmod.sh $buildType $creaimagesource $generationdir - sh installmod.sh $buildType $creacontourssource $generationdir - sh installmod.sh $buildType $crearigidregistrationssource $generationdir - sh installmod.sh $buildType $bbtkgeditorsource $generationdir - sh installmod.sh $buildType $creatoolssource $generationdir + sh installmod.sh $buildType $creasource $generationdir + sh installmod.sh $buildType $bbtksource $generationdir + sh installmod.sh $buildType $creamaracassource $generationdir + sh installmod.sh $buildType $creaenvironmentsource $generationdir + sh installmod.sh $buildType $creabrukersource $generationdir + sh installmod.sh $buildType $creaimagesource $generationdir + sh installmod.sh $buildType $creacontourssource $generationdir + sh installmod.sh $buildType $crearigidregistrationssource $generationdir + sh installmod.sh $buildType $bbtkgeditorsource $generationdir + sh installmod.sh $buildType $creatoolssource $generationdir + +exit 0 CREATOOLS_INSTALL_DIR=$installPrefix diff --git a/Install/scripts/make.sh b/Install/scripts/make.sh index 95e0b60..1f2214a 100644 --- a/Install/scripts/make.sh +++ b/Install/scripts/make.sh @@ -219,7 +219,7 @@ then # creaImageIO sh $scriptDir/cmakemod.sh $creaimagesource $generationdir $installPrefix $buildType sh $scriptDir/creaImageIOVariables.sh $creaimagesource $generationdir $docgeneration $gdcmVersion - sh $scriptDir/compilemod.sh $buildType $creaimagesource $generationdir + sh $scriptDir/compilemod.sh $buildType $creaimagesource $generationdir sh $scriptDir/ctestmod.sh $creaimagesource $generationdir fi fi @@ -239,7 +239,7 @@ then # creaContours sh $scriptDir/cmakemod.sh $creacontourssource $generationdir $installPrefix $buildType sh $scriptDir/creaContoursVariables.sh $creacontourssource $generationdir $docgeneration - sh $scriptDir/compilemod.sh $buildType $creacontourssource $generationdir + sh $scriptDir/compilemod.sh $buildType $creacontourssource $generationdir sh $scriptDir/ctestmod.sh $creacontourssource $generationdir fi fi -- 2.45.1