From f9ff986908521f4eb816d15f8f4598433f13c18e Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Fri, 10 Jul 2009 04:29:00 +0000 Subject: [PATCH] Switch runprebuild.bat from VS2005 to VS2008. Remove runprebuild2008.bat. --- OpenSim/Tools/LaunchSLClient/runprebuild.bat | 4 ++-- OpenSim/Tools/LaunchSLClient/runprebuild.sh | 2 +- OpenSim/Tools/LaunchSLClient/runprebuild2008.bat | 4 ---- runprebuild.bat | 4 ++-- runprebuild.sh | 2 +- runprebuild2008.bat | 4 ---- 6 files changed, 6 insertions(+), 14 deletions(-) delete mode 100755 OpenSim/Tools/LaunchSLClient/runprebuild2008.bat delete mode 100755 runprebuild2008.bat diff --git a/OpenSim/Tools/LaunchSLClient/runprebuild.bat b/OpenSim/Tools/LaunchSLClient/runprebuild.bat index 0ef3dd954e..41e2714a50 100755 --- a/OpenSim/Tools/LaunchSLClient/runprebuild.bat +++ b/OpenSim/Tools/LaunchSLClient/runprebuild.bat @@ -1,4 +1,4 @@ ..\..\..\bin\Prebuild.exe /target nant -..\..\..\bin\Prebuild.exe /target vs2005 +..\..\..\bin\Prebuild.exe /target vs2008 +echo C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild LaunchSLClient.sln > compile.bat -echo C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727\msbuild LaunchSLClient.sln > compile.bat diff --git a/OpenSim/Tools/LaunchSLClient/runprebuild.sh b/OpenSim/Tools/LaunchSLClient/runprebuild.sh index 4fa418b582..25ea4cd284 100755 --- a/OpenSim/Tools/LaunchSLClient/runprebuild.sh +++ b/OpenSim/Tools/LaunchSLClient/runprebuild.sh @@ -2,4 +2,4 @@ mono ../../../bin/Prebuild.exe /target nant mono ../../../bin/Prebuild.exe /target monodev -mono ../../../bin/Prebuild.exe /target vs2005 +mono ../../../bin/Prebuild.exe /target vs2008 diff --git a/OpenSim/Tools/LaunchSLClient/runprebuild2008.bat b/OpenSim/Tools/LaunchSLClient/runprebuild2008.bat deleted file mode 100755 index 41e2714a50..0000000000 --- a/OpenSim/Tools/LaunchSLClient/runprebuild2008.bat +++ /dev/null @@ -1,4 +0,0 @@ -..\..\..\bin\Prebuild.exe /target nant -..\..\..\bin\Prebuild.exe /target vs2008 -echo C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild LaunchSLClient.sln > compile.bat - diff --git a/runprebuild.bat b/runprebuild.bat index ba0cd64da4..8927e9a7ee 100755 --- a/runprebuild.bat +++ b/runprebuild.bat @@ -1,4 +1,4 @@ bin\Prebuild.exe /target nant -bin\Prebuild.exe /target vs2005 +bin\Prebuild.exe /target vs2008 +echo C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild opensim.sln > compile.bat -echo C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727\msbuild opensim.sln > compile.bat diff --git a/runprebuild.sh b/runprebuild.sh index d51cf3c2d2..3e1417aaa6 100755 --- a/runprebuild.sh +++ b/runprebuild.sh @@ -4,4 +4,4 @@ mono bin/Prebuild.exe /target nant # needed until we break up OpenSim.exe perl -pi -e 's{OpenSim.dll}{OpenSim.exe}' OpenSim/ApplicationPlugins/LoadRegions/OpenSim.ApplicationPlugins.LoadRegions.dll.build mono bin/Prebuild.exe /target monodev -mono bin/Prebuild.exe /target vs2005 +mono bin/Prebuild.exe /target vs2008 diff --git a/runprebuild2008.bat b/runprebuild2008.bat deleted file mode 100755 index 8927e9a7ee..0000000000 --- a/runprebuild2008.bat +++ /dev/null @@ -1,4 +0,0 @@ -bin\Prebuild.exe /target nant -bin\Prebuild.exe /target vs2008 -echo C:\WINDOWS\Microsoft.NET\Framework\v3.5\msbuild opensim.sln > compile.bat -