* vaseline + duct-tape.

author: lbsa71 2007-03-27 20:19:35 +0000
committer: lbsa71 2007-03-27 20:19:35 +0000
commit: 81f01a12960a5004cde8321794c002e1ad9522b3 (patch)
tree: a601a55dcb31a80597483c43e65eea06d7330c49 /Prebuild
parent: * Added OpenSim.Framework ref to phys mgr (diff)
download: opensim-SC-81f01a12960a5004cde8321794c002e1ad9522b3.zip
opensim-SC-81f01a12960a5004cde8321794c002e1ad9522b3.tar.gz
opensim-SC-81f01a12960a5004cde8321794c002e1ad9522b3.tar.bz2
opensim-SC-81f01a12960a5004cde8321794c002e1ad9522b3.tar.xz
3 files changed, 36 insertions, 34 deletions
diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln
index b36ed1e..0f35f18 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", "{6A56621D-A328-4E23-96E3-0514A3817BAF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}"
 EndProject
 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
-                {6A56621D-A328-4E23-96E3-0514A3817BAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {6A56621D-A328-4E23-96E3-0514A3817BAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {6A56621D-A328-4E23-96E3-0514A3817BAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {6A56621D-A328-4E23-96E3-0514A3817BAF}.Release|Any CPU.Build.0 = Release|Any CPU
+    {90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Release|Any CPU.Build.0 = Release|Any CPU
-        EndGlobalSection
+  EndGlobalSection
-        GlobalSection(SolutionProperties) = preSolution
+  GlobalSection(SolutionProperties) = preSolution
-                HideSolutionNode = FALSE
+    HideSolutionNode = FALSE
-        EndGlobalSection
+  EndGlobalSection
 EndGlobal
diff --git a/Prebuild/src/Core/Targets/NAntTarget.cs b/Prebuild/src/Core/Targets/NAntTarget.cs
index 242bb9c..0f0deb2 100644
--- a/Prebuild/src/Core/Targets/NAntTarget.cs
+++ b/Prebuild/src/Core/Targets/NAntTarget.cs
@@ -77,14 +77,14 @@ namespace Prebuild.Core.Targets
                        return tmpPath;
                }
-                private static string BuildReference(SolutionNode solution, ReferenceNode refr)
+                private static string BuildReference(SolutionNode solution, ProjectNode currentProject, ReferenceNode refr)
                {
                        string ret = "";
                        if(solution.ProjectsTable.ContainsKey(refr.Name))
                        {
-                                ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];                           
+                                ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];
-                                
-                                string finalPath = Helper.NormalizePath( ((ReferencePathNode) project.ReferencePaths[0]).Path + refr.Name + ".dll", '/');
+                string finalPath = Helper.NormalizePath(((ReferencePathNode)currentProject.ReferencePaths[0]).Path + refr.Name + ".dll", '/');
                                
                                return finalPath;
                        }
@@ -126,12 +126,11 @@ namespace Prebuild.Core.Targets
                        string ret = "";
                        if(solution.ProjectsTable.ContainsKey(refr.Name))
                        {
-                                ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];                           
+                                ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];
-                                string fileRef = FindFileReference(refr.Name, project);
+                string finalPath = Helper.NormalizePath(((ReferencePathNode)project.ReferencePaths[0]).Path, '/');
-                                string finalPath = Helper.NormalizePath(Helper.MakeReferencePath(project.FullPath + "/${build.dir}/"), '/');
-                                ret += finalPath;
+                return finalPath;
-                                return ret;
+            }
-                        }
                        else
                        {
                                ProjectNode project = (ProjectNode)refr.Parent;
@@ -226,7 +225,7 @@ namespace Prebuild.Core.Targets
                                {
                                        if (refr.LocalCopy)
                                        {
-                                                ss.WriteLine("                <include name=\"{0}", Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, refr))+"\" />", '/'));
+                                                ss.WriteLine("                <include name=\"{0}", Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, project, refr))+"\" />", '/'));
                                        }
                                }
                                ss.WriteLine("            </fileset>");
@@ -316,7 +315,7 @@ namespace Prebuild.Core.Targets
                                ss.WriteLine("                </lib>");
                                foreach(ReferenceNode refr in project.References)
                                {
-                                    string path = Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, refr)), '/');
+                                    string path = Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, project, refr)), '/');
                                        ss.WriteLine("                <include name=\""+ path + "\" />" );
                                }
                                ss.WriteLine("            </references>");
diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
index c1ab9b2..3727947 100644
--- a/Prebuild/src/Prebuild.csproj
+++ b/Prebuild/src/Prebuild.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
@@ -17,7 +17,8 @@
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Exe</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
+    <AppDesignerFolder>
+    </AppDesignerFolder>
    <RootNamespace>Prebuild</RootNamespace>
    <StartupObject>Prebuild.Prebuild</StartupObject>
    <FileUpgradeFlags>
@@ -30,7 +31,8 @@
    <ConfigurationOverrideFile>
    </ConfigurationOverrideFile>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
@@ -48,7 +50,8 @@
    <ConfigurationOverrideFile>
    </ConfigurationOverrideFile>
    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
@@ -60,15 +63,15 @@
    <NoWarn>1595</NoWarn>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="System.EnterpriseServices" >
+    <Reference Include="System.EnterpriseServices">
      <HintPath>System.EnterpriseServices.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="System.Xml" >
+    <Reference Include="System.Xml">
      <HintPath>System.Xml.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="System" >
+    <Reference Include="System">
      <HintPath>System.dll</HintPath>
      <Private>False</Private>
    </Reference>
@@ -202,4 +205,4 @@
    <PostBuildEvent>
    </PostBuildEvent>
  </PropertyGroup>
-</Project>
+</Project>
+\ No newline at end of file
author	lbsa71	2007-03-27 20:19:35 +0000
committer	lbsa71	2007-03-27 20:19:35 +0000
commit	81f01a12960a5004cde8321794c002e1ad9522b3 (patch)
tree	a601a55dcb31a80597483c43e65eea06d7330c49 /Prebuild
parent	* Added OpenSim.Framework ref to phys mgr (diff)
download	opensim-SC-81f01a12960a5004cde8321794c002e1ad9522b3.zip opensim-SC-81f01a12960a5004cde8321794c002e1ad9522b3.tar.gz opensim-SC-81f01a12960a5004cde8321794c002e1ad9522b3.tar.bz2 opensim-SC-81f01a12960a5004cde8321794c002e1ad9522b3.tar.xz

diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln index b36ed1e..0f35f18 100644 --- a/Prebuild/Prebuild.sln +++ b/Prebuild/Prebuild.sln
@@ -1,19 +1,19 @@
1	Microsoft Visual Studio Solution File, Format Version 9.00	1	Microsoft Visual Studio Solution File, Format Version 9.00
2	# Visual Studio 2005	2	# Visual Studio 2005
3	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{6A56621D-A328-4E23-96E3-0514A3817BAF}"	3	Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}"
4	EndProject	4	EndProject
5	Global	5	Global
6	GlobalSection(SolutionConfigurationPlatforms) = preSolution	6	GlobalSection(SolutionConfigurationPlatforms) = preSolution
7	Debug\|Any CPU = Debug\|Any CPU	7	Debug\|Any CPU = Debug\|Any CPU
8	Release\|Any CPU = Release\|Any CPU	8	Release\|Any CPU = Release\|Any CPU
9	EndGlobalSection	9	EndGlobalSection
10	GlobalSection(ProjectConfigurationPlatforms) = postSolution	10	GlobalSection(ProjectConfigurationPlatforms) = postSolution
11	{6A56621D-A328-4E23-96E3-0514A3817BAF}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU	11	{90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Debug\|Any CPU.ActiveCfg = Debug\|Any CPU
12	{6A56621D-A328-4E23-96E3-0514A3817BAF}.Debug\|Any CPU.Build.0 = Debug\|Any CPU	12	{90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Debug\|Any CPU.Build.0 = Debug\|Any CPU
13	{6A56621D-A328-4E23-96E3-0514A3817BAF}.Release\|Any CPU.ActiveCfg = Release\|Any CPU	13	{90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Release\|Any CPU.ActiveCfg = Release\|Any CPU
14	{6A56621D-A328-4E23-96E3-0514A3817BAF}.Release\|Any CPU.Build.0 = Release\|Any CPU	14	{90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Release\|Any CPU.Build.0 = Release\|Any CPU
15	EndGlobalSection	15	EndGlobalSection
16	GlobalSection(SolutionProperties) = preSolution	16	GlobalSection(SolutionProperties) = preSolution
17	HideSolutionNode = FALSE	17	HideSolutionNode = FALSE
18	EndGlobalSection	18	EndGlobalSection
19	EndGlobal	19	EndGlobal


diff --git a/Prebuild/src/Core/Targets/NAntTarget.cs b/Prebuild/src/Core/Targets/NAntTarget.cs index 242bb9c..0f0deb2 100644 --- a/Prebuild/src/Core/Targets/NAntTarget.cs +++ b/Prebuild/src/Core/Targets/NAntTarget.cs
@@ -77,14 +77,14 @@ namespace Prebuild.Core.Targets
77	return tmpPath;	77	return tmpPath;
78	}	78	}
79		79
80	private static string BuildReference(SolutionNode solution, ReferenceNode refr)	80	private static string BuildReference(SolutionNode solution, ProjectNode currentProject, ReferenceNode refr)
81	{	81	{
82	string ret = "";	82	string ret = "";
83	if(solution.ProjectsTable.ContainsKey(refr.Name))	83	if(solution.ProjectsTable.ContainsKey(refr.Name))
84	{	84	{
85	ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];	85	ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];
86		86
87	string finalPath = Helper.NormalizePath( ((ReferencePathNode) project.ReferencePaths[0]).Path + refr.Name + ".dll", '/');	87	string finalPath = Helper.NormalizePath(((ReferencePathNode)currentProject.ReferencePaths[0]).Path + refr.Name + ".dll", '/');
88		88
89	return finalPath;	89	return finalPath;
90	}	90	}
@@ -126,12 +126,11 @@ namespace Prebuild.Core.Targets
126	string ret = "";	126	string ret = "";
127	if(solution.ProjectsTable.ContainsKey(refr.Name))	127	if(solution.ProjectsTable.ContainsKey(refr.Name))
128	{	128	{
129	ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];	129	ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name];
130	string fileRef = FindFileReference(refr.Name, project);	130	string finalPath = Helper.NormalizePath(((ReferencePathNode)project.ReferencePaths[0]).Path, '/');
131	string finalPath = Helper.NormalizePath(Helper.MakeReferencePath(project.FullPath + "/${build.dir}/"), '/');	131
132	ret += finalPath;	132	return finalPath;
133	return ret;	133	}
134	}
135	else	134	else
136	{	135	{
137	ProjectNode project = (ProjectNode)refr.Parent;	136	ProjectNode project = (ProjectNode)refr.Parent;
@@ -226,7 +225,7 @@ namespace Prebuild.Core.Targets
226	{	225	{
227	if (refr.LocalCopy)	226	if (refr.LocalCopy)
228	{	227	{
229	ss.WriteLine(" <include name=\"{0}", Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, refr))+"\" />", '/'));	228	ss.WriteLine(" <include name=\"{0}", Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, project, refr))+"\" />", '/'));
230	}	229	}
231	}	230	}
232	ss.WriteLine(" </fileset>");	231	ss.WriteLine(" </fileset>");
@@ -316,7 +315,7 @@ namespace Prebuild.Core.Targets
316	ss.WriteLine(" </lib>");	315	ss.WriteLine(" </lib>");
317	foreach(ReferenceNode refr in project.References)	316	foreach(ReferenceNode refr in project.References)
318	{	317	{
319	string path = Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, refr)), '/');	318	string path = Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, project, refr)), '/');
320	ss.WriteLine(" <include name=\""+ path + "\" />" );	319	ss.WriteLine(" <include name=\""+ path + "\" />" );
321	}	320	}
322	ss.WriteLine(" </references>");	321	ss.WriteLine(" </references>");


diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj index c1ab9b2..3727947 100644 --- a/Prebuild/src/Prebuild.csproj +++ b/Prebuild/src/Prebuild.csproj
@@ -1,4 +1,4 @@
1	<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">	1	<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2	<PropertyGroup>	2	<PropertyGroup>
3	<ProjectType>Local</ProjectType>	3	<ProjectType>Local</ProjectType>
4	<ProductVersion>8.0.50727</ProductVersion>	4	<ProductVersion>8.0.50727</ProductVersion>
@@ -17,7 +17,8 @@
17	<DefaultTargetSchema>IE50</DefaultTargetSchema>	17	<DefaultTargetSchema>IE50</DefaultTargetSchema>
18	<DelaySign>false</DelaySign>	18	<DelaySign>false</DelaySign>
19	<OutputType>Exe</OutputType>	19	<OutputType>Exe</OutputType>
20	<AppDesignerFolder></AppDesignerFolder>	20	<AppDesignerFolder>
		21	</AppDesignerFolder>
21	<RootNamespace>Prebuild</RootNamespace>	22	<RootNamespace>Prebuild</RootNamespace>
22	<StartupObject>Prebuild.Prebuild</StartupObject>	23	<StartupObject>Prebuild.Prebuild</StartupObject>
23	<FileUpgradeFlags>	24	<FileUpgradeFlags>
@@ -30,7 +31,8 @@
30	<ConfigurationOverrideFile>	31	<ConfigurationOverrideFile>
31	</ConfigurationOverrideFile>	32	</ConfigurationOverrideFile>
32	<DefineConstants>DEBUG;TRACE</DefineConstants>	33	<DefineConstants>DEBUG;TRACE</DefineConstants>
33	<DocumentationFile></DocumentationFile>	34	<DocumentationFile>
		35	</DocumentationFile>
34	<DebugSymbols>True</DebugSymbols>	36	<DebugSymbols>True</DebugSymbols>
35	<FileAlignment>4096</FileAlignment>	37	<FileAlignment>4096</FileAlignment>
36	<Optimize>False</Optimize>	38	<Optimize>False</Optimize>
@@ -48,7 +50,8 @@
48	<ConfigurationOverrideFile>	50	<ConfigurationOverrideFile>
49	</ConfigurationOverrideFile>	51	</ConfigurationOverrideFile>
50	<DefineConstants>TRACE</DefineConstants>	52	<DefineConstants>TRACE</DefineConstants>
51	<DocumentationFile></DocumentationFile>	53	<DocumentationFile>
		54	</DocumentationFile>
52	<DebugSymbols>False</DebugSymbols>	55	<DebugSymbols>False</DebugSymbols>
53	<FileAlignment>4096</FileAlignment>	56	<FileAlignment>4096</FileAlignment>
54	<Optimize>True</Optimize>	57	<Optimize>True</Optimize>
@@ -60,15 +63,15 @@
60	<NoWarn>1595</NoWarn>	63	<NoWarn>1595</NoWarn>
61	</PropertyGroup>	64	</PropertyGroup>
62	<ItemGroup>	65	<ItemGroup>
63	<Reference Include="System.EnterpriseServices" >	66	<Reference Include="System.EnterpriseServices">
64	<HintPath>System.EnterpriseServices.dll</HintPath>	67	<HintPath>System.EnterpriseServices.dll</HintPath>
65	<Private>False</Private>	68	<Private>False</Private>
66	</Reference>	69	</Reference>
67	<Reference Include="System.Xml" >	70	<Reference Include="System.Xml">
68	<HintPath>System.Xml.dll</HintPath>	71	<HintPath>System.Xml.dll</HintPath>
69	<Private>False</Private>	72	<Private>False</Private>
70	</Reference>	73	</Reference>
71	<Reference Include="System" >	74	<Reference Include="System">
72	<HintPath>System.dll</HintPath>	75	<HintPath>System.dll</HintPath>
73	<Private>False</Private>	76	<Private>False</Private>
74	</Reference>	77	</Reference>
@@ -202,4 +205,4 @@
202	<PostBuildEvent>	205	<PostBuildEvent>
203	</PostBuildEvent>	206	</PostBuildEvent>
204	</PropertyGroup>	207	</PropertyGroup>
205	</Project>	208	</Project> \ No newline at end of file