++ data/net_2_0/Browsers/ChangeLog (revision 0)

	* Compat.browser: added.  Provides browser definitions with
	compatible IDs.


++ data/net_2_0/ChangeLog	(working copy)

	* Makefile.am: added Browsers/Compat.browser

++ ChangeLog	(working copy)

	* configure.in, runtime/Makefile.am: create a symlink at
	mono/runtime/etc/mono/2.0/Browsers/Compat.browser similar to machine.config


svn path=/trunk/mono/; revision=100147

8 files changed, 82 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index f74087dd0a7..083d681d759 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-08  Dean Brettle  <dean@brettle.com>
+
+	* configure.in, runtime/Makefile.am: create a symlink at
+	mono/runtime/etc/mono/2.0/Browsers/Compat.browser similar to machine.config
+
 2008-03-26  Massimiliano Mantione  <massi@ximian.com>
 	* configure.in: Added PLATFORM_LINUX automake conditional.
 
diff --git a/configure.in b/configure.in
index eb01bc53520..7af857a0b9e 100644
--- a/configure.in
+++ b/configure.in
@@ -2130,6 +2130,20 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/browscap.ini],
     cd $depth
 ],[LN_S='$LN_S'])
 
+AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/Browsers/Compat.browser],
+[   depth=../../../../..
+    case $srcdir in
+    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
+    .) reldir=$depth ;;
+    *) reldir=$depth/$srcdir ;;
+    esac
+    $ac_aux_dir/install-sh -d runtime/etc/mono/2.0/Browsers/
+    cd runtime/etc/mono/2.0/Browsers
+    rm -f Compat.browser
+    $LN_S $reldir/data/net_2_0/Browsers/Compat.browser Compat.browser
+    cd $depth
+],[LN_S='$LN_S'])
+
 AC_OUTPUT([
 Makefile
 mono-uninstalled.pc
@@ -2178,6 +2192,7 @@ docs/Makefile
 data/Makefile
 data/net_1_1/Makefile
 data/net_2_0/Makefile
+data/net_2_0/Browsers/Makefile
 data/mint.pc
 data/mono.pc
 data/mono-cairo.pc
diff --git a/data/net_2_0/Browsers/ChangeLog b/data/net_2_0/Browsers/ChangeLog
new file mode 100644
index 00000000000..26785e377c4
--- /dev/null
+++ b/data/net_2_0/Browsers/ChangeLog
@@ -0,0 +1,6 @@
+2008-03-23  Dean Brettle  <dean@brettle.com>
+
+	* Compat.browser: added.  Provides browser definitions with
+	compatible IDs.
+
+
diff --git a/data/net_2_0/Browsers/Compat.browser b/data/net_2_0/Browsers/Compat.browser
new file mode 100644
index 00000000000..9950c71c5f0
--- /dev/null
+++ b/data/net_2_0/Browsers/Compat.browser
@@ -0,0 +1,42 @@
+<!--

+    This file defines some of the browsers that Microsoft's implementation provides in

+    <windir>\Microsoft.NET\Framework\<ver>\CONFIG\Browsers\*.browser
+	
+	It is not derived from any file distributed with Microsoft's implementation.  Since
+	we can't distribute MS's browser files, we use browscap.ini to determine 
+	browser capabilities.  Then, if and only if the application contains App_Browser/*.browser
+	files and we are using .NET 2.0 or higher, we supplement the capabilities with the 
+	information in those files and the files in this directory.  The primary goal of this file
+	is provide browser definitions that might be referenced in App_Browser/*.browser files.

+-->

+<browsers>

+  <defaultBrowser id="Default">

+  </defaultBrowser>
+  <browser id="Default">
+    <identification>
+    	<userAgent match="." />
+    </identification>

+  </browser>

+  <browser id="IE6to9" parentID="Default">
+    <identification>
+      <capability name="majorver" match="^[6-9]" />
+      <capability name="browser" match="^(IE|AOL)$" />
+    </identification>

+  </browser>

+  <browser id="Opera8to9" parentID="Default">

+    <identification>
+      <capability name="majorver" match="^[8-9]" />
+      <capability name="browser" match="^Opera$" />
+    </identification>

+  </browser>

+  <browser id="Safari" parentID="Default">

+    <identification>
+      <capability name="browser" match="^Safari$" />
+    </identification>

+  </browser>

+  <browser id="Mozilla" parentID="Default">

+    <identification>
+      <capability name="browser" match="^Mozilla" />
+    </identification>

+  </browser>

+</browsers>
\ No newline at end of file
diff --git a/data/net_2_0/Browsers/Makefile.am b/data/net_2_0/Browsers/Makefile.am
new file mode 100644
index 00000000000..4d5b8c9c56b
--- /dev/null
+++ b/data/net_2_0/Browsers/Makefile.am
@@ -0,0 +1,6 @@
+monodir = $(sysconfdir)/mono/2.0/Browsers
+
+EXTRA_DIST =  Compat.browser
+
+mono_DATA =  Compat.browser
+
diff --git a/data/net_2_0/ChangeLog b/data/net_2_0/ChangeLog
index 31af13befa6..bdeda2953be 100644
--- a/data/net_2_0/ChangeLog
+++ b/data/net_2_0/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-23  Dean Brettle  <dean@brettle.com>
+
+	* Makefile.am: added Browsers/Compat.browser
+
 2008-02-29  Marek Habersack  <mhabersack@novell.com>
 
 	* machine.config: added an entry to ignore the browserCaps section.
diff --git a/data/net_2_0/Makefile.am b/data/net_2_0/Makefile.am
index a9ae78aaf44..e583ecfc08d 100644
--- a/data/net_2_0/Makefile.am
+++ b/data/net_2_0/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = Browsers
+
 monodir = $(sysconfdir)/mono/2.0
 
 EXTRA_DIST =  machine.config \
diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 1340c528d99..02a0e02ec37 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -6,12 +6,13 @@ tmpinst = _tmpinst
 noinst_SCRIPTS = mono-wrapper monodis-wrapper
 
 etctmp = etc
-symlinks = etc/mono/1.0/machine.config etc/mono/2.0/machine.config etc/mono/2.0/web.config etc/mono/browscap.ini
+symlinks = etc/mono/1.0/machine.config etc/mono/2.0/machine.config etc/mono/2.0/web.config etc/mono/browscap.ini etc/mono/2.0/Browsers/Compat.browser
 
 etc/mono/1.0/machine.config: $(top_srcdir)/data/net_1_1/machine.config
 etc/mono/2.0/machine.config: $(top_srcdir)/data/net_2_0/machine.config
 etc/mono/2.0/web.config: $(top_srcdir)/data/net_2_0/web.config
 etc/mono/browscap.ini: $(top_srcdir)/data/browscap.ini
+etc/mono/2.0/Browsers/Compat.browser: $(top_srcdir)/data/net_2_0/Browsers/Compat.browser
 
 $(symlinks):
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@