[m-rev.] for review: mercury installer script

Ian MacLarty maclarty at cs.mu.OZ.AU
Mon Nov 21 22:33:33 AEDT 2005


There is an sample installer available from
http://www.cs.mu.oz.au/~maclarty/mercury-compiler-DEV-2005-11-21.msi.
It contains the grades asm_fast.gc, hlc.gc, asm_fast.gc.tr.debug and
asm_fast.gc.decldebug.

Any feedback would be welcome.  

Note that the compiler hasn't worked with Windows 98 since we updated
the garbage collector (it segfaults).

mmc and mdb should work out of the box from the Windows command prompt.  
mmake doesn't work and I haven't tested any of the other tools.

Ian.

Estimated hours taken: 3
Branches: main

Create a script to generate a Windows installer for Mercury.

extras/windows_installer_generator/wix_gui.m:
	Increase the size of some text areas.

extras/windows_installer_generator/wix.m:
extras/windows_installer_generator/wix_installer.m:
	Add a new installer option that determines whether the installation
	is per-machine or per-user.

extras/windows_installer_generator/sample/README:
	Mention the new gen_merc_msi script.

extras/windows_installer_generator/sample/Mercury.config:
	Add a custom configuration file for the Windows installer.
	The only difference is that MERCURY_STDLIB_DIR is set from
	MERCURY_CONFIG_DIR instead of being hard coded.

extras/windows_installer_generator/sample/gen_merc_msi:
	Add a script for building a Mercury installer.

extras/windows_installer_generator/sample/gen_merc_wxs.m:
	Set the MERCURY_CONFIG_DIR and MERCURY_DEBUGGER_INIT 
	environment variables on installation.
	Add some more comments at the welcome and finish steps.
	Make the installation per-machine, so that the documentation
	shortcuts are created for all users.

extras/windows_installer_generator/sample/mdb.bat:
	Add a custom mdb script for the windows installer.

extras/windows_installer_generator/sample/mdbrc:
	Add a custom mdbrc file for the windows installer.

extras/windows_installer_generator/sample/images/banner.bmp:
extras/windows_installer_generator/sample/images/bg.bmp:
	Update these images slightly.

Index: extras/windows_installer_generator/wix.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/windows_installer_generator/wix.m,v
retrieving revision 1.1
diff -u -r1.1 wix.m
--- extras/windows_installer_generator/wix.m	26 Oct 2005 05:04:15 -0000	1.1
+++ extras/windows_installer_generator/wix.m	21 Nov 2005 11:07:00 -0000
@@ -14,6 +14,7 @@
 
 :- interface.
 
+:- import_module bool.
 :- import_module int.
 :- import_module io.
 :- import_module list.
@@ -93,6 +94,9 @@
                     % menu (see the definition of the shortcut_function 
                     % type below).
                 wix_shortcut_func           :: shortcut_function(L),
+
+                    % If yes then the shortcuts will be visible to all users.
+                wix_all_users               :: bool,
 
                     % A token representing the text to display in the
                     % title bar of the installer GUI.
Index: extras/windows_installer_generator/wix_gui.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/windows_installer_generator/wix_gui.m,v
retrieving revision 1.1
diff -u -r1.1 wix_gui.m
--- extras/windows_installer_generator/wix_gui.m	26 Oct 2005 05:04:16 -0000	1.1
+++ extras/windows_installer_generator/wix_gui.m	21 Nov 2005 11:07:00 -0000
@@ -326,7 +326,7 @@
     dialog(finish_dlg, 370 - 270, Title, not_modeless, [
         button(236 - 243, 56 - 17, not_default, Finish, [exit]),
         bitmap(0 - 0, 370 - 234, BackgroundSrc),
-        text(135 - 70, 220 - 60, Message, normal),
+        text(135 - 70, 220 - 160, Message, normal),
         text(135 - 20, 220 - 60, Heading, heading),
         line(0 - 234, 370 - 0)]).
 
@@ -689,7 +689,7 @@
         WizardStep = wizard_start(Heading, Message),
         Background = [bitmap(0 - 0, 370 - 234, BackgroundSrc)],
         HeadingText = [text(135 - 20, 220 - 60, Heading, heading)],
-        MessageText = [text(135 - 70, 220 - 30, Message, normal)],
+        MessageText = [text(135 - 70, 220 - 160, Message, normal)],
         BottomLine = [line(0 - 234, 370 - 0)],
         WizControls = NextButton ++ CancelButton ++
             HeadingText ++ MessageText ++ Background ++
Index: extras/windows_installer_generator/wix_installer.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/windows_installer_generator/wix_installer.m,v
retrieving revision 1.1
diff -u -r1.1 wix_installer.m
--- extras/windows_installer_generator/wix_installer.m	26 Oct 2005 05:04:16 -0000	1.1
+++ extras/windows_installer_generator/wix_installer.m	21 Nov 2005 11:07:00 -0000
@@ -39,6 +39,7 @@
 
 :- implementation.
 
+:- import_module bool.
 :- import_module exception.
 :- import_module int.
 :- import_module list.
@@ -62,7 +63,8 @@
                 ann_installer_bitmaps       :: map(string, id),
                 ann_installer_removedlg_id  :: id,
                 ann_installer_finish_id     :: id,
-                ann_installer_checkifadmin  :: maybe(string)
+                ann_installer_checkifadmin  :: maybe(string),
+                ann_insatller_all_users     :: bool
             ).
 
 :- type ann_set_env_var
@@ -100,7 +102,8 @@
 
 annotated_installer_to_xml(Installer) = XML :-
     Installer = annotated_installer(Product, LanguageId, EnvVarsGUID, EnvVars,
-        WizardSteps, BitMaps, RemoveDlgId, FinishDlgId, CheckIfAdmin),
+        WizardSteps, BitMaps, RemoveDlgId, FinishDlgId, CheckIfAdmin,
+        AllUsers),
     language_to_lcid(LanguageId, LCID),
     Product = annotated_product(
         GUID,
@@ -112,6 +115,14 @@
         Comments,
         Contents,
         DefInstallLoc),
+    (
+        AllUsers = yes,
+        AllUsersPropertyList = [elem("Property", [id_attr("ALLUSERS")],
+            [data("2")])]
+    ;
+        AllUsers = no,
+        AllUsersPropertyList = []
+    ),
     XML = elem("Wix", [
             attr("xmlns","http://schemas.microsoft.com/wix/2003/01/wix")],
         [
@@ -139,6 +150,7 @@
             else
                 []
             ) ++
+            AllUsersPropertyList ++
             [elem("Media", [
                 id_attr("1"),
                 attr("Cabinet", "contents.cab"),
@@ -194,7 +206,7 @@
             Product, 
             Language, 
             EnvVars, 
-            ShortCuts, 
+            ShortCuts, AllUsers,
             Title, InstallHeading, InstallDescr,
             Next, Back, Cancel, Install, CancelMessage, 
             RemoveHeading, RemoveConfirm, Remove,
@@ -251,12 +263,10 @@
 
         annotate_env_vars(Language, EnvVars, AnnEnvVars, !IdSupply,
             RequiredPrivilege),
-        (
-            RequiredPrivilege = admin,
+        ( if ( RequiredPrivilege = admin ; AllUsers = yes ) then
             det_translate(MustBeAdminMessage, Language, MustBeAdminMsgStr),
             CheckForAdmin = yes(MustBeAdminMsgStr)
-        ;
-            RequiredPrivilege = normal,
+        else
             CheckForAdmin = no
         ),
         det_translate(ManufacturerToken, Language, Manufacturer),
@@ -290,7 +300,8 @@
                 !.BitMaps,
                 RemoveDlgId,
                 FinishDlgId,
-                CheckForAdmin
+                CheckForAdmin,
+                AllUsers
             )
     ).
 
Index: extras/windows_installer_generator/sample/Mercury.config
===================================================================
RCS file: extras/windows_installer_generator/sample/Mercury.config
diff -N extras/windows_installer_generator/sample/Mercury.config
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ extras/windows_installer_generator/sample/Mercury.config	21 Nov 2005 11:07:00 -0000
@@ -0,0 +1,112 @@
+#! /bin/sh
+#---------------------------------------------------------------------------#
+# Copyright (C) 2005 The University of Melbourne.
+# This file may only be copied under the terms of the GNU General
+# Public License - see the file COPYING in the Mercury distribution.
+#---------------------------------------------------------------------------#
+#
+# Mercury.config
+#
+# Configuration file for the Melbourne Mercury Compiler.
+#
+# This is a custom configuration file written specifically for 
+# the Windows installer.
+#
+# Environment variables: MERCURY_STDLIB_DIR, MERCURY_C_COMPILER,
+# MERCURY_DEFAULT_GRADE, MERCURY_DEFAULT_OPT_LEVEL,
+# MERCURY_JAVA_COMPILER, MERCURY_JAVA_INTERPRETER.
+
+# These settings won't override settings in the environment.
+MERCURY_STDLIB_DIR=$(MERCURY_CONFIG_DIR)
+MERCURY_DEFAULT_OPT_LEVEL=-O2
+MERCURY_DEFAULT_GRADE=asm_fast.gc
+MERCURY_C_COMPILER=gcc
+MERCURY_MATH_LIB=
+MERCURY_JAVA_COMPILER=/c/MinGW/bin/gcj -C
+MERCURY_JAVA_INTERPRETER=/c/WINDOWS/system32/java
+# $(MATH_LIB) needs to be defined because it may
+# be used by the substitution for SHARED_LIBS.
+MATH_LIB=$(MERCURY_MATH_LIB)
+
+# This needed for Java classpath.
+INSTALL_JAVA_LIBRARY_DIR=$(MERCURY_STDLIB_DIR)/lib/java
+
+# If you change these, you will also need to change the files indicated in
+# scripts/c2init.in.
+RT_LIB_NAME=mer_rt
+STD_LIB_NAME=mer_std
+
+DEFAULT_MERCURY_LINKAGE=static
+
+# The default optimization level should be after
+# all the options that describe the machine configuration.
+DEFAULT_MCFLAGS=\
+		 \
+		 \
+		--cc "$(MERCURY_C_COMPILER)" \
+		--java-compiler "$(MERCURY_JAVA_COMPILER)" \
+		--java-interpreter "$(MERCURY_JAVA_INTERPRETER)" \
+		--grade "$(MERCURY_DEFAULT_GRADE)" \
+		--cflags-for-ansi "-ansi" \
+		--cflags-for-optimization "-O2 -fomit-frame-pointer -fno-strict-aliasing" \
+		--cflags-for-warnings "-Wall -Wwrite-strings -Wshadow -Wmissing-prototypes -Wno-unused -Wno-uninitialized -Wstrict-prototypes" \
+		--cflags-for-threads "-DGC_WIN32_THREADS -DMR_THREAD_SAFE" \
+		--cflags-for-debug "-g" \
+		--cflags-for-regs "-fno-builtin -fno-omit-frame-pointer" \
+		--cflags-for-gotos "-fno-defer-pop -fno-function-cse -fno-gcse" \
+		--cflags-for-pic "" \
+		--c-flag-to-name-object-file "-o " \
+		--object-file-extension ".o" \
+		--pic-object-file-extension ".o" \
+		--link-with-pic-object-file-extension ".o" \
+		--executable-file-extension ".exe" \
+		--shared-library-extension ".a" \
+		--library-extension ".a" \
+		--create-archive-command "ar" \
+		--create-archive-command-output-flag "" \
+		--create-archive-command-flags "cr" \
+		--ranlib-command "ranlib" \
+		--link-executable-command "$(MERCURY_C_COMPILER)" \
+		--link-shared-lib-command "$(MERCURY_C_COMPILER) -shared" \
+		--trace-libs "  " \
+		--thread-libs "" \
+		--shared-libs "`gcc -print-libgcc-file-name` $(MATH_LIB) -lc" \
+		--math-lib "" \
+		--readline-libs "" \
+		--linker-opt-separator "" \
+		--linker-thread-flags "" \
+		--shlib-linker-thread-flags "" \
+		--linker-trace-flags "" \
+		--shlib-linker-trace-flags "" \
+		--linker-static-flags "-static" \
+		--linker-strip-flag "-s" \
+		--linker-debug-flags "-g" \
+		--shlib-linker-debug-flags "-g" \
+		--linker-link-lib-flag "-l" \
+		--linker-link-lib-suffix "" \
+		--shlib-linker-link-lib-flag "-l" \
+		--shlib-linker-link-lib-suffix "" \
+		--linker-path-flag "-L" \
+		--linker-rpath-flag "-Wl,-rpath," \
+		--linker-rpath-separator " -Wl,-rpath," \
+		--shlib-linker-rpath-flag "-Wl,-rpath," \
+		--shlib-linker-rpath-separator " -Wl,-rpath," \
+		 \
+		--shlib-linker-install-name-flag "-install_name " \
+		--linker-allow-undefined-flag "" \
+		--linker-error-undefined-flag "" \
+		--fullarch "i686-pc-mingw32" \
+		--install-prefix "@INSTALL_PREFIX@" \
+		--num-real-r-regs "1" \
+		--num-real-r-temps "0" \
+		--conf-low-tag-bits "2" \
+		--bits-per-word "32" \
+		--bytes-per-word "4" \
+		--dotnet-library-version "1.0.2411.0" \
+		 \
+		--no-unboxed-float \
+		 \
+		$(MERCURY_DEFAULT_OPT_LEVEL) \
+		--no-use-symlinks \
+		 --libgrade asm_fast.gc 
+
Index: extras/windows_installer_generator/sample/README
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/windows_installer_generator/sample/README,v
retrieving revision 1.1
diff -u -r1.1 README
--- extras/windows_installer_generator/sample/README	26 Oct 2005 05:04:17 -0000	1.1
+++ extras/windows_installer_generator/sample/README	21 Nov 2005 11:07:00 -0000
@@ -6,17 +6,5 @@
 
 mmc --make gen_merc_wxs
 
-
-Usage: gen_merc_wxs <version> <path to merc files> <guid command> <out file>
-
-For example the command:
-
-gen_merc_wxs 0.12.0 c:\mercury uuidgen installer.wxs
-
-will produce the file installer.wxs based on the files in c:\mercury.
-The .wxs file can then be compiled into a Microsoft installer (.msi) 
-file using the Wix compiler and linker (candle.exe and light.exe), available
-from wix.sourceforge.net:
-
-candle installer.wxs
-light installer.wixobj
+The script gen_merc_msi can then be used to generate a Windows installer
+for Mercury.  See the comments in that script for usage information.
Index: extras/windows_installer_generator/sample/gen_merc_msi
===================================================================
RCS file: extras/windows_installer_generator/sample/gen_merc_msi
diff -N extras/windows_installer_generator/sample/gen_merc_msi
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ extras/windows_installer_generator/sample/gen_merc_msi	21 Nov 2005 11:07:00 -0000
@@ -0,0 +1,83 @@
+#!/bin/sh
+# This script will generate a windows installer for Mercury.
+#
+
+USAGE="Usage: gen_merc_msi VERSION INSTALL_DIR MINGW_DIR"
+
+# Before running this script perform the following actions:
+# 1. Compile and install Mercury, under MSYS, to INSTALL_DIR.
+# 2. Build the pdf and html documentation and install it to 
+#    INSTALL_DIR/lib/mercury/doc.
+#    (you may need to build the pdf documentation on a Linux machine, since
+#    pdftex doesn't work very well under Cygwin or MSYS).
+# 3. Checkout tutorial/book/book.pdf to INSTALL_DIR/lib/mercury/doc.
+# 4. Install a minimal version of MinGW (www.mingw.org) to MINGW_DIR.
+# 4. Make sure light and candle (available from wix.sourceforge.org) are
+#    in the PATH.
+# 5. Make sure uuidgen is in the PATH.
+# 6. Compile gen_merc_wxs.m (in this directory) on a system that generates
+#    unix style newlines such as an appropriately configured version of 
+#    Cygwin.
+#
+# Note that INSTALL_DIR has no relationship to where the compiler will be
+# installed on the user's machine when they run the installer, so can be 
+# anywhere.  INSTALL_DIR should be specified with a path that windows will
+# understand (such as c:/mercury, not /cygdrive/c/mercury).
+# VERSION is the version number the user will see in the generated installer.
+# It should match the version number of the compiler in INSTALL_DIR.
+#
+# This script should be run from the same directory it resides in.
+#
+
+VERSION=$1 ; shift
+INSTALL_DIR=$1 ; shift
+MINGW_DIR=$1 ; shift
+
+case $VERSION in
+	"")
+		echo $USAGE
+		exit 1
+		;;
+esac
+
+case $INSTALL_DIR in
+	"")
+		echo $USAGE
+		exit 1
+		;;
+esac
+
+case $MINGW_DIR in
+	"")
+		echo $USAGE
+		exit 1
+		;;
+esac
+
+# Install a new configuration file
+cp -f Mercury.config $INSTALL_DIR/lib/mercury/conf || exit 1
+
+# Copy mercury_compile.exe to mmc.exe so that mmc can be invoked from the
+# command prompt.
+mv -f $INSTALL_DIR/bin/mercury_compile.exe $INSTALL_DIR/bin/mmc.exe || \
+	mv -f $INSTALL_DIR/lib/mercury/bin/i686-pc-mingw32/mercury_compile.exe \
+	$INSTALL_DIR/bin/mmc.exe # || exit 1
+
+# Install an mdb.bat file to give basic debugging support.
+cp -f mdb.bat $INSTALL_DIR/bin | exit 1
+
+# Combine a special purpose mdbrc and the installed mdb_doc script
+# into one script, so that mdbrc doesn't have to know where mdb_doc resides.
+cat $INSTALL_DIR/lib/mercury/mdb/mdb_doc ./mdbrc > \
+	$INSTALL_DIR/lib/mercury/mdb/mdbrc || exit 1
+
+# Copy MinGW files.
+cp -rf $MINGW_DIR/bin/* $INSTALL_DIR/bin && \
+cp -rf $MINGW_DIR/lib/* $INSTALL_DIR/lib && \
+cp -rf $MINGW_DIR/include $INSTALL_DIR && \
+cp -rf $MINGW_DIR/libexec $INSTALL_DIR || exit 1
+
+# Generate the installer.
+./gen_merc_wxs $VERSION $INSTALL_DIR uuidgen mercury-compiler-$VERSION.wxs && \
+candle mercury-compiler-$VERSION.wxs && \
+light mercury-compiler-$VERSION.wixobj || exit 1
Index: extras/windows_installer_generator/sample/gen_merc_wxs.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/windows_installer_generator/sample/gen_merc_wxs.m,v
retrieving revision 1.1
diff -u -r1.1 gen_merc_wxs.m
--- extras/windows_installer_generator/sample/gen_merc_wxs.m	26 Oct 2005 05:04:17 -0000	1.1
+++ extras/windows_installer_generator/sample/gen_merc_wxs.m	21 Nov 2005 11:07:00 -0000
@@ -22,6 +22,7 @@
 
 :- implementation.
 
+:- import_module bool.
 :- import_module list.
 :- import_module string.
 
@@ -43,8 +44,14 @@
 		Installer ^ wix_product_info            = Product,
 		Installer ^ wix_language                = english_south_africa, 
 		Installer ^ wix_set_env_vars            = 
-			[set_env_var("PATH", path, prepend, system)],
+			[set_env_var("PATH", path, prepend, system),
+			 set_env_var("MERCURY_CONFIG_DIR", merc_conf_dir, 
+			 	replace, system),
+			 set_env_var("MERCURY_DEBUGGER_INIT", mdbrc_path,
+			 	replace, system)
+			],
 		Installer ^ wix_shortcut_func           = doc_shortcuts,
+		Installer ^ wix_all_users		= yes,
 		Installer ^ wix_title                   = title, 
 		Installer ^ wix_install_heading         = install_heading, 
 		Installer ^ wix_install_descr           = install_descr, 
@@ -71,7 +78,7 @@
 		Installer ^ wix_banner_source           = "images\\banner.bmp", 
 		Installer ^ wix_background_source       = "images\\bg.bmp",
 		Installer ^ wix_wizard_steps            = [
-			welcome_wizard_step(welcome, welcome_message),
+			welcome_wizard_step(welcome, welcome_message(Version)),
 			license_wizard_step(license_heading, blank, notice_src)
 		],
 
@@ -94,8 +101,10 @@
 	;	merc_comp(string)
 	;	product_comments
 	;	path
+	;	merc_conf_dir
+	;	mdbrc_path
 	;	welcome
-	;	welcome_message
+	;	welcome_message(string)
 	;	title
 	;	next
 	;	back
@@ -124,9 +133,11 @@
 	;	html_ref_man
 	;	html_lib_ref
 	;	html_user_guide
+	;	html_trans
 	;	pdf_ref_man
 	;	pdf_lib_ref
 	;	pdf_user_guide
+	;	pdf_trans
 	;	pdf_tutorial
 	;	blank.
 
@@ -142,12 +153,16 @@
 		Shortcuts = [shortcut(programs, html_user_guide)]
 	else if FileName = "mercury_library.html" then
 		Shortcuts = [shortcut(programs, html_lib_ref)]
+	else if FileName = "mercury_trans_guide.html" then
+		Shortcuts = [shortcut(programs, html_trans)]
 	else if FileName = "reference_manual.pdf" then
 		Shortcuts = [shortcut(programs, pdf_ref_man)]
 	else if FileName = "user_guide.pdf" then
 		Shortcuts = [shortcut(programs, pdf_user_guide)]
 	else if FileName = "library.pdf" then
 		Shortcuts = [shortcut(programs, pdf_lib_ref)]
+	else if FileName = "transition_guide.pdf" then
+		Shortcuts = [shortcut(programs, pdf_trans)]
 	else if FileName = "book.pdf" then
 		Shortcuts = [shortcut(programs, pdf_tutorial)]
 	else
@@ -213,10 +228,17 @@
 token_to_english(merc_comp(Version), "Mercury " ++ Version).
 token_to_english(product_comments, "").
 token_to_english(path, "\"[INSTALLDIR]bin\"").
+token_to_english(merc_conf_dir, "\"[INSTALLDIR]lib\\mercury\"").
+token_to_english(mdbrc_path, "[INSTALLDIR]lib\\mercury\\mdb\\mdbrc").
 token_to_english(welcome, "Welcome.").
-token_to_english(welcome_message, 
-	"This program will install the Melbourne Mercury distribution " ++
-	"to your computer. Click Next to continue.").
+token_to_english(welcome_message(Version), 
+	"You are about to install the Melbourne Mercury distribution " ++
+	"(version " ++ Version ++ ") onto your computer.\r\n\r\n" ++
+	"The compiler (mmc) and debugger (mdb) will be added to your PATH " ++
+	"and the MERCURY_CONFIG_DIR environment variable will be set " ++
+	"to the configuration directory of the newly installed compiler."++
+	"\r\n\r\n" ++
+	"Click Next to continue.").
 token_to_english(title, "Mercury installer").
 token_to_english(next, "Next >").
 token_to_english(back, "< Back").
@@ -231,7 +253,7 @@
 token_to_english(install_descr, 
 	"Installation may take a few minutes, please be patient.").
 token_to_english(remove_heading, "Uninstall").
-token_to_english(remove_confirm, "Are you sure you wish to uninstall?").
+token_to_english(remove_confirm, "Are you sure you wish to uninstall Mercury?").
 token_to_english(remove, "Remove").
 token_to_english(files_in_use_heading, 
 	"Some files that need to be updated are currently in use.").
@@ -245,20 +267,34 @@
 token_to_english(remove_prog_descr, 
 	"Uninstallation may take a few minutes, please be patient.").
 token_to_english(admin_message, 
-	"You need to be an administrator to install this software.").
-token_to_english(finish_heading, "All done.").
+	"You need to be an administrator to install Mercury, " ++
+	"because the installer needs to set the PATH "++
+	"environment variable at the system level.").
+token_to_english(finish_heading, "Thank you for installing Mercury.").
 token_to_english(finish_message, 
-	"Thank you for installing Mercury. " ++
-	"Online documentation is avalible from www.cs.mu.oz.au/mercury. " ++
-	"Please email any bug reports to mercury-bugs at cs.mu.oz.au. " ++
+	"Shortcuts to the online documentation have been placed " ++
+	"under the Start/Programs menu. " ++
+	"You can get additional help from the Mercury user's mailing list. " ++
+	"For details on how to subscribe to this mailing list goto " ++
+	"http://www.cs.mu.oz.au/mercury and click on the \"Mailing Lists\" " ++
+	"link.  " ++
+	"Please email any bug reports to mercury-bugs at cs.mu.oz.au. \r\n\r\n" ++
+	"NOTE: The installer has set the environment variables " ++
+	"MERCURY_CONFIG_DIR and MERCURY_DEBUGGER_INIT.  " ++
+	"If you are already running Mercury under Cygwin or MSYS " ++
+	"then you will need to unset these " ++
+	"before running mmc under " ++
+	"these environments.\r\n\r\n" ++
 	"Click finish to exit the Mercury installer.").
 token_to_english(finish, "Finish").
 token_to_english(html_ref_man, "Reference Manual (HTML)").
 token_to_english(pdf_ref_man, "Reference Manual (PDF)").
 token_to_english(html_lib_ref, "Library Reference (HTML)").
+token_to_english(html_trans, "Prolog to Mercury transition guide (HTML)").
 token_to_english(pdf_lib_ref, "Library Reference (PDF)").
 token_to_english(html_user_guide, "User Guide (HTML)").
 token_to_english(pdf_user_guide, "User Guide (PDF)").
+token_to_english(pdf_trans, "Prolog to Mercury transition guide (PDF)").
 token_to_english(pdf_tutorial, "Introductory Tutorial (PDF)").
 
 :- func merc_installer_usage_message = string.
Index: extras/windows_installer_generator/sample/mdb.bat
===================================================================
RCS file: extras/windows_installer_generator/sample/mdb.bat
diff -N extras/windows_installer_generator/sample/mdb.bat
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ extras/windows_installer_generator/sample/mdb.bat	21 Nov 2005 11:07:00 -0000
@@ -0,0 +1,9 @@
+ at echo off
+rem  A version of mdb for Windows.  This version does not support
+rem  any of the options supported by the unix shell script version, but
+rem  then none of those options are applicable to Windows anyway.
+rem
+set OLD_MERCURY_OPTIONS=%MERCURY_OPTIONS%
+set MERCURY_OPTIONS=%MERCURY_OPTIONS% -Di
+%1 %2 %3 %4 %5 %6 %7 %8 %9
+set MERCURY_OPTIONS=%OLD_MERCURY_OPTIONS%
Index: extras/windows_installer_generator/sample/mdbrc
===================================================================
RCS file: extras/windows_installer_generator/sample/mdbrc
diff -N extras/windows_installer_generator/sample/mdbrc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ extras/windows_installer_generator/sample/mdbrc	21 Nov 2005 11:07:00 -0000
@@ -0,0 +1,16 @@
+alias	s	step
+alias	g	goto
+alias	f	finish
+alias	r	retry
+alias	v	vars
+alias	p	print
+alias	P	print *
+alias	d	stack
+alias	c	continue
+alias	b	break
+alias	h	help
+alias	?	help
+alias	excp	exception
+alias	e	exception
+alias	EMPTY	step
+alias	NUMBER	step
Index: extras/windows_installer_generator/sample/images/banner.bmp
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/windows_installer_generator/sample/images/banner.bmp,v
retrieving revision 1.1
diff -u -r1.1 banner.bmp
Binary files /tmp/cvskM6dCX and banner.bmp differ
Index: extras/windows_installer_generator/sample/images/bg.bmp
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/windows_installer_generator/sample/images/bg.bmp,v
retrieving revision 1.1
diff -u -r1.1 bg.bmp
Binary files /tmp/cvsfjUSGs and bg.bmp differ
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------



More information about the reviews mailing list