From: guigues Date: Wed, 23 Jul 2008 11:46:10 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: r0.6.0~8 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=a09174b82cb36ffd30bdbaed12c6ebd936a0e8f7;p=bbtk.git *** empty log message *** --- diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake index 79a44e0..c2f1709 100644 --- a/kernel/cmake/BBTKConfigurePackage_src.cmake +++ b/kernel/cmake/BBTKConfigurePackage_src.cmake @@ -125,6 +125,7 @@ TARGET_LINK_LIBRARIES(bb${BBTK_PACKAGE_NAME} bbtk ${${BBTK_PACKAGE_NAME}_LIBS} ) +SET_TARGET_PROPERTIES(bb${BBTK_PACKAGE_NAME} PROPERTIES COMPILE_FLAGS -Wall) #---------------------------------------------------------------------------- diff --git a/kernel/cmake/BBTKRootCMakeLists.cmake b/kernel/cmake/BBTKRootCMakeLists.cmake index a3810ce..e84b5c1 100644 --- a/kernel/cmake/BBTKRootCMakeLists.cmake +++ b/kernel/cmake/BBTKRootCMakeLists.cmake @@ -1,3 +1,6 @@ +SET(CMAKE_SKIP_RPATH ON) + + #----------------------------------------------------------------------------- SET(BBTK_CMAKE_REL_PATH kernel/cmake) SET(BBTK_CMAKE_DIR ${PROJECT_SOURCE_DIR}/${BBTK_CMAKE_REL_PATH}) diff --git a/kernel/install/linux/CMakeLists.txt b/kernel/install/linux/CMakeLists.txt index 853259d..8fb0b47 100644 --- a/kernel/install/linux/CMakeLists.txt +++ b/kernel/install/linux/CMakeLists.txt @@ -3,3 +3,6 @@ INSTALL( PROGRAMS bbtk-uninstall.sh DESTINATION bin ) + +# rpmbuild +SUBDIRS(rpmbuild) diff --git a/kernel/install/linux/rpmbuild/bbtk.spec.in b/kernel/install/linux/rpmbuild/bbtk.spec.in new file mode 100644 index 0000000..830ead2 --- /dev/null +++ b/kernel/install/linux/rpmbuild/bbtk.spec.in @@ -0,0 +1,70 @@ +# Note that this is NOT a relocatable package +%define prefix /usr +Summary: BBTK +Name: BBTK +Version: @BBTK_VERSION@ +Release: 1.0.0 +# @BBTK_VERSION@.@BBTK_DATE@ +License: CeCILL-B +Group: Development/Libraries +Source: bbtk.tar.gz +BuildRoot: /tmp/bbtk-%{version}-root +Prereq: /sbin/install-info +Docdir: %{prefix}/doc +#Requires: vtk = 4.5.0-0.cvs.2.fc4 +#Requires: vtk-python = 4.5.0-0.cvs.2.fc4 +#BuildPrereq: vtk-devel = 4.5.0-0.cvs.2.fc4 +BuildRequires: cmake >= 2.4.6 + + +%description +The Black Box ToolKit + +%changelog +* Wed Jul 23 2008 Laurent Guigues 1.0.0 +- initial packaging with cmake + +%prep +%setup -q -n BBTK + +export CC='gcc' +export CXX='g++' +export MAKE='make %{?_smp_mflags}' +export CFLAGS="$RPM_OPT_FLAGS" +export CXXFLAGS="$RPM_OPT_FLAGS -Wno-deprecated" +cmake . \ + -DCMAKE_INSTALL_PREFIX:STRING="%{_prefix}" \ + -DCMAKE_SKIP_RPATH:BOOL=ON \ + -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \ + -DCMAKE_C_COMPILER:FILEPATH=$CC \ + -D--BUILD_ALL=ON + +%build +make + +%install +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install + +# creating file BBTK.conf in /etc/ld.so.conf.d +# which contains the path to BBTK dynamic libs +install -d $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d +echo "%{_libdir}/BBTK" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/BBTK.conf +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-, root, root) + +#%doc AUTHORS ChangeLog README TODO DEVELOPPER INSTALL PACKAGER +%doc ChangeLog README TODO +%doc Doc +%{_libdir}/* +%{_includedir}/* +%{_datadir}/* +%{_bindir}/* +%{_sysconfdir}/ld.so.conf.d/BBTK.conf diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt index c5ecded..dcd505a 100644 --- a/kernel/src/CMakeLists.txt +++ b/kernel/src/CMakeLists.txt @@ -177,6 +177,7 @@ ADD_LIBRARY(bbtk SHARED ${SOURCES} ${SOURCES_H}) #----------------------------------------------------------------------------- TARGET_LINK_LIBRARIES(bbtk ${BBTK_LINK_LIBRARIES}) #----------------------------------------------------------------------------- +SET_TARGET_PROPERTIES(bbtk PROPERTIES COMPILE_FLAGS -Wall) #IF(UNIX) # for gnu linker : version script used to define exported symbols diff --git a/kernel/src/bbtkAtomicBlackBoxGetSetFunctor.h b/kernel/src/bbtkAtomicBlackBoxGetSetFunctor.h index 6eec77c..b9aeff8 100644 --- a/kernel/src/bbtkAtomicBlackBoxGetSetFunctor.h +++ b/kernel/src/bbtkAtomicBlackBoxGetSetFunctor.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkAtomicBlackBoxGetSetFunctor.h,v $ Language: C++ - Date: $Date: 2008/04/24 10:11:27 $ - Version: $Revision: 1.2 $ + Date: $Date: 2008/07/23 11:46:10 $ + Version: $Revision: 1.3 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -52,6 +52,8 @@ namespace bbtk public: /// Default constructor AtomicBlackBoxGetFunctor() {} + /// Dtor + virtual ~AtomicBlackBoxGetFunctor() {} /// Abstract method which applies the "Get" function of AtomicBlackBox o virtual Data Get(AtomicBlackBox* o) = 0; /// @@ -73,6 +75,8 @@ namespace bbtk public: /// Default constructor AtomicBlackBoxSetFunctor() {} + /// Dtor + virtual ~AtomicBlackBoxSetFunctor() {} /// Abstract method which applies the "Set" function of AtomicBlackBox o virtual void Set(AtomicBlackBox* o, const Data&) = 0; /// diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx index d213775..b651c09 100644 --- a/kernel/src/bbtkBlackBox.cxx +++ b/kernel/src/bbtkBlackBox.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkBlackBox.cxx,v $ Language: C++ -Date: $Date: 2008/06/19 09:46:41 $ -Version: $Revision: 1.21 $ +Date: $Date: 2008/07/23 11:46:10 $ +Version: $Revision: 1.22 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See doc/license.txt or @@ -90,11 +90,12 @@ namespace bbtk //========================================================================= BlackBox::BlackBox(const std::string &name) - : bbmName(name), - bbmStatus(MODIFIED), - bbmBoxProcessMode("Pipeline"), - bbmParent() - + : + bbmStatus(MODIFIED), + bbmName(name), + bbmBoxProcessMode("Pipeline"), + bbmParent() + { bbtkDebugMessage("object",4,"==> BlackBox::BlackBox(\"" <bbSetStatus(MODIFIED); bbGlobalAddToExecutionList( GetThisPointer() ); } + /* else if ( bbGetStatus() == MODIFIED ) //! this->bbIsUptodate()) { bbtkDebugMessage("modified",2,"-> Already modified"< Status set to modified"<first); diff --git a/kernel/src/bbtkBlackBoxInputOutputDescriptor.h b/kernel/src/bbtkBlackBoxInputOutputDescriptor.h index ad99419..6690016 100644 --- a/kernel/src/bbtkBlackBoxInputOutputDescriptor.h +++ b/kernel/src/bbtkBlackBoxInputOutputDescriptor.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkBlackBoxInputOutputDescriptor.h,v $ Language: C++ - Date: $Date: 2008/07/03 18:20:57 $ - Version: $Revision: 1.3 $ + Date: $Date: 2008/07/23 11:46:11 $ + Version: $Revision: 1.4 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -51,7 +51,9 @@ namespace bbtk mNature(nature), mCopyConstruct(copy_construct) {} - + /// Dtor + virtual ~BlackBoxInputOutputDescriptor() {} + /// Returns the TypeInfo of the BlackBoxDescriptor which created this descriptor TypeInfo GetCreatorTypeInfo() const { return mCreatorTypeInfo; } /// Returns the name of the in/output diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx index 2964c08..5bee02d 100644 --- a/kernel/src/bbtkInterpreter.cxx +++ b/kernel/src/bbtkInterpreter.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkInterpreter.cxx,v $ $ Language: C++ - Date: $Date: 2008/07/03 13:59:32 $ - Version: $Revision: 1.68 $ + Date: $Date: 2008/07/23 11:46:11 $ + Version: $Revision: 1.69 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -1112,7 +1112,8 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& Filenames.clear(); - int nbFiles = Utilities::Explore(*i, false, Filenames); + //int nbFiles = + Utilities::Explore(*i, false, Filenames); nbBssFiles = 0; for (std::vector::iterator j = Filenames.begin(); @@ -1370,8 +1371,8 @@ void Interpreter::SwitchToStream( std::stringstream* stream ) } // tests the number of args - if ( ( words.size()-1 < c->second.argmin ) || - ( words.size()-1 > c->second.argmax ) ) + if ( ( ((int)words.size())-1 < c->second.argmin ) || + ( ((int)words.size())-1 > c->second.argmax ) ) { HelpCommand(words[0]); bbtkError(words[0]<<" : wrong number of arguments"); @@ -1570,10 +1571,10 @@ void Interpreter::Help(const std::vector& words) void Interpreter::GetLineFromPrompt(std::string& s) { int c; - int ind=0; + unsigned int ind=0; - int MAX_LINE_SIZE = 160; - int MAX_HISTORY_SIZE = 100; + unsigned int MAX_LINE_SIZE = 160; + unsigned int MAX_HISTORY_SIZE = 100; char* newline = new char[MAX_LINE_SIZE]; memset(newline,0,MAX_LINE_SIZE); @@ -1581,7 +1582,7 @@ void Interpreter::Help(const std::vector& words) memset(histline,0,MAX_LINE_SIZE); char* line = newline; - int hist = mHistory.size(); + unsigned int hist = mHistory.size(); write(1,"> ",2); while(1) @@ -1934,7 +1935,7 @@ void Interpreter::NewGUI(const std::string& boxname, BlackBox::Pointer box = workspace->GetPrototype()->bbGetBlackBox(boxname); // BlackBox::InputConnectorMapType incm = box->bbGetInputConnectorMap(); - int nb = 0; + // int nb = 0; BlackBox::InputConnectorMapType::iterator i; for (i=box->bbGetInputConnectorMap().begin(); i!=box->bbGetInputConnectorMap().end(); diff --git a/kernel/src/bbtkInterpreter.h b/kernel/src/bbtkInterpreter.h index 2970854..ee5c86c 100644 --- a/kernel/src/bbtkInterpreter.h +++ b/kernel/src/bbtkInterpreter.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkInterpreter.h,v $ $ Language: C++ - Date: $Date: 2008/05/15 08:02:36 $ - Version: $Revision: 1.31 $ + Date: $Date: 2008/07/23 11:46:11 $ + Version: $Revision: 1.32 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -45,7 +45,7 @@ namespace bbtk { public: InterpreterUser() {} - ~InterpreterUser() {} + virtual ~InterpreterUser() {} virtual bool InterpreterUserHasOwnHtmlPageViewer() { return false; } virtual void InterpreterUserViewHtmlPage(const std::string&) {} diff --git a/kernel/src/bbtkObject.h b/kernel/src/bbtkObject.h index ac9a5b9..089afbb 100644 --- a/kernel/src/bbtkObject.h +++ b/kernel/src/bbtkObject.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkObject.h,v $ Language: C++ - Date: $Date: 2008/05/06 13:45:12 $ - Version: $Revision: 1.4 $ + Date: $Date: 2008/07/23 11:46:11 $ + Version: $Revision: 1.5 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See doc/license.txt or @@ -62,6 +62,7 @@ namespace bbtk struct BBTK_EXPORT Deleter { Deleter() : mPointer() {} + virtual ~Deleter() {} virtual void operator() (Object* p); virtual void Delete(Object* p) { delete p; } WeakPointer mPointer; diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx index 401ac41..2625675 100644 --- a/kernel/src/bbtkWxBlackBox.cxx +++ b/kernel/src/bbtkWxBlackBox.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkWxBlackBox.cxx,v $ Language: C++ - Date: $Date: 2008/06/27 08:12:46 $ - Version: $Revision: 1.23 $ + Date: $Date: 2008/07/23 11:46:11 $ + Version: $Revision: 1.24 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -110,7 +110,6 @@ namespace bbtk wxString title, wxSize size) : - WxBlackBoxWindow(box), wxDialog( parent, -1, title, @@ -122,7 +121,8 @@ namespace bbtk wxMAXIMIZE_BOX | wxMINIMIZE_BOX | wxCAPTION - ) + ), + WxBlackBoxWindow(box) { bbtkDebugMessage("wx",9,"WxBlackBoxDialog::WxBlackBoxDialog("<< bbGetBlackBox()->bbGetFullName()<<","<bbGetFullName()<<","<GetCurrentPage()->GetText(); try { - std::cout << "RUN"<IsChecked()) WxGUICommandEnter("reset"); mInterpreter->InterpretBuffer(buf); - std::cout << "EO RUN"<