From 42414bfa551d8039bd5fb4ae9c7054c4bb67d599 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Thu, 4 Apr 2019 15:07:15 +0100
Subject: mantis 8512: add proposed detection of VS2019 to runprebuild (both
 this and vs2019 untested by me

---
 runprebuild.bat | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'runprebuild.bat')

diff --git a/runprebuild.bat b/runprebuild.bat
index e2b6832..3ee1648 100755
--- a/runprebuild.bat
+++ b/runprebuild.bat
@@ -5,22 +5,27 @@ bin\Prebuild.exe /target vs2015
 setlocal ENABLEEXTENSIONS
 set VALUE_NAME=MSBuildToolsPath
 
+rem Try to find VS2019
+for %%e in (Enterprise Professional Community) do (
+    if exist "%PROGRAMS%\Microsoft Visual Studio\2019\%%e\MSBuild\Current\Bin\MSBuild.exe" (
+
+        set ValueValue="%PROGRAMS%\Microsoft Visual Studio\2019\%%e\MSBuild\Current\Bin\"
+		goto :found
+    )
+)
 
 rem try find vs2017
 if "%PROCESSOR_ARCHITECTURE%"=="x86" set PROGRAMS=%ProgramFiles%
 if defined ProgramFiles(x86) set PROGRAMS=%ProgramFiles(x86)%
 
 for %%e in (Enterprise Professional Community) do (
-
     if exist "%PROGRAMS%\Microsoft Visual Studio\2017\%%e\MSBuild\15.0\Bin\MSBuild.exe" (
 
         set ValueValue="%PROGRAMS%\Microsoft Visual Studio\2017\%%e\MSBuild\15.0\Bin\"
 		goto :found
     )
-
 )
 
-
 rem We have to use grep or find to locate the correct line, because reg query spits
 rem out 4 lines before Windows 7 but 2 lines after Windows 7.
 rem We use grep if it's on the path; otherwise we use the built-in find command
-- 
cgit v1.1


From 8d272fb1d08275e4416c08fc82c054825d427467 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Fri, 5 Apr 2019 03:25:02 +0100
Subject: mantis 8512: fix runprebuild

---
 runprebuild.bat | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'runprebuild.bat')

diff --git a/runprebuild.bat b/runprebuild.bat
index 3ee1648..e5d7cb8 100755
--- a/runprebuild.bat
+++ b/runprebuild.bat
@@ -5,23 +5,23 @@ bin\Prebuild.exe /target vs2015
 setlocal ENABLEEXTENSIONS
 set VALUE_NAME=MSBuildToolsPath
 
+if "%PROCESSOR_ARCHITECTURE%"=="x86" set PROGRAMS=%ProgramFiles%
+if defined ProgramFiles(x86) set PROGRAMS=%ProgramFiles(x86)%
+
 rem Try to find VS2019
 for %%e in (Enterprise Professional Community) do (
     if exist "%PROGRAMS%\Microsoft Visual Studio\2019\%%e\MSBuild\Current\Bin\MSBuild.exe" (
 
-        set ValueValue="%PROGRAMS%\Microsoft Visual Studio\2019\%%e\MSBuild\Current\Bin\"
+        set ValueValue="%PROGRAMS%\Microsoft Visual Studio\2019\%%e\MSBuild\Current\Bin\MSBuild"
 		goto :found
     )
 )
 
 rem try find vs2017
-if "%PROCESSOR_ARCHITECTURE%"=="x86" set PROGRAMS=%ProgramFiles%
-if defined ProgramFiles(x86) set PROGRAMS=%ProgramFiles(x86)%
-
 for %%e in (Enterprise Professional Community) do (
     if exist "%PROGRAMS%\Microsoft Visual Studio\2017\%%e\MSBuild\15.0\Bin\MSBuild.exe" (
 
-        set ValueValue="%PROGRAMS%\Microsoft Visual Studio\2017\%%e\MSBuild\15.0\Bin\"
+        set ValueValue="%PROGRAMS%\Microsoft Visual Studio\2017\%%e\MSBuild\15.0\Bin\MSBuild"
 		goto :found
     )
 )
@@ -40,7 +40,7 @@ if defined FOUNDGREP (
 
 rem try vs2015
 FOR /F "usebackq tokens=1-3" %%A IN (`REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0" /v %VALUE_NAME% 2^>nul ^| %FINDCMD% "%VALUE_NAME%"`) DO (
-	set ValueValue=%%C
+	set ValueValue=%%C\msbuild
 	goto :found
 )
 
@@ -54,6 +54,6 @@ goto :done
 :found
     @echo Found msbuild at %ValueValue%
     @echo Creating compile.bat
-    @echo %ValueValue%\msbuild opensim.sln > compile.bat
+    @echo %ValueValue% opensim.sln > compile.bat
 
 :done
\ No newline at end of file
-- 
cgit v1.1


From 0652f01d4cbae9585f4288b68d1feff1711d6be4 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Fri, 5 Apr 2019 03:45:27 +0100
Subject: duhhh npcs don't have child agents; plus minor typos

---
 runprebuild.bat | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'runprebuild.bat')

diff --git a/runprebuild.bat b/runprebuild.bat
index e5d7cb8..0bee6f5 100755
--- a/runprebuild.bat
+++ b/runprebuild.bat
@@ -54,6 +54,8 @@ goto :done
 :found
     @echo Found msbuild at %ValueValue%
     @echo Creating compile.bat
+rem To compile in debug mode
     @echo %ValueValue% opensim.sln > compile.bat
-
+rem To compile in release mode comment line (add rem to start) above and uncomment next (remove rem)
+rem @echo %ValueValue% /P:Config=Release opensim.sln > compile.bat
 :done
\ No newline at end of file
-- 
cgit v1.1