From ea9e96dd50d22e5e1003b675c4148d59df7ec989 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 8 Nov 2013 21:13:05 +0000
Subject: Update OpenSimulator to use .NET 4.0

This allows region modules to register script functions that have more than a couple of arguments.
It also allows OpenSimulator code to use the feature and syntax additions that came with .NET 4.0
Windows users will need to install Microsoft .NET 4 framework if they have not done so already.
Windows C# Express 2010 also becomes the minimum IDE for build, so runprebuild.bat now generates a 2010 solution and runprebuild2010.bat goes away
Official minimum mono version becomes 2.10.8.1.  OpenSimulator will probably work with 2.8 later but this is not guaranteed.
---
 runprebuild.bat | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'runprebuild.bat')

diff --git a/runprebuild.bat b/runprebuild.bat
index 8927e9a..0fd7bbf 100755
--- a/runprebuild.bat
+++ b/runprebuild.bat
@@ -1,4 +1,24 @@
+@echo OFF
+
 bin\Prebuild.exe /target nant
-bin\Prebuild.exe /target vs2008
-echo C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild opensim.sln > compile.bat
+bin\Prebuild.exe /target vs2010
+
+setlocal ENABLEEXTENSIONS
+set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0"
+set VALUE_NAME=MSBuildToolsPath
+
+FOR /F "usebackq skip=4 tokens=1-3" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO (
+    set ValueName=%%A
+    set ValueType=%%B
+    set ValueValue=%%C
+)
+
+if defined ValueName (
+    @echo Value Name = %ValueName%
+    @echo Value Type = %ValueType%
+    @echo Value Value = %ValueValue%
+) else (
+    @echo %KEY_NAME%\%VALUE_NAME% not found.
+)
 
+@echo %ValueValue%\msbuild opensim.sln > compile.bat
-- 
cgit v1.1


From 0f16612400ed959146362810fb21d32656c9b844 Mon Sep 17 00:00:00 2001
From: justincc
Date: Wed, 13 Nov 2013 00:00:55 +0000
Subject: Fix runprebuild.bat on Windows 7 systems and later

MS changed Windows 7 "reg query" command to spit out fewer lines in its preamble
Annoyingly there is no option to print raw values and not this preamble.
So now using the Windows find command.
But this has the side effect of stopping this working with Cygwin as it uses its own GNU find command.
Might fix in the future but not simple since Windows find itself is in different locations
---
 runprebuild.bat | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'runprebuild.bat')

diff --git a/runprebuild.bat b/runprebuild.bat
index 0fd7bbf..5f75982 100755
--- a/runprebuild.bat
+++ b/runprebuild.bat
@@ -7,18 +7,24 @@ setlocal ENABLEEXTENSIONS
 set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0"
 set VALUE_NAME=MSBuildToolsPath
 
-FOR /F "usebackq skip=4 tokens=1-3" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO (
+rem We have to use find here as req query spits out 4 lines before Windows 7
+rem But 2 lines after Windows 7.  Unfortunately, this screws up cygwin
+rem as it uses its own find command.  This could be fixed but it could be
+rem complex to find the location of find on all windows systems
+FOR /F "usebackq tokens=1-3" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul ^| FIND "%VALUE_NAME%"`) DO (
     set ValueName=%%A
     set ValueType=%%B
     set ValueValue=%%C
 )
 
 if defined ValueName (
+    @echo Found msbuild path registry entry
     @echo Value Name = %ValueName%
     @echo Value Type = %ValueType%
     @echo Value Value = %ValueValue%
+    @echo Creating compile.bat
+    @echo %ValueValue%\msbuild opensim.sln > compile.bat
 ) else (
     @echo %KEY_NAME%\%VALUE_NAME% not found.
+    @echo Not creating compile.bat
 )
-
-@echo %ValueValue%\msbuild opensim.sln > compile.bat
-- 
cgit v1.1