aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712007-08-12 08:11:28 +0000
committerlbsa712007-08-12 08:11:28 +0000
commit7f393791e75b740dc6f011f3fcd188a293a49df1 (patch)
treee287259ad531620d3e65a165bc0ac745af44be11
parentAdded a new column (SceneGroupID) to sqlite3 table (sqlite3-prims.sql) so tha... (diff)
downloadopensim-SC_OLD-7f393791e75b740dc6f011f3fcd188a293a49df1.zip
opensim-SC_OLD-7f393791e75b740dc6f011f3fcd188a293a49df1.tar.gz
opensim-SC_OLD-7f393791e75b740dc6f011f3fcd188a293a49df1.tar.bz2
opensim-SC_OLD-7f393791e75b740dc6f011f3fcd188a293a49df1.tar.xz
* Removed magic exclusion of MonoSqlite data store from prebuild
* Renamed project back to base.
-rw-r--r--Prebuild/src/Core/Targets/VS2005Target.cs11
-rwxr-xr-xbin/Prebuild.exebin176128 -> 176128 bytes
-rw-r--r--prebuild.xml2
3 files changed, 1 insertions, 12 deletions
diff --git a/Prebuild/src/Core/Targets/VS2005Target.cs b/Prebuild/src/Core/Targets/VS2005Target.cs
index 102ce61..f01906b 100644
--- a/Prebuild/src/Core/Targets/VS2005Target.cs
+++ b/Prebuild/src/Core/Targets/VS2005Target.cs
@@ -368,12 +368,6 @@ namespace Prebuild.Core.Targets
368 throw new UnknownLanguageException("Unknown .NET language: " + project.Language); 368 throw new UnknownLanguageException("Unknown .NET language: " + project.Language);
369 } 369 }
370 370
371 // Hardcoded exclusion of unbuildable project
372 if( project.Name == "OpenSim.DataStore.MonoSqlite")
373 {
374 return;
375 }
376
377 ToolInfo toolInfo = (ToolInfo)tools[project.Language]; 371 ToolInfo toolInfo = (ToolInfo)tools[project.Language];
378 string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, toolInfo.FileExtension); 372 string projectFile = Helper.MakeFilePath(project.FullPath, project.Name, toolInfo.FileExtension);
379 StreamWriter ps = new StreamWriter(projectFile); 373 StreamWriter ps = new StreamWriter(projectFile);
@@ -721,11 +715,6 @@ namespace Prebuild.Core.Targets
721 throw new UnknownLanguageException("Unknown .NET language: " + project.Language); 715 throw new UnknownLanguageException("Unknown .NET language: " + project.Language);
722 } 716 }
723 717
724 if (project.Name == "OpenSim.DataStore.MonoSqlite")
725 {
726 continue;
727 }
728
729 ToolInfo toolInfo = (ToolInfo)tools[project.Language]; 718 ToolInfo toolInfo = (ToolInfo)tools[project.Language];
730 719
731 string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath); 720 string path = Helper.MakePathRelativeTo(solution.FullPath, project.FullPath);
diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe
index b7d2ac3..e7d31ad 100755
--- a/bin/Prebuild.exe
+++ b/bin/Prebuild.exe
Binary files differ
diff --git a/prebuild.xml b/prebuild.xml
index a8a455e..6fa3e12 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -639,7 +639,7 @@
639 </Files> 639 </Files>
640 </Project> 640 </Project>
641 641
642 <Project name="OpenSim.DataStore.MonoSqlite1" path="OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite" type="Library"> 642 <Project name="OpenSim.DataStore.MonoSqlite" path="OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite" type="Library">
643 <Configuration name="Debug"> 643 <Configuration name="Debug">
644 <Options> 644 <Options>
645 <OutputPath>../../../../bin/</OutputPath> 645 <OutputPath>../../../../bin/</OutputPath>