Stage 1 of repairing the build files, those ofr the OpenSim regionserver should now be okay. Now onto the Grid servers...

2 files changed, 7 insertions, 7 deletions

diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
index a1e95f4..bd1a332 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
@@ -32,7 +32,7 @@
     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

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

+    <OutputPath>..\..\..\bin\ScriptEngines\</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\ScriptEngines\</OutputPath>

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

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

@@ -68,7 +68,7 @@
     </Reference>

   </ItemGroup>

   <ItemGroup>

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

+    <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">

       <Name>OpenSim.Framework</Name>

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

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

diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
index ae79c83..c5255db 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
@@ -41,12 +41,12 @@
                 </lib>

                 <include name="System.dll" />

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

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

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

             </references>

         </csc>

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

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

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

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

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

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

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

                 <include name="*.dll"/>

                 <include name="*.exe"/>