Skip to content

Commit

Permalink
Switch to .NET 4.0 (requires Mono 2.10 or newer
Browse files Browse the repository at this point in the history
  • Loading branch information
@lkalif
lkalif committed Jul 24, 2015
1 parent 9dadf65 commit 29c1a37
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 99 deletions.
58 changes: 28 additions & 30 deletions prebuild.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

<!-- External Libraries -->

<Project name="CSJ2K" path="CSJ2K" type="Library" frameworkVersion="v3_5">
<Project name="CSJ2K" path="CSJ2K" type="Library" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../bin/</OutputPath>
Expand All @@ -56,7 +56,7 @@

<!-- Libraries -->

<Project name="OpenMetaverseTypes" path="OpenMetaverseTypes" type="Library" rootNamespace="OpenMetaverse" frameworkVersion="v3_5">
<Project name="OpenMetaverseTypes" path="OpenMetaverseTypes" type="Library" rootNamespace="OpenMetaverse" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../bin/</OutputPath>
Expand All @@ -77,7 +77,7 @@
</Files>
</Project>

<Project name="OpenMetaverse.StructuredData" path="OpenMetaverse.StructuredData" type="Library" rootNamespace="OpenMetaverse.StructuredData" frameworkVersion="v3_5">
<Project name="OpenMetaverse.StructuredData" path="OpenMetaverse.StructuredData" type="Library" rootNamespace="OpenMetaverse.StructuredData" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../bin/</OutputPath>
Expand All @@ -99,7 +99,7 @@
</Files>
</Project>

<Project name="OpenMetaverse" path="OpenMetaverse" type="Library" rootNamespace="OpenMetaverse" frameworkVersion="v3_5">
<Project name="OpenMetaverse" path="OpenMetaverse" type="Library" rootNamespace="OpenMetaverse" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../bin/</OutputPath>
Expand Down Expand Up @@ -129,7 +129,7 @@
</Files>
</Project>

<Project name="OpenMetaverse.Utilities" path="OpenMetaverse.Utilities" type="Library" frameworkVersion="v3_5">
<Project name="OpenMetaverse.Utilities" path="OpenMetaverse.Utilities" type="Library" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../bin/</OutputPath>
Expand All @@ -154,7 +154,7 @@
</Files>
</Project>

<Project name="OpenMetaverse.Tests" path="OpenMetaverse.Tests" type="Library" frameworkVersion="v3_5">
<Project name="OpenMetaverse.Tests" path="OpenMetaverse.Tests" type="Library" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../bin/</OutputPath>
Expand All @@ -179,7 +179,7 @@
</Files>
</Project>

<Project name="GridProxy" path="Programs/GridProxy" type="Library" frameworkVersion="v3_5">
<Project name="GridProxy" path="Programs/GridProxy" type="Library" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../../bin/</OutputPath>
Expand Down Expand Up @@ -207,7 +207,7 @@
</Files>
</Project>

<Project name="OpenMetaverse.Rendering.Simple" path="OpenMetaverse.Rendering.Simple" type="Library" frameworkVersion="v3_5">
<Project name="OpenMetaverse.Rendering.Simple" path="OpenMetaverse.Rendering.Simple" type="Library" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../bin/</OutputPath>
Expand All @@ -229,7 +229,7 @@
</Files>
</Project>

<Project name="OpenMetaverse.Rendering.Meshmerizer" path="OpenMetaverse.Rendering.Meshmerizer" type="Library" frameworkVersion="v3_5">
<Project name="OpenMetaverse.Rendering.Meshmerizer" path="OpenMetaverse.Rendering.Meshmerizer" type="Library" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../bin/</OutputPath>
Expand All @@ -252,7 +252,7 @@
</Files>
</Project>

<Project name="OpenMetaverse.GUI" path="OpenMetaverse.GUI" type="Library" frameworkVersion="v3_5">
<Project name="OpenMetaverse.GUI" path="OpenMetaverse.GUI" type="Library" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../bin/</OutputPath>
Expand All @@ -279,7 +279,7 @@

<!-- Programs -->

<Project name="AvatarPreview" path="Programs/AvatarPreview" type="WinExe" frameworkVersion="v3_5">
<Project name="AvatarPreview" path="Programs/AvatarPreview" type="WinExe" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../../bin/</OutputPath>
Expand Down Expand Up @@ -310,7 +310,7 @@
</Files>
</Project>

<Project name="Baker" path="Programs/Baker" type="WinExe" frameworkVersion="v3_5">
<Project name="Baker" path="Programs/Baker" type="WinExe" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../../bin/</OutputPath>
Expand Down Expand Up @@ -338,7 +338,7 @@
</Files>
</Project>

<Project name="importprimscript" path="Programs/importprimscript" type="Exe" frameworkVersion="v3_5">
<Project name="importprimscript" path="Programs/importprimscript" type="Exe" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../../bin/</OutputPath>
Expand All @@ -361,7 +361,7 @@
</Files>
</Project>

<Project name="mapgenerator" path="Programs/mapgenerator" type="Exe" frameworkVersion="v3_5">
<Project name="mapgenerator" path="Programs/mapgenerator" type="Exe" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../../bin/</OutputPath>
Expand All @@ -382,7 +382,7 @@
</Files>
</Project>

<Project name="IRCGateway" path="Programs/examples/IRCGateway" type="Exe" frameworkVersion="v3_5">
<Project name="IRCGateway" path="Programs/examples/IRCGateway" type="Exe" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
Expand All @@ -403,7 +403,7 @@
</Files>
</Project>

<Project name="Dashboard" path="Programs/examples/Dashboard" type="WinExe" frameworkVersion="v3_5">
<Project name="Dashboard" path="Programs/examples/Dashboard" type="WinExe" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
Expand Down Expand Up @@ -433,7 +433,7 @@

<!-- // Sorry for the cruft, this is an in progress plugin for WGP that
// will show a simulators objects in a tree view - Coming soon!
<Project name="ObjectTreeBrowser" path="Programs/examples/ObjectTreeBrowser" type="WinExe" frameworkVersion="v3_5">
<Project name="ObjectTreeBrowser" path="Programs/examples/ObjectTreeBrowser" type="WinExe" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
Expand All @@ -460,7 +460,7 @@
</Files>
</Project>
-->
<Project name="PrimWorkshop" path="Programs/PrimWorkshop" type="WinExe" frameworkVersion="v3_5">
<Project name="PrimWorkshop" path="Programs/PrimWorkshop" type="WinExe" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../../bin/</OutputPath>
Expand Down Expand Up @@ -494,7 +494,7 @@
</Files>
</Project>

<Project name="GridImageUpload" path="Programs/GridImageUpload" type="WinExe" frameworkVersion="v3_5">
<Project name="GridImageUpload" path="Programs/GridImageUpload" type="WinExe" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../../bin/</OutputPath>
Expand Down Expand Up @@ -522,7 +522,7 @@
</Files>
</Project>

<Project name="GridProxyApp" path="Programs/GridProxy" type="Exe" frameworkVersion="v3_5">
<Project name="GridProxyApp" path="Programs/GridProxy" type="Exe" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../../bin/</OutputPath>
Expand All @@ -546,7 +546,7 @@
</Project>


<Project name="WinGridProxy" path="Programs/WinGridProxy" type="WinExe" frameworkVersion="v3_5">
<Project name="WinGridProxy" path="Programs/WinGridProxy" type="WinExe" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../../bin/</OutputPath>
Expand Down Expand Up @@ -580,7 +580,6 @@
</Files>
</Project>

<!-- GridProxyGUI, requires Gtk-sharp, uncomment block to enable and re-run runprebuil
<Project name="GridProxyGUI" path="Programs/GridProxyGUI" icon="libomv.ico" type="WinExe" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
Expand Down Expand Up @@ -621,9 +620,8 @@
<Match pattern="*.ico" recurse="true"/>
</Files>
</Project>
-->

<Project name="VisualParamGenerator" path="Programs/VisualParamGenerator" type="Exe" frameworkVersion="v3_5">
<Project name="VisualParamGenerator" path="Programs/VisualParamGenerator" type="Exe" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../../bin/</OutputPath>
Expand All @@ -646,7 +644,7 @@
</Files>
</Project>

<Project name="VoiceTest" path="Programs/VoiceTest" type="Exe" frameworkVersion="v3_5">
<Project name="VoiceTest" path="Programs/VoiceTest" type="Exe" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../../bin/</OutputPath>
Expand All @@ -671,7 +669,7 @@

<!-- Examples -->

<Project name="groupmanager" path="Programs/examples/groupmanager" type="WinExe" frameworkVersion="v3_5">
<Project name="groupmanager" path="Programs/examples/groupmanager" type="WinExe" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
Expand Down Expand Up @@ -699,7 +697,7 @@
</Files>
</Project>

<Project name="Heightmap" path="Programs/examples/Heightmap" type="WinExe" frameworkVersion="v3_5">
<Project name="Heightmap" path="Programs/examples/Heightmap" type="WinExe" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
Expand Down Expand Up @@ -727,7 +725,7 @@
</Files>
</Project>

<Project name="GridAccountant" path="Programs/examples/GridAccountant" type="WinExe" frameworkVersion="v3_5">
<Project name="GridAccountant" path="Programs/examples/GridAccountant" type="WinExe" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
Expand Down Expand Up @@ -755,7 +753,7 @@
</Files>
</Project>

<Project name="PacketDump" path="Programs/examples/PacketDump" type="Exe" frameworkVersion="v3_5">
<Project name="PacketDump" path="Programs/examples/PacketDump" type="Exe" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
Expand All @@ -777,7 +775,7 @@
</Files>
</Project>

<Project name="TestClient" path="Programs/examples/TestClient" type="Exe" frameworkVersion="v3_5">
<Project name="TestClient" path="Programs/examples/TestClient" type="Exe" frameworkVersion="v4_0">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
Expand Down
65 changes: 0 additions & 65 deletions runprebuild2008.bat
View file

This file was deleted.

4 changes: 2 additions & 2 deletions runprebuild2010.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ bin\Prebuild.exe /target vs2010

:: build compile.bat file based on command line parameters
echo @echo off > compile.bat
if(.%1)==(.) echo C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild OpenMetaverse.sln >> compile.bat
if(.%1)==(.) echo C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\msbuild OpenMetaverse.sln >> compile.bat

if(.%1)==(.msbuild) echo echo ==== COMPILE BEGIN ==== >> compile.bat
if(.%1)==(.msbuild) echo %SystemRoot%\Microsoft.NET\Framework\v3.5\MSBuild.exe /p:Configuration=Release OpenMetaverse.sln >> compile.bat
if(.%1)==(.msbuild) echo %SystemRoot%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /p:Configuration=Release OpenMetaverse.sln >> compile.bat
if(.%1)==(.msbuild) echo IF ERRORLEVEL 1 GOTO FAIL >> compile.bat

if(.%1)==(.nant) echo nant >> compile.bat
Expand Down
4 changes: 2 additions & 2 deletions runprebuild2012.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ bin\Prebuild.exe /target vs2012

:: build compile.bat file based on command line parameters
echo @echo off > compile.bat
if(.%1)==(.) echo C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild OpenMetaverse.sln >> compile.bat
if(.%1)==(.) echo C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\msbuild OpenMetaverse.sln >> compile.bat

if(.%1)==(.msbuild) echo echo ==== COMPILE BEGIN ==== >> compile.bat
if(.%1)==(.msbuild) echo %SystemRoot%\Microsoft.NET\Framework\v3.5\MSBuild.exe /p:Configuration=Release OpenMetaverse.sln >> compile.bat
if(.%1)==(.msbuild) echo %SystemRoot%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe /p:Configuration=Release OpenMetaverse.sln >> compile.bat
if(.%1)==(.msbuild) echo IF ERRORLEVEL 1 GOTO FAIL >> compile.bat

if(.%1)==(.nant) echo nant >> compile.bat
Expand Down

0 comments on commit 29c1a37

Please sign in to comment.