diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000000000000000000000000000000000000..64bf4dfb6d110e2e4e057cae651db7952d85ad6b --- /dev/null +++ b/Makefile.am @@ -0,0 +1,27 @@ +ACLOCAL_AMFLAGS = -I m4 + +SUBDIRS = src/f90 + +##if ENABLE_EXAMPLES_F90 +##SUBDIRS += examples/f90 +##endif +##if ENABLE_EXAMPLES_MAT +##SUBDIRS += examples/matlab +##endif +##if ENABLE_EXAMPLES_PY +##SUBDIRS += examples/python +##endif + +if ENABLE_TESTS +SUBDIRS += tests/f90 +endif + +# See build-aux/git-version-gen +EXTRA_DIST = $(top_srcdir)/.version +BUILT_SOURCES = $(top_srcdir)/.version +$(top_srcdir)/.version: + echo $(VERSION) > $@-t && mv $@-t $@ +dist-hook: + echo $(VERSION) > $(distdir)/.tarball-version + +EXTRA_DIST += Code_transfer_INTERPOS_ITERandPartners.pdf LICENSE.pdf diff --git a/bootstrap b/bootstrap new file mode 100755 index 0000000000000000000000000000000000000000..3e81be074a1538d8d47bfe13741fb1599ac02cd0 --- /dev/null +++ b/bootstrap @@ -0,0 +1,39 @@ +#! /bin/sh +# Run ./bootstrap to generate the boilerplate scripts such as ./configure. + +if autoreconf --version 2>&1 > /dev/null ;then + autoreconf -f -v -i +else + set -x + aclocal --force -I m4 \ + && autoconf --force \ + && automake --add-missing --copy --force-missing +fi + +# Print a version into .version + +# The tags follow SVN tags, which are empty commits that branch off. +# This means git describe only works if on such a commit, otherwise +# we'll use this workaround to populate .version. + +# Traverse all tags, +# Find common ancestor of HEAD and tag, +# Count number of commits between this ancestor and HEAD +# Find tag with mininum count +# Produce a <tag>-<count>-g<hash> string a la git describe +if test "x`git describe 2>/dev/null`" = x ;then + TAGS=`git tag -l 2>/dev/null` + if test "x$TAGS" != x ;then + HD=`git describe --always --dirty` + for TAG in $TAGS ;do + MB=`git merge-base $TAG HEAD` + C=`git rev-list ${MB}..HEAD | wc -l` + # Count cannot be 0, git describe would have worked. + if test $C -gt 0 ;then + echo "$C $TAG-$C-g$HD" + fi + done | sort -n | head -n1 | cut -d' ' -f2 > .version + echo .version: `cat .version` + cp -v .version .tarball-version + fi +fi diff --git a/tests/f90/.gitignore b/tests/f90/.gitignore index ff0b675f10dcd456a51d7243216f85968333bd6c..cb60dbae4fea7b0f1ad8b54a8bc5133d94e8d6e6 100644 --- a/tests/f90/.gitignore +++ b/tests/f90/.gitignore @@ -1,5 +1,5 @@ *.log *.trs interpostest3 -interpostest_eqdsk +interpostest_2Deqdsk interpostest_profile diff --git a/tests/f90/Makefile.am b/tests/f90/Makefile.am index 01594439d5d77eeefd07f438d9343003c51e5281..7b4a1112f940471a320151c60a5551636e62f54f 100644 --- a/tests/f90/Makefile.am +++ b/tests/f90/Makefile.am @@ -12,16 +12,16 @@ LDADD += $(LAPACK_LIBS) $(BLAS_LIBS) $(LIBS) $(FCLIBS) endif if ENABLE_TESTS -check_PROGRAMS = interpostest3 interpostest_profile interpostest_eqdsk +check_PROGRAMS = interpostest3 interpostest_profile interpostest_2Deqdsk endif AM_DEFAULT_SOURCE_EXT = .f90 -interpostest_eqdsk_SOURCES = interpostest_2Deqdsk.f90 indexx.f90 +interpostest_2Deqdsk_SOURCES = interpostest_2Deqdsk.f90 indexx.f90 TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ $(top_srcdir)/build-aux/tap-driver.sh TESTS = $(check_PROGRAMS) -EXTRA_DIST = $(TESTS:%=%.f90) +EXTRA_DIST = $(TESTS:%=%.f90) $(interpostest_2Deqdsk_SOURCES) # Treat all .f90 files as preprocessed Fortran. PPFCCOMPILE = $(FC) $(FCDEFS) $(DEFAULT_INCLUDES) $(FCINCLUDES) $(AM_FCCPPFLAGS) $(FCCPPFLAGS) $(AM_FCFLAGS) $(FCFLAGS)