Backed out changeset e187a6b45ce6: restored VSTool et al.

autobuild.xml

@@ -2617,6 +2617,14 @@
                 <key>arguments</key>
                 <array>
                   <string>..\indra</string>
+                  <string>&amp;&amp;</string>
+                  <string>..\indra\tools\vstool\VSTool.exe</string>
+                  <string>--solution</string>
+                  <string>SecondLife.sln</string>
+                  <string>--config</string>
+                  <string>RelWithDebInfo</string>
+                  <string>--startup</string>
+                  <string>secondlife-bin</string>
                 </array>
                 <key>options</key>
                 <array>
@@ -2655,11 +2663,20 @@
                 <key>arguments</key>
                 <array>
                   <string>..\indra</string>
+                  <string>&amp;&amp;</string>
+                  <string>..\indra\tools\vstool\VSTool.exe</string>
+                  <string>--solution</string>
+                  <string>SecondLife.sln</string>
+                  <string>--config</string>
+                  <string>RelWithDebInfo</string>
+                  <string>--startup</string>
+                  <string>secondlife-bin</string>
                 </array>
                 <key>options</key>
                 <array>
                   <string>-G</string>
                   <string>"Visual Studio 12"</string>
+                  <string>-DUNATTENDED:BOOL=ON</string>
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
                   <string>-DUSE_KDU=FALSE</string>
                 </array>
@@ -2688,6 +2705,14 @@
                 <key>arguments</key>
                 <array>
                   <string>..\indra</string>
+                  <string>&amp;&amp;</string>
+                  <string>..\indra\tools\vstool\VSTool.exe</string>
+                  <string>--solution</string>
+                  <string>SecondLife.sln</string>
+                  <string>--config</string>
+                  <string>Release</string>
+                  <string>--startup</string>
+                  <string>secondlife-bin</string>
                 </array>
                 <key>options</key>
                 <array>
@@ -2724,11 +2749,20 @@
                 <key>arguments</key>
                 <array>
                   <string>..\indra</string>
+                  <string>&amp;&amp;</string>
+                  <string>..\indra\tools\vstool\VSTool.exe</string>
+                  <string>--solution</string>
+                  <string>SecondLife.sln</string>
+                  <string>--config</string>
+                  <string>Release</string>
+                  <string>--startup</string>
+                  <string>secondlife-bin</string>
                 </array>
                 <key>options</key>
                 <array>
                   <string>-G</string>
                   <string>"Visual Studio 12"</string>
+                  <string>-DUNATTENDED:BOOL=ON</string>
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
                   <string>-DUSE_KDU=FALSE</string>
                 </array>

indra/cmake/Variables.cmake

@@ -164,6 +164,7 @@ set(SIGNING_IDENTITY "" CACHE STRING "Specifies the signing identity to use, if
 
 set(VERSION_BUILD "0" CACHE STRING "Revision number passed in from the outside")
 set(USESYSTEMLIBS OFF CACHE BOOL "Use libraries from your system rather than Linden-supplied prebuilt libraries.")
+set(UNATTENDED OFF CACHE BOOL "Should be set to ON for building with VC Express editions.")
 
 set(USE_PRECOMPILED_HEADERS ON CACHE BOOL "Enable use of precompiled header directives where supported.")
 

indra/newview/CMakeLists.txt

@@ -1799,6 +1799,21 @@ if (WINDOWS)
    windows-crash-logger
     )
 
+    # sets the 'working directory' for debugging from visual studio.
+    if (NOT UNATTENDED)
+        add_custom_command(
+            TARGET ${VIEWER_BINARY_NAME} POST_BUILD
+            COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe
+            ARGS
+              --solution
+              ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln
+              --workingdir
+              ${VIEWER_BINARY_NAME}
+              "${CMAKE_CURRENT_SOURCE_DIR}"
+            COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging."
+            )
+    endif (NOT UNATTENDED)
+
     if (PACKAGE)
       add_custom_command(
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.bz2

indra/tools/vstool/DispatchUtility.cs

+#region Using Directives
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.Reflection;
+using System.Security.Permissions;
+
+#endregion
+
+namespace TestDispatchUtility
+{
+	/// <summary>
+	/// Provides helper methods for working with COM IDispatch objects that have a registered type library.
+	/// </summary>
+	public static class DispatchUtility
+	{
+		#region Private Constants
+
+		private const int S_OK = 0; //From WinError.h
+		private const int LOCALE_SYSTEM_DEFAULT = 2 << 10; //From WinNT.h == 2048 == 0x800
+
+		#endregion
+
+		#region Public Methods
+
+		/// <summary>
+		/// Gets whether the specified object implements IDispatch.
+		/// </summary>
+		/// <param name="obj">An object to check.</param>
+		/// <returns>True if the object implements IDispatch.  False otherwise.</returns>
+		public static bool ImplementsIDispatch(object obj)
+		{
+			bool result = obj is IDispatchInfo;
+			return result;
+		}
+
+		/// <summary>
+		/// Gets a Type that can be used with reflection.
+		/// </summary>
+		/// <param name="obj">An object that implements IDispatch.</param>
+		/// <param name="throwIfNotFound">Whether an exception should be thrown if a Type can't be obtained.</param>
+		/// <returns>A .NET Type that can be used with reflection.</returns>
+		/// <exception cref="InvalidCastException">If <paramref name="obj"/> doesn't implement IDispatch.</exception>
+		[SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.UnmanagedCode)]
+		public static Type GetType(object obj, bool throwIfNotFound)
+		{
+			RequireReference(obj, "obj");
+			Type result = GetType((IDispatchInfo)obj, throwIfNotFound);
+			return result;
+		}
+
+		/// <summary>
+		/// Tries to get the DISPID for the requested member name.
+		/// </summary>
+		/// <param name="obj">An object that implements IDispatch.</param>
+		/// <param name="name">The name of a member to lookup.</param>
+		/// <param name="dispId">If the method returns true, this holds the DISPID on output.
+		/// If the method returns false, this value should be ignored.</param>
+		/// <returns>True if the member was found and resolved to a DISPID.  False otherwise.</returns>
+		/// <exception cref="InvalidCastException">If <paramref name="obj"/> doesn't implement IDispatch.</exception>
+		[SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.UnmanagedCode)]
+		public static bool TryGetDispId(object obj, string name, out int dispId)
+		{
+			RequireReference(obj, "obj");
+			bool result = TryGetDispId((IDispatchInfo)obj, name, out dispId);
+			return result;
+		}
+
+		/// <summary>
+		/// Invokes a member by DISPID.
+		/// </summary>
+		/// <param name="obj">An object that implements IDispatch.</param>
+		/// <param name="dispId">The DISPID of a member.  This can be obtained using
+		/// <see cref="TryGetDispId(object, string, out int)"/>.</param>
+		/// <param name="args">The arguments to pass to the member.</param>
+		/// <returns>The member's return value.</returns>
+		/// <remarks>
+		/// This can invoke a method or a property get accessor.
+		/// </remarks>
+		public static object Invoke(object obj, int dispId, object[] args)
+		{
+			string memberName = "[DispId=" + dispId + "]";
+			object result = Invoke(obj, memberName, args);
+			return result;
+		}
+
+		/// <summary>
+		/// Invokes a member by name.
+		/// </summary>
+		/// <param name="obj">An object.</param>
+		/// <param name="memberName">The name of the member to invoke.</param>
+		/// <param name="args">The arguments to pass to the member.</param>
+		/// <returns>The member's return value.</returns>
+		/// <remarks>
+		/// This can invoke a method or a property get accessor.
+		/// </remarks>
+		public static object Invoke(object obj, string memberName, object[] args)
+		{
+			RequireReference(obj, "obj");
+			Type type = obj.GetType();
+			object result = type.InvokeMember(memberName, BindingFlags.InvokeMethod | BindingFlags.GetProperty,
+				null, obj, args, null);
+			return result;
+		}
+
+		#endregion
+
+		#region Private Methods
+
+		/// <summary>
+		/// Requires that the value is non-null.
+		/// </summary>
+		/// <typeparam name="T">The type of the value.</typeparam>
+		/// <param name="value">The value to check.</param>
+		/// <param name="name">The name of the value.</param>
+		private static void RequireReference<T>(T value, string name) where T : class
+		{
+			if (value == null)
+			{
+				throw new ArgumentNullException(name);
+			}
+		}
+
+		/// <summary>
+		/// Gets a Type that can be used with reflection.
+		/// </summary>
+		/// <param name="dispatch">An object that implements IDispatch.</param>
+		/// <param name="throwIfNotFound">Whether an exception should be thrown if a Type can't be obtained.</param>
+		/// <returns>A .NET Type that can be used with reflection.</returns>
+		private static Type GetType(IDispatchInfo dispatch, bool throwIfNotFound)
+		{
+			RequireReference(dispatch, "dispatch");
+
+			Type result = null;
+			int typeInfoCount;
+			int hr = dispatch.GetTypeInfoCount(out typeInfoCount);
+			if (hr == S_OK && typeInfoCount > 0)
+			{
+				// Type info isn't usually culture-aware for IDispatch, so we might as well pass
+				// the default locale instead of looking up the current thread's LCID each time
+				// (via CultureInfo.CurrentCulture.LCID).
+				dispatch.GetTypeInfo(0, LOCALE_SYSTEM_DEFAULT, out result);
+			}
+
+			if (result == null && throwIfNotFound)
+			{
+				// If the GetTypeInfoCount called failed, throw an exception for that.
+				Marshal.ThrowExceptionForHR(hr);
+
+				// Otherwise, throw the same exception that Type.GetType would throw.
+				throw new TypeLoadException();
+			}
+
+			return result;
+		}
+
+		/// <summary>
+		/// Tries to get the DISPID for the requested member name.
+		/// </summary>
+		/// <param name="dispatch">An object that implements IDispatch.</param>
+		/// <param name="name">The name of a member to lookup.</param>
+		/// <param name="dispId">If the method returns true, this holds the DISPID on output.
+		/// If the method returns false, this value should be ignored.</param>
+		/// <returns>True if the member was found and resolved to a DISPID.  False otherwise.</returns>
+		private static bool TryGetDispId(IDispatchInfo dispatch, string name, out int dispId)
+		{
+			RequireReference(dispatch, "dispatch");
+			RequireReference(name, "name");
+
+			bool result = false;
+
+			// Members names aren't usually culture-aware for IDispatch, so we might as well
+			// pass the default locale instead of looking up the current thread's LCID each time
+			// (via CultureInfo.CurrentCulture.LCID).
+			Guid iidNull = Guid.Empty;
+			int hr = dispatch.GetDispId(ref iidNull, ref name, 1, LOCALE_SYSTEM_DEFAULT, out dispId);
+
+			const int DISP_E_UNKNOWNNAME = unchecked((int)0x80020006); //From WinError.h
+			const int DISPID_UNKNOWN = -1; //From OAIdl.idl
+			if (hr == S_OK)
+			{
+				result = true;
+			}
+			else if (hr == DISP_E_UNKNOWNNAME && dispId == DISPID_UNKNOWN)
+			{
+				// This is the only supported "error" case because it means IDispatch
+				// is saying it doesn't know the member we asked about.
+				result = false;
+			}
+			else
+			{
+				// The other documented result codes are all errors.
+				Marshal.ThrowExceptionForHR(hr);
+			}
+
+			return result;
+		}
+
+		#endregion
+
+		#region Private Interfaces
+
+		/// <summary>
+		/// A partial declaration of IDispatch used to lookup Type information and DISPIDs.
+		/// </summary>
+		/// <remarks>
+		/// This interface only declares the first three methods of IDispatch.  It omits the
+		/// fourth method (Invoke) because there are already plenty of ways to do dynamic
+		/// invocation in .NET.  But the first three methods provide dynamic type metadata
+		/// discovery, which .NET doesn't provide normally if you have a System.__ComObject
+		/// RCW instead of a strongly-typed RCW.
+		/// <para/>
+		/// Note: The original declaration of IDispatch is in OAIdl.idl.
+		/// </remarks>
+		[ComImport]
+		[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+		[Guid("00020400-0000-0000-C000-000000000046")]
+		private interface IDispatchInfo
+		{
+			/// <summary>
+			/// Gets the number of Types that the object provides (0 or 1).
+			/// </summary>
+			/// <param name="typeInfoCount">Returns 0 or 1 for the number of Types provided by <see cref="GetTypeInfo"/>.</param>
+			/// <remarks>
+			/// http://msdn.microsoft.com/en-us/library/da876d53-cb8a-465c-a43e-c0eb272e2a12(VS.85)
+			/// </remarks>
+			[PreserveSig]
+			int GetTypeInfoCount(out int typeInfoCount);
+
+			/// <summary>
+			/// Gets the Type information for an object if <see cref="GetTypeInfoCount"/> returned 1.
+			/// </summary>
+			/// <param name="typeInfoIndex">Must be 0.</param>
+			/// <param name="lcid">Typically, LOCALE_SYSTEM_DEFAULT (2048).</param>
+			/// <param name="typeInfo">Returns the object's Type information.</param>
+			/// <remarks>
+			/// http://msdn.microsoft.com/en-us/library/cc1ec9aa-6c40-4e70-819c-a7c6dd6b8c99(VS.85)
+			/// </remarks>
+			void GetTypeInfo(int typeInfoIndex, int lcid, [MarshalAs(UnmanagedType.CustomMarshaler,
+				MarshalTypeRef = typeof(System.Runtime.InteropServices.CustomMarshalers.TypeToTypeInfoMarshaler))] out Type typeInfo);
+
+			/// <summary>
+			/// Gets the DISPID of the specified member name.
+			/// </summary>
+			/// <param name="riid">Must be IID_NULL.  Pass a copy of Guid.Empty.</param>
+			/// <param name="name">The name of the member to look up.</param>
+			/// <param name="nameCount">Must be 1.</param>
+			/// <param name="lcid">Typically, LOCALE_SYSTEM_DEFAULT (2048).</param>
+			/// <param name="dispId">If a member with the requested <paramref name="name"/>
+			/// is found, this returns its DISPID and the method's return value is 0.
+			/// If the method returns a non-zero value, then this parameter's output value is
+			/// undefined.</param>
+			/// <returns>Zero for success. Non-zero for failure.</returns>
+			/// <remarks>
+			/// http://msdn.microsoft.com/en-us/library/6f6cf233-3481-436e-8d6a-51f93bf91619(VS.85)
+			/// </remarks>
+			[PreserveSig]
+			int GetDispId(ref Guid riid, ref string name, int nameCount, int lcid, out int dispId);
+
+			// NOTE: The real IDispatch also has an Invoke method next, but we don't need it.
+			// We can invoke methods using .NET's Type.InvokeMember method with the special
+			// [DISPID=n] syntax for member "names", or we can get a .NET Type using GetTypeInfo
+			// and invoke methods on that through reflection.
+			// Type.InvokeMember: http://msdn.microsoft.com/en-us/library/de3dhzwy.aspx
+		}
+
+		#endregion
+	}
+}

indra/tools/vstool/README.txt

+VSTool is a command line utility to manipulate VisualStudio settings. 
+
+The windows cmake project configuration uses VSTool.exe
+
+A handy upgrade:
+ figure out how to make cmake build this csharp app
+ - or write the app using script (jscript?!?) so it doesn't need to be built.
+
+

indra/tools/vstool/VSTool.csproj

+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{96943E2D-1373-4617-A117-D0F997A94919}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>
+    </ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>VSTool</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>VSTool</RootNamespace>
+    <RunPostBuildEvent>Always</RunPostBuildEvent>
+    <StartupObject>VSTool.VSToolMain</StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <OldToolsVersion>2.0</OldToolsVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>.\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>.\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="main.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file

indra/tools/vstool/VSTool.sln

+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VSTool", "VSTool.csproj", "{96943E2D-1373-4617-A117-D0F997A94919}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{96943E2D-1373-4617-A117-D0F997A94919}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96943E2D-1373-4617-A117-D0F997A94919}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96943E2D-1373-4617-A117-D0F997A94919}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{96943E2D-1373-4617-A117-D0F997A94919}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

indra/tools/vstool/app.config

+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>