diff options
author | Justin Clarke Casey | 2008-02-15 11:11:03 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-02-15 11:11:03 +0000 |
commit | 57cfd5e8d1f3a745984db569b28137df5d001310 (patch) | |
tree | 3a9f26accb0b1f816836654ea8654e818535da45 | |
parent | Moved LaunchSLClient prebuild.xml into main prebuild.xml (diff) | |
download | opensim-SC-57cfd5e8d1f3a745984db569b28137df5d001310.zip opensim-SC-57cfd5e8d1f3a745984db569b28137df5d001310.tar.gz opensim-SC-57cfd5e8d1f3a745984db569b28137df5d001310.tar.bz2 opensim-SC-57cfd5e8d1f3a745984db569b28137df5d001310.tar.xz |
* Two (combined) patches from Dr Schofield (dirk husemann). Ta very much :)
* Patch 1 stops OpenSim.32BitLaunch.exe and ScriptEngines/Default.lsl being deleted on nant clean
* Patch 2 resolves a building problem with pCampBot
* This will require a prebuild rerun
-rw-r--r-- | Prebuild/src/Core/Targets/NAntTarget.cs | 2 | ||||
-rwxr-xr-x | bin/Prebuild.exe | bin | 176128 -> 160768 bytes | |||
-rw-r--r-- | prebuild.xml | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/Prebuild/src/Core/Targets/NAntTarget.cs b/Prebuild/src/Core/Targets/NAntTarget.cs index 0091850..8a6dbdf 100644 --- a/Prebuild/src/Core/Targets/NAntTarget.cs +++ b/Prebuild/src/Core/Targets/NAntTarget.cs | |||
@@ -547,6 +547,8 @@ namespace Prebuild.Core.Targets | |||
547 | ss.WriteLine(" <include name=\"OpenSim*.exe\"/>"); | 547 | ss.WriteLine(" <include name=\"OpenSim*.exe\"/>"); |
548 | ss.WriteLine(" <include name=\"ScriptEngines/*\"/>"); | 548 | ss.WriteLine(" <include name=\"ScriptEngines/*\"/>"); |
549 | ss.WriteLine(" <include name=\"Physics/*\"/>"); | 549 | ss.WriteLine(" <include name=\"Physics/*\"/>"); |
550 | ss.WriteLine(" <exclude name=\"OpenSim.32BitLaunch.exe\"/>"); | ||
551 | ss.WriteLine(" <exclude name=\"ScriptEngines/Default.lsl\"/>"); | ||
550 | ss.WriteLine(" </fileset>"); | 552 | ss.WriteLine(" </fileset>"); |
551 | ss.WriteLine(" </delete>"); | 553 | ss.WriteLine(" </delete>"); |
552 | ss.WriteLine(" <delete dir=\"${obj.dir}\" failonerror=\"false\" />"); | 554 | ss.WriteLine(" <delete dir=\"${obj.dir}\" failonerror=\"false\" />"); |
diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe index 9489719..fce82b9 100755 --- a/bin/Prebuild.exe +++ b/bin/Prebuild.exe | |||
Binary files differ | |||
diff --git a/prebuild.xml b/prebuild.xml index e7c51f9..9b1a771 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -1496,8 +1496,8 @@ | |||
1496 | <ReferencePath>../../../bin/</ReferencePath> | 1496 | <ReferencePath>../../../bin/</ReferencePath> |
1497 | <Reference name="System" localCopy="false"/> | 1497 | <Reference name="System" localCopy="false"/> |
1498 | <Reference name="libsecondlife.dll"/> | 1498 | <Reference name="libsecondlife.dll"/> |
1499 | <Reference name="OpenSim.Framework.dll"/> | 1499 | <Reference name="OpenSim.Framework"/> |
1500 | <Reference name="OpenSim.Framework.Console.dll"/> | 1500 | <Reference name="OpenSim.Framework.Console"/> |
1501 | <Reference name="Nini.dll" /> | 1501 | <Reference name="Nini.dll" /> |
1502 | <Reference name="log4net"/> | 1502 | <Reference name="log4net"/> |
1503 | 1503 | ||