From 2f000fc75240258c814526fec97b50d880183713 Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Mon, 11 Apr 2011 21:13:21 +0000 Subject: [PATCH] Add creaMiniTools (for LINUX) --- Linux/menu.sh | 5 +++-- Linux/scripts/CreaTools-compile.sh | 18 ++++++++++++++++++ Linux/scripts/CreaTools-install.sh | 3 ++- Linux/scripts/CreaTools-load.sh | 7 +++++-- Linux/scripts/CreaTools-names.sh | 5 +++-- 5 files changed, 31 insertions(+), 7 deletions(-) diff --git a/Linux/menu.sh b/Linux/menu.sh index a8a50ac..74acab2 100644 --- a/Linux/menu.sh +++ b/Linux/menu.sh @@ -318,7 +318,7 @@ do echo >> $configureFile echo "#File generated by 'menu.sh'" >> $configureFile echo "#DO NOT edit !" >> $configureFile - echo "#(except if you *know* what you do)" >> $configureFile + echo "#(except if you *do* know what you do)" >> $configureFile echo >> $configureFile echo "OperatingSystem=$OperatingSystem" >> $configureFile echo "generationdir=$generationdir" >> $configureFile @@ -531,7 +531,7 @@ do echo "creaRigidRegistration_DIR :" $creaRigidRegistration_DIR echo "bbtkGEditor_DIR : " $bbtkGEditor_DIR echo "creaTools_DIR : " $creaTools_DIR - + echo "creaMiniTools_DIR : " $creaMiniTools_DIR echo "===================================" echo echo "Press any key to continue" @@ -544,6 +544,7 @@ do ;; 10) + # Hiden option, usefull at debug time bash scripts/ThirdParty-install_no_compile.sh ;; diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh index 03cd8c6..e8fd9ea 100644 --- a/Linux/scripts/CreaTools-compile.sh +++ b/Linux/scripts/CreaTools-compile.sh @@ -298,5 +298,23 @@ fi # creatoolsdll=$generationdir/creatools_bin/creatoolsBin # LD_LIBRARY_PATH=$creatoolssdll:$LD_LIBRARY_PATH + +# ------------------------- +# start_point = 12 : creaMiniTools +#------------------------- +if [ $start_point -le 12 ] +then +# the following stupid test is used at debug time; Please don't remove! +#if [ true = false ] +if [ true = true ] +then +# creaMiniTools + bash $scriptDir/cmakemod.sh $creaminitoolssource $generationdir $installPrefix $buildType + bash $scriptDir/creaToolsVariables.sh $creaminitoolssource $generationdir $docgeneration + bash $scriptDir/compilemod.sh $buildType $creaminitoolssource $generationdir +fi +fi + + # shutdown /s # exit /b diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh index c851520..9ddde04 100644 --- a/Linux/scripts/CreaTools-install.sh +++ b/Linux/scripts/CreaTools-install.sh @@ -71,7 +71,8 @@ export ETC_BASHRC=$HOME/.bashrc 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 + #should be nice to add bbwx, too. (?) // JPR //bash installmod.sh $buildType bbwx $generationdir $installPrefix diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh index 1dcc13a..4dd0700 100644 --- a/Linux/scripts/CreaTools-load.sh +++ b/Linux/scripts/CreaTools-load.sh @@ -89,7 +89,8 @@ then bash $scriptDir/cvscheckout.sh $creacontourssource $generationdir $cvsUserName bash $scriptDir/cvscheckout.sh $crearigidregistrationssource $generationdir $cvsUserName bash $scriptDir/cvscheckout.sh $bbtkgeditorsource $generationdir $cvsUserName - bash $scriptDir/cvscheckout.sh $creatoolssource $generationdir $cvsUserName + bash $scriptDir/cvscheckout.sh $creatoolssource $generationdir $cvsUserName + bash $scriptDir/cvscheckout.sh $creaminitoolssource $generationdir $cvsUserName fi if [ $sourcesFrom = HTML ] @@ -107,7 +108,8 @@ then wget $wwwtargz/creaRigidRegistration.tgz wget $wwwtargz/bbtkGEditor.tgz wget $wwwtargz/creaTools.tgz - + wget $wwwtargz/creaMiniTools.tgz + tar xvzf crea.tgz tar xvzf bbtk.tgz tar xvzf creaMaracasVisu.tgz @@ -118,6 +120,7 @@ then tar xvzf creaRigidRegistration.tgz tar xvzf bbtkGEditor.tgz tar xvzf creaTools.tgz + tar xvzf creaMiniTools.tgz rm -f *.tgz fi diff --git a/Linux/scripts/CreaTools-names.sh b/Linux/scripts/CreaTools-names.sh index cf14c80..0559586 100644 --- a/Linux/scripts/CreaTools-names.sh +++ b/Linux/scripts/CreaTools-names.sh @@ -25,7 +25,7 @@ scriptDir=$PWD/scripts crearigidregistrationssource=creaRigidRegistration bbtkgeditorsource=bbtkGEditor creatoolssource=creaTools - + creaminitoolssource=creaMiniTools creadll=$generationdir/creatools_bin/creaBin LD_LIBRARY_PATH=$creadll:LD_LIBRARY_$PATH @@ -47,4 +47,5 @@ LD_LIBRARY_PATH=$crearigidregistrationdll:$LD_LIBRARY_PATH LD_LIBRARY_PATH=$bbtkgeditordll:$LD_LIBRARY_PATH creatoolsdll=$generationdir/creatools_bin/creatoolsBin LD_LIBRARY_PATH=$creatoolssdll:$LD_LIBRARY_PATH - + creaminitoolsdll=$generationdir/creatools_bin/creaMiniToolsBin +LD_LIBRARY_PATH=$creaminitoolssdll:$LD_LIBRARY_PATH -- 2.45.1