Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Update version information for 5.7.1 release.
  • Loading branch information
dcjm committed Nov 18, 2017
1 parent 0853362 commit d581681
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 23 deletions.
12 changes: 6 additions & 6 deletions PolyML.rc
Expand Up @@ -82,7 +82,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
DEFPUSHBUTTON "OK",IDOK,7,92,50,14
LTEXT "Poly/ML v 5.7 Copyright David C.J. Matthews, Cambridge University Technical Services and contributors 2000-17.\n\nThis is free software and released under the GNU Lesser General Public License.",IDC_STATIC,24,30,167,47
LTEXT "Poly/ML v 5.7.1 Copyright David C.J. Matthews, Cambridge University Technical Services and contributors 2000-17.\n\nThis is free software and released under the GNU Lesser General Public License.",IDC_STATIC,24,30,167,47
ICON IDI_ICON,IDC_STATIC,7,7,20,20
END

Expand Down Expand Up @@ -122,8 +122,8 @@ IDI_ICON ICON "poly.ico"
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 5,7,0,0
PRODUCTVERSION 5,7,0,0
FILEVERSION 5,7,1,0
PRODUCTVERSION 5,7,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -139,13 +139,13 @@ BEGIN
BLOCK "080904b0"
BEGIN
VALUE "CompanyName", " "
VALUE "FileDescription", "PolyML v5.7"
VALUE "FileVersion", "5.7.0.0"
VALUE "FileDescription", "PolyML v5.7.1"
VALUE "FileVersion", "5.7.1.0"
VALUE "InternalName", "PolyML"
VALUE "LegalCopyright", "Copyright � David Matthews, CUTS and contributors 2000-2017"
VALUE "OriginalFilename", "PolyML.exe"
VALUE "ProductName", "PolyML"
VALUE "ProductVersion", "5.7.0.0"
VALUE "ProductVersion", "5.7.1.0"
END
END
BLOCK "VarFileInfo"
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.

AC_INIT([Poly/ML],[5.7],[polyml AT polyml DOT org],[polyml])
AC_INIT([Poly/ML],[5.7.1],[polyml AT polyml DOT org],[polyml])
AM_INIT_AUTOMAKE
AC_PREREQ(2.65)
# libtoolize recommends this line.
Expand Down
2 changes: 1 addition & 1 deletion libpolyml/Makefile.am
Expand Up @@ -8,7 +8,7 @@ AM_ASFLAGS = $(OSFLAG)
AM_CCASFLAGS = $(OSFLAG)

lib_LTLIBRARIES = libpolyml.la
libpolyml_la_LDFLAGS = -version-info 8:0:0
libpolyml_la_LDFLAGS = -version-info 9:0:0

if INTERNAL_LIBFFI
libpolyml_la_LIBADD = ../libffi/libffi_convenience.la
Expand Down
2 changes: 1 addition & 1 deletion libpolyml/poly_specific.cpp
Expand Up @@ -71,7 +71,7 @@ extern "C" {
#define SAVE(x) taskData->saveVec.push(x)

static const char *poly_runtime_system_copyright =
"Copyright (c) 2002-17 David C.J. Matthews, CUTS and contributors.";
"Copyright (c) 2002-17 David C.J. Matthews, CUTS and contributors.";

#ifndef GIT_VERSION
#define GIT_VERSION ""
Expand Down
10 changes: 5 additions & 5 deletions libpolyml/version.h
Expand Up @@ -24,15 +24,15 @@
#define VERSION_H_INCLUDED

// Poly/ML system interface level
#define POLY_version_number 570
#define POLY_version_number 571
// POLY_version_number is written into all exported files and tested
// when we start up. The idea is to ensure that if a file is exported
// from one version of the library it will run successfully if linked
// with a different version.
// This only supports version 5.7
#define FIRST_supported_version 570
#define LAST_supported_version 570
// This only supports version 5.7.1
#define FIRST_supported_version 571
#define LAST_supported_version 571

#define TextVersion "5.7"
#define TextVersion "5.7.1"

#endif
2 changes: 1 addition & 1 deletion mlsource/MLCompiler/CompilerVersion.sml
Expand Up @@ -17,7 +17,7 @@

structure CompilerVersion =
struct
val compilerVersion = "5.7.1 Testing"
val compilerVersion = "5.7.1 Release"
val versionNumber = 571
val versionSuffix = Int.toString versionNumber
end;
2 changes: 1 addition & 1 deletion poly.1
@@ -1,4 +1,4 @@
.TH POLY 1 "Poly/ML Version 5.7 2017"
.TH POLY 1 "Poly/ML Version 5.7.1 2017"
.SH NAME
poly \- the Poly/ML Standard ML implementation
.SH SYNOPSIS
Expand Down
2 changes: 1 addition & 1 deletion polyc.1
@@ -1,4 +1,4 @@
.TH POLY 1 "Poly/ML Version 5.7 2017"
.TH POLY 1 "Poly/ML Version 5.7.1 2017"
.SH NAME
polyc \- Compile and link a Standard ML program using Poly/ML
.SH SYNOPSIS
Expand Down
2 changes: 1 addition & 1 deletion polyimport.1
@@ -1,4 +1,4 @@
.TH POLY 1 "Poly/ML Version 5.7 2017"
.TH POLY 1 "Poly/ML Version 5.7.1 2017"
.SH NAME
polyimport \- the Poly/ML import program
.SH SYNOPSIS
Expand Down
10 changes: 5 additions & 5 deletions wininstall/PolyML.wxs
@@ -1,21 +1,21 @@
<?xml version='1.0' encoding='windows-1252'?>
<!-- 32/64-bit version -->
<?if $(var.Platform) = x64 ?>
<?define ProductName = "Poly/ML 5.7 (64 bit)" ?>
<?define ProductName = "Poly/ML 5.7.1 (64 bit)" ?>
<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
<?define UpgradeCode = "7A6C52B0-B7C1-4879-8702-131A21F690FE" ?>
<?else ?>
<?define ProductName = "Poly/ML 5.7" ?>
<?define ProductName = "Poly/ML 5.7.1" ?>
<?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
<?define UpgradeCode = "D7A17500-0FF5-4FC3-BC36-DD799D57071A" ?>
<?endif ?>

<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<Product Name="$(var.ProductName)" Id='*' UpgradeCode='$(var.UpgradeCode)'
Language='2057' Codepage='1252' Version='5.7' Manufacturer='Poly/ML'>
Language='2057' Codepage='1252' Version='5.7.1' Manufacturer='Poly/ML'>

<Package Id='*' Keywords='Installer' Description="Poly/ML 5.7 Installer"
<Package Id='*' Keywords='Installer' Description="Poly/ML 5.7.1 Installer"
InstallerVersion='200' Languages='2057' Compressed='yes' SummaryCodepage='1252' />
<Condition Message="Poly/ML is only supported on Windows Vista or later.">
<![CDATA[Installed OR (VersionNT >= 600)]]>
Expand All @@ -26,7 +26,7 @@
<MajorUpgrade
DowngradeErrorMessage="A later version of Poly/ML is already installed. Setup will now exit." />

<Property Id='DiskPrompt' Value="Poly/ML 5.7 Installation [1]" />
<Property Id='DiskPrompt' Value="Poly/ML 5.7.1 Installation [1]" />

<Directory Id='TARGETDIR' Name='SourceDir'>
<Directory Id='$(var.PlatformProgramFilesFolder)' Name='PFiles'>
Expand Down

0 comments on commit d581681

Please sign in to comment.