Changeset 20758

Timestamp:

09/04/07 21:33:19 (1 year ago)

Author:

patrick

Message:

Set VPR_BASE_DIR automatically on all platforms.

Files:

• juggler/trunk/modules/vapor/ChangeLog (modified) (1 diff)
• juggler/trunk/modules/vapor/vpr/Makefile.in (modified) (1 diff)
• juggler/trunk/modules/vapor/vpr/vprmain.cpp (modified) (3 diffs)

juggler/trunk/modules/vapor/ChangeLog

@@ -1 +1 @@
-DATE       AUTHOR   CHANGE
----------- -------- -----------------------------------------------------------
+2007-09-04 patrick  Set VPR_BASE_DIR automatically on all platforms.
-2007-08-21 patrick  Removed support for SPROC.
-                    NEW VERSION: 2.1.5

juggler/trunk/modules/vapor/vpr/Makefile.in

@@ -60 +60 @@
-                md
-
-
+
+
-
-include $(MKPATH)/dpp.obj-subdir.mk

juggler/trunk/modules/vapor/vpr/vprmain.cpp

@@ -34 +34 @@
- *************** <auto-copyright.pl END do not edit this line> ***************/
-
-f defined(WIN32) || defined(WIN64)
-
+nclude <vpr/vprConfig.h>
+
-#include <iostream>
-#include <sstream>
-#include <cstdlib>
-#include <string>
+
+#if ! defined(WIN32) && ! defined(WIN64)
+#  include <dlfcn.h>
+#endif
+
-#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
-#include <boost/filesystem/exception.hpp>
-
@@ -46 +52 @@
-namespace fs = boost::filesystem;
-
+#if defined(WIN32) || defined(WIN64)
-/**
- * Windows DLL entry point function. This ensures that the environment
@@ -114 +121 @@
-   return TRUE;
-}
+#else
+/**
+ * Non-Windows shared library constructor. This ensures that the environment
+ * variable \c VPR_BASE_DIR is set as soon as this shared library is loaded.
+ * If it is not set, then it sets it based on an assumption about the
+ * structure of a VPR installation. More specifically, an assumption is made
+ * that this shared library lives in the \c lib subdirectory of the VPR
+ * installation. Therefore, the root of the VPR installation is the parent of
+ * the directory containing this shared library.
+ */
+extern "C" void __attribute ((constructor)) vprLibraryInit()
+{
+   Dl_info info;
+   info.dli_fname = 0;
+   const int result = dladdr(reinterpret_cast<const void*>(&vprLibraryInit),
+                             &info);
-
+   // NOTE: dladdr(3) really does return a non-zero value on success.
+   if ( 0 != result )
+   {
+      try
+      {
+         fs::path lib_file(info.dli_fname, fs::native);
+         lib_file = fs::system_complete(lib_file);
-
+#if defined(VPR_OS_IRIX) && defined(_ABIN32)
+         const std::string bit_suffix("32");
+#elif defined(VPR_OS_IRIX) && defined(_ABI64) || \
+      defined(VPR_OS_Linux) && defined(__x86_64__)
+         const std::string bit_suffix("64");
+#else
+         const std::string bit_suffix("");
+#endif
+
+         // Get the directory containing this shared library.
+         const fs::path lib_path = lib_file.branch_path();
+
+         // Start the search for the root of the VPR installation in the
+         // parent of the directory containing this shared library.
+         fs::path base_dir = lib_path.branch_path();
+
+         // Use the lib subdirectory to figure out when we have found the root
+         // of the VPR installation tree.
+         const fs::path lib_subdir(std::string("lib") + bit_suffix);
+
+         bool found(false);
+         while ( ! found )
+         {
+            try
+            {
+               if ( ! fs::exists(base_dir / lib_subdir) )
+               {
+                  base_dir = base_dir.branch_path();
+               }
+               else
+               {
+                  found = true;
+               }
+            }
+            catch (fs::filesystem_error&)
+            {
+               base_dir = base_dir.branch_path();
+            }
+         }
+
+         // We use the overwrite value of 0 as a way around testing whether
+         // the environment variable is already set.
+         setenv("VPR_BASE_DIR", base_dir.native_directory_string().c_str(), 0);
+      }
+      catch (fs::filesystem_error& ex)
+      {
+         std::cerr << "Automatic assignment of VPR_BASE_DIR failed:\n"
+                   << ex.what() << std::endl;
+      }
+   }
+}
-#endif  /* defined(WIN32) || defined(WIN64) */