Skip to content

Commit 1b9399b

Browse files
committed
FoX 4.1.2: update changelog and version number
Also fix URL in final CML metadata element.
1 parent 8f71db0 commit 1b9399b

10 files changed

+28
-21
lines changed

Changelog

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2012-01-05: version 4.1.2
2+
Fix --enable-dummy bug that stopped compilation
3+
Reorder generic procedures used in specification-parts
4+
to allow strict Fortran 2008 compilers to build FoX
5+
Work around minor issue with Cray compiler. FoX will now
6+
build and run with the Cray Fortran compiler.
7+
18
2011-12-05: version 4.1.1
29
Add new 'countrts' function to common
310
Add capability for wcml to handle bonds

DoX/FoX_DoX.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ <h2>Testing</h2>
184184

185185
<p>To run them all, simply run <code>make check</code> from the top-level directory. This will run the individual testsuites, and collate their results.</p>
186186

187-
<p>If any failures occur (unrelated to known compiler issues, see the <a href="http://github.com/andreww/fox/issues">up-to-date list</a>), please send a message to the mailing list (<a href="&#109;&#x61;&#x69;&#108;&#x74;&#x6F;:&#x66;&#x6F;&#120;&#x2D;&#100;&#105;s&#99;&#x75;&#x73;&#115;&#64;&#x67;&#111;&#x6F;&#x67;&#108;&#x65;&#x67;&#114;&#111;&#x75;&#x70;&#x73;&#x2E;&#x63;&#x6F;&#x6D;">&#x66;&#x6F;&#120;&#x2D;&#100;&#105;s&#99;&#x75;&#x73;&#115;&#64;&#x67;&#111;&#x6F;&#x67;&#108;&#x65;&#x67;&#114;&#111;&#x75;&#x70;&#x73;&#x2E;&#x63;&#x6F;&#x6D;</a>) with details of compiler, hardware platform, and the nature of the failure.</p>
187+
<p>If any failures occur (unrelated to known compiler issues, see the <a href="http://github.com/andreww/fox/issues">up-to-date list</a>), please send a message to the mailing list (<a href="&#109;&#97;&#105;&#x6C;to:&#102;&#x6F;&#x78;&#45;&#x64;&#105;&#x73;&#x63;&#x75;&#115;&#115;&#64;&#x67;&#111;o&#x67;&#x6C;&#101;&#x67;&#114;&#x6F;&#117;&#x70;&#x73;&#x2E;&#x63;&#111;&#109;">&#102;&#x6F;&#x78;&#45;&#x64;&#105;&#x73;&#x63;&#x75;&#115;&#115;&#64;&#x67;&#111;o&#x67;&#x6C;&#101;&#x67;&#114;&#x6F;&#117;&#x70;&#x73;&#x2E;&#x63;&#111;&#109;</a>) with details of compiler, hardware platform, and the nature of the failure.</p>
188188

189189
<p>The testsuites for the SAX and DOM libraries are very extensive, and are somewhat fragile, so are not distributed with FoX. Please contact the author for details.</p>
190190

@@ -3653,9 +3653,9 @@ <h2>URI</h2>
36533653
<h1>Further information</h1>
36543654

36553655
<p>FoX evolved from the initial codebase of <a href="http://lcdx00.wm.lc.ehu.es/ag/xml/">xmlf90</a>,
3656-
which was written largely by Alberto Garcia &lt;<a href="&#109;&#97;&#105;&#108;t&#111;:a&#x6C;&#x62;&#101;&#114;&#x74;&#x6F;&#103;&#64;&#105;&#99;&#x6D;&#x61;&#x62;.&#101;&#115;">a&#x6C;&#x62;&#101;&#114;&#x74;&#x6F;&#103;&#64;&#105;&#99;&#x6D;&#x61;&#x62;.&#101;&#115;</a>> and Jon Wakelin &lt;<a href="&#x6D;&#x61;&#105;&#108;&#116;&#x6F;:&#106;&#x6F;&#110;&#x2E;&#119;&#x61;&#107;&#101;&#x6C;&#x69;&#x6E;&#64;&#x62;&#114;&#x69;&#115;&#x74;&#111;&#x6C;&#46;&#x61;&#x63;&#x2E;&#117;&#107;">&#106;&#x6F;&#110;&#x2E;&#119;&#x61;&#107;&#101;&#x6C;&#x69;&#x6E;&#64;&#x62;&#114;&#x69;&#115;&#x74;&#111;&#x6C;&#46;&#x61;&#x63;&#x2E;&#117;&#107;</a>>.</p>
3656+
which was written largely by Alberto Garcia &lt;<a href="&#109;a&#105;&#x6C;&#x74;&#x6F;:&#x61;&#108;&#x62;&#101;&#114;&#x74;&#x6F;&#103;&#64;&#x69;&#99;&#109;&#97;&#98;&#x2E;&#101;&#x73;">&#x61;&#108;&#x62;&#101;&#114;&#x74;&#x6F;&#103;&#64;&#x69;&#99;&#109;&#97;&#98;&#x2E;&#101;&#x73;</a>> and Jon Wakelin &lt;<a href="&#109;&#x61;&#x69;&#x6C;&#116;&#111;:&#106;o&#x6E;&#x2E;&#x77;a&#107;&#101;&#108;&#105;&#x6E;&#64;&#x62;r&#x69;&#x73;&#116;o&#108;&#46;&#x61;&#x63;&#46;&#117;&#x6B;">&#106;o&#x6E;&#x2E;&#x77;a&#107;&#101;&#108;&#105;&#x6E;&#64;&#x62;r&#x69;&#x73;&#116;o&#108;&#46;&#x61;&#x63;&#46;&#117;&#x6B;</a>>.</p>
36573657

3658-
<p>FoX is the work of Toby White &lt;<a href="&#x6D;&#x61;&#x69;&#108;&#x74;&#x6F;:&#x74;&#x6F;&#x77;&#64;&#117;&#115;&#122;&#x6C;&#x61;.&#x6D;&#x65;&#46;&#x75;&#x6B;">&#x74;&#x6F;&#x77;&#64;&#117;&#115;&#122;&#x6C;&#x61;.&#x6D;&#x65;&#46;&#x75;&#x6B;</a>>, and all bug reports/complaints/bouquets of roses should be sent to him. Andrew Walker &lt;<a href="&#x6D;&#97;&#105;&#x6C;&#116;&#111;:&#97;&#110;&#100;&#114;&#101;&#119;&#46;&#x77;&#97;&#x6C;k&#101;&#114;&#64;&#98;&#114;&#105;&#115;&#116;&#111;&#x6C;&#46;&#x61;&#99;&#46;&#x75;&#107;">&#97;&#110;&#100;&#114;&#101;&#119;&#46;&#x77;&#97;&#x6C;k&#101;&#114;&#64;&#98;&#114;&#105;&#115;&#116;&#111;&#x6C;&#46;&#x61;&#99;&#46;&#x75;&#107;</a>> currently looks after maintenance of FoX.</p>
3658+
<p>FoX is the work of Toby White &lt;<a href="&#x6D;&#97;&#x69;&#108;&#116;&#111;:&#116;&#111;&#x77;&#64;&#117;&#115;z&#108;a&#46;&#x6D;&#101;&#46;&#x75;&#107;">&#116;&#111;&#x77;&#64;&#117;&#115;z&#108;a&#46;&#x6D;&#101;&#46;&#x75;&#107;</a>>, and all bug reports/complaints/bouquets of roses should be sent to him. Andrew Walker &lt;<a href="&#109;&#x61;&#105;&#x6C;&#116;&#x6F;:&#97;&#110;dr&#x65;&#119;&#46;w&#x61;&#x6C;&#107;&#101;&#x72;&#64;&#98;&#114;&#x69;&#x73;&#116;&#111;&#108;&#46;&#x61;&#99;&#46;&#117;&#107;">&#97;&#110;dr&#x65;&#119;&#46;w&#x61;&#x6C;&#107;&#101;&#x72;&#64;&#98;&#114;&#x69;&#x73;&#116;&#111;&#108;&#46;&#x61;&#99;&#46;&#117;&#107;</a>> currently looks after maintenance of FoX.</p>
36593659

36603660
<p>There is a FoX website at <a href="http://www1.gly.bris.ac.uk/~walker/FoX/">http://www1.gly.bris.ac.uk/~walker/FoX/</a>.</p>
36613661

@@ -3676,7 +3676,7 @@ <h1>Licensing</h1>
36763676
&copy; 2003, 2004, Alberto Garcia, Jon Wakelin <br />
36773677
&copy; 2005-2008, Toby White <br />
36783678
&copy; 2007-2009, Gen-Tao Chiang
3679-
&copy; 2008-2011, Andrew Walker
3679+
&copy; 2008-2012, Andrew Walker
36803680
All rights reserved.</p>
36813681

36823682
<p>Redistribution and use in source and binary forms, with or without

DoX/Licensing.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h1>Licensing</h1>
1919
&copy; 2003, 2004, Alberto Garcia, Jon Wakelin <br />
2020
&copy; 2005-2008, Toby White <br />
2121
&copy; 2007-2009, Gen-Tao Chiang
22-
&copy; 2008-2011, Andrew Walker
22+
&copy; 2008-2012, Andrew Walker
2323
All rights reserved.</p>
2424

2525
<p>Redistribution and use in source and binary forms, with or without

DoX/Licensing.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Copyright:
1111
&copy; 2003, 2004, Alberto Garcia, Jon Wakelin
1212
&copy; 2005-2008, Toby White
1313
&copy; 2007-2009, Gen-Tao Chiang
14-
&copy; 2008-2011, Andrew Walker
14+
&copy; 2008-2012, Andrew Walker
1515
All rights reserved.
1616

1717
Redistribution and use in source and binary forms, with or without

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ as shown in the file utils/fox_m_utils_mtprng.f90
1010
This version of FoX is:
1111
(c) 2005-2009 Toby White <[email protected]>
1212
(c) 2007-2009 Gen-Tao Chiang <[email protected]>
13-
(c) 2008-2011 Andrew Walker <[email protected]>
13+
(c) 2008-2012 Andrew Walker <[email protected]>
1414

1515
All rights reserved.
1616

common/FoX_common.F90

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ module FoX_common
1111
private
1212

1313
#ifdef DUMMYLIB
14-
character(len=*), parameter :: FoX_version = '4.1.1-dummy'
14+
character(len=*), parameter :: FoX_version = '4.1.2-dummy'
1515
#else
16-
character(len=*), parameter :: FoX_version = '4.1.1'
16+
character(len=*), parameter :: FoX_version = '4.1.2'
1717
#endif
1818

1919
public :: FoX_version

config/configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
AC_INIT([FoX],[4.1.1],[[email protected]])
1+
AC_INIT([FoX],[4.1.2],[[email protected]])
22
AC_CONFIG_SRCDIR([README.FoX.txt])
33
dnl
44
dnl Find system type.

configure

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.61 for FoX 4.1.1.
3+
# Generated by GNU Autoconf 2.61 for FoX 4.1.2.
44
#
55
# Report bugs to <[email protected]>.
66
#
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
574574
# Identity of this package.
575575
PACKAGE_NAME='FoX'
576576
PACKAGE_TARNAME='fox'
577-
PACKAGE_VERSION='4.1.1'
578-
PACKAGE_STRING='FoX 4.1.1'
577+
PACKAGE_VERSION='4.1.2'
578+
PACKAGE_STRING='FoX 4.1.2'
579579
PACKAGE_BUGREPORT='[email protected]'
580580

581581
ac_unique_file="README.FoX.txt"
@@ -1183,7 +1183,7 @@ if test "$ac_init_help" = "long"; then
11831183
# Omit some internal or obsolete options to make the list less imposing.
11841184
# This message is too long to be a string in the A/UX 3.1 sh.
11851185
cat <<_ACEOF
1186-
\`configure' configures FoX 4.1.1 to adapt to many kinds of systems.
1186+
\`configure' configures FoX 4.1.2 to adapt to many kinds of systems.
11871187
11881188
Usage: $0 [OPTION]... [VAR=VALUE]...
11891189
@@ -1248,7 +1248,7 @@ fi
12481248

12491249
if test -n "$ac_init_help"; then
12501250
case $ac_init_help in
1251-
short | recursive ) echo "Configuration of FoX 4.1.1:";;
1251+
short | recursive ) echo "Configuration of FoX 4.1.2:";;
12521252
esac
12531253
cat <<\_ACEOF
12541254
@@ -1342,7 +1342,7 @@ fi
13421342
test -n "$ac_init_help" && exit $ac_status
13431343
if $ac_init_version; then
13441344
cat <<\_ACEOF
1345-
FoX configure 4.1.1
1345+
FoX configure 4.1.2
13461346
generated by GNU Autoconf 2.61
13471347
13481348
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1356,7 +1356,7 @@ cat >config.log <<_ACEOF
13561356
This file contains any messages produced by compilers while
13571357
running configure, to aid debugging if configure makes a mistake.
13581358
1359-
It was created by FoX $as_me 4.1.1, which was
1359+
It was created by FoX $as_me 4.1.2, which was
13601360
generated by GNU Autoconf 2.61. Invocation command line was
13611361
13621362
$ $0 $@
@@ -6804,7 +6804,7 @@ exec 6>&1
68046804
# report actual input values of CONFIG_FILES etc. instead of their
68056805
# values after options handling.
68066806
ac_log="
6807-
This file was extended by FoX $as_me 4.1.1, which was
6807+
This file was extended by FoX $as_me 4.1.2, which was
68086808
generated by GNU Autoconf 2.61. Invocation command line was
68096809
68106810
CONFIG_FILES = $CONFIG_FILES
@@ -6847,7 +6847,7 @@ Report bugs to <[email protected]>."
68476847
_ACEOF
68486848
cat >>$CONFIG_STATUS <<_ACEOF
68496849
ac_cs_version="\\
6850-
FoX config.status 4.1.1
6850+
FoX config.status 4.1.2
68516851
configured by $0, generated by GNU Autoconf 2.61,
68526852
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
68536853

wcml/m_wcml_core.F90

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ subroutine cmlEndCml(xf)
118118
type(xmlf_t), intent(inout) :: xf
119119

120120
#ifndef DUMMYLIB
121-
call cmlAddMetadata(xf, name='dc:contributor', content='FoX-'//FoX_version//' (http://www.uszla.me.uk/FoX)')
121+
call cmlAddMetadata(xf, name='dc:contributor', content='FoX-'//FoX_version//' (http://www1.gly.bris.ac.uk/~walker/FoX)')
122122
call xml_EndElement(xf, 'cml')
123123
#endif
124124

wcml/test/test_cmlEndCml_2.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<cml convention="CMLComp" fileId="test.xml" xmlns="http://www.xml-cml.org/schema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:fpx="http://www.uszla.me.uk/fpx" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:units="http://www.uszla.me.uk/FoX/units" xmlns:cmlUnits="http://www.xml-cml.org/units/units" xmlns:siUnits="http://www.xml-cml.org/units/siUnits" xmlns:atomicUnits="http://www.xml-cml.org/units/atomic">
3-
<metadata name="dc:contributor" content="FoX-4.1.1 (http://www.uszla.me.uk/FoX)"/>
3+
<metadata name="dc:contributor" content="FoX-4.1.2 (http://www1.gly.bris.ac.uk/~walker/FoX)"/>
44
</cml>

0 commit comments

Comments
 (0)