Commit Graph

32 Commits

Author SHA1 Message Date
Scot Breitenfeld
442f985464 [svn-r25433] Brought changes from the trunk into the branch.
For the top level, brings in changes for configure.ac, configure and the MANIFEST:

   svn merge -c25286 https://svn.hdfgroup.uiuc.edu/hdf5/trunk .
   svn merge -c25287 https://svn.hdfgroup.uiuc.edu/hdf5/trunk .
   svn merge -c25290 https://svn.hdfgroup.uiuc.edu/hdf5/trunk .

For the fortran level:

   384	17:00	svn merge -r25235:25272 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran
   389	17:01	svn merge -r25284:25432 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran

For the fortran merges, I skipped changes relating to hyperslab selection since the C source has not been merged from the trunk yet. These changes should be in place in the fortran source when the C source is merged to the 1.8 branch.
2014-07-18 17:17:58 -05:00
Scot Breitenfeld
cb461d0ece [svn-r25237] Merged changes from the trunk to the branch,
svn merge -r25009:25235 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran

Tested: jam (gnu, intel, pgi)
2014-06-03 08:52:32 -05:00
Scot Breitenfeld
19c485a128 [svn-r25027] Merged changes from the trunk to the branch,
svn merge -r24929:25009 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran

tested: jam (gnu)
2014-04-11 22:26:21 -05:00
Allen Byrne
ab2d9f1e9c [svn-r24980] HDFFV-8290: Merge automake 1.14.1 changes from trunk
Tested: h5committest
2014-04-07 12:26:44 -05:00
Scot Breitenfeld
c129390dfe [svn-r23352] merged -r22826:23050 and -r23060:23351 from trunk into branch.
Tested: jam (gnu, intel)
2013-03-15 00:08:29 -05:00
Scot Breitenfeld
11861e6618 [svn-r22509] Merged changes from the trunk into the branch:
svn merge -r 22163:22479 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran

Fixed merged issue with fortran/test/tH5E_F03.f90 (missing part of the file) and
changed Makefile.am accordingly.
2012-07-02 20:12:37 -05:00
Elena Pourmal
d05e1c8ca1 [svn-r22503] Maintenance:
See HELPDESK-643 issue in JIRA.
NAG Fortran compiler doesn't like the current tH5E_F03.f90 file that has only comments
and no executable statements. Removed tH5E_F03.f90 from the list of modules to build.

Tested on jam with PGI compiler using --enable-fortran2003 flag. Will point the user to a 
snapshot when it is available.
2012-06-29 15:39:37 -05:00
Scot Breitenfeld
4af3cd2b7a [svn-r21421] Merged the Fortran 2003 changes from the trunk into the 1.8 branch, used:
svn merge -r 20506:21414 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran

Tested: jam (gnu, intel, pgi compilers)

Also merged effected non-Fortran files: 
svn merge -r21247:r21248 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/src/libhdf5.settings.in
2011-09-27 00:02:38 -05:00
Mike McGreevy
dd4360dccf [svn-r17645] Purpose:
Merge from Trunk

Description:

    Merging all of my CFLAGS-related changes from trunk to 1.8

    This includes revision #s: 17616, 17625, 17627, 17639, and 17643.

Tested:

    h5committest and some additional checks on our FreeBSD as well 
    as NCSA's machines.
2009-10-15 12:08:41 -05:00
Scot Breitenfeld
fe1ca64d16 [svn-r15727]
Maintenance: Merged new Fortran Features and tests from trunk into hdf5_1_8 branch
             (used svn merge -r 14941:14525 http://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran
              command).
2008-09-30 11:42:10 -05:00
Albert Cheng
4344cf5391 [svn-r15042] Bug fix.
Description:
The fortran Makefile.am used HDF_FORTRAN to indicate it is part of the
Fortran API source so that conclude.am will give fortran api prefix in the
test output.  The symbox HDF_FORTRAN is also used in configure for a different
purpose (indicated --enable-fortran). They conflicted.
Similar problem for the symbol HDF_CXX.

Solution:
Changed all the involved Makefile.am to use "FORTRAN_API" instead. It is
a more appropriate name.  Same for CXX_API.

Along the way, discovered that the Makefile.am of hl/fortran/test and
hl/cxx/test did not have those symbols at all.  Added them in.

Platform tested:
Kagiso serial and h5committested (kagisopp, smirom, linew).
2008-05-19 20:29:26 -05:00
Scot Breitenfeld
8d4ae7e283 [svn-r14964] merged the fortran trunk into the branch, used the command:
(svn merge -r 14942:14963 http://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran)
2008-05-09 16:38:52 -05:00
Elena Pourmal
0bfb17bf00 [svn-r14942] Maintenance: Merged new Fortran APIs and tests from trunk into hdf5_1_8 branch
(used svn merge -r 14505:14941 http://svn.hdfgorup.uiuc.edu/hdf5/trunk/fortran 
              command).
             Updated MANIFEST
             Disabled -O3 optimization for gcc 4.3 (long due check-in)

Platforms tested: kagiso with PGI compilers, smirom with g95 and v16 option, linew
2008-05-06 14:23:32 -05:00
Albert Cheng
a7cac4a194 [svn-r13264] Updated Makefile.am with new THG copyright notice.
Ran reconfigure to generate the Makefile.in files.
2007-02-07 17:28:58 -05:00
James Laird
64b5d95251 [svn-r12431] Purpose:
Configuration feature

Description:
'make install' now tests both static and shared libraries if both are installed.

Solution:
Previously, shared libraries were only tested when static libraries were not installed.
Also cleaned up line in commence.am that was including HL library in all Makefiles.

Platforms tested:
mir (Makefile change only)
2006-06-21 18:15:08 -05:00
Pedro Vicente Nunes
bc66efc788 [svn-r12229] Purpose:
new feature

Description:
1) separated the HL library into "public" and "private" header files, with the same caracteristics as the basic library
2) added the public headers to hdf5.h (with a conditional include macro, defined in configure.in)
3) added the path to HL in all Makefile.am 's , because of the inclusion in hdf5.h

Solution:

Platforms tested:
linux 32, 64
AIX
solaris
with fortran and c++

(one packet table example fails)

Misc. update:
2006-04-12 16:21:38 -05:00
James Laird
cc8f7d98bf [svn-r11418] Purpose:
Bug fix/feature

Description:
Disabled shared libraries for a number of Fortran compilers that don't
support them.
This allows other compilers to support shared Fortran libraries.

Solution:
Added a conditional, SHARED_FORTRAN_CONDITIONAL, which is true if
Fortran supports shared libraries.  It is set in configure.in.

Platforms tested:
mir, sleipnir, colonelk, heping
2005-09-15 16:30:06 -05:00
James Laird
33beeb7f55 [svn-r11411] Purpose:
Bug fix

Description:
Building with --disable-static seems to have been broken on several platforms.
Fixed this.
Configure will now disable shared libraries automatically when using pgf90
or when building on Cygwin.

Solution:
To avoid errors when using shared libraries with pgf90 (which I had not
realized were compiler-specific), I had manually set convenience libraries
to use the -static linking flag.  Apparently, this is not necessary, and
caused these libraries to be created as empty archives when --disable-static
was used.
Also, some libraries were including other libraries, which was not
necessary.
I also fixed code in configure.in to correctly detect whether shared
or static libraries are enabled, and moved code that disables shared libraries
to before libtool is created (rather than editing libtool after the fact).
Despite repeated warnings that only one shared library can be linked at a
time, I have yet to have shared libraries break the linking of tests on
any system.  We'll see if the Daily Tests turn up anything.

Platforms tested:
mir (fortran, C++), sleipnir (C++), modi4 (fortran, C++, parallel),
sol (fortran, C++), cygwin
2005-09-13 17:30:33 -05:00
Albert Cheng
8e52b3c798 [svn-r11202] Purpose:
bug fix.

Description:
Fortran test, fflush2, depends on a file created by fflush1.
Fixed Makefile to reflect such a dependency.

Platforms tested:
heping.
2005-08-04 15:23:25 -05:00
James Laird
e75a185eca [svn-r11185] Purpose:
Makefile feature

Description:
'make check-clean' now cleans *.h5 files created by tests as well as
.log and .chkexe files.

Solution:
check-clean is now a separate target in its own right, which cleans less
than mostlyclean (check-clean < mostlyclean < clean < distclean).

Platforms tested:
mir, heping, modi4 (serial and parallel)
2005-08-02 12:59:03 -05:00
James Laird
c63ef2cba2 [svn-r11179] Purpose:
Feature: check-clean target

Description:
'make check-clean' cleans up output files from tests.

Solution:
Tests create foo.chkexe and foo.log files.  Scripts create foo.chksh and
foo.logsh files.  'make check-clean' will clean these files up so that
the tests can be re-run.
Also suppressed some not-very-useful output of Makefiles when it would
echo commands.

Platforms tested:
mir, sleipnir, modi4

Misc. update:
2005-08-01 17:22:55 -05:00
James Laird
43f091f462 [svn-r11008] Purpose:
Feature: tests now use parallel make and only run once

Description:
When make is invoked in parallel (using the -j option), several tests will
now be run simultaneously.  This should speed up testing on a number of
systems.
When a test passes, it creates a foo.chkexe or foo.chksh file, which prevents
the test from running again unless the test or library changes.

Solution:
Most of the changes live in config/conclude.am.  Added *.chkexe and *.chksh
files to the list of files to be cleaned at "make mostlyclean" time.
Parallel tests still run one at a time, but use the same make instructions
as serial tests.

Platforms tested:
mir, eirene, sleipnir, pommier, copper, modi4 (some errors occurred, probably
due to the test being run before updating hdf5.  Will re-run tests after
checkin.)
2005-06-30 18:35:32 -05:00
James Laird
a05061f512 [svn-r10657] Purpose:
Configuration feature

Description:
Fortran integer types (not reals) are now automatically detected at
build-time.

Solution:
Two helper programs are used, one to detect what types the Fortran compiler
has access to, and one to generate header files for C and Fortran matching
up types.

Platforms tested:
mir, copper, modi4, pommier (last week)

Misc. update:
MANIFEST updated, H5f90fortran_types.f90 removed from configure.in, since
it is not longer generated by configure.
2005-04-25 14:00:06 -05:00
James Laird
1cc3666a27 [svn-r10656] Purpose:
Output tweak

Description:
Test output in C++ and Fortran directories now puts "C++ API:" or
"Fortran API:" in front of the name of the test being run.
I had overlooked the line of code that caused this to happen.

Solution:
Added HDF_CXX and HDF_FORTRAN variables to C++ and Fortran Makefiles.am.

Platforms tested:
heping (minor change)
2005-04-25 12:43:58 -05:00
James Laird
25df1908bc [svn-r10158] Purpose:
Automake version upgrade

Description:
Upgraded automake version from 1.6.2 to 1.9.5.
Changed bin/reconfigure script to use automake 1.9.5.
Changed configure.in and Makefiles to use new FCFLAGS and FC variables
instead of FFLAGS and F9X.
Automake and configure should now do the lion's share of the work
supporting Fortran 9X; macros in acsite.m4 are now mostly unused (will
be cleaned later).
Altered how configure handles pmake; now root-level Makefile.in is
processed by bin/reconfigure to have a .MAKEFLAGS target, since
automake no longer allows us to define unused variables.
Configure now always checks for C++ compiler even if it is not
used, since automake thinks this is the Right Thing To Do and
will break otherwise.

Platforms tested:
Sol, copper, heping, mir, sleipnir, eirene, pommier, kelgia, modi4.
2005-03-07 12:57:27 -05:00
James Laird
5b4232e9d1 [svn-r10107] Purpose:
Bug fix

Description:
Fortran builds were dying with unknown flags.

Solution:
Fortran builds should be static, not shared.  Static flags had been specified
for libraries, but apparently were also needed for executables.
Solved problem by adding static flag to everything in fortran directories.

Platforms tested:
mir, eirene
2005-02-28 17:54:17 -05:00
James Laird
d7883f21bf [svn-r10098] Purpose:
Bug fix

Description:
Some machines and compilers were having trouble creating fortran libraries
as shared libraries.

Solution:
Added flag in Makefiles.am to create fortran libraries as shared libraries.
(This is how HDF5 was set up before automake changes; I forgot to add
these flags, and it didn't cause a problem until now.)

Platforms tested:
sleipnir, eirene, verbena

Misc. update:
2005-02-26 17:28:23 -05:00
James Laird
adf0f3e317 [svn-r10013] Purpose:
Bug fix

Description:
While commenting out some code in a Makefile.am, I missed two lines.

Solution:
Commented out those lines.

Platforms tested:
verbena, heping

Misc. update:
2005-02-15 17:49:27 -05:00
James Laird
b96f342722 [svn-r9993] Purpose:
Bug fix

Description:
Arabica exhibited strange errors when linker found wrong versions of
header files.  This happened because include directories were
given to linker in the wrong order.

Solution:
Move include directories from AM_CFLAGS variable to INCLUDES
variable to put them before CPPFLAGS variable.  Trust me, it works.
This bug may also have contributed to strange errors on other platforms
(kelgia?).

Platforms tested:
copper, sleipnir, arabica.
	(h5dump broke while building on arabica, but this happened in
	a clean checkout, too).
2005-02-11 16:32:22 -05:00
James Laird
db2575baa9 [svn-r9930]
Purpose:
Bug fix

Description:
Parallel builds were breaking in tools/lib

Solution:
talign didn't realize it depended on libh5tools.la because its
dependencies listed the full path (../../tools/lib/libh5tools.la).
Changed this, and made similar changes in a couple of other
directories.
This checkin should also add the --foreign flag to every Makefile.in

Platforms tested:
sleipnir (minor change)
2005-02-03 16:59:40 -05:00
James Laird
30bfb1e0ea [svn-r9907] Purpose:
Bug fix

Description:
Different compilers use different flags to include Fortran module files

Solution:
Changed boilerplate to use configure variable rather than hardcoded -M flag.

Platforms tested:
sleipnir, sol, copper
2005-02-01 10:27:37 -05:00
James Laird
26303241fe [svn-r9902] Purpose:
Configuration feature

Description:
HDF5 now uses automake to generate Makefiles

Solution:
Makefile.in files are now generated from Makefile.am files.
To reconfigure (after chaning a Makefile.am or configure.in):
/bin/sh bin/reconfigure.sh

Platforms tested:
Many
2005-01-31 22:17:02 -05:00