From 2d2fc4c6349d5040a9f13a240f079e7a1c6687dd Mon Sep 17 00:00:00 2001 From: guigues Date: Wed, 12 Nov 2008 12:46:49 +0000 Subject: [PATCH] MacOSX build --- kernel/appli/bbPackageBrowser/CMakeLists.txt | 2 +- kernel/appli/bbStudio/CMakeLists.txt | 2 +- kernel/appli/bbi/CMakeLists.txt | 2 +- kernel/appli/bbi/bbi.cxx | 7 +- kernel/cmake/BBTKAddDefinitions.cmake | 5 + kernel/cmake/BBTKKernelConfig.cmake | 17 +- kernel/doc/help_contents.html.in | 4 +- kernel/src/bbtkConfigurationFile.cxx | 180 +++++++++++++++++- kernel/src/bbtkSystem.h | 8 +- kernel/src/bbtkUtilities.cxx | 12 +- .../itk/src/bbitkBinaryThresholdImageFilter.h | 7 +- packages/itk/src/bbitkExtractImageFilter.h | 7 +- .../src/bbitkvtkitkImage2vtkImageData.cxx | 15 +- 13 files changed, 227 insertions(+), 41 deletions(-) diff --git a/kernel/appli/bbPackageBrowser/CMakeLists.txt b/kernel/appli/bbPackageBrowser/CMakeLists.txt index 9ff5e69..201ea18 100644 --- a/kernel/appli/bbPackageBrowser/CMakeLists.txt +++ b/kernel/appli/bbPackageBrowser/CMakeLists.txt @@ -6,7 +6,7 @@ IF(BBTK_USE_WXWIDGETS AND WIN32) ADD_EXECUTABLE(bbPackageBrowser WIN32 ${SOURCES}) # SET_TARGET_PROPERTIES(bbPackageBrowser PROPERTIES LINK_FLAGS /subsystem:console ) ELSE(BBTK_USE_WXWIDGETS AND WIN32) - ADD_EXECUTABLE(bbPackageBrowser ${SOURCES}) + ADD_EXECUTABLE(bbPackageBrowser MACOSX_BUNDLE ${SOURCES}) ENDIF(BBTK_USE_WXWIDGETS AND WIN32) diff --git a/kernel/appli/bbStudio/CMakeLists.txt b/kernel/appli/bbStudio/CMakeLists.txt index 99f7d87..339ba1d 100644 --- a/kernel/appli/bbStudio/CMakeLists.txt +++ b/kernel/appli/bbStudio/CMakeLists.txt @@ -14,7 +14,7 @@ IF(BBTK_USE_WXWIDGETS AND WIN32) ADD_EXECUTABLE(bbStudio WIN32 ${SOURCES}) SET_TARGET_PROPERTIES(bbStudio PROPERTIES LINK_FLAGS /subsystem:console ) ELSE(BBTK_USE_WXWIDGETS AND WIN32) - ADD_EXECUTABLE(bbStudio ${SOURCES} ) + ADD_EXECUTABLE(bbStudio MACOSX_BUNDLE ${SOURCES} ) ENDIF(BBTK_USE_WXWIDGETS AND WIN32) diff --git a/kernel/appli/bbi/CMakeLists.txt b/kernel/appli/bbi/CMakeLists.txt index 702ebb6..87046b9 100644 --- a/kernel/appli/bbi/CMakeLists.txt +++ b/kernel/appli/bbi/CMakeLists.txt @@ -15,7 +15,7 @@ IF(BBTK_USE_WXWIDGETS AND WIN32) ADD_EXECUTABLE(bbi WIN32 ${SOURCES}) SET_TARGET_PROPERTIES(bbi PROPERTIES LINK_FLAGS /subsystem:console ) ELSE(BBTK_USE_WXWIDGETS AND WIN32) - ADD_EXECUTABLE(bbi ${SOURCES}) + ADD_EXECUTABLE(bbi MACOSX_BUNDLE ${SOURCES}) ENDIF(BBTK_USE_WXWIDGETS AND WIN32) diff --git a/kernel/appli/bbi/bbi.cxx b/kernel/appli/bbi/bbi.cxx index 3d3e890..86952f5 100644 --- a/kernel/appli/bbi/bbi.cxx +++ b/kernel/appli/bbi/bbi.cxx @@ -151,7 +151,7 @@ bool wxBBIApp::OnCmdLineParsed(wxCmdLineParser& parser) // main frame bool wxBBIApp::OnInit( ) { - // std::cout << "OnInit"<Close"<Help Contents -Demos
-Examples +Demos
+Examples

Guides

diff --git a/kernel/src/bbtkConfigurationFile.cxx b/kernel/src/bbtkConfigurationFile.cxx index 0b9f54b..d5e4e99 100644 --- a/kernel/src/bbtkConfigurationFile.cxx +++ b/kernel/src/bbtkConfigurationFile.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkConfigurationFile.cxx,v $ Language: C++ - Date: $Date: 2008/11/03 15:53:31 $ - Version: $Revision: 1.20 $ + Date: $Date: 2008/11/12 12:47:00 $ + Version: $Revision: 1.21 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -39,9 +39,22 @@ #include "bbtkUtilities.h" #if defined(WIN32) -#include // for getcwd +# include // for getcwd +# include #endif +#if defined(MACOSX) // assume this is OSX +# include +# include // _NSGetExecutablePath : must add -framework CoreFoundation to link line +# include +# ifndef PATH_MAX +# define PATH_MAX MAXPATHLEN +# endif +#endif // MACOSX + +#ifndef PATH_MAX // If not defined yet : do it +# define PATH_MAX 2048 +#endif namespace bbtk @@ -57,8 +70,12 @@ namespace bbtk // ==> Set system paths mBin_path = GetExecutablePath(); //EED mInstall_path = mBin_path + mFile_separator + ".."; - mInstall_path = mBin_path + "/.."; - // The relative path to the doc folder (=BBTK_DOC_REL_PATH) +#ifdef MACOSX + mInstall_path = mBin_path + "/../../../.."; +#else + mInstall_path = mBin_path + "/.."; +#endif + // The relative path to the doc folder (=BBTK_DOC_REL_PATH) mDoc_rel_path = BBTK_STRINGIFY_SYMBOL(BBTK_DOC_REL_PATH); // The path to the doc folder (=mInstall_path+"/"+mDoc_rel_path) //EED mDoc_path = mInstall_path + mFile_separator + mDoc_rel_path; @@ -211,12 +228,151 @@ namespace bbtk } //========================================================================= + + + //========================================================================= + // From http://www.fltk.org/newsgroups.php?gfltk.general+v:22083 + // + int get_app_path (char *pname, size_t pathsize) + { +#ifdef LINUX + /* Oddly, the readlink(2) man page says no NULL is appended. */ + /* So you have to do it yourself, based on the return value: */ + pathsize --; /* Preserve a space to add the trailing NULL */ + long result = readlink("/proc/self/exe", pname, pathsize); + if (result > 0) + { + pname[result] = 0; /* add the #@!%ing NULL */ + + if ((access(pname, 0) == 0)) + return 0; /* file exists, return OK */ + /*else name doesn't seem to exist, return FAIL (falls + through) */ + } +#endif /* LINUX */ + +#ifdef WIN32 + long result = GetModuleFileName(NULL, pname, pathsize); + if (result > 0) + { + /* fix up the dir slashes... */ + int len = strlen(pname); + int idx; + for (idx = 0; idx < len; idx++) + { + if (pname[idx] == '\\') pname[idx] = '/'; + } + if ((access(pname, 0) == 0)) + return 0; /* file exists, return OK */ + /*else name doesn't seem to exist, return FAIL (falls + through) */ + } +#endif /* WIN32 */ + +#ifdef SOLARIS + char *p = getexecname(); + if (p) + { + /* According to the Sun manpages, getexecname will + "normally" return an */ + /* absolute path - BUT might not... AND that IF it is not, + pre-pending */ + /* getcwd() will "usually" be the correct thing... Urgh! + */ + + /* check pathname is absolute (begins with a / ???) */ + if (p[0] == '/') /* assume this means we have an + absolute path */ + { + strncpy(pname, p, pathsize); + if ((access(pname, 0) == 0)) + return 0; /* file exists, return OK */ + } + else /* if not, prepend getcwd() then check if file + exists */ + { + getcwd(pname, pathsize); + long result = strlen(pname); + strncat(pname, "/", (pathsize - result)); + result ++; + strncat(pname, p, (pathsize - result)); + + if ((access(pname, 0) == 0)) + return 0; /* file exists, return OK */ + /*else name doesn't seem to exist, return FAIL + (falls through) */ + } + } +#endif /* SOLARIS */ + +#ifdef MACOSX /* assume this is OSX */ + /* + from http://www.hmug.org/man/3/NSModule.html + + extern int _NSGetExecutablePath(char *buf, unsigned long + *bufsize); + + _NSGetExecutablePath copies the path of the executable + into the buffer and returns 0 if the path was successfully + copied in the provided buffer. If the buffer is not large + enough, -1 is returned and the expected buffer size is + copied in *bufsize. Note that _NSGetExecutablePath will + return "a path" to the executable not a "real path" to the + executable. That is the path may be a symbolic link and + not the real file. And with deep directories the total + bufsize needed could be more than MAXPATHLEN. + */ + int status = -1; + char *given_path = (char*)malloc(MAXPATHLEN * 2); + if (!given_path) return status; + + uint32_t npathsize = MAXPATHLEN * 2; + long result = _NSGetExecutablePath(given_path, &npathsize); + if (result == 0) + { /* OK, we got something - now try and resolve the real path... + */ + if (realpath(given_path, pname) != NULL) + { + if ((access(pname, 0) == 0)) + status = 0; /* file exists, return OK */ + } + } + free (given_path); + return status; +#endif /* MACOSX */ + + return -1; /* Path Lookup Failed */ + } + + //========================================================================= std::string ConfigurationFile::GetExecutablePath() { + char name[PATH_MAX]; + int err = get_app_path(name, PATH_MAX); + if (err) + { + bbtkError("Could not determine current executable path ?"); + } + + // remove the exe name + char *slash; + slash = strrchr(name, VALID_FILE_SEPARATOR_CHAR); + if (slash) + { + *slash = 0; + } + return name; + } + +/* /// \todo : Think to delete it! char *buf = (char *)malloc(512); + if (!buf) + { + bbtkError("Could not allocate 512 bytes !"); + } char *slash; #if defined(WIN32) @@ -226,26 +382,30 @@ namespace bbtk { *slash = 0; } -#elif defined(__GNUC__) +#endif + + +#if defined(__GNUC__) int res; res = readlink("/proc/self/exe", buf, 512); if (res == -1) - return ""; + { + free(buf); + + } buf[res] = 0; slash = strrchr(buf, '/'); if (slash) { *slash = 0; } -#else - return ""; #endif std::string ret(buf); free(buf); return ret; } //========================================================================= - +*/ //========================================================================= void ConfigurationFile::InstallPath () diff --git a/kernel/src/bbtkSystem.h b/kernel/src/bbtkSystem.h index 7f7df45..0b36ebf 100644 --- a/kernel/src/bbtkSystem.h +++ b/kernel/src/bbtkSystem.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkSystem.h,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:14 $ - Version: $Revision: 1.9 $ + Date: $Date: 2008/11/12 12:47:01 $ + Version: $Revision: 1.10 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -211,9 +211,13 @@ namespace bbtk #if defined(_WIN32) #define VALID_FILE_SEPARATOR "\\" #define INVALID_FILE_SEPARATOR "/" +#define VALID_FILE_SEPARATOR_CHAR '\\' +#define INVALID_FILE_SEPARATOR_CHAR '/' #else #define INVALID_FILE_SEPARATOR "\\" #define VALID_FILE_SEPARATOR "/" +#define INVALID_FILE_SEPARATOR_CHAR '\\' +#define VALID_FILE_SEPARATOR_CHAR '/' #endif #endif diff --git a/kernel/src/bbtkUtilities.cxx b/kernel/src/bbtkUtilities.cxx index cce469f..b0eda99 100644 --- a/kernel/src/bbtkUtilities.cxx +++ b/kernel/src/bbtkUtilities.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkUtilities.cxx,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:14 $ - Version: $Revision: 1.7 $ + Date: $Date: 2008/11/12 12:47:01 $ + Version: $Revision: 1.8 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -260,8 +260,12 @@ namespace bbtk else libname += "libbb"; libname += pkgname; - libname += ".so"; - +#if defined(MACOSX) + libname += ".dylib"; +#else + libname += ".so"; +#endif + #elif defined(_WIN32) if (c != '\\') libname = path+"\\bb"; diff --git a/packages/itk/src/bbitkBinaryThresholdImageFilter.h b/packages/itk/src/bbitkBinaryThresholdImageFilter.h index 6365032..066f602 100644 --- a/packages/itk/src/bbitkBinaryThresholdImageFilter.h +++ b/packages/itk/src/bbitkBinaryThresholdImageFilter.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbitkBinaryThresholdImageFilter.h,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:21 $ - Version: $Revision: 1.8 $ + Date: $Date: 2008/11/12 12:47:03 $ + Version: $Revision: 1.9 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -143,7 +143,8 @@ namespace bbitk typedef BinaryThresholdImageFilter FilterType; typename FilterType::Pointer f = FilterType::New("Temp"); - f->bbSetInputIn( this->bbGetInputIn().get()); + typedef T* TPointer; + f->bbSetInputIn( this->bbGetInputIn().get < TPointer > ()); f->bbSetInputLowerThreshold ( (typename T::PixelType) this->bbGetInputLowerThreshold() ); f->bbSetInputUpperThreshold ( (typename T::PixelType) diff --git a/packages/itk/src/bbitkExtractImageFilter.h b/packages/itk/src/bbitkExtractImageFilter.h index 40385ec..8906085 100644 --- a/packages/itk/src/bbitkExtractImageFilter.h +++ b/packages/itk/src/bbitkExtractImageFilter.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbitkExtractImageFilter.h,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:21 $ - Version: $Revision: 1.8 $ + Date: $Date: 2008/11/12 12:47:03 $ + Version: $Revision: 1.9 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -112,7 +112,8 @@ namespace bbitk typedef T ImageType; typedef ExtractImageFilter FilterType; typename FilterType::Pointer f = FilterType::New("Temp"); - f->bbSetInputIn( this->bbGetInputIn().unsafe_get() ); + typedef ImageType* ImageTypePointer; + f->bbSetInputIn( this->bbGetInputIn().unsafe_get() ); f->bbSetInputExtractionRegion ( this->bbGetInputRegion().get() ); f->bbExecute(); f->bbGetOutputOut()->Register(); diff --git a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx index 9d6308d..ac14914 100644 --- a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx +++ b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbitkvtkitkImage2vtkImageData.cxx,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:24 $ - Version: $Revision: 1.5 $ + Date: $Date: 2008/11/12 12:47:05 $ + Version: $Revision: 1.6 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -62,12 +62,13 @@ namespace bbitkvtk template void itkImage2vtkImageData::Convert() - { + { bbtkDebugMessage("process",5,"==> ["<() <<">()"< ItkToVtkConnection; typename ItkToVtkConnection::Pointer conv; @@ -77,7 +78,7 @@ namespace bbitkvtk bbtkDebugMessage("process",5," ["<SetInput( this->bbGetInputIn().get() ); + conv->SetInput( this->bbGetInputIn().get< itkImageTypePointer >() ); } else { @@ -94,16 +95,16 @@ namespace bbitkvtk mConverter->UnRegister(); conv = ItkToVtkConnection::New(); mConverter = conv; - conv->SetInput( this->bbGetInputIn().get() ); + conv->SetInput( this->bbGetInputIn().get() ); } // Input image type did not change but input image pointer did: // set new input - else if ( this->bbGetInputIn().get() + else if ( this->bbGetInputIn().get() != (itkImageType*)(conv->GetExporter()->GetInputs()[0].GetPointer())) { bbtkDebugMessage("process",5," ["<SetInput( this->bbGetInputIn().get() ); + conv->SetInput( this->bbGetInputIn().get() ); } else { -- 2.45.0