2006-09-08 Robert Jordan <robertj@gmx.net>

	* mkbundle.cs, TODO: The `-z' option is now supported under
	Windows.

svn path=/trunk/mcs/; revision=65086

diff --git a/mcs/tools/mkbundle/ChangeLog b/mcs/tools/mkbundle/ChangeLog
index 638173878c242d5f1280cb475ab1e7cb72d87484..57609d601d45b7302dd3c13d9d11486682ce9c75 100644 (file)
--- a/mcs/tools/mkbundle/ChangeLog
+++ b/mcs/tools/mkbundle/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-08  Robert Jordan  <robertj@gmx.net>
+
+       * mkbundle.cs, TODO: The `-z' option is now supported under
+       Windows.
+
 2006-09-05  Kornél Pál  <kornelpal@gmail.com>
 
        * TODO: Renamed mono-1.dll to mono.dll.

diff --git a/mcs/tools/mkbundle/TODO b/mcs/tools/mkbundle/TODO
index bf32644f4ad5f4856dd4bcf5c43e7d51f771ee36..bd57f96168dccb7a42fba8f4f88e1923df80e089 100644 (file)
--- a/mcs/tools/mkbundle/TODO
+++ b/mcs/tools/mkbundle/TODO
@@ -10,23 +10,18 @@ Files:
 
 Windows Issues:
 
---static doesn't work because libmono.a is not distributed with the
-Windows package.
-
-Not a big deal, because the needed dlls can be simply distributed with
-the mkbundle-generated executable.
-
-For example, a bundled XSP needs:
-
-mono.dll
-libglib*.dll
-libgmodule*.dll
-libgthread*.dll
-iconv.dll
-intl.dll
-
-(roundabout 10MB). This seems to be the minimal working set of dlls
-that have to be distributed with a bundled application.
-
--z doesn't work due to some weird cygwin zlib problems.
+       * --static is not supported and probably it will never be,
+         because the libgc code must reside in a DLL.
+
+       * Document that the following DLLs are required to be deployed
+         along with the bundle. Do we need some legal blub if we
+         incite the user to deploy these binaries?
+
+               [Mm]ono*.dll
+               libglib*.dll
+               libgmodule*.dll
+               libgthread*.dll
+               iconv.dll
+               intl.dll
+               zlib1.dll
 

diff --git a/mcs/tools/mkbundle/mkbundle.cs b/mcs/tools/mkbundle/mkbundle.cs
index 7fbda6bc581ca5cfd1616c034be1d2636c015e3e..f8c65c53f04b81e341d0e636e9bc2c8fa5c02217 100644 (file)
--- a/mcs/tools/mkbundle/mkbundle.cs
+++ b/mcs/tools/mkbundle/mkbundle.cs
@@ -110,10 +110,6 @@ class MakeBundle {
                                config_dir = args [++i];
                                break;
                        case "-z":
-                               if (style == "windows") {
-                                       Console.Error.WriteLine ("The option `{0}' is not supported on this platform.", args [i]);
-                                       return 1;
-                               }
                                compress = true;
                                break;
                        default: