Merge branch 'master' into varregion
Robert Adams
commit
d67236c09d
|
|
@ -519,12 +519,12 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
|
|
||||||
protected internal void AddPhysicalPrim(int number)
|
protected internal void AddPhysicalPrim(int number)
|
||||||
{
|
{
|
||||||
m_physicalPrim++;
|
m_physicalPrim += number;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected internal void RemovePhysicalPrim(int number)
|
protected internal void RemovePhysicalPrim(int number)
|
||||||
{
|
{
|
||||||
m_physicalPrim--;
|
m_physicalPrim -= number;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected internal void AddToScriptLPS(int number)
|
protected internal void AddToScriptLPS(int number)
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,71 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
* * Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
* * Neither the name of the OpenSimulator Project nor the
|
||||||
|
* names of its contributors may be used to endorse or promote products
|
||||||
|
* derived from this software without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Reflection;
|
||||||
|
using NUnit.Framework;
|
||||||
|
using OpenMetaverse;
|
||||||
|
using OpenSim.Framework;
|
||||||
|
using OpenSim.Framework.Communications;
|
||||||
|
using OpenSim.Region.Framework.Scenes;
|
||||||
|
using OpenSim.Tests.Common;
|
||||||
|
using OpenSim.Tests.Common.Mock;
|
||||||
|
|
||||||
|
namespace OpenSim.Region.Framework.Scenes.Tests
|
||||||
|
{
|
||||||
|
[TestFixture]
|
||||||
|
public class SceneStatisticsTests : OpenSimTestCase
|
||||||
|
{
|
||||||
|
private TestScene m_scene;
|
||||||
|
|
||||||
|
[SetUp]
|
||||||
|
public void Init()
|
||||||
|
{
|
||||||
|
m_scene = new SceneHelpers().SetupScene();
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void TestAddRemovePhysicalLinkset()
|
||||||
|
{
|
||||||
|
Assert.That(m_scene.SceneGraph.GetActiveObjectsCount(), Is.EqualTo(0));
|
||||||
|
|
||||||
|
UUID ownerId = TestHelpers.ParseTail(0x1);
|
||||||
|
SceneObjectGroup so1 = SceneHelpers.CreateSceneObject(3, ownerId, "so1", 0x10);
|
||||||
|
so1.ScriptSetPhysicsStatus(true);
|
||||||
|
m_scene.AddSceneObject(so1);
|
||||||
|
|
||||||
|
Assert.That(m_scene.SceneGraph.GetTotalObjectsCount(), Is.EqualTo(3));
|
||||||
|
Assert.That(m_scene.SceneGraph.GetActiveObjectsCount(), Is.EqualTo(3));
|
||||||
|
|
||||||
|
m_scene.DeleteSceneObject(so1, false);
|
||||||
|
|
||||||
|
Assert.That(m_scene.SceneGraph.GetTotalObjectsCount(), Is.EqualTo(0));
|
||||||
|
Assert.That(m_scene.SceneGraph.GetActiveObjectsCount(), Is.EqualTo(0));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,58 +1,97 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||||
<ProductVersion>9.0.30729</ProductVersion>
|
<ProductVersion>9.0.30729</ProductVersion>
|
||||||
<SchemaVersion>2.0</SchemaVersion>
|
<SchemaVersion>2.0</SchemaVersion>
|
||||||
<ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
|
<ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>OpenSim._32BitLaunch</RootNamespace>
|
<RootNamespace>OpenSim._32BitLaunch</RootNamespace>
|
||||||
<AssemblyName>OpenSim.32BitLaunch</AssemblyName>
|
<AssemblyName>OpenSim.32BitLaunch</AssemblyName>
|
||||||
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
</PropertyGroup>
|
<FileUpgradeFlags>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
</FileUpgradeFlags>
|
||||||
<DebugSymbols>true</DebugSymbols>
|
<UpgradeBackupLocation>
|
||||||
<DebugType>full</DebugType>
|
</UpgradeBackupLocation>
|
||||||
<Optimize>false</Optimize>
|
<OldToolsVersion>3.5</OldToolsVersion>
|
||||||
<OutputPath>..\..\..\bin\</OutputPath>
|
<PublishUrl>publish\</PublishUrl>
|
||||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
<Install>true</Install>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<InstallFrom>Disk</InstallFrom>
|
||||||
<WarningLevel>4</WarningLevel>
|
<UpdateEnabled>false</UpdateEnabled>
|
||||||
<PlatformTarget>x86</PlatformTarget>
|
<UpdateMode>Foreground</UpdateMode>
|
||||||
</PropertyGroup>
|
<UpdateInterval>7</UpdateInterval>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
|
||||||
<DebugType>pdbonly</DebugType>
|
<UpdatePeriodically>false</UpdatePeriodically>
|
||||||
<Optimize>true</Optimize>
|
<UpdateRequired>false</UpdateRequired>
|
||||||
<OutputPath>bin\Release\</OutputPath>
|
<MapFileExtensions>true</MapFileExtensions>
|
||||||
<DefineConstants>TRACE</DefineConstants>
|
<ApplicationRevision>0</ApplicationRevision>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
||||||
<WarningLevel>4</WarningLevel>
|
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||||
</PropertyGroup>
|
<UseApplicationTrust>false</UseApplicationTrust>
|
||||||
<ItemGroup>
|
<BootstrapperEnabled>true</BootstrapperEnabled>
|
||||||
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL" />
|
</PropertyGroup>
|
||||||
<Reference Include="System" />
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
<Reference Include="System.Data" />
|
<DebugSymbols>true</DebugSymbols>
|
||||||
<Reference Include="System.Xml" />
|
<DebugType>full</DebugType>
|
||||||
</ItemGroup>
|
<Optimize>false</Optimize>
|
||||||
<ItemGroup>
|
<OutputPath>..\..\..\bin\</OutputPath>
|
||||||
<Compile Include="Program.cs" />
|
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<ErrorReport>prompt</ErrorReport>
|
||||||
</ItemGroup>
|
<WarningLevel>4</WarningLevel>
|
||||||
<ItemGroup>
|
<PlatformTarget>x86</PlatformTarget>
|
||||||
<ProjectReference Include="..\..\Region\Application\OpenSim.csproj">
|
</PropertyGroup>
|
||||||
<Project>{438A9556-0000-0000-0000-000000000000}</Project>
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<Name>OpenSim</Name>
|
<DebugType>pdbonly</DebugType>
|
||||||
</ProjectReference>
|
<Optimize>true</Optimize>
|
||||||
</ItemGroup>
|
<OutputPath>bin\Release\</OutputPath>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<DefineConstants>TRACE</DefineConstants>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL" />
|
||||||
|
<Reference Include="OpenSim, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
|
<SpecificVersion>False</SpecificVersion>
|
||||||
|
<ExecutableExtension>.exe</ExecutableExtension>
|
||||||
|
<HintPath>..\..\..\bin\OpenSim.exe</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="System" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="Program.cs" />
|
||||||
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<BootstrapperPackage Include=".NETFramework,Version=v4.0">
|
||||||
|
<Visible>False</Visible>
|
||||||
|
<ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
|
||||||
|
<Install>true</Install>
|
||||||
|
</BootstrapperPackage>
|
||||||
|
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
|
||||||
|
<Visible>False</Visible>
|
||||||
|
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
|
||||||
|
<Install>false</Install>
|
||||||
|
</BootstrapperPackage>
|
||||||
|
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
|
||||||
|
<Visible>False</Visible>
|
||||||
|
<ProductName>.NET Framework 3.5 SP1</ProductName>
|
||||||
|
<Install>false</Install>
|
||||||
|
</BootstrapperPackage>
|
||||||
|
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
|
||||||
|
<Visible>False</Visible>
|
||||||
|
<ProductName>Windows Installer 3.1</ProductName>
|
||||||
|
<Install>true</Install>
|
||||||
|
</BootstrapperPackage>
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
Other similar extension points exist, see Microsoft.Common.targets.
|
Other similar extension points exist, see Microsoft.Common.targets.
|
||||||
<Target Name="BeforeBuild">
|
<Target Name="BeforeBuild">
|
||||||
</Target>
|
</Target>
|
||||||
<Target Name="AfterBuild">
|
<Target Name="AfterBuild">
|
||||||
</Target>
|
</Target>
|
||||||
-->
|
-->
|
||||||
</Project>
|
</Project>
|
||||||
|
|
@ -1,62 +1,99 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||||
<ProductVersion>9.0.30729</ProductVersion>
|
<ProductVersion>9.0.30729</ProductVersion>
|
||||||
<SchemaVersion>2.0</SchemaVersion>
|
<SchemaVersion>2.0</SchemaVersion>
|
||||||
<ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
|
<ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>Robust._32BitLaunch</RootNamespace>
|
<RootNamespace>Robust._32BitLaunch</RootNamespace>
|
||||||
<AssemblyName>Robust.32BitLaunch</AssemblyName>
|
<AssemblyName>Robust.32BitLaunch</AssemblyName>
|
||||||
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
</PropertyGroup>
|
<FileUpgradeFlags>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
</FileUpgradeFlags>
|
||||||
<DebugSymbols>true</DebugSymbols>
|
<UpgradeBackupLocation>
|
||||||
<DebugType>full</DebugType>
|
</UpgradeBackupLocation>
|
||||||
<Optimize>false</Optimize>
|
<OldToolsVersion>3.5</OldToolsVersion>
|
||||||
<OutputPath>..\..\..\bin\</OutputPath>
|
<PublishUrl>publish\</PublishUrl>
|
||||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
<Install>true</Install>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<InstallFrom>Disk</InstallFrom>
|
||||||
<WarningLevel>4</WarningLevel>
|
<UpdateEnabled>false</UpdateEnabled>
|
||||||
<PlatformTarget>x86</PlatformTarget>
|
<UpdateMode>Foreground</UpdateMode>
|
||||||
</PropertyGroup>
|
<UpdateInterval>7</UpdateInterval>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
|
||||||
<DebugType>pdbonly</DebugType>
|
<UpdatePeriodically>false</UpdatePeriodically>
|
||||||
<Optimize>true</Optimize>
|
<UpdateRequired>false</UpdateRequired>
|
||||||
<OutputPath>bin\Release\</OutputPath>
|
<MapFileExtensions>true</MapFileExtensions>
|
||||||
<DefineConstants>TRACE</DefineConstants>
|
<ApplicationRevision>0</ApplicationRevision>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
||||||
<WarningLevel>4</WarningLevel>
|
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||||
</PropertyGroup>
|
<UseApplicationTrust>false</UseApplicationTrust>
|
||||||
<ItemGroup>
|
<BootstrapperEnabled>true</BootstrapperEnabled>
|
||||||
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
|
</PropertyGroup>
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
<HintPath>..\..\..\bin\log4net.dll</HintPath>
|
<DebugSymbols>true</DebugSymbols>
|
||||||
</Reference>
|
<DebugType>full</DebugType>
|
||||||
<Reference Include="Robust, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
<Optimize>false</Optimize>
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<OutputPath>..\..\..\bin\</OutputPath>
|
||||||
<HintPath>..\..\..\bin\Robust.exe</HintPath>
|
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||||
</Reference>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<Reference Include="System" />
|
<WarningLevel>4</WarningLevel>
|
||||||
<Reference Include="System.Core">
|
<PlatformTarget>x86</PlatformTarget>
|
||||||
<RequiredTargetFramework>3.5</RequiredTargetFramework>
|
</PropertyGroup>
|
||||||
</Reference>
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<Reference Include="System.Data" />
|
<DebugType>pdbonly</DebugType>
|
||||||
<Reference Include="System.Xml" />
|
<Optimize>true</Optimize>
|
||||||
</ItemGroup>
|
<OutputPath>bin\Release\</OutputPath>
|
||||||
<ItemGroup>
|
<DefineConstants>TRACE</DefineConstants>
|
||||||
<Compile Include="Program.cs" />
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<WarningLevel>4</WarningLevel>
|
||||||
</ItemGroup>
|
</PropertyGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<ItemGroup>
|
||||||
|
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
|
||||||
|
<SpecificVersion>False</SpecificVersion>
|
||||||
|
<HintPath>..\..\..\bin\log4net.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="Robust, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
|
<SpecificVersion>False</SpecificVersion>
|
||||||
|
<HintPath>..\..\..\bin\Robust.exe</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="System" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="Program.cs" />
|
||||||
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<BootstrapperPackage Include=".NETFramework,Version=v4.0">
|
||||||
|
<Visible>False</Visible>
|
||||||
|
<ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
|
||||||
|
<Install>true</Install>
|
||||||
|
</BootstrapperPackage>
|
||||||
|
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
|
||||||
|
<Visible>False</Visible>
|
||||||
|
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
|
||||||
|
<Install>false</Install>
|
||||||
|
</BootstrapperPackage>
|
||||||
|
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
|
||||||
|
<Visible>False</Visible>
|
||||||
|
<ProductName>.NET Framework 3.5 SP1</ProductName>
|
||||||
|
<Install>false</Install>
|
||||||
|
</BootstrapperPackage>
|
||||||
|
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
|
||||||
|
<Visible>False</Visible>
|
||||||
|
<ProductName>Windows Installer 3.1</ProductName>
|
||||||
|
<Install>true</Install>
|
||||||
|
</BootstrapperPackage>
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
Other similar extension points exist, see Microsoft.Common.targets.
|
Other similar extension points exist, see Microsoft.Common.targets.
|
||||||
<Target Name="BeforeBuild">
|
<Target Name="BeforeBuild">
|
||||||
</Target>
|
</Target>
|
||||||
<Target Name="AfterBuild">
|
<Target Name="AfterBuild">
|
||||||
</Target>
|
</Target>
|
||||||
-->
|
-->
|
||||||
</Project>
|
</Project>
|
||||||
|
|
@ -1,20 +1,20 @@
|
||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 10.00
|
Microsoft Visual Studio Solution File, Format Version 11.00
|
||||||
# Visual C# Express 2008
|
# Visual C# Express 2010
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.32BitLaunch", "Robust.32BitLaunch.csproj", "{595D67F3-B413-4A43-8568-5B5930E3B31D}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.32BitLaunch", "Robust.32BitLaunch.csproj", "{595D67F3-B413-4A43-8568-5B5930E3B31D}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
Release|Any CPU = Release|Any CPU
|
Release|Any CPU = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
{595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.Build.0 = Release|Any CPU
|
{595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
EndGlobal
|
EndGlobal
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
|
|
@ -7,18 +7,24 @@ setlocal ENABLEEXTENSIONS
|
||||||
set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0"
|
set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0"
|
||||||
set VALUE_NAME=MSBuildToolsPath
|
set VALUE_NAME=MSBuildToolsPath
|
||||||
|
|
||||||
FOR /F "usebackq skip=4 tokens=1-3" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO (
|
rem We have to use find here as req query spits out 4 lines before Windows 7
|
||||||
|
rem But 2 lines after Windows 7. Unfortunately, this screws up cygwin
|
||||||
|
rem as it uses its own find command. This could be fixed but it could be
|
||||||
|
rem complex to find the location of find on all windows systems
|
||||||
|
FOR /F "usebackq tokens=1-3" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul ^| FIND "%VALUE_NAME%"`) DO (
|
||||||
set ValueName=%%A
|
set ValueName=%%A
|
||||||
set ValueType=%%B
|
set ValueType=%%B
|
||||||
set ValueValue=%%C
|
set ValueValue=%%C
|
||||||
)
|
)
|
||||||
|
|
||||||
if defined ValueName (
|
if defined ValueName (
|
||||||
|
@echo Found msbuild path registry entry
|
||||||
@echo Value Name = %ValueName%
|
@echo Value Name = %ValueName%
|
||||||
@echo Value Type = %ValueType%
|
@echo Value Type = %ValueType%
|
||||||
@echo Value Value = %ValueValue%
|
@echo Value Value = %ValueValue%
|
||||||
|
@echo Creating compile.bat
|
||||||
|
@echo %ValueValue%\msbuild opensim.sln > compile.bat
|
||||||
) else (
|
) else (
|
||||||
@echo %KEY_NAME%\%VALUE_NAME% not found.
|
@echo %KEY_NAME%\%VALUE_NAME% not found.
|
||||||
|
@echo Not creating compile.bat
|
||||||
)
|
)
|
||||||
|
|
||||||
@echo %ValueValue%\msbuild opensim.sln > compile.bat
|
|
||||||
|
|
|
||||||
|
|
@ -22,21 +22,11 @@ case "$1" in
|
||||||
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
|
||||||
'vs2008')
|
|
||||||
|
|
||||||
mono bin/Prebuild.exe /target vs2008
|
|
||||||
|
|
||||||
;;
|
|
||||||
|
|
||||||
|
|
||||||
*)
|
*)
|
||||||
|
|
||||||
mono bin/Prebuild.exe /target nant
|
mono bin/Prebuild.exe /target nant
|
||||||
mono bin/Prebuild.exe /target vs2008
|
mono bin/Prebuild.exe /target vs2010
|
||||||
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue