Menu
▾
▴
SF.net SVN: openvrml:[3979] trunk
|
From: <br...@us...> - 2009-08-02 04:45:20
|
Revision: 3979
http://openvrml.svn.sourceforge.net/openvrml/?rev=3979&view=rev
Author: braden
Date: 2009-08-02 04:45:09 +0000 (Sun, 02 Aug 2009)
Log Message:
-----------
Moved libltdl/LoadLibrary wrapper to its own convenience library.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/Makefile.am
Added Paths:
-----------
trunk/src/local/libopenvrml-dl/
trunk/src/local/libopenvrml-dl/openvrml/
trunk/src/local/libopenvrml-dl/openvrml/local/
trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp
trunk/src/local/libopenvrml-dl/openvrml/local/dl.h
Removed Paths:
-------------
trunk/src/libopenvrml/openvrml/local/dl.cpp
trunk/src/libopenvrml/openvrml/local/dl.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-08-02 04:38:31 UTC (rev 3978)
+++ trunk/ChangeLog 2009-08-02 04:45:09 UTC (rev 3979)
@@ -1,3 +1,24 @@
+2009-08-02 Braden McDaniel <br...@en...>
+
+ Moved libltdl/LoadLibrary wrapper to its own convenience library.
+
+ * src/Makefile.am
+ (noinst_LTLIBRARIES): Added local/libopenvrml-dl.la.
+ (libopenvrml_libopenvrml_la_CPPFLAGS): Add libopenvrml-dl source
+ directory to the include path.
+ (libopenvrml_libopenvrml_la_SOURCES): Removed
+ libopenvrml/openvrml/local/dl.{cpp,h}.
+ (libopenvrml_libopenvrml_la_LIBADD): Added libopenvrml-dl.la;
+ removed -lltdl.
+ (local_libopenvrml_dl_la_SOURCES): Added.
+ (local_libopenvrml_dl_la_CPPFLAGS): Add libopenvrml build source
+ directories to the include path.
+ (local_libopenvrml_dl_la_LIBADD): Link with libltdl.
+ * src/libopenvrml/openvrml/local/dl.cpp: Removed.
+ * src/libopenvrml/openvrml/local/dl.h: Removed.
+ * src/local/libopenvrml-dl/openvrml/local/dl.cpp: Added.
+ * src/local/libopenvrml-dl/openvrml/local/dl.h: Added.
+
2009-08-01 Braden McDaniel <br...@en...>
Moved src/libopenvrml-control to src/local/libopenvrml-control.
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2009-08-02 04:38:31 UTC (rev 3978)
+++ trunk/src/Makefile.am 2009-08-02 04:45:09 UTC (rev 3979)
@@ -6,6 +6,7 @@
if ENABLE_GL_RENDERER
lib_LTLIBRARIES += libopenvrml-gl/libopenvrml-gl.la
endif
+noinst_LTLIBRARIES = local/libopenvrml-dl.la
pkginclude_HEADERS = \
libopenvrml/openvrml-config.h \
@@ -64,6 +65,7 @@
libopenvrml_libopenvrml_la_CPPFLAGS = \
-I$(top_builddir)/src/libopenvrml \
-I$(top_srcdir)/src/libopenvrml \
+ -I$(top_srcdir)/src/local/libopenvrml-dl \
-I$(srcdir)/node \
-I$(srcdir)/node/vrml97 \
-DOPENVRML_LIBDIR_=\"$(libdir)\" \
@@ -96,8 +98,6 @@
libopenvrml/openvrml/node_impl_util.cpp \
libopenvrml/openvrml/local/conf.cpp \
libopenvrml/openvrml/local/conf.h \
- libopenvrml/openvrml/local/dl.cpp \
- libopenvrml/openvrml/local/dl.h \
libopenvrml/openvrml/local/uri.cpp \
libopenvrml/openvrml/local/uri.h \
libopenvrml/openvrml/local/xml_reader.cpp \
@@ -122,10 +122,18 @@
$(PTHREAD_LIBS)
libopenvrml_libopenvrml_la_LIBADD = \
+ local/libopenvrml-dl.la \
-lboost_thread$(BOOST_LIB_SUFFIX) \
- -lboost_filesystem$(BOOST_LIB_SUFFIX) \
- -lltdl
+ -lboost_filesystem$(BOOST_LIB_SUFFIX)
+local_libopenvrml_dl_la_SOURCES = \
+ local/libopenvrml-dl/openvrml/local/dl.cpp \
+ local/libopenvrml-dl/openvrml/local/dl.h
+local_libopenvrml_dl_la_CPPFLAGS = \
+ -I$(top_builddir)/src/libopenvrml \
+ -I$(top_srcdir)/src/libopenvrml
+local_libopenvrml_dl_la_LIBADD = -lltdl
+
openvrmlscriptdir = $(pkglibdir)/script
openvrmlscript_LTLIBRARIES =
@@ -719,7 +727,7 @@
libopenvrml_gl_libopenvrml_gl_la_LIBADD = libopenvrml/libopenvrml.la
if ENABLE_XEMBED
-noinst_LTLIBRARIES = local/libopenvrml-control.la
+noinst_LTLIBRARIES += local/libopenvrml-control.la
libexec_PROGRAMS = openvrml-xembed/openvrml-xembed
session_bus_servicesdir = $(datadir)/dbus-1/services
session_bus_services_DATA = openvrml-xembed/org.openvrml.BrowserControl.service
Deleted: trunk/src/libopenvrml/openvrml/local/dl.cpp
===================================================================
--- trunk/src/libopenvrml/openvrml/local/dl.cpp 2009-08-02 04:38:31 UTC (rev 3978)
+++ trunk/src/libopenvrml/openvrml/local/dl.cpp 2009-08-02 04:45:09 UTC (rev 3979)
@@ -1,172 +0,0 @@
-// -*- mode: c++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*-
-//
-// OpenVRML
-//
-// Copyright 2008 Braden McDaniel
-//
-// This library is free software; you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or (at your
-// option) any later version.
-//
-// This library is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-// License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this library; if not, see <http://www.gnu.org/licenses/>.
-//
-
-# include "dl.h"
-# include <boost/filesystem.hpp>
-# include <boost/ref.hpp>
-# include <boost/tokenizer.hpp>
-# include <boost/multi_index/detail/scope_guard.hpp>
-
-using namespace boost::multi_index::detail; // for scope_guard
-
-int openvrml::local::dl::init()
-{
-# ifdef _WIN32
- return 0;
-# else
- return lt_dlinit();
-# endif
-}
-
-int openvrml::local::dl::exit()
-{
-# ifdef _WIN32
- return 0;
-# else
- return lt_dlexit();
-# endif
-}
-
-namespace {
-
- struct OPENVRML_LOCAL win32_search_path_tokenizer {
- win32_search_path_tokenizer()
- {}
-
- template <typename Iterator, typename Token>
- bool operator()(Iterator & next, Iterator end, Token & tok)
- {
- while (next != end) {
- if (*next == ';') {
- ++next;
- break;
- }
- this->tok_.push_back(*next);
- ++next;
- }
- if (!this->tok_.empty()) {
- tok = this->tok_;
- this->tok_.clear();
- return true;
- }
- return false;
- }
-
- void reset()
- {
- this->tok_.clear();
- }
-
- private:
- std::string tok_;
- };
-}
-
-int
-openvrml::local::dl::foreachfile(const char * search_path,
- int (*func)(const char * filename, void * data),
- void * data)
-{
-# ifdef _WIN32
- using boost::filesystem::path;
- using boost::filesystem::directory_iterator;
- typedef boost::tokenizer<win32_search_path_tokenizer> tokenizer_t;
-
- std::vector<path> search_dirs;
- win32_search_path_tokenizer tokenizer_func;
- std::string search_path_str(search_path);
- tokenizer_t tokenizer(search_path_str, tokenizer_func);
- for (tokenizer_t::const_iterator token = tokenizer.begin();
- token != tokenizer.end();
- ++token) {
- search_dirs.push_back(path(*token));
- }
-
- int result = 0;
- for (std::vector<path>::const_iterator dir = search_dirs.begin();
- dir != search_dirs.end();
- ++dir) try {
- for (directory_iterator entry(*dir);
- entry != directory_iterator();
- ++entry) {
- result = (func)(entry->path().external_file_string().c_str(),
- data);
- if (result != 0) { return result; }
- }
- } catch (boost::filesystem::filesystem_error &) {}
- return result;
-# else
- return lt_dlforeachfile(search_path, func, data);
-# endif
-}
-
-openvrml::local::dl::handle openvrml::local::dl::open(const char * filename)
-{
-# ifdef _WIN32
- const char * last_dot = strrchr(filename, '.');
- if (strcmp(last_dot, ".dll") != 0) { return 0; }
- return LoadLibrary(filename);
-# else
- return lt_dlopenext(filename);
-# endif
-}
-
-const std::string openvrml::local::dl::error()
-{
-# ifdef _WIN32
- const DWORD err = GetLastError();
- char * buf = 0;
- scope_guard buf_guard = make_guard(LocalFree, boost::ref(buf));
- static const LPCVOID source = 0;
- static const DWORD buf_size = 0;
- static va_list * const args = 0;
- const DWORD buf_chars = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER
- | FORMAT_MESSAGE_FROM_SYSTEM,
- source,
- err,
- LANG_USER_DEFAULT,
- reinterpret_cast<LPSTR>(&buf),
- buf_size,
- args);
- assert(buf_chars != 0); // If FormatMessage failed, just give up.
- const std::string buf_str(buf ? buf : "");
- return buf_str;
-# else
- return lt_dlerror();
-# endif
-}
-
-int openvrml::local::dl::close(handle h)
-{
-# ifdef _WIN32
- return FreeLibrary(h);
-# else
- return lt_dlclose(h);
-# endif
-}
-
-void * openvrml::local::dl::sym(handle h, const char * name)
-{
-# ifdef _WIN32
- return GetProcAddress(h, name);
-# else
- return lt_dlsym(h, name);
-# endif
-}
Deleted: trunk/src/libopenvrml/openvrml/local/dl.h
===================================================================
--- trunk/src/libopenvrml/openvrml/local/dl.h 2009-08-02 04:38:31 UTC (rev 3978)
+++ trunk/src/libopenvrml/openvrml/local/dl.h 2009-08-02 04:45:09 UTC (rev 3979)
@@ -1,64 +0,0 @@
-// -*- mode: c++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*-
-//
-// OpenVRML
-//
-// Copyright 2008 Braden McDaniel
-//
-// This library is free software; you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or (at your
-// option) any later version.
-//
-// This library is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-// License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this library; if not, see <http://www.gnu.org/licenses/>.
-//
-
-# ifndef OPENVRML_LOCAL_DL_H
-# define OPENVRML_LOCAL_DL_H
-
-# include <openvrml-common.h>
-# ifdef _WIN32
-# include <windows.h>
-# else
-# include <ltdl.h>
-# endif
-# include <string>
-
-namespace openvrml {
-
- namespace local {
-
- namespace dl {
-
- OPENVRML_LOCAL int init();
-
- OPENVRML_LOCAL int exit();
-
- OPENVRML_LOCAL
- int foreachfile(const char * search_path,
- int (*func)(const char * filename, void * data),
- void * data);
-
-# ifdef _WIN32
- typedef HMODULE handle;
-# else
- typedef lt_dlhandle handle;
-# endif
-
- OPENVRML_LOCAL handle open(const char * filename);
-
- OPENVRML_LOCAL const std::string error();
-
- OPENVRML_LOCAL int close(handle);
-
- OPENVRML_LOCAL void * sym(handle, const char * name);
- }
- }
-}
-
-# endif // ifndef OPENVRML_LOCAL_DL_H
Copied: trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp (from rev 3973, trunk/src/libopenvrml/openvrml/local/dl.cpp)
===================================================================
--- trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp (rev 0)
+++ trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp 2009-08-02 04:45:09 UTC (rev 3979)
@@ -0,0 +1,172 @@
+// -*- mode: c++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*-
+//
+// OpenVRML
+//
+// Copyright 2008 Braden McDaniel
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or (at your
+// option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, see <http://www.gnu.org/licenses/>.
+//
+
+# include "dl.h"
+# include <boost/filesystem.hpp>
+# include <boost/ref.hpp>
+# include <boost/tokenizer.hpp>
+# include <boost/multi_index/detail/scope_guard.hpp>
+
+using namespace boost::multi_index::detail; // for scope_guard
+
+int openvrml::local::dl::init()
+{
+# ifdef _WIN32
+ return 0;
+# else
+ return lt_dlinit();
+# endif
+}
+
+int openvrml::local::dl::exit()
+{
+# ifdef _WIN32
+ return 0;
+# else
+ return lt_dlexit();
+# endif
+}
+
+namespace {
+
+ struct OPENVRML_LOCAL win32_search_path_tokenizer {
+ win32_search_path_tokenizer()
+ {}
+
+ template <typename Iterator, typename Token>
+ bool operator()(Iterator & next, Iterator end, Token & tok)
+ {
+ while (next != end) {
+ if (*next == ';') {
+ ++next;
+ break;
+ }
+ this->tok_.push_back(*next);
+ ++next;
+ }
+ if (!this->tok_.empty()) {
+ tok = this->tok_;
+ this->tok_.clear();
+ return true;
+ }
+ return false;
+ }
+
+ void reset()
+ {
+ this->tok_.clear();
+ }
+
+ private:
+ std::string tok_;
+ };
+}
+
+int
+openvrml::local::dl::foreachfile(const char * search_path,
+ int (*func)(const char * filename, void * data),
+ void * data)
+{
+# ifdef _WIN32
+ using boost::filesystem::path;
+ using boost::filesystem::directory_iterator;
+ typedef boost::tokenizer<win32_search_path_tokenizer> tokenizer_t;
+
+ std::vector<path> search_dirs;
+ win32_search_path_tokenizer tokenizer_func;
+ std::string search_path_str(search_path);
+ tokenizer_t tokenizer(search_path_str, tokenizer_func);
+ for (tokenizer_t::const_iterator token = tokenizer.begin();
+ token != tokenizer.end();
+ ++token) {
+ search_dirs.push_back(path(*token));
+ }
+
+ int result = 0;
+ for (std::vector<path>::const_iterator dir = search_dirs.begin();
+ dir != search_dirs.end();
+ ++dir) try {
+ for (directory_iterator entry(*dir);
+ entry != directory_iterator();
+ ++entry) {
+ result = (func)(entry->path().external_file_string().c_str(),
+ data);
+ if (result != 0) { return result; }
+ }
+ } catch (boost::filesystem::filesystem_error &) {}
+ return result;
+# else
+ return lt_dlforeachfile(search_path, func, data);
+# endif
+}
+
+openvrml::local::dl::handle openvrml::local::dl::open(const char * filename)
+{
+# ifdef _WIN32
+ const char * last_dot = strrchr(filename, '.');
+ if (strcmp(last_dot, ".dll") != 0) { return 0; }
+ return LoadLibrary(filename);
+# else
+ return lt_dlopenext(filename);
+# endif
+}
+
+const std::string openvrml::local::dl::error()
+{
+# ifdef _WIN32
+ const DWORD err = GetLastError();
+ char * buf = 0;
+ scope_guard buf_guard = make_guard(LocalFree, boost::ref(buf));
+ static const LPCVOID source = 0;
+ static const DWORD buf_size = 0;
+ static va_list * const args = 0;
+ const DWORD buf_chars = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER
+ | FORMAT_MESSAGE_FROM_SYSTEM,
+ source,
+ err,
+ LANG_USER_DEFAULT,
+ reinterpret_cast<LPSTR>(&buf),
+ buf_size,
+ args);
+ assert(buf_chars != 0); // If FormatMessage failed, just give up.
+ const std::string buf_str(buf ? buf : "");
+ return buf_str;
+# else
+ return lt_dlerror();
+# endif
+}
+
+int openvrml::local::dl::close(handle h)
+{
+# ifdef _WIN32
+ return FreeLibrary(h);
+# else
+ return lt_dlclose(h);
+# endif
+}
+
+void * openvrml::local::dl::sym(handle h, const char * name)
+{
+# ifdef _WIN32
+ return GetProcAddress(h, name);
+# else
+ return lt_dlsym(h, name);
+# endif
+}
Copied: trunk/src/local/libopenvrml-dl/openvrml/local/dl.h (from rev 3973, trunk/src/libopenvrml/openvrml/local/dl.h)
===================================================================
--- trunk/src/local/libopenvrml-dl/openvrml/local/dl.h (rev 0)
+++ trunk/src/local/libopenvrml-dl/openvrml/local/dl.h 2009-08-02 04:45:09 UTC (rev 3979)
@@ -0,0 +1,64 @@
+// -*- mode: c++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*-
+//
+// OpenVRML
+//
+// Copyright 2008 Braden McDaniel
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or (at your
+// option) any later version.
+//
+// This library is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+// License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this library; if not, see <http://www.gnu.org/licenses/>.
+//
+
+# ifndef OPENVRML_LOCAL_DL_H
+# define OPENVRML_LOCAL_DL_H
+
+# include <openvrml-common.h>
+# ifdef _WIN32
+# include <windows.h>
+# else
+# include <ltdl.h>
+# endif
+# include <string>
+
+namespace openvrml {
+
+ namespace local {
+
+ namespace dl {
+
+ OPENVRML_LOCAL int init();
+
+ OPENVRML_LOCAL int exit();
+
+ OPENVRML_LOCAL
+ int foreachfile(const char * search_path,
+ int (*func)(const char * filename, void * data),
+ void * data);
+
+# ifdef _WIN32
+ typedef HMODULE handle;
+# else
+ typedef lt_dlhandle handle;
+# endif
+
+ OPENVRML_LOCAL handle open(const char * filename);
+
+ OPENVRML_LOCAL const std::string error();
+
+ OPENVRML_LOCAL int close(handle);
+
+ OPENVRML_LOCAL void * sym(handle, const char * name);
+ }
+ }
+}
+
+# endif // ifndef OPENVRML_LOCAL_DL_H
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
