diff options
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 'OpenGridServices/OpenGrid.Framework.Manager')
| -rw-r--r-- | OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj | 36 | ||||
| -rw-r--r-- | OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build | 14 |
2 files changed, 22 insertions, 28 deletions
diff --git a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj index 3122633..ea7548a 100644 --- a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.csproj +++ b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.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> |
| @@ -62,30 +62,24 @@ | |||
| 62 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
| 63 | <Private>False</Private> | 63 | <Private>False</Private> |
| 64 | </Reference> | 64 | </Reference> |
| 65 | <Reference Include="OpenSim.Framework" > | ||
| 66 | <HintPath>OpenSim.Framework.dll</HintPath> | ||
| 67 | <Private>False</Private> | ||
| 68 | </Reference> | ||
| 69 | <Reference Include="OpenSim.Servers" > | ||
| 70 | <HintPath>OpenSim.Servers.dll</HintPath> | ||
| 71 | <Private>False</Private> | ||
| 72 | </Reference> | ||
| 65 | <Reference Include="libsecondlife.dll" > | 73 | <Reference Include="libsecondlife.dll" > |
| 66 | <HintPath>..\bin\libsecondlife.dll</HintPath> | 74 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> |
| 75 | <Private>False</Private> | ||
| 76 | </Reference> | ||
| 77 | <Reference Include="XMLRPC" > | ||
| 78 | <HintPath>XMLRPC.dll</HintPath> | ||
| 67 | <Private>False</Private> | 79 | <Private>False</Private> |
| 68 | </Reference> | 80 | </Reference> |
| 69 | </ItemGroup> | 81 | </ItemGroup> |
| 70 | <ItemGroup> | 82 | <ItemGroup> |
| 71 | <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> | ||
| 72 | <Name>OpenSim.Framework</Name> | ||
| 73 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | ||
| 74 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
| 75 | <Private>False</Private> | ||
| 76 | </ProjectReference> | ||
| 77 | <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj"> | ||
| 78 | <Name>OpenSim.Servers</Name> | ||
| 79 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> | ||
| 80 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
| 81 | <Private>False</Private> | ||
| 82 | </ProjectReference> | ||
| 83 | <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj"> | ||
| 84 | <Name>XMLRPC</Name> | ||
| 85 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> | ||
| 86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
| 87 | <Private>False</Private> | ||
| 88 | </ProjectReference> | ||
| 89 | </ItemGroup> | 83 | </ItemGroup> |
| 90 | <ItemGroup> | 84 | <ItemGroup> |
| 91 | <Compile Include="GridManagementAgent.cs"> | 85 | <Compile Include="GridManagementAgent.cs"> |
diff --git a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build index daee3bf..f8cc80e 100644 --- a/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build | |||
| @@ -20,15 +20,15 @@ | |||
| 20 | <include name="${project::get-base-directory()}/${build.dir}" /> | 20 | <include name="${project::get-base-directory()}/${build.dir}" /> |
| 21 | </lib> | 21 | </lib> |
| 22 | <include name="System.dll" /> | 22 | <include name="System.dll" /> |
| 23 | <include name="../bin/OpenSim.Framework.dll" /> | 23 | <include name="../../bin/OpenSim.Framework.dll" /> |
| 24 | <include name="../bin/OpenSim.Servers.dll" /> | 24 | <include name="../../bin/OpenSim.Servers.dll" /> |
| 25 | <include name="../bin/libsecondlife.dll" /> | 25 | <include name="../../bin/libsecondlife.dll" /> |
| 26 | <include name="../bin/XMLRPC.dll" /> | 26 | <include name="../../bin/XMLRPC.dll" /> |
| 27 | </references> | 27 | </references> |
| 28 | </csc> | 28 | </csc> |
| 29 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 29 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> |
| 30 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 30 | <mkdir dir="${project::get-base-directory()}/../../bin/"/> |
| 31 | <copy todir="${project::get-base-directory()}/../bin/"> | 31 | <copy todir="${project::get-base-directory()}/../../bin/"> |
| 32 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 32 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
| 33 | <include name="*.dll"/> | 33 | <include name="*.dll"/> |
| 34 | <include name="*.exe"/> | 34 | <include name="*.exe"/> |