[Install] Add Compat.browser files for net_4_0 and net_4_5

Without that referencing browser 'Default' (parentID="Default")
in a .browser file make the app throw exceptions here
mcs/class/System.Web/System.Web.Configuration_2.0/nBrowser/Build.cs#L206

Signed-off-by: Etienne CHAMPETIER <etienne.champetier@fiducial.net>

diff --git a/configure.in b/configure.in
index 012fbc7f914088491f4a77d3edbf5de56c712ac9..c806492e281ade3c4af37f97d350e1dbd7b8f9b6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3388,7 +3388,35 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/Browsers/Compat.browser],
     $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
+    $LN_S $reldir/data/Browsers/Compat.browser Compat.browser
+    cd $depth
+],[LN_S='$LN_S'])
+
+AC_CONFIG_COMMANDS([runtime/etc/mono/4.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/4.0/Browsers/
+    cd runtime/etc/mono/4.0/Browsers
+    rm -f Compat.browser
+    $LN_S $reldir/data/Browsers/Compat.browser Compat.browser
+    cd $depth
+],[LN_S='$LN_S'])
+
+AC_CONFIG_COMMANDS([runtime/etc/mono/4.5/Browsers/Compat.browser],
+[   depth=../../../../..
+    case $srcdir in
+    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
+    .) reldir=$depth ;;
+    *) reldir=$depth/$srcdir ;;
+    esac
+    $ac_aux_dir/install-sh -d runtime/etc/mono/4.5/Browsers/
+    cd runtime/etc/mono/4.5/Browsers
+    rm -f Compat.browser
+    $LN_S $reldir/data/Browsers/Compat.browser Compat.browser
     cd $depth
 ],[LN_S='$LN_S'])
 
@@ -3496,6 +3524,8 @@ data/net_2_0/Makefile
 data/net_4_0/Makefile
 data/net_4_5/Makefile
 data/net_2_0/Browsers/Makefile
+data/net_4_0/Browsers/Makefile
+data/net_4_5/Browsers/Makefile
 data/mint.pc
 data/mono-2.pc
 data/monosgen-2.pc

diff --git a/data/Browsers/.gitattributes b/data/Browsers/.gitattributes
new file mode 100644 (file)
index 0000000..6b8861b
--- /dev/null
+++ b/data/Browsers/.gitattributes
@@ -0,0 +1 @@
+/Compat.browser -crlf

diff --git a/data/Browsers/ChangeLog b/data/Browsers/ChangeLog
new file mode 100644 (file)
index 0000000..26785e3
--- /dev/null
+++ b/data/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/Browsers/Compat.browser b/data/Browsers/Compat.browser
new file mode 100644 (file)
index 0000000..9950c71
--- /dev/null
+++ b/data/Browsers/Compat.browser
@@ -0,0 +1,42 @@
+<!--\r
+    This file defines some of the browsers that Microsoft's implementation provides in\r
+    <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.\r
+-->\r
+<browsers>\r
+  <defaultBrowser id="Default">\r
+  </defaultBrowser>
+  <browser id="Default">
+    <identification>
+       <userAgent match="." />
+    </identification>\r
+  </browser>\r
+  <browser id="IE6to9" parentID="Default">
+    <identification>
+      <capability name="majorver" match="^[6-9]" />
+      <capability name="browser" match="^(IE|AOL)$" />
+    </identification>\r
+  </browser>\r
+  <browser id="Opera8to9" parentID="Default">\r
+    <identification>
+      <capability name="majorver" match="^[8-9]" />
+      <capability name="browser" match="^Opera$" />
+    </identification>\r
+  </browser>\r
+  <browser id="Safari" parentID="Default">\r
+    <identification>
+      <capability name="browser" match="^Safari$" />
+    </identification>\r
+  </browser>\r
+  <browser id="Mozilla" parentID="Default">\r
+    <identification>
+      <capability name="browser" match="^Mozilla" />
+    </identification>\r
+  </browser>\r
+</browsers>
\ No newline at end of file

diff --git a/data/net_2_0/Browsers/.gitattributes b/data/net_2_0/Browsers/.gitattributes
deleted file mode 100644 (file)
index 6b8861b..0000000
--- a/data/net_2_0/Browsers/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-/Compat.browser -crlf

diff --git a/data/net_2_0/Browsers/ChangeLog b/data/net_2_0/Browsers/ChangeLog
deleted file mode 100644 (file)
index 26785e3..0000000
--- a/data/net_2_0/Browsers/ChangeLog
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644 (file)
index 9950c71..0000000
--- a/data/net_2_0/Browsers/Compat.browser
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--\r
-    This file defines some of the browsers that Microsoft's implementation provides in\r
-    <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.\r
--->\r
-<browsers>\r
-  <defaultBrowser id="Default">\r
-  </defaultBrowser>
-  <browser id="Default">
-    <identification>
-       <userAgent match="." />
-    </identification>\r
-  </browser>\r
-  <browser id="IE6to9" parentID="Default">
-    <identification>
-      <capability name="majorver" match="^[6-9]" />
-      <capability name="browser" match="^(IE|AOL)$" />
-    </identification>\r
-  </browser>\r
-  <browser id="Opera8to9" parentID="Default">\r
-    <identification>
-      <capability name="majorver" match="^[8-9]" />
-      <capability name="browser" match="^Opera$" />
-    </identification>\r
-  </browser>\r
-  <browser id="Safari" parentID="Default">\r
-    <identification>
-      <capability name="browser" match="^Safari$" />
-    </identification>\r
-  </browser>\r
-  <browser id="Mozilla" parentID="Default">\r
-    <identification>
-      <capability name="browser" match="^Mozilla" />
-    </identification>\r
-  </browser>\r
-</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
index 4d5b8c9c56b8dae4c45b2664c2284d5ebf8cce97..ed00678b16499fadcde2f93ae11c0f23c91abd6d 100644 (file)
--- a/data/net_2_0/Browsers/Makefile.am
+++ b/data/net_2_0/Browsers/Makefile.am
@@ -1,6 +1,6 @@
 monodir = $(sysconfdir)/mono/2.0/Browsers
 
-EXTRA_DIST =  Compat.browser
+EXTRA_DIST =  ../../Browsers/Compat.browser
 
-mono_DATA =  Compat.browser
+mono_DATA =  ../../Browsers/Compat.browser
 

diff --git a/data/net_4_0/Browsers/.gitignore b/data/net_4_0/Browsers/.gitignore
new file mode 100644 (file)
index 0000000..b336cc7
--- /dev/null
+++ b/data/net_4_0/Browsers/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in

diff --git a/data/net_4_0/Browsers/Makefile.am b/data/net_4_0/Browsers/Makefile.am
new file mode 100644 (file)
index 0000000..0940002
--- /dev/null
+++ b/data/net_4_0/Browsers/Makefile.am
@@ -0,0 +1,6 @@
+monodir = $(sysconfdir)/mono/4.0/Browsers
+
+EXTRA_DIST =  ../../Browsers/Compat.browser
+
+mono_DATA =  ../../Browsers/Compat.browser
+

diff --git a/data/net_4_0/Makefile.am b/data/net_4_0/Makefile.am
index 9ca4996f8b26f0efa1599e21ace935949fd11939..31727c5910b0ff8cfabc91d4542852f89f57cebe 100644 (file)
--- a/data/net_4_0/Makefile.am
+++ b/data/net_4_0/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS =
+SUBDIRS = Browsers
 
 monodir = $(sysconfdir)/mono/4.0
 

diff --git a/data/net_4_5/Browsers/.gitignore b/data/net_4_5/Browsers/.gitignore
new file mode 100644 (file)
index 0000000..b336cc7
--- /dev/null
+++ b/data/net_4_5/Browsers/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in

diff --git a/data/net_4_5/Browsers/Makefile.am b/data/net_4_5/Browsers/Makefile.am
new file mode 100644 (file)
index 0000000..a234829
--- /dev/null
+++ b/data/net_4_5/Browsers/Makefile.am
@@ -0,0 +1,6 @@
+monodir = $(sysconfdir)/mono/4.5/Browsers
+
+EXTRA_DIST =  ../../Browsers/Compat.browser
+
+mono_DATA =  ../../Browsers/Compat.browser
+

diff --git a/data/net_4_5/Makefile.am b/data/net_4_5/Makefile.am
index c45989c15e0a3190769852227c215c2f33cb1d1b..bfe4ac6a7b48609b17e50b448898b8be1e6da02a 100644 (file)
--- a/data/net_4_5/Makefile.am
+++ b/data/net_4_5/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS =
+SUBDIRS = Browsers
 
 monodir = $(sysconfdir)/mono/4.5
 

diff --git a/mono-core.spec.in b/mono-core.spec.in
index 455e0e5c51d4c2b1d929159d153e1603bd8eeb82..217bcaa0226ba6711723bb1ef38534d70fdd76d0 100644 (file)
--- a/mono-core.spec.in
+++ b/mono-core.spec.in
@@ -908,8 +908,10 @@ Mono implementation of ASP.NET, Remoting and Web Services.
 %config %_sysconfdir/mono/2.0/Browsers
 %config %_sysconfdir/mono/2.0/DefaultWsdlHelpGenerator.aspx
 %config %_sysconfdir/mono/2.0/web.config
+%config %_sysconfdir/mono/4.0/Browsers
 %config %_sysconfdir/mono/4.0/DefaultWsdlHelpGenerator.aspx
 %config %_sysconfdir/mono/4.0/web.config
+%config %_sysconfdir/mono/4.5/Browsers
 %config %_sysconfdir/mono/4.5/DefaultWsdlHelpGenerator.aspx
 %config %_sysconfdir/mono/4.5/web.config
 %config %_sysconfdir/mono/browscap.ini

diff --git a/msvc/win32.xml b/msvc/win32.xml
index 4ab2c674cb49b90c634c6c156d0b0d057b216296..6263590c1108efd95c39f3d7d8e55b06d367f34b 100644 (file)
--- a/msvc/win32.xml
+++ b/msvc/win32.xml
@@ -17,7 +17,9 @@
        <Copy source="{sourcedir}\mono\data\net_2_0\DefaultWsdlHelpGenerator.aspx" destination="{destdir}\etc\mono\2.0\DefaultWsdlHelpGenerator.aspx" />\r
        <Copy source="{sourcedir}\mono\data\net_2_0\settings.map" destination="{destdir}\etc\mono\2.0\settings.map" />\r
        <Copy source="{sourcedir}\mono\data\net_2_0\web.config" destination="{destdir}\etc\mono\2.0\web.config" />\r
-       <Copy source="{sourcedir}\mono\data\net_2_0\Browsers\Compat.browser" destination="{destdir}\etc\mono\2.0\Browsers\Compat.browser" />\r
+       <Copy source="{sourcedir}\mono\data\Browsers\Compat.browser" destination="{destdir}\etc\mono\2.0\Browsers\Compat.browser" />\r
+       <Copy source="{sourcedir}\mono\data\Browsers\Compat.browser" destination="{destdir}\etc\mono\4.0\Browsers\Compat.browser" />\r
+       <Copy source="{sourcedir}\mono\data\Browsers\Compat.browser" destination="{destdir}\etc\mono\4.5\Browsers\Compat.browser" />\r
        <Copy source="{sourcedir}\mono\data\browscap.ini" destination="{destdir}\etc\mono\browscap.ini" />\r
 \r
        <!-- Bring in xulrunner -->\r
@@ -1894,4 +1896,4 @@
 \r
        <!-- Build the wix includes files -->\r
        <WixInclude installeronly="true" root="{destdir}" wixfiles="{destdir}\Files.wxi" wixcomponents="{destdir}\Components.wxi"/>\r
-</Assemblies>
\ No newline at end of file
+</Assemblies>\r

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 927089468256c1b159aa6cfc2be79c909cdc8161..8cf639ff9118ef29b9ccf9706f7259f545ba276f 100644 (file)
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -6,13 +6,15 @@ 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 etc/mono/2.0/Browsers/Compat.browser
 
 if INSTALL_4_0
-symlinks += etc/mono/4.0/machine.config etc/mono/4.0/web.config etc/mono/4.5/web.config etc/mono/4.5/machine.config
+symlinks += etc/mono/4.0/machine.config etc/mono/4.0/web.config etc/mono/4.5/web.config etc/mono/4.5/machine.config etc/mono/4.0/Browsers/Compat.browser etc/mono/4.5/Browsers/Compat.browser
 endif
 
 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
+etc/mono/2.0/Browsers/Compat.browser: $(top_srcdir)/data/Browsers/Compat.browser
+etc/mono/4.0/Browsers/Compat.browser: $(top_srcdir)/data/Browsers/Compat.browser
+etc/mono/4.5/Browsers/Compat.browser: $(top_srcdir)/data/Browsers/Compat.browser
 etc/mono/4.0/machine.config: $(top_srcdir)/data/net_4_0/machine.config
 etc/mono/4.0/web.config: $(top_srcdir)/data/net_4_0/web.config
 etc/mono/4.5/machine.config: $(top_srcdir)/data/net_4_5/machine.config