From: jean-pierre roux Date: Thu, 2 Sep 2010 17:53:00 +0000 (+0000) Subject: First stage of Linux version X-Git-Tag: CREATOOLS.2-0-3~71 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=d76552fe1d448d38571766051594d531c36afc96;p=creaToolsTools.git First stage of Linux version .bat translated in .sh NOTHING CHECKED! --- diff --git a/ctest/dashboard/All.bat b/ctest/dashboard/All.bat index 24525d9..ec3ddb7 100644 --- a/ctest/dashboard/All.bat +++ b/ctest/dashboard/All.bat @@ -69,6 +69,8 @@ call ctestmod.bat %creaenvironmentbinary% set creaenvironmentdll=%~dp0%creaenvironmentbinary%\%buildtype% set PATH=%creaenvironmentdll%;%PATH% + +rem JPR : strange : call creaenvironmentVariables.bat here ?!? rem creaBruker call cmakemod.bat %creabrukersource% %creabrukerbinary% call creaenvironmentVariables.bat %creabrukerbinary% %creabinfolder% @@ -113,9 +115,9 @@ rem creaTools call cmakemod.bat %creatoolssource% %creatoolsbinary% call creaToolsVariables.bat %creatoolsbinary% call compilemodCreaTools.bat %buildtype% %creatoolsbinary% -rem remcall ctestmod.bat %creatoolsbinary% +rem call ctestmod.bat %creatoolsbinary% set creatoolsdll=%~dp0%creatoolsbinary%\%buildtype% set PATH=%creatoolssdll%;%PATH% rem shutdown /s -exit /b \ No newline at end of file +exit /b diff --git a/ctest/dashboard/All.sh b/ctest/dashboard/All.sh new file mode 100644 index 0000000..c691b50 --- /dev/null +++ b/ctest/dashboard/All.sh @@ -0,0 +1,123 @@ +#!/bin/sh + +# @echo off + +# buildtype, useless for Linux; let here for compatiblitily purpose + buildtype=Release + + creasourcefolder=crea + creabinfolder=creaBin + bbtksourcefolder=bbtk + bbtkbinfolder=bbtkBin + creamaracassourcefolder=creaMaracasVisu + creamaracasbinary=creaMaracasVisuBin + creaenvironmentsource=creaEnvironment + creaenvironmentbinary=creaEnvironmentBin + creabrukersource=creaBruker + creabrukerbinary=creaBrukerBin + creaimagesourcefolder=creaImageIO + creaimagebinary=creaImageIOBin + creacontourssource=creaContours + creacontoursbinary=creaContoursBin + crearigidregistrationssource=creaRigidRegistration + crearigidregistrationbinary=creaRigidRegistrationBin + bbtkgeditorsource=bbtkGEditor + bbtkgeditorbinary=bbtkGEditorBin + creatoolssource=creaTools + creatoolsbinary=creaToolsBin + + + sh cvscheckout.sh $creasourcefolder + sh cvscheckout.sh $bbtksourcefolder + sh cvscheckout.sh $creamaracassourcefolder + sh cvscheckout.sh $creaenvironmentsource + sh cvscheckout.sh $creabrukersource + sh cvscheckout.sh $creaimagesourcefolder + sh cvscheckout.sh $creacontourssource + sh cvscheckout.sh $crearigidregistrationssource + sh cvscheckout.sh $bbtkgeditorsource + sh cvscheckout.sh $creatoolssource + + +# CREA + sh cmakemod.sh $creasourcefolder $creabinfolder + sh creaVariables.sh $creabinfolder $creasourcefolder + sh compilemod.sh $buildtype $creabinfolder + sh ctestmod.sh $creabinfolder + creadll=`pwd`/creabinfolder + PATH=$creadll:$PATH + +# BBTK + sh cmakemod.sh $bbtksourcefolder $bbtkbinfolder + sh bbtkVariables.sh $bbtkbinfolder $creabinfolder + sh compilemod.sh $buildtype $bbtkbinfolder + sh ctestmod.sh $bbtkbinfolder + bbtkdll=`pwd`/bbtkbinfolder + LD_LIBRARY_PATH=$bbtkdll:$LD_LIBRARY_PATH + +# creaMaracasVisu + sh cmakemod.sh $creamaracassourcefolder $creamaracasbinary + sh creaMaracasVariables.sh $creamaracasbinary $creabinfolder $bbtkbinfolder + sh compilemod.sh $buildtype $creamaracasbinary + sh ctestmod.sh $creamaracasbinary + creamaracasdll=`pwd`/$creamaracasbinary + LD_LIBRARY_PATH=$creamaracasdll:$LD_LIBRARY_PATH + +# creaEnvironment + sh cmakemod.sh $creaenvironmentsource $creaenvironmentbinary + sh creaenvironmentVariables.sh $creaenvironmentbinary $creabinfolder + sh compilemod.sh $buildtype $creaenvironmentbinary + sh ctestmod.sh $creaenvironmentbinary + creaenvironmentdll=`pwd`/$creaenvironmentbinary + LD_LIBRARY_PATH=$creaenvironmentdll:$LD_LIBRARY_PATH + +# creaBruker + sh cmakemod.sh $creabrukersource $creabrukerbinary + sh creaenvironmentVariables.sh $creabrukerbinary $creabinfolder + sh compilemod.sh $buildtype $creabrukerbinary + sh ctestmod.sh $creabrukerbinary + creabrukerdll=`pwd`$creabrukerbinary + LD_LIBRARY_PATH=$creabrukerdll:$LD_LIBRARY_PATH + +# creaImageIO + sh cmakemod.sh $creaimagesourcefolder $creaimagebinary + sh creaImageIOVariables.sh $creaimagebinary $creabinfolder $bbtkbinfolder $creabrukerbinary + sh compilemod.sh $buildtype $creaimagebinary + sh ctestmod.sh $creaimagebinary + creaimagedll=`pwd`/$creaimagebinary + LD_LIBRARY_PATH=$creaimagedll:$LD_LIBRARY_PATH + +# creaContours + sh cmakemod.sh $creacontourssource $creacontoursbinary + sh creaContoursVariables.sh $creacontoursbinary $creasourcefolder $creaenvironmentsource $creamaracassourcefolder $creaimagesourcefolder $bbtksourcefolder + sh compilemod.sh $buildtype $creacontoursbinary + sh ctestmod.sh $creacontoursbinary +# creacontourdll=`pwd`/$creacontoursbinary +# LD_LIBRARY_PATH=$creacontoursdll:$LD_LIBRARY_PATH + +# creaRigidRegistration + cmakemod.sh $crearigidregistrationssource $crearigidregistrationbinary + creaRigidRegistrationVariables.sh $crearigidregistrationbinary $creabinfolder $bbtksourcefolder + compilemod.sh $buildtype $crearigidregistrationbinary + ctestmod.sh $crearigidregistrationbinary +# crearigidregistrationdll=`pwd`/$crearigidregistrationbinary +# LD_LIBRARY_PATH=$crearigidregistrationdll:$LD_LIBRARY_PATH + +# bbtkGEditor + sh cmakemod.sh $bbtkgeditorsource $bbtkgeditorbinary + sh bbtkGEditorVariables.sh $bbtkgeditorbinary $creasourcefolder $bbtksourcefolder $creamaracassourcefolder + sh compilemod.sh $buildtype $bbtkgeditorbinary + sh ctestmod.sh $bbtkgeditorbinary +# bbtkgeditordll=`pwd`/$bbtkgeditorbinary +# LD_LIBRARY_PATH=$bbtkgeditordll:$LD_LIBRARY_PATH + +# creaTools + sh cmakemod.sh $creatoolssource $creatoolsbinary + sh creaToolsVariables.sh $creatoolsbinary + sh compilemodCreaTools.sh $buildtype $creatoolsbinary +# sh ctestmod.sh $creatoolsbinary + creatoolsdll=`pwd`/$creatoolsbinary + LD_LIBRARY_PATH=$creatoolssdll:$LD_LIBRARY_PATH + +# shutdown /s +# exit /b diff --git a/ctest/dashboard/Readme-JPR.txt b/ctest/dashboard/Readme-JPR.txt new file mode 100644 index 0000000..3feed9b --- /dev/null +++ b/ctest/dashboard/Readme-JPR.txt @@ -0,0 +1,6 @@ +DO NOT try to use Linux version (.sh files)! + +Nothing is finished (not even syntax checked). +I just commited to avoid to loose the scripts... + +JPRx diff --git a/ctest/dashboard/Readme.txt b/ctest/dashboard/Readme.txt index e799698..4d97b3e 100644 --- a/ctest/dashboard/Readme.txt +++ b/ctest/dashboard/Readme.txt @@ -43,9 +43,9 @@ avoid Read Only conflicts 1) Download with svn CDASH https://www.kitware.com/svn/CDash/Release-1-6-4 -y put it in www of your "/EasyPHP" instalation +y put it in www of your "/EasyPHP" installation -2) modify php.ini confiuration +2) modify php.ini configuration In EasyPHP=5.3.3/conf_files php.ini uncomment : diff --git a/ctest/dashboard/bbtkGEditorVariables.sh b/ctest/dashboard/bbtkGEditorVariables.sh new file mode 100644 index 0000000..4c357cd --- /dev/null +++ b/ctest/dashboard/bbtkGEditorVariables.sh @@ -0,0 +1,11 @@ +# %1 is the binary folder %2 is the binary folder crea %3 is the binaryfolder bbtk +currentdir=`pwd` +# set currentdir=%currentdir:\=/% + +cd $1 +cmake -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/$2 -D BUILD_bbtkGEditor_DOC:BOOL=OFF CMakeCache.txt +cmake -D BBTK_DIR:PATH=ùcurrentdir/tmpCreaTools_INSTALL/$3 CMakeCache.txt +cmake -D creaMaracasVisu_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/$4 CMakeCache.txt +cmake CMakeCache.txt +cmake CMakeCache.txt +cd .. diff --git a/ctest/dashboard/bbtkVariables.sh b/ctest/dashboard/bbtkVariables.sh new file mode 100644 index 0000000..c33867c --- /dev/null +++ b/ctest/dashboard/bbtkVariables.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +binfolder=$1 +cd $binfolder +currentdir=`pwd` + +#currentdir=%currentdir:\=/% +#cmake -D --BUILD_ALL:BOOL=ON -D crea_DIR:PATH=%currentdir%%2 CMakeCache.txt + +cmake -D --BUILD_ALL:BOOL=ON -D crea_DIR:PATH=$currentdir/$2 CMakeCache.txt +cmake CMakeCache.txt +cmake CMakeCache.txt +cmake CMakeCache.txt +cmake CMakeCache.txt +cmake CMakeCache.txt +cd .. diff --git a/ctest/dashboard/cmakemod.sh b/ctest/dashboard/cmakemod.sh new file mode 100644 index 0000000..5622f0c --- /dev/null +++ b/ctest/dashboard/cmakemod.sh @@ -0,0 +1,9 @@ +currentdir=`pwd` +dirInstall=$currentdir/tmpCreaTools_INSTALL/$1 + +mkdir $2 +cd $2 +cmake -G"Unix Makefiles" -H$currentdir$1 -B$currentdir$2 +cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=$dirInstall CMakeCache.txt +cd .. + diff --git a/ctest/dashboard/compilemod.sh b/ctest/dashboard/compilemod.sh new file mode 100644 index 0000000..a2e4b1d --- /dev/null +++ b/ctest/dashboard/compilemod.sh @@ -0,0 +1,10 @@ +cd $2 + + +# A FINIR! + +# call "C:\Program Files\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" +# FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%1 +# FOR /R %%a IN (*.sln) DO msbuild /p:Configuration=%1 INSTALL.vcproj +# FOR /R %%a IN (*.sln) DO msbuild /p:Configuration=%1 PACKAGE.vcproj +cd .. diff --git a/ctest/dashboard/creaContoursVariables.sh b/ctest/dashboard/creaContoursVariables.sh new file mode 100644 index 0000000..b540df6 --- /dev/null +++ b/ctest/dashboard/creaContoursVariables.sh @@ -0,0 +1,8 @@ +# %1=creacontoursbinary %2=creabinfolder% %3=creaenvironmentbinary %4=creamaracasbinary %5=creaimagebinary %6=bbtkBin +currentdir=`pwd` +#set currentdir=%currentdir:\=/% + +cd $1 +cmake -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/$2 -D creaEnvironment_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/$3 -D creaMaracasVisu_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/$4 -D creaImageIO_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/$5 -D BUILD_BBTK_PACKAGE_creaContours:BOOL=ON CMakeCache.txt +cmake -D BBTK_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/$6 CMakeCache.txt +cd .. diff --git a/ctest/dashboard/creaImageIOVariables.sh b/ctest/dashboard/creaImageIOVariables.sh new file mode 100644 index 0000000..079c3d2 --- /dev/null +++ b/ctest/dashboard/creaImageIOVariables.sh @@ -0,0 +1,8 @@ +# %1 is the binary folder %2 is the binary folder crea %3 is the binaryfolder bbtk +currentdir=`pwd` +#set currentdir=%currentdir:\=/% + +cd $1 +cmake -D crea_DIR:PATH=$currentdir$2 -D BUILD_BBTK_PACKAGE_creaImageIO:BOOL=ON -D creaImageIO_DOC:BOOL=ON -D creaBruker_DIR:PATH=$currentdir$4 -D USE_GDCM:BOOL=ON CMakeCache.txt +cmake -D BBTK_DIR:PATH=$currentdir$3 CMakeCache.txt +cd .. diff --git a/ctest/dashboard/creaMaracasVariables.sh b/ctest/dashboard/creaMaracasVariables.sh new file mode 100644 index 0000000..20718d6 --- /dev/null +++ b/ctest/dashboard/creaMaracasVariables.sh @@ -0,0 +1,10 @@ +# %1 is the binary folder %2 is the binary folder crea %3 is the binaryfolder bbtk +currentdir=`pwd` +#set currentdir=%currentdir:\=/% + +cd $1 +cmake -D crea_DIR:PATH=$currentdir/$2 -D BUILD_BBTK_PACKAGE_creaMaracasVisu:BOOL=ON -D creaMaracasVisu_DOC:BOOL=OFF CMakeCache.txt +cmake -D BBTK_DIR:PATH=$currentdir$3 CMakeCache.txt +cmake CMakeCache.txt +cmake CMakeCache.txt +cd .. diff --git a/ctest/dashboard/creaToolsVariables.sh b/ctest/dashboard/creaToolsVariables.sh new file mode 100644 index 0000000..ad3f74a --- /dev/null +++ b/ctest/dashboard/creaToolsVariables.sh @@ -0,0 +1,6 @@ +currentdir=`pwd` +#set currentdir=%currentdir:\=/% + +cd $1 +cmake -D CREATOOLS_SOURCE_PATH:PATH=$currentdir/tmpCreaTools_INSTALL/ CMakeCache.txt +cd .. diff --git a/ctest/dashboard/creaenvironmentVariables.sh b/ctest/dashboard/creaenvironmentVariables.sh new file mode 100644 index 0000000..85fd54c --- /dev/null +++ b/ctest/dashboard/creaenvironmentVariables.sh @@ -0,0 +1,7 @@ +#%1=creacontoursbinary %2=creabinfolder% %3=creaenvironmentbinary %4=creamaracasbinary %5=creaimagebinary %6=bbtkBin +currentdir=`pwd` +#set currentdir=%currentdir:\=/% + +cd $1 +cmake -D crea_DIR:PATH=$currentdir$2 CMakeCache.txt +cd .. diff --git a/ctest/dashboard/ctestmod.sh b/ctest/dashboard/ctestmod.sh new file mode 100644 index 0000000..27fede3 --- /dev/null +++ b/ctest/dashboard/ctestmod.sh @@ -0,0 +1,10 @@ +set binfolder=$1 +cd $binfolder +# rem EED>> ctest -D ContinuousStart -D ContinuousUpdate -D ContinuousConfigure -D ContinuousBuild -D ContinuousTest -D ContinuousSubmit +# rem EED>> ctest -D ContinuousMemCheck -D ContinuousSubmit +# rem EED>> ctest -D ExperimentalStart -D ExperimentalUpdate -D ExperimentalConfigure -D ExperimentalBuild -D ExperimentalTest -D ExperimentalSubmit +# rem EED>> ctest -D ExperimentalMemCheck -D ExperimentalSubmit +ctest -D ExperimentalConfigure -D ExperimentalBuild +# rem EED>> ctest -D NightlyStart -D NightlyUpdate -D NightlyConfigure -D NightlyBuild -D NightlyTest -D NightlySubmit +# rem EED>> ctest -D NightlyMemCheck -D NightlySubmit +cd .. diff --git a/ctest/dashboard/cvscheckout.sh b/ctest/dashboard/cvscheckout.sh new file mode 100644 index 0000000..a1e074c --- /dev/null +++ b/ctest/dashboard/cvscheckout.sh @@ -0,0 +1 @@ +cvs -d :ssh:davila@cvs.creatis.insa-lyon.fr:/cvs/creatis checkout $1