Commit Graph

18 Commits

Author SHA1 Message Date
Julien Fischer
a2db163e56 Use a typed inst in spot.
extras/windows_installer_generator/sample/gen_merc_wxs.m:
    As above.
2023-02-14 16:49:09 +11:00
Julien Fischer
c4358adeeb Fix the windows installer generator sample
extras/windows_installer_generator/sample/gen_merc_wxs.m:
    Get this compiling again.

    Add a vim modeline; convert tabs to spaces.
2023-02-14 16:46:51 +11:00
Julien Fischer
df5b302a60 Update more links.
extras/windows_installer_generator/sample/gen_merc_wxs.m:
    As above.

    Delete trailing whitespace.
2023-02-14 16:32:08 +11:00
Julien Fischer
04db4c5b0b Delete trailing whitespace.
extras/windows_installer_generator/*.m:
    As above.
2022-01-18 16:46:08 +11:00
Julien Fischer
a908799acb Fix issues in extras caused by recent changes.
extras/*/*.m:
     Avoid ambiguous pragmas.

     Replace an use of is.

     Fix module imports.
2021-06-19 21:11:35 +10:00
Paul Bone
a0f4980d9d Move unnecessary execute bits
extras/windows_installer_generator/sample/images/Exclam.ico:
extras/windows_installer_generator/sample/images/Info.ico:
extras/windows_installer_generator/sample/images/banner.bmp:
extras/windows_installer_generator/sample/images/bg.bmp:
samples/solutions/all_solutions.m:
samples/solutions/some_solutions.m:
    These files had their execute bit set unnecessarily.
2018-11-18 16:20:56 +11:00
Mark Brown
d465fa53cb Update the COPYING.LIB file and references to it.
Discussion of these changes can be found on the Mercury developers
mailing list archives from June 2018.

COPYING.LIB:
    Add a special linking exception to the LGPL.

*:
    Update references to COPYING.LIB.

    Clean up some minor errors that have accumulated in copyright
    messages.
2018-06-09 17:43:12 +10:00
Paul Bone
fc4b3ff196 Remove .cvsignore files
Remove old .cvsignore files, moving their contents to .gitignore files.
There are now no .cvsignore files in the repository.

I've also sorted some .gitignore files and avoided repeating a pattern in a
subdirectory's .gitignore file when it is already mentioned in the parent
.gitignore file.
2017-04-04 12:05:56 +10:00
Zoltan Somogyi
d33273d033 Tell vim not to expand tabs in Makefiles.
This file-specific setting will override a default setting of expandtabs
in $HOME/.vimrc.

*/Makefile:
*/Mmakefile:
    As above.

tests/hard_coded/.gitignore:
    Don't ignore the purity subdir. This ignore must have been left over
    from when purity.m was a test in hard_coded, not hard_coded/purity,
    and it ignored an executable, not a directory.
2015-01-08 22:07:29 +11:00
Sebastian Godelet
fcee76f671 Update .gitignore files.
Update .gitignore files to ignore Unix executables and intermediate files.

extras/.gitignore:
    ignore *.beams

extras/cgi/.gitignore:
extras/gator/.gitignore:
extras/graphics/mercury_cairo/tutorial/.gitignore:
extras/logged_output/.gitignore:
extras/monte/.gitignore:
extras/odbc/.gitignore:
extras/posix/samples/.gitignore:
extras/quickcheck/.gitignore:
extras/quickcheck/tutes/.gitignore:
extras/references/samples/.gitignore:
    ignore executable(s)

extras/references/tests/.gitignore:
extras/trailed_update/tests/.gitignore:
    ignore test *.res and *.out files,
    ignore executable

extras/windows_installer_generator/sample/.gitignore:
samples/concurrency/dining_philosophers/.gitignore:
samples/concurrency/midimon/.gitignore:
    ignore executables

tests/hard_coded/.gitignore:
    ignore *.o and *.obj object files
2014-11-06 22:33:48 +11:00
Julien Fischer
436e5a2616 Remove deprecated modules and (most) deprecated procedures from the standard
Branches: main

Remove deprecated modules and (most) deprecated procedures from the standard
library.  (The remaining deprecated procedures probably need to stick around
for at least another release in order to give people time to adapt their code.)

library/dir.m:
library/list.m:
library/stack.m:
library/string.m:
library/type_desc.m:
	Delete obsolete procedures.

library/svarray.m:
library/svbag.m:
library/svbimap.m:
library/sveqvclass.m:
library/svmap.m:
library/svmulti_map.m:
library/svqueue.m:
library/svset.m:
library/svvarset.m:
	Delete these modules, they are no longer required since the
	original predicates now have their arguments in the state-variable
	friendly order.

library/library.m:
	Delete the above modules.

compiler/frameopt.m:
compiler/par_loop_control.m:
compiler/rbmm.region_transformation.m:
browser/browser_test.m:
extras/windows_installer_generator/wix_gui.m:
samples/ultra_sub.m:
tests/hard_coded/rnd.m:
tests/hard_coded/type_spec_ho_term.m:
tests/hard_coded/xmlable_test.m:
	Conform to the above changes.
2012-01-03 11:04:49 +00:00
Julien Fischer
9d4030c7b0 Fix the Windows installer generator program in the extras distribution.
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.
2008-04-04 05:28:28 +00:00
Julien Fischer
74e8da8ede Ignore generated files.
extras/windows_installer_generator/.cvsignore:
	Ignore generated files.
2008-04-04 05:23:11 +00:00
Julien Fischer
a70d249804 Don't check for a copyright message in the .cvsignore file.
extras/windows_installer_generator/.nocopyright:
	Don't check for a copyright message in the .cvsignore file.
2008-04-04 05:23:08 +00:00
Julien Fischer
9484fc521b Fix a typo: s/moduleis reposible/module is reponsible/
Estimated hours taken: 0
Branches: main, release

extras/windows_installer_generator/wix_installer.m:
	Fix a typo: s/moduleis reposible/module is reponsible/
2006-04-21 04:18:53 +00:00
Julien Fischer
9fb4f15dfc Fix compilation problems in the extras distribution caused by recent
Estimated hours taken: 0.5
Branches: main

Fix compilation problems in the extras distribution caused by recent
changes.

extras/stream/stream.m:
	Provide a definition for the type stream/1.

extras/*/*.m:
	Conform to the recent changes to the standard library.
2006-03-30 01:21:20 +00:00
Ian MacLarty
b20f03c4df Fix problems with the Windows installer generator.
Estimated hours taken: 10
Branches: main

Fix problems with the Windows installer generator.
The GUID's are now all pregenerated, which makes the generator a lot faster
(previously an external program needed to be called to generate each GUID).

Fix a problem with calling MinGW GCC from its installed location in
"Program Files/Mercury ...".  MinGW is configured to be installed in
c:\MinGW, so the Mercury compiler must pass extra arguments to gcc to
get it to find cc1 and the standard header files and libraries.

Allow installed shortcuts to be visible to all users.

extras/windows_installer_generator/wix.m:
extras/windows_installer_generator/wix_files.m:
	Read the GUIDs from a file instead of generating them on demand.

extras/windows_installer_generator/wix_gui.m:
	Allow more space for text in the welcome and finish steps.

extras/windows_installer_generator/wix_installer.m:
	Allow installed shortcuts to be visible to all users.

extras/windows_installer_generator/sample/Mercury.config:
	Add a customised version of Mercury.config for the WIndows installer.

extras/windows_installer_generator/sample/README:
extras/windows_installer_generator/sample/gen_merc_msi:
	Add a script to generate an .msi installer and mention it in the
	README.

extras/windows_installer_generator/sample/gen_merc_wxs.m:
	Set MERCURY_CONFIG_DIR on installation so that mercury_compile.exe
	(which we rename to mmc.exe) can find Mercury.config.
	Improve the messages in the installer wizard.

extras/windows_installer_generator/sample/mdb.c:
	Add a C version of mdb for the Windows installer.

extras/windows_installer_generator/sample/mdbrc:
	This file is used to generate a version of mdbrc that includes
	the stuff from mdb_doc, so that mdbrc doesn't need to know where
	mdb_doc is.

extras/windows_installer_generator/sample/images/banner.bmp:
extras/windows_installer_generator/sample/images/bg.bmp:
	Update installer images.
2006-01-04 07:48:42 +00:00
Ian MacLarty
b0c2d07d8d Implement a Wix source file generator. Wix is an XML language used to
Estimated hours taken: 50
Branches: main

Implement a Wix source file generator.  Wix is an XML language used to
describe Windows installer packages (.msi files).

NEWS:
	Mention the new library.

extras/Mmakefile:
	Include windows_installer_generator in SUBDIRS so it is
	built when mmake is run from the extras directory.

extras/README:
	Mention the new library.

extras/curs/curs.m:
	Use new module qualifier.

extras/windows_installer_generator/README:
extras/windows_installer_generator/wix.m:
extras/windows_installer_generator/wix_files.m:
extras/windows_installer_generator/wix_gui.m:
extras/windows_installer_generator/wix_installer.m:
extras/windows_installer_generator/wix_language.m:
extras/windows_installer_generator/wix_util.m:
	Implement a wix library for generating Wix source files.

extras/windows_installer_generator/sample/Mercury.options:
extras/windows_installer_generator/sample/README:
extras/windows_installer_generator/sample/gen_merc_wxs.m:
extras/windows_installer_generator/sample/images/Exclam.ico:
extras/windows_installer_generator/sample/images/Info.ico:
extras/windows_installer_generator/sample/images/banner.bmp:
extras/windows_installer_generator/sample/images/bg.bmp:
	Implement an example installer generator for the Mercury
	distribution.
2005-10-26 05:04:18 +00:00