aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenGridServices/OpenGridServices.GridServer
diff options
context:
space:
mode:
authorMW2007-05-24 13:08:36 +0000
committerMW2007-05-24 13:08:36 +0000
commitf1af78d6844e61232bd271d9e91ea9e97e5c4451 (patch)
tree1a16ac699c5dce6f642d5dbd03aeb41a77ed48b1 /OpenGridServices/OpenGridServices.GridServer
parentStage 1 of repairing the build files, those ofr the OpenSim regionserver shou... (diff)
downloadopensim-SC_OLD-f1af78d6844e61232bd271d9e91ea9e97e5c4451.zip
opensim-SC_OLD-f1af78d6844e61232bd271d9e91ea9e97e5c4451.tar.gz
opensim-SC_OLD-f1af78d6844e61232bd271d9e91ea9e97e5c4451.tar.bz2
opensim-SC_OLD-f1af78d6844e61232bd271d9e91ea9e97e5c4451.tar.xz
Stage 2: GridServices build files should be fixed now, Someone will need to test it under nant, and the releng scripts might need updating as we now have two solutions.
Also the build order for the two solutions should be to compile the OpenSim Solution first and then the GridServices one, as the common projects are referenced by DLL in the Gridservices.
Diffstat (limited to '')
-rw-r--r--OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj48
-rw-r--r--OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build22
2 files changed, 31 insertions, 39 deletions
diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
index 5f3fc6f..b83c6ba 100644
--- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
+++ b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
@@ -32,7 +32,7 @@
32 <DebugSymbols>True</DebugSymbols> 32 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment> 33 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize> 34 <Optimize>False</Optimize>
35 <OutputPath>..\bin\</OutputPath> 35 <OutputPath>..\..\bin\</OutputPath>
36 <RegisterForComInterop>False</RegisterForComInterop> 36 <RegisterForComInterop>False</RegisterForComInterop>
37 <RemoveIntegerChecks>False</RemoveIntegerChecks> 37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
50 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
53 <OutputPath>..\bin\</OutputPath> 53 <OutputPath>..\..\bin\</OutputPath>
54 <RegisterForComInterop>False</RegisterForComInterop> 54 <RegisterForComInterop>False</RegisterForComInterop>
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -70,34 +70,32 @@
70 <HintPath>System.Xml.dll</HintPath> 70 <HintPath>System.Xml.dll</HintPath>
71 <Private>False</Private> 71 <Private>False</Private>
72 </Reference> 72 </Reference>
73 <Reference Include="OpenSim.Framework" >
74 <HintPath>OpenSim.Framework.dll</HintPath>
75 <Private>False</Private>
76 </Reference>
77 <Reference Include="OpenSim.Framework.Console" >
78 <HintPath>OpenSim.Framework.Console.dll</HintPath>
79 <Private>False</Private>
80 </Reference>
81 <Reference Include="OpenSim.Servers" >
82 <HintPath>OpenSim.Servers.dll</HintPath>
83 <Private>False</Private>
84 </Reference>
73 <Reference Include="libsecondlife.dll" > 85 <Reference Include="libsecondlife.dll" >
74 <HintPath>..\bin\libsecondlife.dll</HintPath> 86 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
75 <Private>False</Private> 87 <Private>False</Private>
76 </Reference> 88 </Reference>
77 <Reference Include="Db4objects.Db4o.dll" > 89 <Reference Include="Db4objects.Db4o.dll" >
78 <HintPath>..\bin\Db4objects.Db4o.dll</HintPath> 90 <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
91 <Private>False</Private>
92 </Reference>
93 <Reference Include="XMLRPC" >
94 <HintPath>XMLRPC.dll</HintPath>
79 <Private>False</Private> 95 <Private>False</Private>
80 </Reference> 96 </Reference>
81 </ItemGroup> 97 </ItemGroup>
82 <ItemGroup> 98 <ItemGroup>
83 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
84 <Name>OpenSim.Framework</Name>
85 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
87 <Private>False</Private>
88 </ProjectReference>
89 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
90 <Name>OpenSim.Framework.Console</Name>
91 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
93 <Private>False</Private>
94 </ProjectReference>
95 <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj">
96 <Name>OpenSim.Servers</Name>
97 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
98 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
99 <Private>False</Private>
100 </ProjectReference>
101 <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj"> 99 <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
102 <Name>OpenGrid.Framework.Data</Name> 100 <Name>OpenGrid.Framework.Data</Name>
103 <Project>{62CDF671-0000-0000-0000-000000000000}</Project> 101 <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
@@ -110,12 +108,6 @@
110 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 108 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
111 <Private>False</Private> 109 <Private>False</Private>
112 </ProjectReference> 110 </ProjectReference>
113 <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
114 <Name>XMLRPC</Name>
115 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
116 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
117 <Private>False</Private>
118 </ProjectReference>
119 </ItemGroup> 111 </ItemGroup>
120 <ItemGroup> 112 <ItemGroup>
121 <Compile Include="GridManager.cs"> 113 <Compile Include="GridManager.cs">
diff --git a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
index 9ca4d4b..d61c0f3 100644
--- a/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
+++ b/OpenGridServices/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
@@ -23,19 +23,19 @@
23 <include name="System.dll" /> 23 <include name="System.dll" />
24 <include name="System.Data.dll" /> 24 <include name="System.Data.dll" />
25 <include name="System.Xml.dll" /> 25 <include name="System.Xml.dll" />
26 <include name="../bin/OpenSim.Framework.dll" /> 26 <include name="../../bin/OpenSim.Framework.dll" />
27 <include name="../bin/OpenSim.Framework.Console.dll" /> 27 <include name="../../bin/OpenSim.Framework.Console.dll" />
28 <include name="../bin/OpenSim.Servers.dll" /> 28 <include name="../../bin/OpenSim.Servers.dll" />
29 <include name="../bin/OpenGrid.Framework.Data.dll" /> 29 <include name="../../bin/OpenGrid.Framework.Data.dll" />
30 <include name="../bin/OpenGrid.Framework.Manager.dll" /> 30 <include name="../../bin/OpenGrid.Framework.Manager.dll" />
31 <include name="../bin/libsecondlife.dll" /> 31 <include name="../../bin/libsecondlife.dll" />
32 <include name="../bin/Db4objects.Db4o.dll" /> 32 <include name="../../bin/Db4objects.Db4o.dll" />
33 <include name="../bin/XMLRPC.dll" /> 33 <include name="../../bin/XMLRPC.dll" />
34 </references> 34 </references>
35 </csc> 35 </csc>
36 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 36 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
37 <mkdir dir="${project::get-base-directory()}/../bin/"/> 37 <mkdir dir="${project::get-base-directory()}/../../bin/"/>
38 <copy todir="${project::get-base-directory()}/../bin/"> 38 <copy todir="${project::get-base-directory()}/../../bin/">
39 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 39 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
40 <include name="*.dll"/> 40 <include name="*.dll"/>
41 <include name="*.exe"/> 41 <include name="*.exe"/>
generated by cgit v1.1 at 2024-11-19 22:56:36 +0000