From 113efdbcc424706f0ffa058d9170cf034f18b6f1 Mon Sep 17 00:00:00 2001
From: "eduardo.davila@creatis.insa-lyon.fr"
<eduardo.davila@creatis.insa-lyon.fr>
Date: Tue, 3 Dec 2024 11:37:47 +0100
Subject: [PATCH] #3528 bashrc to bashrc_CreaTools
---
kernel/appli/bbPlugPackage/bbPlugPackage.cpp | 14 ++++++-----
kernel/appli/bbc/bbc.sh.in | 2 +-
kernel/cmake/BBTKConfigurePackage_src.cmake | 4 ++--
kernel/doc/bbtkUsersGuide/bbtkUsersGuide.tex | 2 +-
packages/std/src/bbstdExecSystemCommand.cxx | 2 +-
packages/vtk/src/bbvtkProbeFilter.cxx | 25 +++++++++-----------
6 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/kernel/appli/bbPlugPackage/bbPlugPackage.cpp b/kernel/appli/bbPlugPackage/bbPlugPackage.cpp
index ed0d026..5d05127 100644
--- a/kernel/appli/bbPlugPackage/bbPlugPackage.cpp
+++ b/kernel/appli/bbPlugPackage/bbPlugPackage.cpp
@@ -72,13 +72,14 @@ int main(int argc, char **argv)
std::string command;
-#ifdef __APPLE__
- command = "source ~/.bashrc ; " + command;
-#endif
+//#ifdef __APPLE__
+// command = "source ~/.bashrc ; " + command;
+//#endif
#if defined(WIN32)
command = "\"";
#endif
+ command = "source ~/.bashrc_CreaTools ; " + command;
command += ConfigurationFile::GetInstance().Get_bin_path();
command += ConfigurationFile::GetInstance().Get_file_separator();
command += "bbRegeneratePackageDoc";
@@ -96,13 +97,14 @@ int main(int argc, char **argv)
command = "";
-#ifdef __APPLE__
- command = "source ~/.bashrc ; " + command;
-#endif
+//#ifdef __APPLE__
+// command = "source ~/.bashrc ; " + command;
+//#endif
#if defined(WIN32)
command = "\"";
#endif
+ command = "source ~/.bashrc_CreaTools ; " + command;
command += ConfigurationFile::GetInstance().Get_bin_path();
command += ConfigurationFile::GetInstance().Get_file_separator();
command += "bbRegenerateBoxesLists";
diff --git a/kernel/appli/bbc/bbc.sh.in b/kernel/appli/bbc/bbc.sh.in
index 8b3528b..c994f15 100755
--- a/kernel/appli/bbc/bbc.sh.in
+++ b/kernel/appli/bbc/bbc.sh.in
@@ -26,7 +26,7 @@
#!/bin/bash
# compiles bbs files
-source ~/.bashrc
+source ~/.bashrc_CreaTools
if [ $# -lt 1 ]
then
diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index 9b9d9bc..39df910 100644
--- a/kernel/cmake/BBTKConfigurePackage_src.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_src.cmake
@@ -132,7 +132,7 @@ FOREACH(xmlfile ${${BBTK_PACKAGE_NAME}_XML_SOURCES})
ADD_CUSTOM_COMMAND(
OUTPUT ${BBFY_CXX_OUT}
COMMAND
- export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} && echo $ENV{LD_LIBRARY_PATH} && source ~/.bashrc && ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
+ export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} && echo $ENV{LD_LIBRARY_PATH} && source ~/.bashrc_CreaTools && ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
DEPENDS ${xmlfile}
${BBTK_BBFY_DEPENDENCY}
)
@@ -330,7 +330,7 @@ ADD_CUSTOM_COMMAND(
ELSE(WIN32)
SET(LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}")
ADD_CUSTOM_TARGET( bb${BBTK_PACKAGE_NAME}.bbp ALL
- COMMAND source ~/.bashrc && ${BBTK_BBPCONFIGURATOR} ${CMAKE_CURRENT_SOURCE_DIR}/../bbs/boxes/ ${BBTK_PACKAGE_NAME} ${BBTK_BBS_BUILD_PATH}/
+ COMMAND source ~/.bashrc_CreaTools && ${BBTK_BBPCONFIGURATOR} ${CMAKE_CURRENT_SOURCE_DIR}/../bbs/boxes/ ${BBTK_PACKAGE_NAME} ${BBTK_BBS_BUILD_PATH}/
)
add_dependencies( bb${BBTK_PACKAGE_NAME}.bbp bbpConfigurator )
ENDIF(WIN32)
diff --git a/kernel/doc/bbtkUsersGuide/bbtkUsersGuide.tex b/kernel/doc/bbtkUsersGuide/bbtkUsersGuide.tex
index 05b2c32..2bbf4fb 100644
--- a/kernel/doc/bbtkUsersGuide/bbtkUsersGuide.tex
+++ b/kernel/doc/bbtkUsersGuide/bbtkUsersGuide.tex
@@ -2108,7 +2108,7 @@ sudo make install
otherwise package documentation will not be generated. \\
-Then update your environment variable LD\_LIBRARY\_PATH (in .bashrc if
+Then update your environment variable LD\_LIBRARY\_PATH (in .bashrc_CreaTools if
you are using bash), to add the path to the shared library
\texttt{libbb\emph{YourNewPackageName}.so}
diff --git a/packages/std/src/bbstdExecSystemCommand.cxx b/packages/std/src/bbstdExecSystemCommand.cxx
index d50c221..2f11d2e 100755
--- a/packages/std/src/bbstdExecSystemCommand.cxx
+++ b/packages/std/src/bbstdExecSystemCommand.cxx
@@ -86,7 +86,7 @@ namespace bbstd
#ifdef __APPLE__
- ccommand = "source ~/.bashrc ; " + ccommand;
+ ccommand = "source ~/.bashrc_CreaTools ; " + ccommand;
#endif
if (bbGetInputVerbose()==true)
diff --git a/packages/vtk/src/bbvtkProbeFilter.cxx b/packages/vtk/src/bbvtkProbeFilter.cxx
index d75378b..7fa160a 100644
--- a/packages/vtk/src/bbvtkProbeFilter.cxx
+++ b/packages/vtk/src/bbvtkProbeFilter.cxx
@@ -24,9 +24,10 @@ void ProbeFilter::Process()
// (the one provided in the attribute 'name' of the tag 'input')
// * TYPE is the C++ type of the input/output
// (the one provided in the attribute 'type' of the tag 'input')
+
if ( (bbGetInputSource()==NULL) || (bbGetInputInput()==NULL) )
{
- bbSetOutputOut( NULL );
+ bbSetOutputOut( NULL );
} else {
//EED 2017-01-01 Migration VTK7
@@ -41,7 +42,8 @@ void ProbeFilter::Process()
bbSetOutputOut( _probefilter->GetOutput() );
} // if source input
}
-//=====
+
+//=====
// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
//=====
void ProbeFilter::bbUserSetDefaultValues()
@@ -53,36 +55,31 @@ void ProbeFilter::bbUserSetDefaultValues()
// bbSetInputSource(NULL);
// bbSetOutputOut(NULL);
}
-//=====
+
+//=====
// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
//=====
void ProbeFilter::bbUserInitializeProcessing()
{
-
// THE INITIALIZATION METHOD BODY :
// Here does nothing
// but this is where you should allocate the internal/output pointers
-// if any
-
+// if any
_probefilter = vtkProbeFilter::New();
-
-
}
-//=====
+
+//=====
// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
//=====
void ProbeFilter::bbUserFinalizeProcessing()
{
-
// THE FINALIZATION METHOD BODY :
// Here does nothing
// but this is where you should desallocate the internal/output pointers
// if any
-
_probefilter->Delete();
-
-}
}
-// EO namespace bbvtk
+
+}// EO namespace bbvtk
--
2.49.0