aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2007-11-28 16:24:28 +0000
committerSean Dague2007-11-28 16:24:28 +0000
commit4c28554d881eff864b579f367f434b409133abd4 (patch)
tree560055e85222aee08acb854e7d7a18bfa2a360f6
parentmerged ClientView into a non partial class. Will (diff)
downloadopensim-SC_OLD-4c28554d881eff864b579f367f434b409133abd4.zip
opensim-SC_OLD-4c28554d881eff864b579f367f434b409133abd4.tar.gz
opensim-SC_OLD-4c28554d881eff864b579f367f434b409133abd4.tar.bz2
opensim-SC_OLD-4c28554d881eff864b579f367f434b409133abd4.tar.xz
update prebuild
Nant files now obey the target out of prebuild.xml, so Linux users will be able to build as Debug Nant clean target now does the right thing (doesn't wipe out all of bin/) Prebuild's own prebuild system is broken due to the .exe workaround added a while ago, will register a bug for that seperately.
-rw-r--r--Prebuild/src/Core/Targets/NAntTarget.cs19
-rwxr-xr-xbin/Prebuild.exebin176128 -> 160256 bytes
2 files changed, 12 insertions, 7 deletions
diff --git a/Prebuild/src/Core/Targets/NAntTarget.cs b/Prebuild/src/Core/Targets/NAntTarget.cs
index 5355eef..d3385e1 100644
--- a/Prebuild/src/Core/Targets/NAntTarget.cs
+++ b/Prebuild/src/Core/Targets/NAntTarget.cs
@@ -355,8 +355,8 @@ namespace Prebuild.Core.Targets
355 ss.WriteLine(" </target>"); 355 ss.WriteLine(" </target>");
356 356
357 ss.WriteLine(" <target name=\"clean\">"); 357 ss.WriteLine(" <target name=\"clean\">");
358 ss.WriteLine(" <delete dir=\"${bin.dir}\" failonerror=\"false\" />");
359 ss.WriteLine(" <delete dir=\"${obj.dir}\" failonerror=\"false\" />"); 358 ss.WriteLine(" <delete dir=\"${obj.dir}\" failonerror=\"false\" />");
359 ss.WriteLine(" <delete dir=\"${bin.dir}\" failonerror=\"false\" />");
360 ss.WriteLine(" </target>"); 360 ss.WriteLine(" </target>");
361 361
362 ss.WriteLine(" <target name=\"doc\" description=\"Creates documentation.\">"); 362 ss.WriteLine(" <target name=\"doc\" description=\"Creates documentation.\">");
@@ -457,13 +457,11 @@ namespace Prebuild.Core.Targets
457 ss.WriteLine(" <property name=\"doc.dir\" value=\"doc\" />"); 457 ss.WriteLine(" <property name=\"doc.dir\" value=\"doc\" />");
458 ss.WriteLine(" <property name=\"project.main.dir\" value=\"${project::get-base-directory()}\" />"); 458 ss.WriteLine(" <property name=\"project.main.dir\" value=\"${project::get-base-directory()}\" />");
459 459
460 // actually use active config out of prebuild.xml
461 ss.WriteLine(" <property name=\"project.config\" value=\"{0}\" />", solution.ActiveConfig);
462
460 foreach (ConfigurationNode conf in solution.Configurations) 463 foreach (ConfigurationNode conf in solution.Configurations)
461 { 464 {
462 // Set the project.config to a non-debug configuration
463 if (conf.Options["DebugInformation"].ToString().ToLower() != "true")
464 {
465 ss.WriteLine(" <property name=\"project.config\" value=\"{0}\" />", conf.Name);
466 }
467 ss.WriteLine(); 465 ss.WriteLine();
468 ss.WriteLine(" <target name=\"{0}\" description=\"\">", conf.Name); 466 ss.WriteLine(" <target name=\"{0}\" description=\"\">", conf.Name);
469 ss.WriteLine(" <property name=\"project.config\" value=\"{0}\" />", conf.Name); 467 ss.WriteLine(" <property name=\"project.config\" value=\"{0}\" />", conf.Name);
@@ -559,7 +557,14 @@ namespace Prebuild.Core.Targets
559 ss.WriteLine(" <target name=\"clean\" description=\"\">"); 557 ss.WriteLine(" <target name=\"clean\" description=\"\">");
560 ss.WriteLine(" <echo message=\"Deleting all builds from all configurations\" />"); 558 ss.WriteLine(" <echo message=\"Deleting all builds from all configurations\" />");
561 //ss.WriteLine(" <delete dir=\"${dist.dir}\" failonerror=\"false\" />"); 559 //ss.WriteLine(" <delete dir=\"${dist.dir}\" failonerror=\"false\" />");
562 ss.WriteLine(" <delete dir=\"${bin.dir}\" failonerror=\"false\" />"); 560 ss.WriteLine(" <delete failonerror=\"false\">");
561 ss.WriteLine(" <fileset basedir=\"${bin.dir}\">");
562 ss.WriteLine(" <include name=\"OpenSim*.dll\"/>");
563 ss.WriteLine(" <include name=\"OpenSim*.exe\"/>");
564 ss.WriteLine(" <include name=\"ScriptEngines/*\"/>");
565 ss.WriteLine(" <include name=\"Physics/*\"/>");
566 ss.WriteLine(" </fileset>");
567 ss.WriteLine(" </delete>");
563 ss.WriteLine(" <delete dir=\"${obj.dir}\" failonerror=\"false\" />"); 568 ss.WriteLine(" <delete dir=\"${obj.dir}\" failonerror=\"false\" />");
564 foreach (ProjectNode project in solution.Projects) 569 foreach (ProjectNode project in solution.Projects)
565 { 570 {
diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe
index 220eb56..632b9dc 100755
--- a/bin/Prebuild.exe
+++ b/bin/Prebuild.exe
Binary files differ