Move pCampBot prebuild.xml into main prebuild.xml to fix reference errors. Update README.

6 files changed, 69 insertions, 105 deletions

diff --git a/OpenSim/Tools/pCampBot/PhysicsCamperBotREADME.txt b/OpenSim/Tools/pCampBot/PhysicsCamperBotREADME.txt
deleted file mode 100644
index afa5fbd..0000000
--- a/OpenSim/Tools/pCampBot/PhysicsCamperBotREADME.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-This is the PhysicsCamperbot libslBot tester.
-
-This is designed to be run in standalone mode with authorize accounts turned off as a way to stress test the simulator.
-It creates <N> clients that log in, randomly jump/walk around, and say excuses from the BOFH
-
-**Warning:** Using this bot on a public grid could get you banned perminantly, so just say No! to greifing!
-
------Setup -----
-Linux: chmod the .sh runprebuild file, run it.  Then run nant like;   
-
-nant -buildfile: pCampBot.build 
-
-and pCampBot.exe will end up in the regular opensim/bin folder
-
-Windows:
-Run the prebuild bat IN THIS FOLDER and then open the created solution and compile it.  the Exe file will end up in the regular opensim bin folder.
-
-
------Running the bot----
-
-windows: pCampBot.exe -botcount <N> -loginuri <URI>
-*nix: mono pCampBot.exe -botcount <N> -loginuri <URI>
-
-The names it produces are random by default, however, you can specify either a firstname or a lastname in the command line also.
-ex: pCampBot.exe -botcount <N> -loginuri <URI> -lastname <lastname>
-
-If you specify both a firstname *and* a lastname, you'll likely run into trouble unless you're only running a single bot.  In that case, there's also a password option.
-
-pCampBot.exe -botcount 1 -loginuri http://somegrid.com:8002 -firstname SomeDude -lastname SomeDude -password GobbleDeGook
--------
-
-The bot also has console commands
-help - lists the console commands and what they do
-shutdown - gracefully shuts down the bots
-quit - forcefully shuts things down leaving stuff unclean
-addbots N - adds N number of random bots.  (replace 'N' with a number)
\ No newline at end of file
diff --git a/OpenSim/Tools/pCampBot/README.txt b/OpenSim/Tools/pCampBot/README.txt
new file mode 100644
index 0000000..7ecbde1
--- /dev/null
+++ b/OpenSim/Tools/pCampBot/README.txt
@@ -0,0 +1,44 @@
+This is the PhysicsCamperbot libslBot tester.
+
+This is designed to be run in standalone mode with authorize accounts
+turned off as a way to stress test the simulator.  It creates <N>
+clients that log in, randomly jump/walk around, and say excuses from
+the BOFH.
+
+*** WARNING ***
+Using this bot on a public grid could get you banned permanently, so
+just say No! to griefing!
+
+----- Setup -----
+Linux: To build, in the main opensim directory, run:
+  ./runprebuild.sh
+  nant
+
+Windows: Run the prebuild.bat in the main opensim directory and then
+open the created solution and compile it.
+
+pCampBot.exe will end up in the regular opensim/bin folder
+
+----- Running the bot -----
+
+windows: pCampBot.exe -botcount <N> -loginuri <URI>
+*nix: mono pCampBot.exe -botcount <N> -loginuri <URI>
+
+The names it produces are random by default, however, you can specify
+either a firstname or a lastname in the command line also.
+
+ex: pCampBot.exe -botcount <N> -loginuri <URI> -lastname <lastname>
+
+If you specify both a firstname *and* a lastname, you'll likely run
+into trouble unless you're only running a single bot.  In that case,
+there's also a password option.
+
+pCampBot.exe -botcount 1 -loginuri http://somegrid.com:8002 -firstname SomeDude -lastname SomeDude -password GobbleDeGook
+
+----- Commands -----
+
+The bot has console commands:
+  help       - lists the console commands and what they do
+  shutdown   - gracefully shuts down the bots
+  quit       - forcefully shuts things down leaving stuff unclean
+  addbots N  - adds N number of random bots. (replace 'N' with a number)
diff --git a/OpenSim/Tools/pCampBot/prebuild.xml b/OpenSim/Tools/pCampBot/prebuild.xml
deleted file mode 100644
index bfaf408..0000000
--- a/OpenSim/Tools/pCampBot/prebuild.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd" version="1.7">
-  <Solution name="pCampBot" activeConfig="Debug" path="./" version="0.5.0-svn">
-    <Configuration name="Debug">
-      <Options>
-        <CompilerDefines>TRACE;DEBUG</CompilerDefines>
-        <OptimizeCode>false</OptimizeCode>
-        <CheckUnderflowOverflow>false</CheckUnderflowOverflow>
-        <AllowUnsafe>false</AllowUnsafe>
-        <WarningLevel>4</WarningLevel>
-        <WarningsAsErrors>false</WarningsAsErrors>
-        <SuppressWarnings></SuppressWarnings>
-        <OutputPath>../../../bin</OutputPath>
-        <DebugInformation>true</DebugInformation>
-        <IncrementalBuild>true</IncrementalBuild>
-        <NoStdLib>false</NoStdLib>
-      </Options>
-    </Configuration>
-    <Configuration name="Release">
-      <Options>
-        <CompilerDefines>TRACE</CompilerDefines>
-        <OptimizeCode>true</OptimizeCode>
-        <CheckUnderflowOverflow>false</CheckUnderflowOverflow>
-        <AllowUnsafe>false</AllowUnsafe>
-        <WarningLevel>4</WarningLevel>
-        <WarningsAsErrors>false</WarningsAsErrors>
-        <SuppressWarnings></SuppressWarnings>
-        <OutputPath>../../../bin</OutputPath>
-        <DebugInformation>false</DebugInformation>
-        <IncrementalBuild>true</IncrementalBuild>
-        <NoStdLib>false</NoStdLib>
-      </Options>
-    </Configuration>
-        
-    <!-- Core OpenSim Projects -->
-
-    <Project name="pCampBot" path="./" type="Exe">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-
-      <ReferencePath>../../../bin/</ReferencePath>
-      <Reference name="System" localCopy="false"/>
-      <Reference name="libsecondlife.dll"/>
-      <Reference name="OpenSim.Framework.dll"/>
-      <Reference name="OpenSim.Framework.Console.dll"/>
-      <Reference name="Nini.dll" />
-      <Reference name="log4net"/>
-
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-
-  </Solution>
-</Prebuild>
diff --git a/OpenSim/Tools/pCampBot/runprebuild.bat b/OpenSim/Tools/pCampBot/runprebuild.bat
deleted file mode 100755
index 0427d2e..0000000
--- a/OpenSim/Tools/pCampBot/runprebuild.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-..\..\..\bin\Prebuild.exe /target nant
-..\..\..\bin\Prebuild.exe /target vs2005
diff --git a/OpenSim/Tools/pCampBot/runprebuild.sh b/OpenSim/Tools/pCampBot/runprebuild.sh
deleted file mode 100755
index 7215bc5..0000000
--- a/OpenSim/Tools/pCampBot/runprebuild.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-mono ../../../bin/Prebuild.exe /target nant
-mono ../../../bin/Prebuild.exe /target vs2005
diff --git a/prebuild.xml b/prebuild.xml
index f956e7e..135a8d7 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1480,6 +1480,31 @@
         <Match pattern="*.cs" recurse="true"/>
       </Files>
     </Project>
+
+    <Project name="pCampBot" path="OpenSim/Tools/pCampBot" type="Exe">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="libsecondlife.dll"/>
+      <Reference name="OpenSim.Framework.dll"/>
+      <Reference name="OpenSim.Framework.Console.dll"/>
+      <Reference name="Nini.dll" />
+      <Reference name="log4net"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
   </Solution>
 
   <!-- Prebuild tool -->