#3528 bashrc to bashrc_CreaTools

diff --git a/kernel/appli/bbPlugPackage/bbPlugPackage.cpp b/kernel/appli/bbPlugPackage/bbPlugPackage.cpp
index ed0d026862dfed5f301a58c785f6649ec4a6f1fe..5d05127ec151cb0f471cbf7a9d778a4915f256ad 100644 (file)
--- 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 8b3528be965aa0a2bbe05b5372aa9e8c4f6d1f75..c994f15c051f87842bb20c8f46b96e93e48cf412 100755 (executable)
--- 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 9b9d9bc3b8c315031049ef8e8ea50088c48c6b48..39df9102d61e60be4b4fa4df84c1ab68765e5cda 100644 (file)
--- 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 05b2c32228a2ae3d179f651f7a313aab07f809c5..2bbf4fbddad9161c6bbc9e27906e908e13c6de2a 100644 (file)
--- 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 d50c2215e4c0d011fb55dbbe888406074038c951..2f11d2e623a674cdd27e2396543b34656f8ee127 100755 (executable)
--- 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 d75378b2b960c165f38753cad40ed3243f9379f5..7fa160ac21d90d427efd76c825b29487af20cc8d 100644 (file)
--- 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