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. 

2 files changed, 20 insertions, 24 deletions

diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj
index 8c4fd39..722b8d4 100644
--- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj
+++ b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj
@@ -32,7 +32,7 @@
     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

-    <OutputPath>..\..\bin\</OutputPath>

+    <OutputPath>..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

@@ -50,7 +50,7 @@
     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

-    <OutputPath>..\..\bin\</OutputPath>

+    <OutputPath>..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

@@ -63,7 +63,7 @@
       <Private>False</Private>

     </Reference>

     <Reference Include="System.Data.dll" >

-      <HintPath>..\..\bin\System.Data.dll</HintPath>

+      <HintPath>..\..\..\bin\System.Data.dll</HintPath>

       <Private>False</Private>

     </Reference>

     <Reference Include="System.Xml" >

@@ -71,27 +71,23 @@
       <Private>False</Private>

     </Reference>

     <Reference Include="libsecondlife.dll" >

-      <HintPath>..\..\bin\libsecondlife.dll</HintPath>

+      <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

     <Reference Include="Db4objects.Db4o.dll" >

-      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>

+      <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="OpenSim.Framework" >

+      <HintPath>OpenSim.Framework.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="OpenSim.Framework.Console" >

+      <HintPath>OpenSim.Framework.Console.dll</HintPath>

       <Private>False</Private>

     </Reference>

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">

-      <Name>OpenSim.Framework</Name>

-      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>

-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

-    </ProjectReference>

-    <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">

-      <Name>OpenSim.Framework.Console</Name>

-      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>

-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

-    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Compile Include="AssemblyInfo.cs">

diff --git a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
index 8494a0b..2833bce 100644
--- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
+++ b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
@@ -22,15 +22,15 @@
                 <include name="System.dll" />

                 <include name="System.Data.dll.dll" />

                 <include name="System.Xml.dll" />

-                <include name="../../bin/libsecondlife.dll" />

-                <include name="../../bin/Db4objects.Db4o.dll" />

-                <include name="../../bin/OpenSim.Framework.dll" />

-                <include name="../../bin/OpenSim.Framework.Console.dll" />

+                <include name="../../../bin/libsecondlife.dll" />

+                <include name="../../../bin/Db4objects.Db4o.dll" />

+                <include name="../../../bin/OpenSim.Framework.dll" />

+                <include name="../../../bin/OpenSim.Framework.Console.dll" />

             </references>

         </csc>

-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />

-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>

-        <copy todir="${project::get-base-directory()}/../../bin/">

+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />

+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>

+        <copy todir="${project::get-base-directory()}/../../../bin/">

             <fileset basedir="${project::get-base-directory()}/${build.dir}/" >

                 <include name="*.dll"/>

                 <include name="*.exe"/>