mirror of
https://github.com/TREX-CoE/trexio.git
synced 2024-12-23 04:43:57 +01:00
Merge branch 'master' of github.com:TREX-CoE/trexio
This commit is contained in:
commit
68087b2ccc
@ -14,6 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
|
||||
VERSION_MAJOR=`echo ${PACKAGE_VERSION} | cut -d. -f1`
|
||||
VERSION_MINOR=`echo ${PACKAGE_VERSION} | cut -d. -f2`
|
||||
VERSION_PATCH=`echo ${PACKAGE_VERSION} | cut -d. -f3 | cut -d- -f1`
|
||||
AC_DEFINE_UNQUOTED(TREXIO_PACKAGE_VERSION, ["${PACKAGE_VERSION}"], [full version])
|
||||
AC_DEFINE_UNQUOTED(TREXIO_VERSION_MAJOR, [$VERSION_MAJOR], [major version])
|
||||
AC_DEFINE_UNQUOTED(TREXIO_VERSION_MINOR, [$VERSION_MINOR], [minor version])
|
||||
AC_DEFINE_UNQUOTED(TREXIO_VERSION_PATCH, [$VERSION_PATCH], [patch version])
|
||||
|
@ -5,7 +5,10 @@ cat prefix_front.c > trexio.c
|
||||
cat prefix_front.h > trexio.h
|
||||
# grep some usefull constants from the config.h
|
||||
echo "" >> trexio.h
|
||||
grep "_VERSION" ../../include/config.h >> trexio.h
|
||||
grep "TREXIO_PACKAGE_VERSION" ../../include/config.h >> trexio.h
|
||||
grep "TREXIO_VERSION_MAJOR" ../../include/config.h >> trexio.h
|
||||
grep "TREXIO_VERSION_MINOR" ../../include/config.h >> trexio.h
|
||||
grep "TREXIO_VERSION_PATCH" ../../include/config.h >> trexio.h
|
||||
echo "" >> trexio.h
|
||||
|
||||
cat prefix_s_front.h > trexio_s.h
|
||||
|
@ -761,7 +761,7 @@ trexio_open(const char* file_name, const char mode,
|
||||
return NULL;
|
||||
}
|
||||
|
||||
strncpy(result->version, PACKAGE_VERSION, 16);
|
||||
strncpy(result->version, TREXIO_PACKAGE_VERSION, 16);
|
||||
if (result->version[15] != '\0') {
|
||||
if (rc_open != NULL) *rc_open = TREXIO_FAILURE;
|
||||
free(result);
|
||||
@ -817,15 +817,15 @@ trexio_open(const char* file_name, const char mode,
|
||||
switch (back_end) {
|
||||
|
||||
case TREXIO_TEXT:
|
||||
rc = trexio_text_write_metadata_package_version(result, PACKAGE_VERSION);
|
||||
rc = trexio_text_write_metadata_package_version(result, TREXIO_PACKAGE_VERSION);
|
||||
break;
|
||||
|
||||
case TREXIO_HDF5:
|
||||
rc = trexio_hdf5_write_metadata_package_version(result, PACKAGE_VERSION);
|
||||
rc = trexio_hdf5_write_metadata_package_version(result, TREXIO_PACKAGE_VERSION);
|
||||
break;
|
||||
/*
|
||||
case TREXIO_JSON:
|
||||
rc = trexio_json_write_metadata_package_version(result, PACKAGE_VERSION);
|
||||
rc = trexio_json_write_metadata_package_version(result, TREXIO_PACKAGE_VERSION);
|
||||
break;
|
||||
,*/
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user