Changeset 19262

Timestamp:

08/23/06 09:34:42 (2 years ago)

Author:

patrick

Message:

Back out Revision 19087 and 19088. They are not needed now that the VR
Juggler dependency distribution properly bundles fully versioned copies of
CppDOM and GMTL.

Files:

• PyJuggler/trunk/buildwin32.py (modified) (4 diffs)
• PyJuggler/trunk/vc7/cluster/cluster.vcproj (modified) (2 diffs)
• PyJuggler/trunk/vc7/gadget/gadget.vcproj (modified) (2 diffs)
• PyJuggler/trunk/vc7/jccl/jccl.vcproj (modified) (2 diffs)
• PyJuggler/trunk/vc7/osgapp/osgapp.vcproj (modified) (2 diffs)
• PyJuggler/trunk/vc7/vpr/vpr.vcproj (modified) (2 diffs)
• PyJuggler/trunk/vc7/vrj/vrj.vcproj (modified) (2 diffs)

PyJuggler/trunk/buildwin32.py

@@ -12 +12 @@
-import time
-import traceback
-pj = os.path.join
-
-python_ver_re = re.compile(r'(\d+)\.(\d+)')
@@ -41 +40 @@
-   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')
@@ -64 +62 @@
-   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',
@@ -97 +88 @@
-   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)

PyJuggler/trunk/vc7/cluster/cluster.vcproj

@@ -22 +22 @@
-                                Optimization="0"
-                                ImproveFloatingPointConsistency="TRUE"
-;"$(CPPDOM_INCLUDES)"
+
-                                PreprocessorDefinitions="CPPDOM_DYN_LINK;WIN32;_DEBUG;_CONSOLE;_USRDLL;BOOST_PYTHON_DYNAMIC_LIB"
-                                MinimalRebuild="FALSE"
@@ -84 +84 @@
-                                ImproveFloatingPointConsistency="TRUE"
-                                OmitFramePointers="TRUE"
-;"$(CPPDOM_INCLUDES)"
+
-                                PreprocessorDefinitions="CPPDOM_DYN_LINK;WIN32;NDEBUG;_CONSOLE;_USRDLL;BOOST_PYTHON_DYNAMIC_LIB"
-                                StringPooling="TRUE"

PyJuggler/trunk/vc7/gadget/gadget.vcproj

@@ -22 +22 @@
-                                Optimization="0"
-                                ImproveFloatingPointConsistency="TRUE"
-;"$(CPPDOM_INCLUDES)"
+
-                                PreprocessorDefinitions="CPPDOM_DYN_LINK;WIN32;_DEBUG;_CONSOLE;_USRDLL;BOOST_PYTHON_DYNAMIC_LIB"
-                                MinimalRebuild="FALSE"
@@ -84 +84 @@
-                                ImproveFloatingPointConsistency="TRUE"
-                                OmitFramePointers="TRUE"
-;"$(CPPDOM_INCLUDES)"
+
-                                PreprocessorDefinitions="CPPDOM_DYN_LINK;WIN32;NDEBUG;_CONSOLE;_USRDLL;BOOST_PYTHON_DYNAMIC_LIB"
-                                StringPooling="TRUE"

PyJuggler/trunk/vc7/jccl/jccl.vcproj

@@ -22 +22 @@
-                                Optimization="0"
-                                ImproveFloatingPointConsistency="TRUE"
-;"$(CPPDOM_INCLUDES)"
+
-                                PreprocessorDefinitions="CPPDOM_DYN_LINK;WIN32;_DEBUG;_CONSOLE;_USRDLL;BOOST_PYTHON_DYNAMIC_LIB"
-                                MinimalRebuild="FALSE"
@@ -84 +84 @@
-                                ImproveFloatingPointConsistency="TRUE"
-                                OmitFramePointers="TRUE"
-;"$(CPPDOM_INCLUDES)"
+
-                                PreprocessorDefinitions="CPPDOM_DYN_LINK;WIN32;NDEBUG;_CONSOLE;_USRDLL;BOOST_PYTHON_DYNAMIC_LIB"
-                                StringPooling="TRUE"

PyJuggler/trunk/vc7/osgapp/osgapp.vcproj

@@ -22 +22 @@
-                                Optimization="0"
-                                ImproveFloatingPointConsistency="TRUE"
-;"$(CPPDOM_INCLUDES)"
+
-                                PreprocessorDefinitions="CPPDOM_DYN_LINK;WIN32;_DEBUG;_CONSOLE;_USRDLL;BOOST_PYTHON_DYNAMIC_LIB"
-                                MinimalRebuild="FALSE"
@@ -84 +84 @@
-                                ImproveFloatingPointConsistency="TRUE"
-                                OmitFramePointers="TRUE"
-;"$(CPPDOM_INCLUDES)"
+
-                                PreprocessorDefinitions="CPPDOM_DYN_LINK;WIN32;NDEBUG;_CONSOLE;_USRDLL;BOOST_PYTHON_DYNAMIC_LIB"
-                                StringPooling="TRUE"

PyJuggler/trunk/vc7/vpr/vpr.vcproj

@@ -22 +22 @@
-                                Optimization="0"
-                                ImproveFloatingPointConsistency="TRUE"
-;"$(CPPDOM_INCLUDES)"
+
-                                PreprocessorDefinitions="CPPDOM_DYN_LINK;WIN32;_DEBUG;_CONSOLE;_USRDLL;BOOST_PYTHON_DYNAMIC_LIB"
-                                MinimalRebuild="FALSE"
@@ -84 +84 @@
-                                ImproveFloatingPointConsistency="TRUE"
-                                OmitFramePointers="TRUE"
-;"$(CPPDOM_INCLUDES)"
+
-                                PreprocessorDefinitions="CPPDOM_DYN_LINK;WIN32;NDEBUG;_CONSOLE;_USRDLL;BOOST_PYTHON_DYNAMIC_LIB"
-                                StringPooling="TRUE"

PyJuggler/trunk/vc7/vrj/vrj.vcproj

@@ -22 +22 @@
-                                Optimization="0"
-                                ImproveFloatingPointConsistency="TRUE"
-;"$(CPPDOM_INCLUDES)"
+
-                                PreprocessorDefinitions="CPPDOM_DYN_LINK;WIN32;_DEBUG;_CONSOLE;_USRDLL;BOOST_PYTHON_DYNAMIC_LIB"
-                                MinimalRebuild="FALSE"
@@ -84 +84 @@
-                                ImproveFloatingPointConsistency="TRUE"
-                                OmitFramePointers="TRUE"
-;"$(CPPDOM_INCLUDES)"
+
-                                PreprocessorDefinitions="CPPDOM_DYN_LINK;WIN32;NDEBUG;_CONSOLE;_USRDLL;BOOST_PYTHON_DYNAMIC_LIB"
-                                StringPooling="TRUE"