Changeset 19087

Timestamp:

07/22/06 08:22:17 (2 years ago)

Author:

allenb

Message:

- Add setting of CPPDOM_INCLUDES variable
- Added method that searches for potential cppdom include directories in existing directory settings.

Files:

• PyJuggler/trunk/buildwin32.py (modified) (4 diffs)

PyJuggler/trunk/buildwin32.py

@@ -12 +12 @@
-import time
-import traceback
+pj = os.path.join
-
-python_ver_re = re.compile(r'(\d+)\.(\d+)')
@@ -40 +41 @@
-   options = {
-      # Default values for required settings.
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-      # Default values for optional settings.
-      'OSGHOME'        : os.getenv('OSGHOME', '')
-   }
-
+
-   # If there are cached options, read them in.
-   cache_file = os.path.join(pyj_dir, 'options.cache')
@@ -62 +64 @@
-   processInput(options, 'VJ_DEPS_DIR',
-                'VR Juggler dependency installation directory')
+   
+   if "" == options["CPPDOM_INCLUDES"]:
+      roots = [pj(options[v],'include') for v in ['VJ_BASE_DIR','VJ_DEPS_DIR']]
+      options["CPPDOM_INCLUDES"] = findCppdomIncludeDir(roots)
+
+   processInput(options, 'CPPDOM_INCLUDES', 
+                'Directory containing the CppDOM header tree')                
-   processInput(options, 'BOOST_VERSION', 'Boost C++ version')
-   processInput(options, 'BOOST_TOOL',
@@ -88 +97 @@
-   return options
-
+def findCppdomIncludeDir(potentialIncRoots):
+   """ Attempt to search for cppdom include directory.  If found return it.
+       potentialIncRoots should be an 'include' directory to search in.
+   """
+   found_dir = ""
+   potential_dirs = []
+   for root in potentialIncRoots:
+      if os.path.isdir(root):
+         potential_dirs += [pj(root,d) for d in os.listdir(root) if d.count("cppdom")]
+   
+   # Sort them and reverse the order to get a list based on version.
+   potential_dirs.sort()
+   potential_dirs.reverse()
+
+   for d in potential_dirs:
+      if os.path.isfile(pj(d,'cppdom','version.h')):
+         found_dir = d
+         break         
+
+   return found_dir
+            
-def doInstall(prefix):
-   makeTree(prefix)