TREX/trexio
1
0
Fork 0
mirror of https://github.com/TREX-CoE/trexio.git synced 2024-12-23 04:43:57 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:TREX-CoE/trexio

Browse Source
This commit is contained in:
q-posev 2021-11-08 20:11:32 +01:00
commit f0df59e003
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Makefile.am
View File

@ -35,8 +35,9 @@
ACLOCAL_AMFLAGS = -I m4
CLEANFILES = trexio.mod
BUILT_SOURCES = trexio.mod
EXTRA_DIST = .git_hash
SUBDIRS =
SUBDIRS =
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = pkgconfig/trexio.pc
@ -61,9 +62,9 @@ SOURCES = \
src/trexio_text.c \
src/trexio_text.h
if HAVE_HDF5
if HAVE_HDF5
SOURCES += src/trexio_hdf5.c \
src/trexio_hdf5.h
src/trexio_hdf5.h
endif
ORG_FILES = \
@ -88,7 +89,7 @@ TESTS_C = \
tests/overwrite_all_text \
tests/io_all
if HAVE_HDF5
if HAVE_HDF5
TESTS_C += \
tests/open_hdf5 \
tests/io_num_hdf5 \
@ -97,7 +98,7 @@ TESTS_C += \
tests/io_safe_dset_float_hdf5 \
tests/io_str_hdf5 \
tests/io_dset_str_hdf5 \
tests/overwrite_all_hdf5
tests/overwrite_all_hdf5
endif
TESTS_F = \
@ -110,7 +111,7 @@ check_PROGRAMS = $(TESTS)
LDADD = src/libtrexio.la
# in principal, specifying -no-install (see below) is not mandatory
# for the tests to compile and pass, but the produced test binaries differ
# for the tests to compile and pass, but the produced test binaries differ
tests_open_text_LDFLAGS = -no-install
tests_io_num_text_LDFLAGS = -no-install
tests_io_dset_float_text_LDFLAGS = -no-install
@ -178,10 +179,10 @@ doc: html
# =============== DEVELOPER MODE =============== #
SWIG = @SWIG@
HDF5_LDFLAGS = @HDF5_LDFLAGS@
HDF5_CFLAGS = @HDF5_CFLAGS@
HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
SWIG = @SWIG@
HDF5_LDFLAGS = @HDF5_LDFLAGS@
HDF5_CFLAGS = @HDF5_CFLAGS@
HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
if TREXIO_DEVEL
@ -189,6 +190,11 @@ CLEANFILES += $(SOURCES) $(trexio_f) $(trexio_h)
BUILT_SOURCES += $(SOURCES) $(trexio_f) $(test_trexio_f)
.git_hash: FORCE
git log | head -1 | cut -d ' ' -f 2 > .git_hash
all: .git_hash
$(SOURCES): $(trexio_f)
src/trexio.c: $(trexio_h)
@ -232,7 +238,7 @@ python-sdist: $(pytrexio_py) $(setup_py) $(setup_cfg)
cd python && \
python setup.py sdist
$(pytrexio_py): $(pytrexio_c)
$(pytrexio_py): $(pytrexio_c)
cd tools && ./prepare_python.sh
# Build Python module and C wrapper code for TREXIO using SWIG
@ -244,7 +250,7 @@ $(pytrexio_c): $(ORG_FILES) $(trexio_h) $(pytrexio_i) $(numpy_i)
$(RM) -- src/trexio.h
$(numpy_i):
wget https://raw.githubusercontent.com/numpy/numpy/main/tools/swig/numpy.i -O $(numpy_i)
wget https://raw.githubusercontent.com/numpy/numpy/main/tools/swig/numpy.i -O $(numpy_i)
check-numpy:
cd tools && ./check_numpy_i.sh
@ -259,3 +265,4 @@ CLEANFILES += $(pytrexio_c) \
endif
.PHONY: FORCE

9
configure.ac
View File

@ -169,7 +169,14 @@ if test "x${TREXIO_DEVEL}" != "x"; then
HAS_CPPCHECK=1
fi
GIT_HASH=`git log | head -1 | cut -d ' ' -f 2 | tee ${srcdir}/.git_hash`
else
GIT_HASH=`cat ${srcdir}/.git_hash`
fi
AC_DEFINE_UNQUOTED(GIT_HASH, ["${GIT_HASH}"], [Git SHA1 Hash])
## Libm
## ----
@ -191,7 +198,7 @@ AC_OUTPUT
echo \
"-------------------------------------------------
${PACKAGE_NAME} Version ${PACKAGE_VERSION} ${TREXIO_DEVEL}
${PACKAGE_NAME} Version ${PACKAGE_VERSION} ${GIT_HASH} ${TREXIO_DEVEL}
Prefix ........: ${prefix}
CC ............: ${CC}