aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-22 17:03:13 -0700
committerJohn Hurliman2009-10-22 17:03:13 -0700
commit96d53f11e554f37c135fa2d009f9ffed1a5ec724 (patch)
treefa31b970bb08bc9bda9db0e9a5a7866116300d70
parent* Moved Copyrights above the comments in ODEPrim and ODEDynamics so they're c... (diff)
downloadopensim-SC-96d53f11e554f37c135fa2d009f9ffed1a5ec724.zip
opensim-SC-96d53f11e554f37c135fa2d009f9ffed1a5ec724.tar.gz
opensim-SC-96d53f11e554f37c135fa2d009f9ffed1a5ec724.tar.bz2
opensim-SC-96d53f11e554f37c135fa2d009f9ffed1a5ec724.tar.xz
Added VS2010 support to Prebuild and created runprebuild2010.bat
-rw-r--r--Prebuild/src/Core/Nodes/ProjectNode.cs4
-rw-r--r--Prebuild/src/Core/Targets/VS2008Target.cs2
-rw-r--r--Prebuild/src/Core/Targets/VS2010Target.cs134
-rw-r--r--Prebuild/src/Core/Targets/VSGenericTarget.cs2
-rw-r--r--Prebuild/src/Core/Targets/VSVersion.cs6
-rwxr-xr-xbin/Prebuild.exebin246272 -> 237568 bytes
-rw-r--r--prebuild.xml2
-rw-r--r--runprebuild2010.bat2
8 files changed, 148 insertions, 4 deletions
diff --git a/Prebuild/src/Core/Nodes/ProjectNode.cs b/Prebuild/src/Core/Nodes/ProjectNode.cs
index 0a24abf..04af7a3 100644
--- a/Prebuild/src/Core/Nodes/ProjectNode.cs
+++ b/Prebuild/src/Core/Nodes/ProjectNode.cs
@@ -90,6 +90,10 @@ namespace Prebuild.Core.Nodes
90 /// .NET 3.5 90 /// .NET 3.5
91 /// </summary> 91 /// </summary>
92 v3_5, 92 v3_5,
93 /// <summary>
94 /// .NET 4.0
95 /// </summary>
96 v4_0,
93 } 97 }
94 /// <summary> 98 /// <summary>
95 /// The Node object representing /Prebuild/Solution/Project elements 99 /// The Node object representing /Prebuild/Solution/Project elements
diff --git a/Prebuild/src/Core/Targets/VS2008Target.cs b/Prebuild/src/Core/Targets/VS2008Target.cs
index f30017b..e685962 100644
--- a/Prebuild/src/Core/Targets/VS2008Target.cs
+++ b/Prebuild/src/Core/Targets/VS2008Target.cs
@@ -120,7 +120,7 @@ namespace Prebuild.Core.Targets
120 #region Constructors 120 #region Constructors
121 121
122 /// <summary> 122 /// <summary>
123 /// Initializes a new instance of the <see cref="VS2005Target"/> class. 123 /// Initializes a new instance of the <see cref="VS2008Target"/> class.
124 /// </summary> 124 /// </summary>
125 public VS2008Target() 125 public VS2008Target()
126 : base() 126 : base()
diff --git a/Prebuild/src/Core/Targets/VS2010Target.cs b/Prebuild/src/Core/Targets/VS2010Target.cs
new file mode 100644
index 0000000..8772d18
--- /dev/null
+++ b/Prebuild/src/Core/Targets/VS2010Target.cs
@@ -0,0 +1,134 @@
1using System;
2using System.Collections;
3using System.Collections.Specialized;
4using System.IO;
5using System.Text;
6
7using Prebuild.Core.Attributes;
8using Prebuild.Core.Interfaces;
9using Prebuild.Core.Nodes;
10using Prebuild.Core.Utilities;
11using System.CodeDom.Compiler;
12
13namespace Prebuild.Core.Targets
14{
15
16 /// <summary>
17 ///
18 /// </summary>
19 [Target("vs2010")]
20 public class VS2010Target : VSGenericTarget
21 {
22 #region Fields
23 string solutionVersion = "11.00";
24 string productVersion = "9.0.21022";
25 string schemaVersion = "2.0";
26 string versionName = "Visual Studio 2010";
27 string name = "vs2008";
28 VSVersion version = VSVersion.VS10;
29
30 Hashtable tools;
31 Kernel kernel;
32
33 /// <summary>
34 /// Gets or sets the solution version.
35 /// </summary>
36 /// <value>The solution version.</value>
37 public override string SolutionVersion
38 {
39 get
40 {
41 return solutionVersion;
42 }
43 }
44 /// <summary>
45 /// Gets or sets the product version.
46 /// </summary>
47 /// <value>The product version.</value>
48 public override string ProductVersion
49 {
50 get
51 {
52 return productVersion;
53 }
54 }
55 /// <summary>
56 /// Gets or sets the schema version.
57 /// </summary>
58 /// <value>The schema version.</value>
59 public override string SchemaVersion
60 {
61 get
62 {
63 return schemaVersion;
64 }
65 }
66 /// <summary>
67 /// Gets or sets the name of the version.
68 /// </summary>
69 /// <value>The name of the version.</value>
70 public override string VersionName
71 {
72 get
73 {
74 return versionName;
75 }
76 }
77 /// <summary>
78 /// Gets or sets the version.
79 /// </summary>
80 /// <value>The version.</value>
81 public override VSVersion Version
82 {
83 get
84 {
85 return version;
86 }
87 }
88 /// <summary>
89 /// Gets the name.
90 /// </summary>
91 /// <value>The name.</value>
92 public override string Name
93 {
94 get
95 {
96 return name;
97 }
98 }
99
100 protected override string GetToolsVersionXml(FrameworkVersion frameworkVersion)
101 {
102 switch (frameworkVersion)
103 {
104 case FrameworkVersion.v4_0:
105 return "ToolsVersion=\"4.0\"";
106 case FrameworkVersion.v3_5:
107 return "ToolsVersion=\"3.5\"";
108 case FrameworkVersion.v3_0:
109 return "ToolsVersion=\"3.0\"";
110 default:
111 return "ToolsVersion=\"2.0\"";
112 }
113 }
114
115 public override string SolutionTag
116 {
117 get { return "# Visual Studio 2010"; }
118 }
119
120 #endregion
121
122 #region Constructors
123
124 /// <summary>
125 /// Initializes a new instance of the <see cref="VS2010Target"/> class.
126 /// </summary>
127 public VS2010Target()
128 : base()
129 {
130 }
131
132 #endregion
133 }
134}
diff --git a/Prebuild/src/Core/Targets/VSGenericTarget.cs b/Prebuild/src/Core/Targets/VSGenericTarget.cs
index 84f1df5..fdcc2b9 100644
--- a/Prebuild/src/Core/Targets/VSGenericTarget.cs
+++ b/Prebuild/src/Core/Targets/VSGenericTarget.cs
@@ -173,7 +173,7 @@ namespace Prebuild.Core.Targets
173 #region Project File 173 #region Project File
174 using (ps) 174 using (ps)
175 { 175 {
176 ps.WriteLine("<Project DefaultTargets=\"Build\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\" {0}>", GetToolsVersionXml(project.FrameworkVersion)); 176 ps.WriteLine("<Project DefaultTargets=\"Build\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\" ToolsVersion=\"{0}\">", this.Version == VSVersion.VS10 ? "4.0" : "3.5");
177 ps.WriteLine(" <PropertyGroup>"); 177 ps.WriteLine(" <PropertyGroup>");
178 ps.WriteLine(" <ProjectType>Local</ProjectType>"); 178 ps.WriteLine(" <ProjectType>Local</ProjectType>");
179 ps.WriteLine(" <ProductVersion>{0}</ProductVersion>", this.ProductVersion); 179 ps.WriteLine(" <ProductVersion>{0}</ProductVersion>", this.ProductVersion);
diff --git a/Prebuild/src/Core/Targets/VSVersion.cs b/Prebuild/src/Core/Targets/VSVersion.cs
index f477086..59549b0 100644
--- a/Prebuild/src/Core/Targets/VSVersion.cs
+++ b/Prebuild/src/Core/Targets/VSVersion.cs
@@ -45,6 +45,10 @@ namespace Prebuild.Core.Targets
45 /// <summary> 45 /// <summary>
46 /// Visual Studio 2008 46 /// Visual Studio 2008
47 /// </summary> 47 /// </summary>
48 VS90 48 VS90,
49 /// <summary>
50 /// Visual Studio 2010
51 /// </summary>
52 VS10
49 } 53 }
50} 54}
diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe
index e58657c..eb4c224 100755
--- a/bin/Prebuild.exe
+++ b/bin/Prebuild.exe
Binary files differ
diff --git a/prebuild.xml b/prebuild.xml
index 81f907d..1c44ebf 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -3135,7 +3135,7 @@
3135 </Files> 3135 </Files>
3136 </Project> 3136 </Project>
3137 3137
3138 <Project name="OpenSim.Tools.lslc" path="OpenSim/Tools/Compiler" type="Exe"> 3138 <Project frameworkVersion="v3_5" name="OpenSim.Tools.lslc" path="OpenSim/Tools/Compiler" type="Exe">
3139 <Configuration name="Debug"> 3139 <Configuration name="Debug">
3140 <Options> 3140 <Options>
3141 <OutputPath>../../../bin/</OutputPath> 3141 <OutputPath>../../../bin/</OutputPath>
diff --git a/runprebuild2010.bat b/runprebuild2010.bat
new file mode 100644
index 0000000..8c832b3
--- /dev/null
+++ b/runprebuild2010.bat
@@ -0,0 +1,2 @@
1bin\Prebuild.exe /target vs2010
2echo C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild OpenSim.sln > compile.bat