Bug #1754

Package control Version

Feature #1755
Type of Script

Clean Debug comments

diff --git a/kernel/cmake/BBTKVersion.cmake b/kernel/cmake/BBTKVersion.cmake
index 29a5a932745f0d5ffcf66ff942aed43440c097d4..60dc082ad70397e77f980dc577388f4598385334 100644 (file)
--- a/kernel/cmake/BBTKVersion.cmake
+++ b/kernel/cmake/BBTKVersion.cmake
@@ -2,8 +2,8 @@
 # BBTK version number
 SET(BBTK_VERSION_DATE "19/03/2010")
 SET(BBTK_MAJOR_VERSION 0)
-SET(BBTK_MINOR_VERSION 9)
-SET(BBTK_BUILD_VERSION 7)
+SET(BBTK_MINOR_VERSION 10)
+SET(BBTK_BUILD_VERSION 1)
 SET(BBTK_VERSION 
   "${BBTK_MAJOR_VERSION}.${BBTK_MINOR_VERSION}.${BBTK_BUILD_VERSION}")
 # Now in bbtkConfigure.h file (cf. core/src)

diff --git a/kernel/src/bbtkBlackBoxDescriptor.cxx b/kernel/src/bbtkBlackBoxDescriptor.cxx
index 18dfcd181546f43e8ca8e4f4a3279ede30f958ae..e165e97c139d922fc5e7d9dfbb5bf8af5699dd5c 100644 (file)
--- a/kernel/src/bbtkBlackBoxDescriptor.cxx
+++ b/kernel/src/bbtkBlackBoxDescriptor.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBoxDescriptor.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/12/08 14:10:36 $
-  Version:   $Revision: 1.22 $
+  Date:      $Date: 2012/11/14 07:12:00 $
+  Version:   $Revision: 1.23 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -59,6 +59,7 @@ namespace bbtk
       mAuthor(""),
       mCategory(""),
       mKind(STANDARD),
+         mTypeOfScript(TS_BINARY),
       mPackage()
   {
     bbtkDDebugMessage("object",4,
@@ -72,6 +73,7 @@ namespace bbtk
   /// Default ctor
   BlackBoxDescriptor::BlackBoxDescriptor(const BlackBoxDescriptor&)  
   {
+         mScriptFileName="";
   }
   //=========================================================================
   /// Dtor
@@ -527,4 +529,28 @@ namespace bbtk
    }
   //=========================================================================
  
+       
+       //==========================================================================
+       void BlackBoxDescriptor::SetTypeOfScript_Application()
+       {
+               SetTypeOfScript(TS_SCRIPT_APPLICATION);
+       }        
+       //==========================================================================
+       
+               
+       //==========================================================================
+       bool BlackBoxDescriptor::IsTypeOfScript_Application()
+       {
+               return (GetTypeOfScript()==TS_SCRIPT_APPLICATION);
+       }
+       //==========================================================================
+
+       
+       //==========================================================================
+       bool BlackBoxDescriptor::IsTypeOfScript_ComplexBox()
+       {
+               return (GetTypeOfScript()==TS_SCRIPT_COMPLEXBOX);
+       }
+       //==========================================================================
+       
 }

diff --git a/kernel/src/bbtkBlackBoxDescriptor.h b/kernel/src/bbtkBlackBoxDescriptor.h
index 1de5b8cea94c1aaaa8a15655963b4a9ed6d25a9b..97c57b88aea39df86e2b3d812deaec14dc062abc 100644 (file)
--- a/kernel/src/bbtkBlackBoxDescriptor.h
+++ b/kernel/src/bbtkBlackBoxDescriptor.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBoxDescriptor.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:12 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2012/11/14 07:12:00 $
+  Version:   $Revision: 1.12 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -79,6 +79,13 @@ namespace bbtk
     }
     Kind;
 
+       typedef enum
+       {
+               TS_BINARY=0,
+               TS_SCRIPT_COMPLEXBOX=1,
+               TS_SCRIPT_APPLICATION=2
+       } TypeOfScript;
+         
     /// Releases a descriptor
     //    static void Release(BlackBoxDescriptor::WeakPointer);
 
@@ -158,6 +165,35 @@ namespace bbtk
     ///
     virtual void Check(bool recursive=true) const;
 
+         
+         
+         /// Sets the name of the script file from which it is defined
+         void SetScriptFileName(const std::string& n) { mScriptFileName = n; }
+         /// Gets the name of the script file from which it is defined
+         std::string GetScriptFileName() const { return mScriptFileName; }
+         
+         
+         
+         
+         /// Gets the type of script  BINARY, SCRIPT_COMPLEXBOX, SCRIPT_APPLICATION 
+         TypeOfScript GetTypeOfScript()                        {       return mTypeOfScript;   };
+         void SetTypeOfScript(TypeOfScript type)       {       mTypeOfScript=type;             };        
+         bool IsTypeOfScript_Application();
+         bool IsTypeOfScript_ComplexBox();
+         void SetTypeOfScript_Application();
+         
+         
+         
+         
+  private:
+         
+         TypeOfScript mTypeOfScript;
+         
+         /// The name of the script file from which it was created
+         std::string mScriptFileName;
+         
+         
+         
   protected:
     /// Adds an input descriptor
     void AddInputDescriptor( BlackBoxInputDescriptor *d ) 

diff --git a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
index 3037cae072d36a075e40e19a3a9786540c36c2c4..2cc69bb7e94992195d944f7a1c5c1d2760640faf 100644 (file)
--- a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
+++ b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkComplexBlackBoxDescriptor.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/12/08 14:10:36 $
-  Version:   $Revision: 1.21 $
+  Date:      $Date: 2012/11/14 07:12:00 $
+  Version:   $Revision: 1.22 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -64,6 +64,7 @@ namespace bbtk
   ComplexBlackBoxDescriptor::ComplexBlackBoxDescriptor(const std::string& name)
   {
     bbtkDDebugMessage("object",2,"==> ComplexBlackBoxDescriptor(\""<<name<<"\")"<<std::endl);
+       SetTypeOfScript(TS_SCRIPT_COMPLEXBOX);
     SetTypeName(name);
     AddToCategory("complex box");
     mPrototype = ComplexBlackBox::New(name+std::string("Prototype"),
@@ -659,4 +660,5 @@ size_t  ComplexBlackBoxDescriptor::GetObjectInternalSize() const
   }
   //==========================================================================
 
+       
 }

diff --git a/kernel/src/bbtkComplexBlackBoxDescriptor.h b/kernel/src/bbtkComplexBlackBoxDescriptor.h
index 09d7d40fe12d3d7b58ef4029593e29c0742ccb2c..5ee03013a8cbcc9244deec0f0fca1f34f2cf6d73 100644 (file)
--- a/kernel/src/bbtkComplexBlackBoxDescriptor.h
+++ b/kernel/src/bbtkComplexBlackBoxDescriptor.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkComplexBlackBoxDescriptor.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:12 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2012/11/14 07:12:00 $
+  Version:   $Revision: 1.7 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -105,10 +105,6 @@ namespace bbtk
                       const std::string& help);
  
  
-    /// Sets the name of the script file from which it is defined
-    void SetScriptFileName(const std::string& n) { mScriptFileName = n; }
-    /// Gets the name of the script file from which it is defined
-    std::string GetScriptFileName() const { return mScriptFileName; }
    
     /// 
     void AddToExecutionList( const std::string& box );
@@ -153,13 +149,12 @@ namespace bbtk
     ComplexBlackBoxDescriptor(const std::string& name); 
 
   private:
+       
     /// The factory used
     Factory::WeakPointer mFactory;
     /// The complex box in which boxes and connections are stored
     ComplexBlackBoxPointer mPrototype;
-    /// The name of the script file from which it was created
-    std::string mScriptFileName;
-    
+             
   };
   // class ComplexBlackBoxDescriptor
   //==========================================================================

diff --git a/kernel/src/bbtkExecuter.cxx b/kernel/src/bbtkExecuter.cxx
index 72ad0de9a8952f9d1b5fba55e75ff42a1174219e..74cba0105bd966728021484722da48f1159b2c7d 100644 (file)
--- a/kernel/src/bbtkExecuter.cxx
+++ b/kernel/src/bbtkExecuter.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkExecuter.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/06/18 14:43:19 $
-  Version:   $Revision: 1.32 $
+  Date:      $Date: 2012/11/14 07:12:00 $
+  Version:   $Revision: 1.33 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -221,6 +221,13 @@ namespace bbtk
   }
   //=======================================================================
 
+       void Executer::SetTypeOfScript_Application ()
+       {
+               mOpenDefinition.back().box->SetTypeOfScript_Application();
+       }
+       
+       
+       
   //=======================================================================
   void Executer::Clear()
   {

diff --git a/kernel/src/bbtkExecuter.h b/kernel/src/bbtkExecuter.h
index 71f92d227b10fe8960e0836f7240d8e603d6af18..d53e06b4af5daf0a44fd067d0c0b2f318fa41393 100644 (file)
--- a/kernel/src/bbtkExecuter.h
+++ b/kernel/src/bbtkExecuter.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkExecuter.h,v $
   Language:  C++
-  Date:      $Date: 2009/06/08 14:50:03 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2012/11/14 07:12:00 $
+  Version:   $Revision: 1.19 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -108,6 +108,11 @@ namespace bbtk
     /// (Used to set it after the Define command)
     void SetCurrentFileName (const std::string &name );
 
+       //Set type of script
+       void SetTypeOfScript_Application();
+ 
+         
+         
     /// End the definition of a ComplexBlackBox
     void EndDefine ();
 

diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx
index 7c55c7f00ed9fd7dc33769cc2503098364e725b2..9989bfcfe36f9357b3723f0dcdbc57009db42d82 100644 (file)
--- a/kernel/src/bbtkFactory.cxx
+++ b/kernel/src/bbtkFactory.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkFactory.cxx,v $
   Language:  C++
-  Date:      $Date: 2012/10/16 06:31:04 $
-  Version:   $Revision: 1.53 $
+  Date:      $Date: 2012/11/14 07:12:00 $
+  Version:   $Revision: 1.54 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -173,7 +173,7 @@ namespace bbtk
                iUnload = mPackageMap.find(pkgname);
 
 //EED Debuging message
-     std::cout << "EED Factory::LoadPackage " <<  std::endl;
+//     std::cout << "EED Factory::LoadPackage " <<  std::endl;
 //             PackageMapType::iterator it;
 //             for ( it=mPackageMap.begin() ; it != mPackageMap.end(); it++ )
 //                     std::cout << (*it).first << " ";
@@ -510,12 +510,8 @@ namespace bbtk
     bbtkDebugMessageInc("kernel",9,"Factory::InsertPackage(\""<<
                         p->GetName()<<"\")"<<std::endl);
 
-    p->AddFactory(GetThisPointer<Factory>());
-         
-printf("EED Factory::InsertPackage %s\n", p->GetName().c_str() );        
-         
+    p->AddFactory(GetThisPointer<Factory>());    
     mPackageMap[p->GetName()] = p;
-
     bbtkDebugDecTab("kernel",9);
   }
   //===================================================================

diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx
index 5a3fd71a46c1c9e8edbc5a2b4d999ff0fa7176a1..a71ded325b84c46a1900800762e04b74f7afab1b 100644 (file)
--- a/kernel/src/bbtkInterpreter.cxx
+++ b/kernel/src/bbtkInterpreter.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkInterpreter.cxx,v $
   Language:  C++
-  Date:      $Date: 2012/10/16 06:31:04 $
-  Version:   $Revision: 1.93 $
+  Date:      $Date: 2012/11/14 07:12:00 $
+  Version:   $Revision: 1.94 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -1286,6 +1286,14 @@ namespace bbtk
        }       
        //=======================================================================
        
+       
+       void Interpreter::SetTypeOfScript_Application()
+       {
+               GetExecuter()->SetTypeOfScript_Application();
+       }
+
+       
+       
 /*EED Borrame  
   //=======================================================================
 void Interpreter::SwitchToStream( std::stringstream* stream )

diff --git a/kernel/src/bbtkInterpreter.h b/kernel/src/bbtkInterpreter.h
index a402908996f817b14c0d79f8d24a433936b68c50..39294ed8135c93e0b6facd3d53a6f00740364434 100644 (file)
--- a/kernel/src/bbtkInterpreter.h
+++ b/kernel/src/bbtkInterpreter.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkInterpreter.h,v $
   Language:  C++
-  Date:      $Date: 2010/09/18 22:31:40 $
-  Version:   $Revision: 1.44 $
+  Date:      $Date: 2012/11/14 07:12:00 $
+  Version:   $Revision: 1.45 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -363,8 +363,10 @@ namespace bbtk
          virtual void commandMessage();
          virtual void commandMessage(const std::string &kind,const  std::string &levelstr);
          virtual void SetCurrentFileName(const std::string &fullPathScriptName); 
+         virtual void SetTypeOfScript_Application();
 
          
+         
          /// Constructor
          Interpreter(const std::string& cpp_file = "");
          Interpreter(VirtualExec::Pointer);

diff --git a/kernel/src/bbtkInterpreterVirtual.cxx b/kernel/src/bbtkInterpreterVirtual.cxx
index 35a87464b311639d28bd23b655cc26870cc58d2c..01d37a8ab48163c553d491c39f14836a755ea8d3 100644 (file)
--- a/kernel/src/bbtkInterpreterVirtual.cxx
+++ b/kernel/src/bbtkInterpreterVirtual.cxx
@@ -1559,7 +1559,12 @@ printf("EED InterpreterVirtual::SwitchToFile kkkkk     >>  %s\n", (*j).c_str() )
 //EED printf("EED D. SwitchToFile %s\n", fullPathScriptName.c_str() );   
                LoadScript(fullPathScriptName,name);
 //EED Borrame    if (source) GetExecuter()->SetCurrentFileName(fullPathScriptName);
-               if (source) SetCurrentFileName(fullPathScriptName);
+                 if (source) 
+                 {
+                         // Over writing the fullpath of the bbp file.
+                         SetCurrentFileName( fullPathScriptName );
+                         SetTypeOfScript_Application();
+                 }
        }    
                  
     return;
@@ -1572,6 +1577,14 @@ printf("EED InterpreterVirtual::SwitchToFile kkkkk     >>  %s\n", (*j).c_str() )
        }       
        //=======================================================================
        
+       
+       //=======================================================================
+       void InterpreterVirtual::SetTypeOfScript_Application( )
+       {
+       }
+       //=======================================================================
+
+       
   //=======================================================================
 void InterpreterVirtual::SwitchToStream( std::stringstream* stream )
 {

diff --git a/kernel/src/bbtkInterpreterVirtual.h b/kernel/src/bbtkInterpreterVirtual.h
index a471ba79ead55c2cfb1ccaa7f8fe59c7248cd074..29e198cf6ed008fa2a1a9891ce8e36c8f177a11d 100644 (file)
--- a/kernel/src/bbtkInterpreterVirtual.h
+++ b/kernel/src/bbtkInterpreterVirtual.h
@@ -182,6 +182,8 @@ namespace bbtk
 #endif
 
 
+         
+         
     /*
     // For 'break' commands observation
     typedef boost::signals::trackable BreakObserverType;
@@ -323,7 +325,8 @@ namespace bbtk
          virtual void commandMessage();
          virtual void commandMessage(const std::string &kind,const std::string &levelstr);
          virtual void SetCurrentFileName(const std::string &fullPathScriptName);
-
+         virtual void SetTypeOfScript_Application();
+         
          /// Constructor
          InterpreterVirtual();
          

diff --git a/kernel/src/bbtkPackage.cxx b/kernel/src/bbtkPackage.cxx
index 66465e9813e2bb200a50e611848ad8c3d3e2cc88..1aa5a1c19a980ec2ddb61372af3d3fdc79501850 100644 (file)
--- a/kernel/src/bbtkPackage.cxx
+++ b/kernel/src/bbtkPackage.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkPackage.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/09/12 14:52:25 $
-  Version:   $Revision: 1.35 $
+  Date:      $Date: 2012/11/14 07:12:00 $
+  Version:   $Revision: 1.36 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -349,11 +349,8 @@ namespace bbtk
   /// to test that a dyn lib is a valid bbtk package lib
   /// NB : The BBTK version exported from the library 
   ///      is tested against the current bbtk version
-  DynamicLibraryHandler Package::OpenDynamicLibrary
-  ( const std::string& libname,
-    const std::string& package_name,
-    DLGetPackageFunction& getpack,
-    DLDeletePackageFunction& delpack)
+  DynamicLibraryHandler Package::OpenDynamicLibrary( const std::string& libname,const std::string& package_name,
+                                                                                                        DLGetPackageFunction& getpack, DLDeletePackageFunction& delpack)
   {
     bbtkDebugMessage("package",3,"==> Package::OpenDynamicLibrary("
                     <<libname<<")"<<std::endl);
@@ -366,8 +363,8 @@ namespace bbtk
          
     if (!handler)
       {
-       bbtkMessage("package",2,
-                   "Could not open shared library [" <<libname<<"] : "
+       bbtkMessage("package",0,
+                   "BBTK ..ERROR.. loading could not open shared library [" <<libname<<"] : "
                    <<dlerror() << std::endl);
        return 0;
       }
@@ -376,15 +373,13 @@ namespace bbtk
 
     // Loads the Package bbtk version function 
     std::string getvername(package_name);
-    getvername += 
-      BBTK_STRINGIFY_SYMBOL(BBTK_GET_PACKAGE_BBTK_VERSION_FUNCTION_NAME);
-    DLGetPackageBBTKVersionFunction getbbtkversion 
-      = (DLGetPackageBBTKVersionFunction)(dlsym(handler,getvername.c_str()));
+    getvername += BBTK_STRINGIFY_SYMBOL(BBTK_GET_PACKAGE_BBTK_VERSION_FUNCTION_NAME);
+    DLGetPackageBBTKVersionFunction getbbtkversion  = (DLGetPackageBBTKVersionFunction)(dlsym(handler,getvername.c_str()));
     if (!getbbtkversion)
       {
        bbtkDebugMessage("package",3,"***"<<std::endl);
-       bbtkMessage("package",2,
-                   "Shared library ["<<libname
+       bbtkMessage("package",0,
+                   "BBTK ..ERROR.. loading shared library ["<<libname
                    <<"] is not a valid bbtk package."
                    <<" Symbol ["<<getvername<<"] :"<<dlerror()<< std::endl);
        dlclose(handler);
@@ -396,12 +391,13 @@ namespace bbtk
     // version matches ?
     if (getbbtkversion() != bbtk::GetVersion())
       {
-       bbtkMessage("package",2,
-                   "Shared library ["<<libname
+       bbtkMessage("package",0,
+                   "BBTK ..ERROR.. loading: "<<package_name
+                       <<" - Shared library ["<<libname
                    <<"] was build with bbtk version "
                    <<getbbtkversion()
                    <<" but the current program runs with version "
-                   <<bbtk::GetVersion()<<" : cannot load it"<<std::endl);
+                   <<bbtk::GetVersion()<<" : cannot load it. You have to recompile your BBTK-Package."<<std::endl);
        dlclose(handler);
        return 0;
        
@@ -414,8 +410,8 @@ namespace bbtk
     getpack = (DLGetPackageFunction)(dlsym(handler, getpackname.c_str()));
     if (!getpack)
       {
-       bbtkMessage("package",2,
-                   "Shared library ["<<libname
+       bbtkMessage("package",0,
+                   "BBTK ..ERROR.. loading shared library ["<<libname
                    <<"] is not a valid bbtk package."
                    <<" Symbol ["<<getpackname<<"] :"<<dlerror()<< std::endl);
        dlclose(handler);
@@ -430,8 +426,8 @@ namespace bbtk
     delpack = (DLDeletePackageFunction)(dlsym(handler, delpackname.c_str()));
     if (!delpack)
       {
-       bbtkMessage("package",2,
-                   "Shared library ["<<libname
+       bbtkMessage("package",0,
+                   "BBTK ..ERROR.. loading shared library ["<<libname
                    <<"] is not a valid bbtk package."
                    <<" Symbol ["<<delpackname<<"] :"<<dlerror()<< std::endl);
        dlclose(handler);
@@ -447,8 +443,8 @@ namespace bbtk
     handler = LoadLibrary(libname.c_str());
     if (!handler)
       {
-       bbtkMessage("package",2,
-                   "Could not open shared library [" <<libname<<"]"
+       bbtkMessage("package",0,
+                   "BBTK ..ERROR..  could not open shared library [" <<libname<<"]"
                    << std::endl);
        DWORD dwErrorCode = 0;
        dwErrorCode = GetLastError();
@@ -461,16 +457,14 @@ namespace bbtk
     
     // Loads the Package bbtk version function 
     std::string getvername(package_name);
-    getvername += 
-      BBTK_STRINGIFY_SYMBOL(BBTK_GET_PACKAGE_BBTK_VERSION_FUNCTION_NAME);
-    DLGetPackageBBTKVersionFunction getbbtkversion 
-      = (DLGetPackageBBTKVersionFunction)(GetProcAddress(handler,
-                                                       getvername.c_str()));
+    getvername += BBTK_STRINGIFY_SYMBOL(BBTK_GET_PACKAGE_BBTK_VERSION_FUNCTION_NAME);
+    DLGetPackageBBTKVersionFunction getbbtkversion = (DLGetPackageBBTKVersionFunction)(GetProcAddress(handler, getvername.c_str()));
+         
     if (!getbbtkversion)
       {
        FreeLibrary(handler);
-       bbtkMessage("package",2,
-                   "Shared library ["<<libname
+       bbtkMessage("package",0,
+                   "BBTK ..ERROR.. loading shared library ["<<libname
                    <<"] is not a valid bbtk package."
                    <<" Symbol ["<<getbbtkversion<<"] not found"<< std::endl);
        return 0;
@@ -479,15 +473,15 @@ namespace bbtk
     // version matches ?
     if (getbbtkversion() != bbtk::GetVersion())
       {
-       FreeLibrary(handler);
-       bbtkMessage("package",2,
-                   "Shared library ["<<libname
-                   <<"] was build with bbtk version "
-                   <<getbbtkversion()
-                   <<" but the current program runs with version "
-                   <<bbtk::GetVersion()<<" : cannot load it"<<std::endl);
-       return 0;
-       
+                 FreeLibrary(handler);
+                 bbtkMessage("package",0,
+                               "BBTK ..ERROR.. loading: "<<package_name
+                               <<" - Shared library ["<<libname
+                               <<"] was build with bbtk version "
+                               <<getbbtkversion()
+                               <<" but the current program runs with version "
+                               <<bbtk::GetVersion()<<" : cannot load it. You have to recompile your BBTK-Package."<<std::endl);
+                 return 0;
       }
 
      // Loads the Package get function
@@ -497,8 +491,8 @@ namespace bbtk
     if (!getpack)
       {
        FreeLibrary(handler);
-       bbtkMessage("package",2,
-                   "Shared library ["<<libname
+       bbtkMessage("package",0,
+                   "BBTK ..ERROR.. loading shared library ["<<libname
                    <<"] is not a valid bbtk package."
                    <<" Symbol ["<<getpackname<<"] not found"<< std::endl);
        return 0;
@@ -511,8 +505,8 @@ namespace bbtk
     if (!delpack)
       {
        FreeLibrary(handler);
-       bbtkMessage("package",2,
-                   "Shared library ["<<libname
+       bbtkMessage("package",0,
+                   "BBTK ..ERROR.. loading shared library ["<<libname
                    <<"] is not a valid bbtk package."
                    <<" Symbol ["<<delpackname<<"] not found"<< std::endl);
        return 0;
@@ -677,7 +671,6 @@ namespace bbtk
   }
   //==========================================================================
 
-//ups4 EED borrame
        bool Package::ifBoxExist( std::string type)     
     {
                bool ok=false;

diff --git a/kernel/src/bbtkPackage.h b/kernel/src/bbtkPackage.h
index b1976977dfcb54bbf7a85ef9f21905866c36a276..96e3bfc2bdba355fa6f1e9105d35c351786a2097 100644 (file)
--- a/kernel/src/bbtkPackage.h
+++ b/kernel/src/bbtkPackage.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkPackage.h,v $
   Language:  C++
-  Date:      $Date: 2010/09/12 14:52:25 $
-  Version:   $Revision: 1.16 $
+  Date:      $Date: 2012/11/14 07:12:00 $
+  Version:   $Revision: 1.17 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -371,8 +371,8 @@ namespace bbtk
       return NAME ## GetPackagePointer();                              \
     }                                                                  \
     BBTK_PACKAGE_EXPORT const std::string&                             \
-    BBTK_CDECL NAME ## GetPackageBBTKVersion ()                                \
-    { return bbtk::GetVersion(); }                                     \
+    BBTK_CDECL NAME ## GetPackageBBTKVersion ()                                                                                        \
+    { static const std::string v(BBTK_STRINGIFY_SYMBOL(BBTK_VERSION));            return v; }  \
     class NAME ## PackageAutodestructor                                        \
     {                                                                  \
     public:                                                            \

diff --git a/kernel/src/bbtkTranscriptor.cxx b/kernel/src/bbtkTranscriptor.cxx
index 9f73066f63de092df64f7ab711d4399837e2851f..6fe2953ee123ca1c54dd010adceedd71839b5c0a 100644 (file)
--- a/kernel/src/bbtkTranscriptor.cxx
+++ b/kernel/src/bbtkTranscriptor.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkTranscriptor.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/06/08 14:50:04 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2012/11/14 07:12:00 $
+  Version:   $Revision: 1.18 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -375,5 +375,12 @@ size_t  Transcriptor::GetObjectInternalSize() const
   }
   //==========================================================================
 
+       
+  //==========================================================================
+       void Transcriptor::SetTypeOfScript_Application()
+       {
+       }
+  //==========================================================================
+
 
 }//namespace

diff --git a/kernel/src/bbtkTranscriptor.h b/kernel/src/bbtkTranscriptor.h
index ca0a54729c306bb5210f96640d1f8658d5ec79a2..573dfe458b0d5e8e533ed8d641113d719c71b780 100644 (file)
--- a/kernel/src/bbtkTranscriptor.h
+++ b/kernel/src/bbtkTranscriptor.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkTranscriptor.h,v $
   Language:  C++
-  Date:      $Date: 2009/06/08 14:50:04 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2012/11/14 07:12:00 $
+  Version:   $Revision: 1.15 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -107,6 +107,8 @@ namespace bbtk
     /// (Used to set it after the Define command)
     void SetCurrentFileName (const std::string &name );
 
+       void SetTypeOfScript_Application();
+         
     /// End the definition of a ComplexBlackBox
     void EndDefine ();
 

diff --git a/kernel/src/bbtkVirtualExec.h b/kernel/src/bbtkVirtualExec.h
index 73010f242481c732f1ca237a09115583ccdf104d..3c3c45d866c1a2784394e2fb502ccff819b2d67f 100644 (file)
--- a/kernel/src/bbtkVirtualExec.h
+++ b/kernel/src/bbtkVirtualExec.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkVirtualExec.h,v $
   Language:  C++
-  Date:      $Date: 2009/06/08 14:50:04 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2012/11/14 07:12:00 $
+  Version:   $Revision: 1.20 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -113,7 +113,9 @@ namespace bbtk
     /// Sets the file name to use for the current definition
     /// (Used to set it after the Define command)
     virtual void SetCurrentFileName (const std::string &name ) = 0;
-
+         
+         virtual void SetTypeOfScript_Application( ) = 0;
+         
     /// End the definition of a ComplexBlackBox
     virtual void EndDefine () = 0;
 

diff --git a/packages/vtk/src/bbvtkRescaleSlopeIntercept.cxx b/packages/vtk/src/bbvtkRescaleSlopeIntercept.cxx
index 3f4494eb978a272ea7e8294d3088b14de565e7ac..4acd045a849bec3ca028f367d1555fccce61dc76 100644 (file)
--- a/packages/vtk/src/bbvtkRescaleSlopeIntercept.cxx
+++ b/packages/vtk/src/bbvtkRescaleSlopeIntercept.cxx
@@ -30,10 +30,6 @@ void RescaleSlopeIntercept::Process()
 //    bbSetOutputOut( bbGetInputIn() );
 //    std::cout << "Output value = " <<bbGetOutputOut() << std::endl;
   
-       
-       printf("EED  RescaleSlopeIntercept::Process start\n");          
-       
-
        double range[2];
        double spc[3];
        int ext[6];
@@ -113,12 +109,10 @@ void RescaleSlopeIntercept::Process()
                
        } else  {
                bbSetOutputOut( NULL );
-       }               // if bbGetInputIn
-       
-       printf("EED  RescaleSlopeIntercept::Process end\n");            
-       
+       }               // if bbGetInputIn      
 }
        
+       
 //===== 
 // Don't edit this file. This file is generated from xml description.. 
 //=====