From 9ea0e881a45701782240013c8f17dfad7e5ab463 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Thu, 29 Mar 2007 17:29:52 +0000
Subject: * Naaw, -realphysx is too much to ask * Genning proj Guids from name
hash, for great justice
---
Prebuild/Prebuild.sln | 28 ++++++++++++++--------------
Prebuild/src/Core/Nodes/ProjectNode.cs | 6 +++++-
Prebuild/src/Core/Targets/VS2005Target.cs | 2 +-
Prebuild/src/Prebuild.csproj | 2 +-
4 files changed, 21 insertions(+), 17 deletions(-)
(limited to 'Prebuild')
diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln
index 6dcce98..227677f 100644
--- a/Prebuild/Prebuild.sln
+++ b/Prebuild/Prebuild.sln
@@ -1,19 +1,19 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{92E80C1C-0000-0000-0000-000000000000}"
EndProject
Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
EndGlobal
diff --git a/Prebuild/src/Core/Nodes/ProjectNode.cs b/Prebuild/src/Core/Nodes/ProjectNode.cs
index 7ac0a36..84d9f5d 100644
--- a/Prebuild/src/Core/Nodes/ProjectNode.cs
+++ b/Prebuild/src/Core/Nodes/ProjectNode.cs
@@ -424,7 +424,11 @@ namespace Prebuild.Core.Nodes
m_Runtime = (ClrRuntime)Helper.EnumAttributeValue(node, "runtime", typeof(ClrRuntime), m_Runtime);
m_StartupObject = Helper.AttributeValue(node, "startupObject", m_StartupObject);
m_RootNamespace = Helper.AttributeValue(node, "rootNamespace", m_RootNamespace);
- m_Guid = Guid.NewGuid();
+
+ int hash = m_Name.GetHashCode();
+
+ m_Guid = new Guid( hash, 0, 0, 0, 0, 0, 0,0,0,0,0 );
+
m_GenerateAssemblyInfoFile = Helper.ParseBoolean(node, "generateAssemblyInfoFile", false);
if(m_AssemblyName == null || m_AssemblyName.Length < 1)
diff --git a/Prebuild/src/Core/Targets/VS2005Target.cs b/Prebuild/src/Core/Targets/VS2005Target.cs
index 6435593..23b6116 100644
--- a/Prebuild/src/Core/Targets/VS2005Target.cs
+++ b/Prebuild/src/Core/Targets/VS2005Target.cs
@@ -665,7 +665,7 @@ namespace Prebuild.Core.Targets
if (projectFile.Contains( "OpenSim.csproj" ))
{
- ps.WriteLine(" -loginserver -sandbox -accounts -realphysx");
+ ps.WriteLine(" -loginserver -sandbox -accounts");
}
ps.WriteLine(" {0}", MakeRefPath(project));
diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
index 34daca9..55efffa 100644
--- a/Prebuild/src/Prebuild.csproj
+++ b/Prebuild/src/Prebuild.csproj
@@ -3,7 +3,7 @@
Local
8.0.50727
2.0
- {1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}
+ {92E80C1C-0000-0000-0000-000000000000}
Debug
AnyCPU
App.ico
--
cgit v1.1