Changeset 18806

Timestamp:

05/08/06 17:50:25 (3 years ago)

Author:

patrick

Message:

Added a Visual Studio 2005 build for Juggler. This is needed for targeting
64-bit Windows. I have not been able to find a forward compatible
apparoach for setting up 64-bit Windows builds using Visual Studio 2002,
so this seems like our best option.

Files:

• juggler/trunk/buildwin32.py (modified) (8 diffs)
• juggler/trunk/vc7/Gadgeteer/Gadgeteer.rc (deleted)
• juggler/trunk/vc7/Gadgeteer/gadgeteer.ico (deleted)
• juggler/trunk/vc7/README.html (deleted)
• juggler/trunk/vc7/VRJuggler/OpenGL_Draw_Manager/VRJuggler.rc (deleted)
• juggler/trunk/vc7/VRJuggler/OpenGL_Draw_Manager/vrjuggler.ico (deleted)
• juggler/trunk/vc7/juggler-logo.gif (deleted)
• juggler/trunk/vc8 (copied) (copied from juggler/trunk/vc7)
• juggler/trunk/vc8/Gadgeteer (modified) (1 prop)
• juggler/trunk/vc8/Gadgeteer/ApplicationDataManager (modified) (1 prop)
• juggler/trunk/vc8/Gadgeteer/ApplicationDataManager/ApplicationDataManager.vcproj (modified) (7 diffs)
• juggler/trunk/vc8/Gadgeteer/DTrack (modified) (1 prop)
• juggler/trunk/vc8/Gadgeteer/DTrack/DTrack.vcproj (modified) (7 diffs)
• juggler/trunk/vc8/Gadgeteer/DataGlove (modified) (1 prop)
• juggler/trunk/vc8/Gadgeteer/DataGlove/DataGlove.vcproj (modified) (7 diffs)
• juggler/trunk/vc8/Gadgeteer/DirectXJoystick/DirectXJoystick.vcproj (modified) (7 diffs)
• juggler/trunk/vc8/Gadgeteer/Ether24 (modified) (1 prop)
• juggler/trunk/vc8/Gadgeteer/Ether24/Ether24.vcproj (modified) (8 diffs)
• juggler/trunk/vc8/Gadgeteer/Fastrak (modified) (1 prop)
• juggler/trunk/vc8/Gadgeteer/Fastrak/Fastrak.vcproj (modified) (7 diffs)
• juggler/trunk/vc8/Gadgeteer/Flock (modified) (1 prop)
• juggler/trunk/vc8/Gadgeteer/Flock/Flock.vcproj (modified) (7 diffs)
• juggler/trunk/vc8/Gadgeteer/Gadgeteer.vcproj (modified) (6 diffs)
• juggler/trunk/vc8/Gadgeteer/IBox (modified) (1 prop)
• juggler/trunk/vc8/Gadgeteer/IBox/IBox.vcproj (modified) (7 diffs)
• juggler/trunk/vc8/Gadgeteer/IS900 (modified) (1 prop)
• juggler/trunk/vc8/Gadgeteer/IS900/IS900.vcproj (modified) (6 diffs)
• juggler/trunk/vc8/Gadgeteer/IntersenseAPI/IntersenseAPI.vcproj (modified) (7 diffs)
• juggler/trunk/vc8/Gadgeteer/MSFTSpeechRecognition/MicrosoftSpeechRecognition.vcproj (modified) (7 diffs)
• juggler/trunk/vc8/Gadgeteer/MotionStar (modified) (1 prop)
• juggler/trunk/vc8/Gadgeteer/MotionStar/MotionStar.vcproj (modified) (7 diffs)
• juggler/trunk/vc8/Gadgeteer/PinchGlove (modified) (1 prop)
• juggler/trunk/vc8/Gadgeteer/PinchGlove/PinchGlove.vcproj (modified) (7 diffs)
• juggler/trunk/vc8/Gadgeteer/RemoteInputManager (modified) (1 prop)
• juggler/trunk/vc8/Gadgeteer/RemoteInputManager/RemoteInputManager.vcproj (modified) (7 diffs)
• juggler/trunk/vc8/Gadgeteer/SerialEncoder (modified) (1 prop)
• juggler/trunk/vc8/Gadgeteer/SerialEncoder/SerialEncoder.vcproj (modified) (7 diffs)
• juggler/trunk/vc8/Gadgeteer/SpaceBall (modified) (1 prop)
• juggler/trunk/vc8/Gadgeteer/SpaceBall/SpaceBall.vcproj (modified) (7 diffs)
• juggler/trunk/vc8/Gadgeteer/StartBarrierPlugin (modified) (1 prop)
• juggler/trunk/vc8/Gadgeteer/StartBarrierPlugin/StartBarrierPlugin.vcproj (modified) (7 diffs)
• juggler/trunk/vc8/Gadgeteer/SwapLockTCPPlugin (modified) (1 prop)
• juggler/trunk/vc8/Gadgeteer/SwapLockTCPPlugin/SwapLockTCPPlugin.vcproj (modified) (7 diffs)
• juggler/trunk/vc8/Gadgeteer/TrackdAPI/TrackdAPI.vcproj (modified) (7 diffs)
• juggler/trunk/vc8/Gadgeteer/VRPN/VRPN.vcproj (modified) (7 diffs)
• juggler/trunk/vc8/Gadgeteer/Wanda (modified) (1 prop)
• juggler/trunk/vc8/Gadgeteer/Wanda/Wanda.vcproj (modified) (7 diffs)
• juggler/trunk/vc8/JCCL (modified) (1 prop)
• juggler/trunk/vc8/JCCL/JCCL.vcproj (modified) (6 diffs)
• juggler/trunk/vc8/JCCL/RTRC_Plugin_CXX (modified) (1 prop)
• juggler/trunk/vc8/JCCL/RTRC_Plugin_CXX/RTRC_Plugin_CXX.vcproj (modified) (5 diffs)
• juggler/trunk/vc8/JCCL/RTRC_Plugin_CXX_IDL (modified) (1 prop)
• juggler/trunk/vc8/JCCL/RTRC_Plugin_CXX_IDL/RTRC_Plugin_CXX_IDL.vcproj (modified) (2 diffs)
• juggler/trunk/vc8/JCCL_Java/JCCL_Java.vcproj (modified) (3 diffs)
• juggler/trunk/vc8/JCCL_Java/RTRC_Plugin_Java/RTRC_Plugin_Java.vcproj (modified) (3 diffs)
• juggler/trunk/vc8/Juggler.sln (modified) (1 diff)
• juggler/trunk/vc8/Sonix (modified) (1 prop)
• juggler/trunk/vc8/Sonix/Audiere/Audiere.vcproj (modified) (7 diffs)
• juggler/trunk/vc8/Sonix/OpenAL/OpenAL.vcproj (modified) (7 diffs)
• juggler/trunk/vc8/Sonix/Sonix.vcproj (modified) (6 diffs)
• juggler/trunk/vc8/Tweek_CXX (modified) (1 prop)
• juggler/trunk/vc8/Tweek_CXX/Tweek_CXX.vcproj (modified) (5 diffs)
• juggler/trunk/vc8/Tweek_CXX_IDL/Makefile (modified) (1 diff)
• juggler/trunk/vc8/Tweek_CXX_IDL/Tweek_CXX_IDL.vcproj (modified) (2 diffs)
• juggler/trunk/vc8/Tweek_Java/Tweek_Java.vcproj (modified) (3 diffs)
• juggler/trunk/vc8/Tweek_Java/tweek_jni (modified) (1 prop)
• juggler/trunk/vc8/Tweek_Java/tweek_jni/tweek_jni.vcproj (modified) (3 diffs)
• juggler/trunk/vc8/VPR (modified) (1 prop)
• juggler/trunk/vc8/VPR/VPR.vcproj (modified) (6 diffs)
• juggler/trunk/vc8/VRJConfig/VRJConfig.vcproj (modified) (3 diffs)
• juggler/trunk/vc8/VRJuggler (modified) (1 prop)
• juggler/trunk/vc8/VRJuggler/OpenGL_Draw_Manager (modified) (1 prop)
• juggler/trunk/vc8/VRJuggler/OpenGL_Draw_Manager/OpenGL_Draw_Manager.vcproj (modified) (7 diffs)
• juggler/trunk/vc8/VRJuggler/Performer_Draw_Manager/Performer_Draw_Manager.vcproj (modified) (7 diffs)
• juggler/trunk/vc8/VRJuggler/VRJuggler.vcproj (modified) (7 diffs)
• juggler/trunk/vc8/VRJugglerPlugins/Perf_Plugin_CXX (modified) (1 prop)
• juggler/trunk/vc8/VRJugglerPlugins/Perf_Plugin_CXX/Perf_Plugin_CXX.vcproj (modified) (5 diffs)
• juggler/trunk/vc8/VRJugglerPlugins/Perf_Plugin_CXX_IDL (modified) (1 prop)
• juggler/trunk/vc8/VRJugglerPlugins/Perf_Plugin_CXX_IDL/Perf_Plugin_CXX_IDL.vcproj (modified) (2 diffs)
• juggler/trunk/vc8/VRJugglerPlugins/Perf_Plugin_Java/Perf_Plugin_Java.vcproj (modified) (3 diffs)

juggler/trunk/buildwin32.py

@@ -71 +71 @@
-      self.isDirectory = isDirectory
-
-guessBoostToolset
+detectVisualStudioVersion
-   (cl_stdin, cl_stdout, cl_stderr) = os.popen3('cl')
-   cl_version_line = cl_stderr.readline()
@@ -77 +77 @@
-   cl_ver_match = re.compile(r'Compiler Version ((\d+)\.(\d+)\.(\d+))')
-   ver_string_match = cl_ver_match.search(cl_version_line)
+
+   cl_major = 0
+   cl_minor = 0
-
-   if ver_string_match is not None:
@@ -84 +87 @@
-      if cl_major == 13 and cl_minor < 10:
-         vs_ver = '.NET 2002'
-         boost_tool_guess = 'vc7'
-      elif cl_major == 13 and cl_minor >= 10:
-         vs_ver = '.NET 2003'
-         boost_tool_guess = 'vc71'
-      else:
-         vs_ver = '2005'
-         boost_tool_guess = 'vc80'
-
-      printStatus("It appears that we will be using Visual Studio " + vs_ver)
-   else:
-      boost_tool_guess = ''
-
-   in_status  = cl_stdin.close()
@@ -139 +137 @@
-         noVisualStudioError()
-
+   return (cl_major, cl_minor)
+
+def chooseVisualStudioDir():
+   (cl_ver_major, cl_ver_minor) = detectVisualStudioVersion()
+
+   # For Visual Studio .NET 2002 and 2003 (versions 7.0 and 7.1 respectively),
+   # we will use the solution in the vc7 subtree.
+   if cl_ver_major == 13:
+      vc_dir = 'vc7'
+   # Otherwise, we use the solution in the vc8 subtree.
+   else:
+      vc_dir = 'vc8'
+
+   return (cl_ver_major, cl_ver_minor, vc_dir)
+
+def guessBoostToolset(clVerMajor, clVerMinor):
+   if clVerMajor == 13 and clVerMinor < 10:
+      boost_tool_guess = 'vc7'
+   elif clVerMajor == 13 and clVerMinor >= 10:
+      boost_tool_guess = 'vc71'
+   else:
+      boost_tool_guess = 'vc80'
+
-   return boost_tool_guess
-
@@ -177 +198 @@
-   return value_str
-
-
-
+clVerMajor, clVerMinor
+clVerMajor, clVerMinor
-
-   required = []
@@ -242 +263 @@
-   return required, optional, options
-
-
-
+clVerMajor, clVerMinor
+clVerMajor, clVerMinor
-
-   print "+++ Required Settings"
@@ -1571 +1592 @@
-      printStatus = self.printMessage
-
-
+
+
-      self.mOptions   = options
-      self.mTkOptions = {}
-'vc7'
+vc_dir
-
-      # Make a StringVar dictionary.
@@ -2045 +2067 @@
-   # the text-based interface.
-   if not gHaveTk or disable_tk:
-options = setVars
-vc_dir  = 'vc7'
+(cl_ver_major, cl_ver_minor, vc_dir) = chooseVisualStudioDir
+options = setVars(cl_ver_major, cl_ver_minor)
-      generateVersionHeaders(vc_dir)
-      generateAntBuildFiles(vc_dir)

juggler/trunk/vc8/Gadgeteer/ApplicationDataManager/ApplicationDataManager.vcproj

@@ -1 @@
- = 
+=
-<VisualStudioProject
-        ProjectType="Visual C++"
-7
+8
-        Name="Cluster Plug-in - Application Data Manager"
-        ProjectGUID="{2BB1C6DC-A6DB-42A3-A91A-DBD8BA7A843D}"
-
+
+
-        <Platforms>
-                <Platform
-
+
+
+
+
+
-        </Platforms>
+        <ToolFiles>
+        </ToolFiles>
-        <Configurations>
-                <Configuration
@@ -16 +23 @@
-                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-                        ConfigurationType="2"
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        <Tool
-                                Name="VCCLCompilerTool"
@@ -22 +46 @@
-                                AdditionalIncludeDirectories="&quot;$(NSPR_ROOT)\include&quot;;&quot;$(BOOST_INCLUDES)&quot;;&quot;$(CPPDOM_ROOT)\include&quot;;&quot;$(GMTL_ROOT)\include&quot;;..;..\..\..\modules\vapor;..\..\VPR;..\..\..\modules\jackal\common;..\..\..\modules\jackal\config;..\..\..\modules\jackal\rtrc;..\..\JCCL;..\..\..\modules\gadgeteer"
-                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_USRDLL;_GADGET_CLUSTER_PLUGIN_BUILD_"
-FALSE
+false
-                                BasicRuntimeChecks="3"
-                                RuntimeLibrary="3"
-FALSE
-TRUE
+false
+true
-                                UsePrecompiledHeader="0"
-                                WarningLevel="3"
-TRUE
+true
-                                DebugInformationFormat="1"
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                        <Tool
-                                Name="VCLinkerTool"
@@ -41 +73 @@
-                                LinkIncremental="1"
-                                AdditionalLibraryDirectories="&quot;$(NSPR_ROOT)\lib&quot;;&quot;$(BOOST_ROOT)\lib&quot;;&quot;..\$(OutDir)&quot;;&quot;..\..\JCCL\$(OutDir)&quot;;&quot;..\..\VPR\$(OutDir)&quot;"
-TRUE
+true
-                                ProgramDatabaseFile="$(OutDir)/ApplicationDataManager_d.pdb"
-                                SubSystem="1"
-                                ImportLibrary="$(OutDir)/ApplicationDataManager_d.lib"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                </Configuration>
-                <Configuration
@@ -66 +109 @@
-                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-                        ConfigurationType="2"
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        <Tool
-                                Name="VCCLCompilerTool"
-                                Optimization="2"
-                                InlineFunctionExpansion="1"
-TRUE
+true
-                                AdditionalIncludeDirectories="&quot;$(NSPR_ROOT)\include&quot;;&quot;$(BOOST_INCLUDES)&quot;;&quot;$(CPPDOM_ROOT)\include&quot;;&quot;$(GMTL_ROOT)\include&quot;;..;..\..\..\modules\vapor;..\..\VPR;..\..\..\modules\jackal\common;..\..\..\modules\jackal\config;..\..\..\modules\jackal\rtrc;..\..\JCCL;..\..\..\modules\gadgeteer"
-                                PreprocessorDefinitions="WIN32;_OPT;NDEBUG;_CONSOLE;_USRDLL;_GADGET_CLUSTER_PLUGIN_BUILD_"
-TRUE
+true
-                                RuntimeLibrary="2"
-FALSE
-TRUE
-TRUE
+false
+true
+true
-                                UsePrecompiledHeader="0"
-                                WarningLevel="3"
-TRUE
+true
-                                DebugInformationFormat="3"
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                        <Tool
-                                Name="VCLinkerTool"
@@ -93 +161 @@
-                                LinkIncremental="1"
-                                AdditionalLibraryDirectories="&quot;$(NSPR_ROOT)\lib&quot;;&quot;$(BOOST_ROOT)\lib&quot;;&quot;..\$(OutDir)&quot;;&quot;..\..\JCCL\$(OutDir)&quot;;&quot;..\..\VPR\$(OutDir)&quot;"
-TRUE
+true
-                                ProgramDatabaseFile="$(OutDir)/ApplicationDataManager.pdb"
-                                SubSystem="1"
@@ -99 +167 @@
-                                EnableCOMDATFolding="2"
-                                ImportLibrary="$(OutDir)/ApplicationDataManager.lib"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                </Configuration>
-        </Configurations>
+        <References>
+        </References>
-        <Files>
-                <Filter
-                        Name="Source Files"
-
-
-