[m-rev.] trivial diff: fix broken windows installer generator in extras dist.

[Julien Fischer]

Estimated hours taken: 0.2
Branches: main

Fix the Windows installer generator program in the extras distribution.

extras/windows_installer_generator/wix_installer.m:
 	Add a missing abstract type declaration.
 	(This was causing problems with type class constraints that
 	referred to the type; the underlying problem is already
 	reported as bug #17 in Mantis.)

extras/windows_installer_generator/wix_util.m:
 	Conform to changes in the string module.

Julien.

Index: wix_installer.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/extras/windows_installer_generator/wix_installer.m,v
retrieving revision 1.4
diff -u -r1.4 wix_installer.m
--- wix_installer.m	21 Apr 2006 04:18:53 -0000	1.4
+++ wix_installer.m	4 Apr 2008 05:23:16 -0000
@@ -26,6 +26,8 @@

  :- import_module wix.

+:- type annotated_installer.
+
  % gen_annotated_installer(Installer, GUIDStream, AnnotatedInstaller, !IO).
  %

Index: wix_util.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/extras/windows_installer_generator/wix_util.m,v
retrieving revision 1.2
diff -u -r1.2 wix_util.m
--- wix_util.m	30 Mar 2006 01:21:20 -0000	1.2
+++ wix_util.m	4 Apr 2008 05:23:16 -0000
@@ -142,17 +142,17 @@
  :- pred is_legal_windows_short_name(string::in) is semidet.

  is_legal_windows_short_name(FileName) :-
-    Parts = string.words(unify('.'), FileName),
+    Parts = string.words_separator(unify('.'), FileName),
      (
          Parts = [BaseName, Extension],
          string.length(BaseName) =< 8,
          string.length(Extension) =< 3,
-        string.is_alnum_or_underscore(BaseName),
-        string.is_alnum_or_underscore(Extension)
+        string.is_all_alnum_or_underscore(BaseName),
+        string.is_all_alnum_or_underscore(Extension)
      ;
          Parts = [BaseName],
          string.length(BaseName) =< 8,
-        string.is_alnum_or_underscore(BaseName)
+        string.is_all_alnum_or_underscore(BaseName)
      ).

      % XXX I don't know exactly how to do this, so am ignoring it for

--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------