diff options
author | UbitUmarov | 2017-08-31 11:23:03 +0100 |
---|---|---|
committer | UbitUmarov | 2017-08-31 11:23:03 +0100 |
commit | b9fc629bdfd050a7ded26aefec5d3ed3d97ce916 (patch) | |
tree | 648547e88f5a13f0962486a86ea4896aa92b9556 /Prebuild/src/Core | |
parent | fix a prebuild VS targets assembly name (diff) | |
download | opensim-SC-b9fc629bdfd050a7ded26aefec5d3ed3d97ce916.zip opensim-SC-b9fc629bdfd050a7ded26aefec5d3ed3d97ce916.tar.gz opensim-SC-b9fc629bdfd050a7ded26aefec5d3ed3d97ce916.tar.bz2 opensim-SC-b9fc629bdfd050a7ded26aefec5d3ed3d97ce916.tar.xz |
fix a whitecode bug, add missing files
Diffstat (limited to 'Prebuild/src/Core')
-rw-r--r-- | Prebuild/src/Core/Kernel.cs | 7 | ||||
-rw-r--r-- | Prebuild/src/Core/Targets/VS2012Target.cs | 138 | ||||
-rw-r--r-- | Prebuild/src/Core/Targets/VS2013Target.cs | 139 | ||||
-rw-r--r-- | Prebuild/src/Core/Targets/VS2015Target.cs | 143 |
4 files changed, 426 insertions, 1 deletions
diff --git a/Prebuild/src/Core/Kernel.cs b/Prebuild/src/Core/Kernel.cs index 535913e..218f28e 100644 --- a/Prebuild/src/Core/Kernel.cs +++ b/Prebuild/src/Core/Kernel.cs | |||
@@ -89,6 +89,7 @@ namespace Prebuild.Core | |||
89 | 89 | ||
90 | readonly List<SolutionNode> m_Solutions = new List<SolutionNode>(); | 90 | readonly List<SolutionNode> m_Solutions = new List<SolutionNode>(); |
91 | string m_Target; | 91 | string m_Target; |
92 | bool cmdlineTargetFramework; | ||
92 | FrameworkVersion m_TargetFramework; //Overrides all project settings | 93 | FrameworkVersion m_TargetFramework; //Overrides all project settings |
93 | string m_Conditionals; //Adds to all project settings | 94 | string m_Conditionals; //Adds to all project settings |
94 | public string ForcedConditionals { get { return m_Conditionals; } } | 95 | public string ForcedConditionals { get { return m_Conditionals; } } |
@@ -327,6 +328,7 @@ namespace Prebuild.Core | |||
327 | m_Log.Write("C.J. Adams-Collier (cjac@colliertech.org),"); | 328 | m_Log.Write("C.J. Adams-Collier (cjac@colliertech.org),"); |
328 | m_Log.Write("John Hurliman (john.hurliman@intel.com),"); | 329 | m_Log.Write("John Hurliman (john.hurliman@intel.com),"); |
329 | m_Log.Write("WhiteCore build 2015 (greythane@gmail.com),"); | 330 | m_Log.Write("WhiteCore build 2015 (greythane@gmail.com),"); |
331 | m_Log.Write("OpenSim build 2017 Ubit Umarov,"); | ||
330 | m_Log.Write (""); | 332 | m_Log.Write (""); |
331 | m_Log.Write("See 'prebuild /usage' for help"); | 333 | m_Log.Write("See 'prebuild /usage' for help"); |
332 | m_Log.Write(); | 334 | m_Log.Write(); |
@@ -602,7 +604,7 @@ namespace Prebuild.Core | |||
602 | dataNode = preNode; | 604 | dataNode = preNode; |
603 | 605 | ||
604 | dataNode.Parent = parent; | 606 | dataNode.Parent = parent; |
605 | if (dataNode is ProjectNode) | 607 | if (cmdlineTargetFramework && dataNode is ProjectNode) |
606 | { | 608 | { |
607 | ((ProjectNode)dataNode).FrameworkVersion = m_TargetFramework; | 609 | ((ProjectNode)dataNode).FrameworkVersion = m_TargetFramework; |
608 | } | 610 | } |
@@ -663,7 +665,10 @@ namespace Prebuild.Core | |||
663 | m_Target = m_CommandLine["target"]; | 665 | m_Target = m_CommandLine["target"]; |
664 | m_Conditionals = m_CommandLine["conditionals"]; | 666 | m_Conditionals = m_CommandLine["conditionals"]; |
665 | if(m_CommandLine["targetframework"] != null) | 667 | if(m_CommandLine["targetframework"] != null) |
668 | { | ||
666 | m_TargetFramework = (FrameworkVersion)Enum.Parse (typeof (FrameworkVersion), m_CommandLine["targetframework"]); | 669 | m_TargetFramework = (FrameworkVersion)Enum.Parse (typeof (FrameworkVersion), m_CommandLine["targetframework"]); |
670 | cmdlineTargetFramework = true; | ||
671 | } | ||
667 | m_Clean = m_CommandLine["clean"]; | 672 | m_Clean = m_CommandLine["clean"]; |
668 | string removeDirs = m_CommandLine["removedir"]; | 673 | string removeDirs = m_CommandLine["removedir"]; |
669 | if(removeDirs != null && removeDirs.Length == 0) | 674 | if(removeDirs != null && removeDirs.Length == 0) |
diff --git a/Prebuild/src/Core/Targets/VS2012Target.cs b/Prebuild/src/Core/Targets/VS2012Target.cs new file mode 100644 index 0000000..e21c97a --- /dev/null +++ b/Prebuild/src/Core/Targets/VS2012Target.cs | |||
@@ -0,0 +1,138 @@ | |||
1 | using System; | ||
2 | |||
3 | using Prebuild.Core.Attributes; | ||
4 | using Prebuild.Core.Nodes; | ||
5 | |||
6 | namespace Prebuild.Core.Targets | ||
7 | { | ||
8 | |||
9 | /// <summary> | ||
10 | /// | ||
11 | /// </summary> | ||
12 | [Target("vs2012")] | ||
13 | public class VS2012Target : VSGenericTarget | ||
14 | { | ||
15 | #region Fields | ||
16 | |||
17 | string solutionVersion = "12.00"; | ||
18 | string productVersion = "11.0.61030.0"; | ||
19 | string schemaVersion = "2.0"; | ||
20 | string versionName = "Visual Studio 2012"; | ||
21 | string name = "vs2012"; | ||
22 | VSVersion version = VSVersion.VS11; | ||
23 | |||
24 | #endregion | ||
25 | |||
26 | #region Properties | ||
27 | |||
28 | /// <summary> | ||
29 | /// Gets or sets the solution version. | ||
30 | /// </summary> | ||
31 | /// <value>The solution version.</value> | ||
32 | public override string SolutionVersion | ||
33 | { | ||
34 | get | ||
35 | { | ||
36 | return solutionVersion; | ||
37 | } | ||
38 | } | ||
39 | |||
40 | /// <summary> | ||
41 | /// Gets or sets the product version. | ||
42 | /// </summary> | ||
43 | /// <value>The product version.</value> | ||
44 | public override string ProductVersion | ||
45 | { | ||
46 | get | ||
47 | { | ||
48 | return productVersion; | ||
49 | } | ||
50 | } | ||
51 | |||
52 | /// <summary> | ||
53 | /// Gets or sets the schema version. | ||
54 | /// </summary> | ||
55 | /// <value>The schema version.</value> | ||
56 | public override string SchemaVersion | ||
57 | { | ||
58 | get | ||
59 | { | ||
60 | return schemaVersion; | ||
61 | } | ||
62 | } | ||
63 | |||
64 | /// <summary> | ||
65 | /// Gets or sets the name of the version. | ||
66 | /// </summary> | ||
67 | /// <value>The name of the version.</value> | ||
68 | public override string VersionName | ||
69 | { | ||
70 | get | ||
71 | { | ||
72 | return versionName; | ||
73 | } | ||
74 | } | ||
75 | |||
76 | /// <summary> | ||
77 | /// Gets or sets the version. | ||
78 | /// </summary> | ||
79 | /// <value>The version.</value> | ||
80 | public override VSVersion Version | ||
81 | { | ||
82 | get | ||
83 | { | ||
84 | return version; | ||
85 | } | ||
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_6_1: | ||
105 | case FrameworkVersion.v4_6: | ||
106 | return "ToolsVersion=\"14.0\""; | ||
107 | case FrameworkVersion.v4_5_1: | ||
108 | case FrameworkVersion.v4_5: | ||
109 | case FrameworkVersion.v4_0: | ||
110 | case FrameworkVersion.v3_5: | ||
111 | return "ToolsVersion=\"4.0\""; | ||
112 | case FrameworkVersion.v3_0: | ||
113 | return "ToolsVersion=\"3.0\""; | ||
114 | default: | ||
115 | return "ToolsVersion=\"2.0\""; | ||
116 | } | ||
117 | } | ||
118 | |||
119 | public override string SolutionTag | ||
120 | { | ||
121 | get { return "# Visual Studio 2012"; } | ||
122 | } | ||
123 | |||
124 | #endregion | ||
125 | |||
126 | #region Constructors | ||
127 | |||
128 | /// <summary> | ||
129 | /// Initializes a new instance of the <see cref="VS2005Target"/> class. | ||
130 | /// </summary> | ||
131 | public VS2012Target() | ||
132 | : base() | ||
133 | { | ||
134 | } | ||
135 | |||
136 | #endregion | ||
137 | } | ||
138 | } | ||
diff --git a/Prebuild/src/Core/Targets/VS2013Target.cs b/Prebuild/src/Core/Targets/VS2013Target.cs new file mode 100644 index 0000000..96d8294 --- /dev/null +++ b/Prebuild/src/Core/Targets/VS2013Target.cs | |||
@@ -0,0 +1,139 @@ | |||
1 | using System; | ||
2 | |||
3 | using Prebuild.Core.Attributes; | ||
4 | using Prebuild.Core.Nodes; | ||
5 | |||
6 | namespace Prebuild.Core.Targets | ||
7 | { | ||
8 | |||
9 | /// <summary> | ||
10 | /// | ||
11 | /// </summary> | ||
12 | [Target("vs2013")] | ||
13 | public class VS2013Target : VSGenericTarget | ||
14 | { | ||
15 | #region Fields | ||
16 | |||
17 | string solutionVersion = "12.00"; | ||
18 | string productVersion = "12.0.31101"; | ||
19 | string schemaVersion = "2.0"; | ||
20 | string versionName = "Visual Studio 2013"; | ||
21 | string name = "vs2013"; | ||
22 | VSVersion version = VSVersion.VS12; | ||
23 | |||
24 | #endregion | ||
25 | |||
26 | #region Properties | ||
27 | |||
28 | /// <summary> | ||
29 | /// Gets or sets the solution version. | ||
30 | /// </summary> | ||
31 | /// <value>The solution version.</value> | ||
32 | public override string SolutionVersion | ||
33 | { | ||
34 | get | ||
35 | { | ||
36 | return solutionVersion; | ||
37 | } | ||
38 | } | ||
39 | |||
40 | /// <summary> | ||
41 | /// Gets or sets the product version. | ||
42 | /// </summary> | ||
43 | /// <value>The product version.</value> | ||
44 | public override string ProductVersion | ||
45 | { | ||
46 | get | ||
47 | { | ||
48 | return productVersion; | ||
49 | } | ||
50 | } | ||
51 | |||
52 | /// <summary> | ||
53 | /// Gets or sets the schema version. | ||
54 | /// </summary> | ||
55 | /// <value>The schema version.</value> | ||
56 | public override string SchemaVersion | ||
57 | { | ||
58 | get | ||
59 | { | ||
60 | return schemaVersion; | ||
61 | } | ||
62 | } | ||
63 | |||
64 | /// <summary> | ||
65 | /// Gets or sets the name of the version. | ||
66 | /// </summary> | ||
67 | /// <value>The name of the version.</value> | ||
68 | public override string VersionName | ||
69 | { | ||
70 | get | ||
71 | { | ||
72 | return versionName; | ||
73 | } | ||
74 | } | ||
75 | |||
76 | /// <summary> | ||
77 | /// Gets or sets the version. | ||
78 | /// </summary> | ||
79 | /// <value>The version.</value> | ||
80 | public override VSVersion Version | ||
81 | { | ||
82 | get | ||
83 | { | ||
84 | return version; | ||
85 | } | ||
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_6_1: | ||
105 | case FrameworkVersion.v4_6: | ||
106 | return "ToolsVersion=\"14.0\""; | ||
107 | case FrameworkVersion.v4_5_1: | ||
108 | case FrameworkVersion.v4_5: | ||
109 | return "ToolsVersion=\"12.0\""; | ||
110 | case FrameworkVersion.v4_0: | ||
111 | case FrameworkVersion.v3_5: | ||
112 | return "ToolsVersion=\"4.0\""; | ||
113 | case FrameworkVersion.v3_0: | ||
114 | return "ToolsVersion=\"3.0\""; | ||
115 | default: | ||
116 | return "ToolsVersion=\"2.0\""; | ||
117 | } | ||
118 | } | ||
119 | |||
120 | public override string SolutionTag | ||
121 | { | ||
122 | get { return "# Visual Studio 2013"; } | ||
123 | } | ||
124 | |||
125 | #endregion | ||
126 | |||
127 | #region Constructors | ||
128 | |||
129 | /// <summary> | ||
130 | /// Initializes a new instance of the <see cref="VS2005Target"/> class. | ||
131 | /// </summary> | ||
132 | public VS2013Target() | ||
133 | : base() | ||
134 | { | ||
135 | } | ||
136 | |||
137 | #endregion | ||
138 | } | ||
139 | } | ||
diff --git a/Prebuild/src/Core/Targets/VS2015Target.cs b/Prebuild/src/Core/Targets/VS2015Target.cs new file mode 100644 index 0000000..b487979 --- /dev/null +++ b/Prebuild/src/Core/Targets/VS2015Target.cs | |||
@@ -0,0 +1,143 @@ | |||
1 | using System; | ||
2 | using System.IO; | ||
3 | using System.Text; | ||
4 | |||
5 | using Prebuild.Core.Attributes; | ||
6 | using Prebuild.Core.Interfaces; | ||
7 | using Prebuild.Core.Nodes; | ||
8 | using Prebuild.Core.Utilities; | ||
9 | using System.CodeDom.Compiler; | ||
10 | |||
11 | namespace Prebuild.Core.Targets | ||
12 | { | ||
13 | |||
14 | /// <summary> | ||
15 | /// | ||
16 | /// </summary> | ||
17 | [Target("vs2015")] | ||
18 | public class VS2015Target : VSGenericTarget | ||
19 | { | ||
20 | #region Fields | ||
21 | |||
22 | string solutionVersion = "12.00"; | ||
23 | string productVersion = "14.0.23107.0"; | ||
24 | string schemaVersion = "2.0"; | ||
25 | string versionName = "Visual Studio 14"; | ||
26 | string name = "vs2015"; | ||
27 | VSVersion version = VSVersion.VS15; | ||
28 | |||
29 | #endregion | ||
30 | |||
31 | #region Properties | ||
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 | |||
45 | /// <summary> | ||
46 | /// Gets or sets the product version. | ||
47 | /// </summary> | ||
48 | /// <value>The product version.</value> | ||
49 | public override string ProductVersion | ||
50 | { | ||
51 | get | ||
52 | { | ||
53 | return productVersion; | ||
54 | } | ||
55 | } | ||
56 | |||
57 | /// <summary> | ||
58 | /// Gets or sets the schema version. | ||
59 | /// </summary> | ||
60 | /// <value>The schema version.</value> | ||
61 | public override string SchemaVersion | ||
62 | { | ||
63 | get | ||
64 | { | ||
65 | return schemaVersion; | ||
66 | } | ||
67 | } | ||
68 | |||
69 | /// <summary> | ||
70 | /// Gets or sets the name of the version. | ||
71 | /// </summary> | ||
72 | /// <value>The name of the version.</value> | ||
73 | public override string VersionName | ||
74 | { | ||
75 | get | ||
76 | { | ||
77 | return versionName; | ||
78 | } | ||
79 | } | ||
80 | |||
81 | /// <summary> | ||
82 | /// Gets or sets the version. | ||
83 | /// </summary> | ||
84 | /// <value>The version.</value> | ||
85 | public override VSVersion Version | ||
86 | { | ||
87 | get | ||
88 | { | ||
89 | return version; | ||
90 | } | ||
91 | } | ||
92 | |||
93 | /// <summary> | ||
94 | /// Gets the name. | ||
95 | /// </summary> | ||
96 | /// <value>The name.</value> | ||
97 | public override string Name | ||
98 | { | ||
99 | get | ||
100 | { | ||
101 | return name; | ||
102 | } | ||
103 | } | ||
104 | |||
105 | protected override string GetToolsVersionXml(FrameworkVersion frameworkVersion) | ||
106 | { | ||
107 | switch (frameworkVersion) | ||
108 | { | ||
109 | case FrameworkVersion.v4_6_1: | ||
110 | case FrameworkVersion.v4_6: | ||
111 | return "ToolsVersion=\"14.0\""; | ||
112 | case FrameworkVersion.v4_5: | ||
113 | return "ToolsVersion=\"12.0\""; | ||
114 | case FrameworkVersion.v4_0: | ||
115 | case FrameworkVersion.v3_5: | ||
116 | return "ToolsVersion=\"4.0\""; | ||
117 | case FrameworkVersion.v3_0: | ||
118 | return "ToolsVersion=\"3.0\""; | ||
119 | default: | ||
120 | return "ToolsVersion=\"2.0\""; | ||
121 | } | ||
122 | } | ||
123 | |||
124 | public override string SolutionTag | ||
125 | { | ||
126 | get { return "# Visual Studio 14"; } | ||
127 | } | ||
128 | |||
129 | #endregion | ||
130 | |||
131 | #region Constructors | ||
132 | |||
133 | /// <summary> | ||
134 | /// Initializes a new instance of the <see cref="VS2012Target"/> class. | ||
135 | /// </summary> | ||
136 | public VS2015Target() | ||
137 | : base() | ||
138 | { | ||
139 | } | ||
140 | |||
141 | #endregion | ||
142 | } | ||
143 | } \ No newline at end of file | ||