From 0f8609da532babefc869c81637bafbee12513bdd Mon Sep 17 00:00:00 2001
From: "Joel W. Reed" <joelwreed@gmail.com>
Date: Sat, 1 Dec 2007 22:56:15 -0500
Subject: [PATCH] fix.build

---
 class/OpenTF.Common/FileType.cs          | 146 ++++++++++++++++---------------
 class/OpenTF.Common/Makefile             |  41 ++++-----
 class/OpenTF.Common/NoFileType.cs        |  15 +++-
 class/OpenTF.Common/OpenTF.Common.csproj | 122 +++++++-------------------
 4 files changed, 136 insertions(+), 188 deletions(-)
 rewrite class/OpenTF.Common/Makefile (89%)
 rewrite class/OpenTF.Common/OpenTF.Common.csproj (71%)

diff --git a/class/OpenTF.Common/FileType.cs b/class/OpenTF.Common/FileType.cs
index 984643e..f4a121f 100644
--- a/class/OpenTF.Common/FileType.cs
+++ b/class/OpenTF.Common/FileType.cs
@@ -32,78 +32,80 @@ using System.IO;
 using System.Runtime.InteropServices;
 using Mono.Unix;
 
-class FileTypeDatabase
+namespace OpenTF.Common
 {
-	[DllImport("magic")]
-	private extern static IntPtr magic_open(int flags);
-
-	[DllImport("magic")]
-	private extern static void magic_close(IntPtr magic_cookie);
-
-	[DllImport("magic")]
-	private extern static IntPtr magic_file(IntPtr magic_cookie, string filename);
-
-	[DllImport("magic")]
-	private extern static int magic_load(IntPtr magic_cookie, IntPtr x);
-
-	private static IntPtr _magic = IntPtr.Zero;
-
-	static FileTypeDatabase()
-	{
-		_magic = magic_open(0);
-		if (_magic == IntPtr.Zero)
-			{
-				Console.WriteLine("Warning: failed to open libmagic database");
-				return;
-			}
-
-		magic_load(_magic, IntPtr.Zero);
-	}
-
-	~FileTypeDatabase()
-	{
-		if (_magic != IntPtr.Zero)
-			magic_close(_magic);
-	}
-
-	public static bool ShouldBeExecutable(string filename)
-	{
-		if (_magic == IntPtr.Zero) return false;
-		string desc = Marshal.PtrToStringAuto(magic_file(_magic, filename));
-		if (String.IsNullOrEmpty(desc))
-			{
-				Console.WriteLine("Error querying file type for " + filename);
-				return false;
-			}
-
-		return desc.Contains("executable");
-	}
-
-	public static void MakeExecutable(string filename)
-	{
-		Mono.Unix.Native.Stat stat;
-		if (0 == Mono.Unix.Native.Syscall.stat(filename, out stat))
-			{
-				Mono.Unix.Native.FilePermissions fp = stat.st_mode | Mono.Unix.Native.FilePermissions.S_IXUSR;
-				Mono.Unix.Native.Syscall.chmod(filename, fp);
-			}
-	}
-
-	public static void SetPermissions(List<string> fileList)
+	class FileTypeDatabase
 	{
-		Console.Write("Setting permissions...");
-
-		int i = 0;
-		foreach (string file in fileList)
-			{
-				if (0 == (i % 100)) Console.Write("."); 
-				i++;
-
-				if (! ShouldBeExecutable(file)) continue;
-				MakeExecutable(file);
-			}
-
-		Console.WriteLine(" done!");
+		[DllImport("magic")]
+		private extern static IntPtr magic_open(int flags);
+
+		[DllImport("magic")]
+		private extern static void magic_close(IntPtr magic_cookie);
+
+		[DllImport("magic")]
+		private extern static IntPtr magic_file(IntPtr magic_cookie, string filename);
+
+		[DllImport("magic")]
+		private extern static int magic_load(IntPtr magic_cookie, IntPtr x);
+
+		private static IntPtr _magic = IntPtr.Zero;
+
+		static FileTypeDatabase()
+		{
+			_magic = magic_open(0);
+			if (_magic == IntPtr.Zero)
+				{
+					Console.WriteLine("Warning: failed to open libmagic database");
+					return;
+				}
+
+			magic_load(_magic, IntPtr.Zero);
+		}
+
+		~FileTypeDatabase()
+		{
+			if (_magic != IntPtr.Zero)
+				magic_close(_magic);
+		}
+
+		public static bool ShouldBeExecutable(string filename)
+		{
+			if (_magic == IntPtr.Zero) return false;
+			string desc = Marshal.PtrToStringAuto(magic_file(_magic, filename));
+			if (String.IsNullOrEmpty(desc))
+				{
+					Console.WriteLine("Error querying file type for " + filename);
+					return false;
+				}
+
+			return desc.Contains("executable");
+		}
+
+		public static void MakeExecutable(string filename)
+		{
+			Mono.Unix.Native.Stat stat;
+			if (0 == Mono.Unix.Native.Syscall.stat(filename, out stat))
+				{
+					Mono.Unix.Native.FilePermissions fp = stat.st_mode | Mono.Unix.Native.FilePermissions.S_IXUSR;
+					Mono.Unix.Native.Syscall.chmod(filename, fp);
+				}
+		}
+
+		public static void SetPermissions(List<string> fileList)
+		{
+			Console.Write("Setting permissions...");
+
+			int i = 0;
+			foreach (string file in fileList)
+				{
+					if (0 == (i % 100)) Console.Write("."); 
+					i++;
+
+					if (! ShouldBeExecutable(file)) continue;
+					MakeExecutable(file);
+				}
+
+			Console.WriteLine(" done!");
+		}
 	}
-}
-				
+}				
diff --git a/class/OpenTF.Common/Makefile b/class/OpenTF.Common/Makefile
dissimilarity index 89%
index e6945db..6ff88f1 100644
--- a/class/OpenTF.Common/Makefile
+++ b/class/OpenTF.Common/Makefile
@@ -1,24 +1,17 @@
-thisdir = tools/Gtk.TeamFoundation
-include ../../build/rules.make
-
-LIBRARY = Gtk.TeamFoundation.dll
-RESOURCES = $(wildcard icons/*.png)
-
-LIB_MCS_FLAGS = /unsafe /pkg:gtk-sharp-2.0 /r:Microsoft.TeamFoundation.dll /r:Microsoft.TeamFoundation.Common.dll /r:Microsoft.TeamFoundation.Client.dll /r:Microsoft.TeamFoundation.VersionControl.Client.dll /r:Microsoft.TeamFoundation.VersionControl.Common.dll
-
-ifeq ($(HAVE_SYNTAX_HIGHLIGHTING),no)
-EXTRA_SOURCES += NoSourceView.cs
-else
-EXTRA_SOURCES += SourceView.cs
-LOCAL_MCS_FLAGS += -pkg:gtksourceview-sharp-2.0 -pkg:gnome-vfs-sharp-2.0 -d:HAVE_SYNTAX_HIGHLIGHTING
-endif
-
-res:
-	echo $(RESOURCES)
-
-LOCAL_MCS_FLAGS += $(RESOURCES:%=/resource:%)
-
-TEST_MCS_FLAGS =  $(LIB_MCS_FLAGS)
-
-include ../../build/library.make
-
+thisdir = tools/OpenTF.Common
+include ../../build/rules.make
+
+LIBRARY = OpenTF.Common.dll
+
+ifeq ($(HAVE_MAGIC),no)
+EXTRA_SOURCES += NoFileType.cs
+else
+EXTRA_SOURCES += FileType.cs
+LOCAL_MCS_FLAGS +=  /unsafe -d:HAVE_MAGIC -r:Mono.Posix.dll
+
+endif
+
+TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
+
+include ../../build/library.make
+
diff --git a/class/OpenTF.Common/NoFileType.cs b/class/OpenTF.Common/NoFileType.cs
index 063e065..ec305f2 100644
--- a/class/OpenTF.Common/NoFileType.cs
+++ b/class/OpenTF.Common/NoFileType.cs
@@ -29,10 +29,17 @@
 using System;
 using System.Collections.Generic;
 
-class FileTypeDatabase
+namespace OpenTF.Common
 {
-	public static void SetPermissions(List<string> x)
+	class FileTypeDatabase
 	{
-	}
+		public static bool ShouldBeExecutable(string filename)
+		{
+			return false;
+		}
+
+		public static void MakeExecutable(string filename)
+		{
+		}
+	}		
 }
-				
diff --git a/class/OpenTF.Common/OpenTF.Common.csproj b/class/OpenTF.Common/OpenTF.Common.csproj
dissimilarity index 71%
index a87fe17..b7b47cb 100644
--- a/class/OpenTF.Common/OpenTF.Common.csproj
+++ b/class/OpenTF.Common/OpenTF.Common.csproj
@@ -1,88 +1,34 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{B0953653-A461-4338-BDAE-91DA9C3583AA}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <NoStandardLibraries>false</NoStandardLibraries>
-    <AssemblyName>Gtk.TeamFoundation</AssemblyName>
-    <RootNamespace>Gtk.TeamFoundation</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\lib\net_2_0\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\lib\net_2_0\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Web.Services" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="IVersionControlServerFactory.cs" />
-    <Compile Include="AuthenticationDialog.cs" />
-    <Compile Include="ChangesetDetailView.cs" />
-    <Compile Include="ChangesetDiffView.cs" />
-    <Compile Include="ChangesetView.cs" />
-    <Compile Include="DialogBase.cs" />
-    <Compile Include="DiffItemNull.cs" />
-    <Compile Include="DirectoryMenu.cs" />
-    <Compile Include="DirectoryView.cs" />
-    <Compile Include="ExploreView.cs" />
-    <Compile Include="FileView.cs" />
-    <Compile Include="GetLatestEventArgs.cs" />
-    <Compile Include="GetLatestEventHandler.cs" />
-    <Compile Include="Images.cs" />
-    <Compile Include="MenuBase.cs" />
-    <Compile Include="RepositoryDialog.cs" />
-    <Compile Include="RepositoryView.cs" />
-    <Compile Include="RepositoryMenu.cs" />
-    <Compile Include="ScrolledWindowBase.cs" />
-    <Compile Include="ShowChangesetDialog.cs" />
-    <Compile Include="ShowChangesetEventHandler.cs" />
-    <Compile Include="ShowChangesetEventArgs.cs" />
-    <Compile Include="ShowFileDialog.cs" />
-    <Compile Include="ShowFileEventHandler.cs" />
-    <Compile Include="ShowFileEventArgs.cs" />
-    <Compile Include="SortableColumns.cs" />
-    <Compile Include="TreeViewBase.cs" />
-    <Compile Include="WorkingFolderDialog.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Makefile" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\class\Microsoft.TeamFoundation.Common\Microsoft.TeamFoundation.Common.csproj">
-      <Project>{E0953653-D640-4338-BDAE-91DA9C3583F8}</Project>
-      <Name>Microsoft.TeamFoundation.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\class\Microsoft.TeamFoundation.Client\Microsoft.TeamFoundation.Client.csproj">
-      <Project>{B0953653-D640-4338-BDAE-91DA9C3583F8}</Project>
-      <Name>Microsoft.TeamFoundation.Client</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\class\Microsoft.TeamFoundation\Microsoft.TeamFoundation.csproj">
-      <Project>{B0953653-D640-4338-BDAE-91DA9C3583F8}</Project>
-      <Name>Microsoft.TeamFoundation</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\class\Microsoft.TeamFoundation.VersionControl.Common\Microsoft.TeamFoundation.VersionControl.Common.csproj">
-      <Project>{A0953653-D640-4338-BDAE-91DA9C3583F8}</Project>
-      <Name>Microsoft.TeamFoundation.VersionControl.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\class\Microsoft.TeamFoundation.VersionControl.Client\Microsoft.TeamFoundation.VersionControl.Client.csproj">
-      <Project>{F0953653-D640-4338-BDAE-91DA9C3583F8}</Project>
-      <Name>Microsoft.TeamFoundation.VersionControl.Client</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ProjectExtensions>
-    <VisualStudio AllowExistingFolder="true" />
-  </ProjectExtensions>
-</Project>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{B0953653-A461-4338-BDAE-91DA9C35BBAA}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoStandardLibraries>false</NoStandardLibraries>
+    <AssemblyName>OpenTF.Common</AssemblyName>
+    <RootNamespace>OpenTF.Common</RootNamespace>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\lib\net_2_0\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\lib\net_2_0\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Makefile" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio AllowExistingFolder="true" />
+  </ProjectExtensions>
+</Project>
-- 
2.11.4.GIT