Fixed .gitignores; updated Mono build files and build/update_mono_build_files.sh. Removed user-specific build data. Fixed typo in MooNetServer. Removed some old name references.

plash · plash · commit a3ef912301ab · 2011-09-29T07:30:48.000-04:00
diff --git a/WARNING b/WARNING
@@ -1,10 +1,10 @@
-D3Sharp's focus is entirely on education, and we would like to keep it that way.
+mooege's focus is entirely on education, and we would like to keep it that way.
 
 Since any public and/or commercial use of this software is considered illegal
-in many countries (please refer to your local law), the D3Sharp team
+in many countries (please refer to your local law), the mooege team
 will not provide any help nor support with such usage in any way.
 Every user of this software is encouraged to make sure no law is being broken
 in his/her country.
 
-The D3Sharp team cannot take any responsibility for the use of this software
+The mooege team cannot take any responsibility for the use of this software
 by end-users.
diff --git a/build/.gitignore b/build/.gitignore
@@ -1,3 +1,5 @@
 /_ReSharper.Mooege-VS2010/
-/*.suo
 /*.6.0.ReSharper.user
+/*.suo
+/*.userprefs
+/*.user
diff --git a/build/Mooege-Mono.sln b/build/Mooege-Mono.sln
@@ -1,9 +1,9 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "D3Proto", "D3Proto\D3Proto.csproj", "{4CC19847-6F24-4453-9E31-126F94308AB9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mooege-Mono", "..\src\Mooege\Mooege-Mono.csproj", "{41BB6B2D-BD3F-42B6-860C-D21DC74B33CD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "D3Sharp-Mono", "D3Sharp\D3Sharp-Mono.csproj", "{41BB6B2D-BD3F-42B6-860C-D21DC74B33CD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibMooNet", "..\src\LibMooNet\LibMooNet.csproj", "{4CC19847-6F24-4453-9E31-126F94308AB9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -32,14 +32,16 @@ Global
 		{4CC19847-6F24-4453-9E31-126F94308AB9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{4CC19847-6F24-4453-9E31-126F94308AB9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{4CC19847-6F24-4453-9E31-126F94308AB9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4CC19847-6F24-4453-9E31-126F94308AB9}.Debug|x86.Build.0 = Debug|Any CPU
 		{4CC19847-6F24-4453-9E31-126F94308AB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4CC19847-6F24-4453-9E31-126F94308AB9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4CC19847-6F24-4453-9E31-126F94308AB9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4CC19847-6F24-4453-9E31-126F94308AB9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{4CC19847-6F24-4453-9E31-126F94308AB9}.Release|x86.ActiveCfg = Release|Any CPU
+		{4CC19847-6F24-4453-9E31-126F94308AB9}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = D3Sharp\D3Sharp-Mono.csproj
+		StartupItem = ..\src\Mooege\Mooege-Mono.csproj
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/build/fix_project_for_mono.sh b/build/fix_project_for_mono.sh
@@ -11,4 +11,4 @@ fi
 file_in=$1
 file_out=$2
 
-sed -e 's/\.\.\\libs\\sqlite-mixed/\.\.\\libs\\sqlite-managed/g' $file_in > $file_out
+sed -e 's/dep\\sqlite\\sqlite-mixed/dep\\sqlite\\sqlite-managed/g' $file_in > $file_out
diff --git a/build/tools/gs/.gitignore b/build/tools/gs/.gitignore
@@ -1,3 +1,5 @@
 /_ReSharper.GS-Tools/
 /*.6.0.ReSharper.user
 /*.suo
+/*.userprefs
+/*.user
diff --git a/build/tools/moonet/.gitignore b/build/tools/moonet/.gitignore
@@ -1,3 +1,5 @@
 /_ReSharper.MooNet-Tools/
 /*.6.0.ReSharper.user
 /*.suo
+/*.userprefs
+/*.user
diff --git a/build/update_mono_build_files.sh b/build/update_mono_build_files.sh
@@ -2,4 +2,4 @@
 
 # Run from repo root
 
-sh scripts/fix_project_for_mono.sh "source/D3Sharp/D3Sharp.csproj" "source/D3Sharp/D3Sharp-Mono.csproj"
+sh build/fix_project_for_mono.sh "src/Mooege/Mooege-VS2010.csproj" "src/Mooege/Mooege-Mono.csproj"
diff --git a/src/.gitignore b/src/.gitignore
@@ -1,6 +1,5 @@
-/_ReSharper.D3Sharp-win32/
-/*.user
-/*.suo
 /*.6.0.ReSharper.user
+/*.suo
 /*.userprefs
-/_ReSharper.D3Sharp/
+/*.user
+
diff --git a/src/LibMooNet/.gitignore b/src/LibMooNet/.gitignore
@@ -1,3 +1,4 @@
 bin/
 obj/
-D3Proto.pidb
+/*.ReSharper
+/*.pidb
diff --git a/src/LibMooNet/LibMooNet.csproj b/src/LibMooNet/LibMooNet.csproj
@@ -1,4 +1,4 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -34,7 +34,7 @@
     </Reference>
     <Reference Include="Google.ProtocolBuffers, Version=2.3.0.277, Culture=neutral, PublicKeyToken=17b3b1f090c3ea48">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\libs\Google.ProtocolBuffers.dll</HintPath>
+      <HintPath>..\..\dep\Google.ProtocolBuffers.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/LibMooNet/LibMooNet.pidb b/src/LibMooNet/LibMooNet.pidb
diff --git a/src/Mooege/.gitignore b/src/Mooege/.gitignore
@@ -1,4 +1,4 @@
 bin/
 obj/
-D3Sharp.pidb
-D3Sharp-Mono.pidb
+/*.ReSharper
+/*.pidb
diff --git a/src/Mooege/Mooege-Mono.csproj b/src/Mooege/Mooege-Mono.csproj
diff --git a/src/Mooege/Mooege-VS2010.pidb b/src/Mooege/Mooege-VS2010.pidb
diff --git a/src/Mooege/Net/MooNet/MooNetServer.cs b/src/Mooege/Net/MooNet/MooNetServer.cs
@@ -30,7 +30,7 @@ public MooNetServer()
 
         void BnetServer_OnConnect(object sender, ConnectionEventArgs e)
         {
-            Logger.Trace("MoonNet-Client connected: {0}", e.Connection.ToString());
+            Logger.Trace("MooNet-Client connected: {0}", e.Connection.ToString());
             e.Connection.Client = new MooNetClient(e.Connection);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`# Run from repo root`
`4`	`4`
`5`		`-sh scripts/fix_project_for_mono.sh "source/D3Sharp/D3Sharp.csproj" "source/D3Sharp/D3Sharp-Mono.csproj"`
	`5`	`+sh build/fix_project_for_mono.sh "src/Mooege/Mooege-VS2010.csproj" "src/Mooege/Mooege-Mono.csproj"`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public MooNetServer()`
`30`	`30`
`31`	`31`	`void BnetServer_OnConnect(object sender, ConnectionEventArgs e)`
`32`	`32`	`{`
`33`		`- Logger.Trace("MoonNet-Client connected: {0}", e.Connection.ToString());`
	`33`	`+ Logger.Trace("MooNet-Client connected: {0}", e.Connection.ToString());`
`34`	`34`	`e.Connection.Client = new MooNetClient(e.Connection);`
`35`	`35`	`}`
`36`	`36`