Maintenance will be performed on git.ligo.org, chat.ligo.org, containers.ligo.org, and docs.ligo.org tomorrow, 2020/08/04, starting at approximately 9am PDT. It is expected to take around 15 minutes and there will be a short period of downtime towards the end of the maintenance window. Please direct any comments, questions or concerns to computing-help@ligo.org.

Commit 9b6151a7 authored by Karl Wette's avatar Karl Wette

LALVCSInfo: consolidate VCS and build information in structs

- generate_vcs_info.sh: add @CLEAN@ replacement, evaluates to just "CLEAN"
  or "UNCLEAN" depending of state of git repositor
- Generate build information into LAL...BuildInfoHeader.h instead of
  LAL...BuildInfo.c, and as #defines instead of constant variables so
  that they can be used to initialise struct fields
- Include (UN)CLEAN status and build information in LALVCSInfo struct
- Add identable LALVCSInfo struct lal...VCSIdentInfo to LAL...VCSInfo.[ch]
- Remove global variables defining VCS and build information from
  LAL...VCSInfo.[ch], since the same information is available from the
  LALVCSInfo structs lal...VCSInfo and lal...VCSIdentInfo
- Refs #4801
Original: 27676b2b51a8c94b4228724e06332686d3224a1a
parent 51c9a919
......@@ -103,11 +103,14 @@ esac
# determine state of git repository
if ! eval "(cd \"$srcdir\" && $git_path diff-files --quiet)"; then
git_status="UNCLEAN: Modified working tree"
git_clean=UNCLEAN
git_status="$git_clean: Modified working tree"
elif ! eval "(cd \"$srcdir\" && $git_path diff-index --cached --quiet HEAD)"; then
git_status="UNCLEAN: Modified index"
git_clean=UNCLEAN
git_status="$git_clean: Modified index"
else
git_status="CLEAN: All modifications committed"
git_clean=CLEAN
git_status="$git_clean: All modifications committed"
fi
# determine builder
......@@ -144,6 +147,7 @@ s%@BRANCH@%$git_branch%;t t
s%@TAG@%$git_tag%;t t
s%@AUTHOR@%$git_author%;t t
s%@COMMITTER@%$git_committer%;t t
s%@CLEAN@%$git_clean%;t t
s%@STATUS@%$git_status%;t t
s%@BUILDER@%$git_builder%;t t
"
......
......@@ -12,8 +12,9 @@ endif # HAVE_GIT_REPO
MOSTLYCLEANFILES += $(build_info_source)
$(build_info_source): Makefile
$(vcs_build_info_source): $(vcs_info_sources) $(build_info_source)
$(build_info_source): Makefile $(build_info_dependencies)
$(AM_V_GEN)echo '/* $@: generated by Makefile */' >$@; \
echo 'const char *const lal$(PACKAGE_NAME_NOLAL)ConfigureArgs = "'"$(ac_configure_args)"'";' >>$@; \
echo 'const char *const lal$(PACKAGE_NAME_NOLAL)ConfigureDate = "'"$(configure_date)"'";' >>$@; \
echo 'const char *const lal$(PACKAGE_NAME_NOLAL)BuildDate = "'`date +"%Y-%m-%dT%H:%M:%S%z"`'";' >>$@
echo '#define $(PACKAGE_NAME_UCASE)_CONFIGURE_ARGS "'"$(ac_configure_args)"'"' >>$@; \
echo '#define $(PACKAGE_NAME_UCASE)_CONFIGURE_DATE "'"$(configure_date)"'"' >>$@; \
echo '#define $(PACKAGE_NAME_UCASE)_BUILD_DATE "'`date +"%Y-%m-%dT%H:%M:%S%z"`'"' >>$@
......@@ -41,7 +41,7 @@ python/lal/__init__.py
python/lal/_lal*
python/lal/git_version.py
python/lal/lal.py
src/LALBuildInfo.c
src/LALBuildInfoHeader.h
src/LALConfig.h
src/LALVCSInfo.c
src/LALVCSInfo.h
......
/*
* @PACKAGE_NAME@VCSInfo.c - @PACKAGE_NAME@ VCS Information
* Copyright (C) 2014, 2016 Karl Wette
* Copyright (C) 2009-2013 Adam Mercer
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -15,9 +16,10 @@
* along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright (C) 2009-2013 Adam Mercer
* Copyright (C) 2014, 2016 Karl Wette
*/
/*
* @PACKAGE_NAME@VCSInfo.c - @PACKAGE_NAME@ VCS Information
*/
#include <stdlib.h>
......@@ -60,40 +62,44 @@
#endif
#include "@PACKAGE_NAME@VCSInfoHeader.h"
#include "@PACKAGE_NAME@BuildInfoHeader.h"
/* global variables for vcs information */
const char *const lal@PACKAGE_NAME_NOLAL@VCSVersion = @PACKAGE_NAME_UCASE@_VERSION;
const char *const lal@PACKAGE_NAME_NOLAL@VCSId = @PACKAGE_NAME_UCASE@_VCS_ID;
const char *const lal@PACKAGE_NAME_NOLAL@VCSDate = @PACKAGE_NAME_UCASE@_VCS_DATE;
const char *const lal@PACKAGE_NAME_NOLAL@VCSBranch = @PACKAGE_NAME_UCASE@_VCS_BRANCH;
const char *const lal@PACKAGE_NAME_NOLAL@VCSTag = @PACKAGE_NAME_UCASE@_VCS_TAG;
const char *const lal@PACKAGE_NAME_NOLAL@VCSAuthor = @PACKAGE_NAME_UCASE@_VCS_AUTHOR;
const char *const lal@PACKAGE_NAME_NOLAL@VCSCommitter = @PACKAGE_NAME_UCASE@_VCS_COMMITTER;
const char *const lal@PACKAGE_NAME_NOLAL@VCSStatus = @PACKAGE_NAME_UCASE@_VCS_STATUS;
/* global variables for vcs information - identable */
const char *const lal@PACKAGE_NAME_NOLAL@VCSIdentId = @PACKAGE_NAME_UCASE@_VCS_IDENT_ID;
const char *const lal@PACKAGE_NAME_NOLAL@VCSIdentDate = @PACKAGE_NAME_UCASE@_VCS_IDENT_DATE;
const char *const lal@PACKAGE_NAME_NOLAL@VCSIdentBranch = @PACKAGE_NAME_UCASE@_VCS_IDENT_BRANCH;
const char *const lal@PACKAGE_NAME_NOLAL@VCSIdentTag = @PACKAGE_NAME_UCASE@_VCS_IDENT_TAG;
const char *const lal@PACKAGE_NAME_NOLAL@VCSIdentAuthor = @PACKAGE_NAME_UCASE@_VCS_IDENT_AUTHOR;
const char *const lal@PACKAGE_NAME_NOLAL@VCSIdentCommitter = @PACKAGE_NAME_UCASE@_VCS_IDENT_COMMITTER;
const char *const lal@PACKAGE_NAME_NOLAL@VCSIdentStatus = @PACKAGE_NAME_UCASE@_VCS_IDENT_STATUS;
/* VCS and build information */
const LALVCSInfo lal@PACKAGE_NAME_NOLAL@VCSInfo = {
.name = "@PACKAGE_NAME@",
.version = @PACKAGE_NAME_UCASE@_VERSION,
.vcsId = @PACKAGE_NAME_UCASE@_VCS_ID,
.vcsDate = @PACKAGE_NAME_UCASE@_VCS_DATE,
.vcsBranch = @PACKAGE_NAME_UCASE@_VCS_BRANCH,
.vcsTag = @PACKAGE_NAME_UCASE@_VCS_TAG,
.vcsAuthor = @PACKAGE_NAME_UCASE@_VCS_AUTHOR,
.vcsCommitter = @PACKAGE_NAME_UCASE@_VCS_COMMITTER,
.vcsClean = @PACKAGE_NAME_UCASE@_VCS_CLEAN,
.vcsStatus = @PACKAGE_NAME_UCASE@_VCS_STATUS,
.configureArgs = @PACKAGE_NAME_UCASE@_CONFIGURE_ARGS,
.configureDate = @PACKAGE_NAME_UCASE@_CONFIGURE_DATE,
.buildDate = @PACKAGE_NAME_UCASE@_BUILD_DATE,
};
/* library vcs information structure */
const struct tagLALVCSInfo lal@PACKAGE_NAME_NOLAL@VCSInfo = { \
@PACKAGE_NAME_UCASE@_NAME, \
@PACKAGE_NAME_UCASE@_VERSION, \
@PACKAGE_NAME_UCASE@_VCS_ID, \
@PACKAGE_NAME_UCASE@_VCS_DATE, \
@PACKAGE_NAME_UCASE@_VCS_BRANCH, \
@PACKAGE_NAME_UCASE@_VCS_TAG, \
@PACKAGE_NAME_UCASE@_VCS_AUTHOR, \
@PACKAGE_NAME_UCASE@_VCS_COMMITTER, \
@PACKAGE_NAME_UCASE@_VCS_STATUS \
/* Identable VCS and build information */
const LALVCSInfo lal@PACKAGE_NAME_NOLAL@VCSIdentInfo = {
.name = "$@PACKAGE_NAME@Name: " "@PACKAGE_NAME@" " $",
.version = "$@PACKAGE_NAME@Version: " @PACKAGE_NAME_UCASE@_VERSION " $",
.vcsId = "$@PACKAGE_NAME@VCSId: " @PACKAGE_NAME_UCASE@_VCS_ID " $",
.vcsDate = "$@PACKAGE_NAME@VCSDate: " @PACKAGE_NAME_UCASE@_VCS_DATE " $",
.vcsBranch = "$@PACKAGE_NAME@VCSBranch: " @PACKAGE_NAME_UCASE@_VCS_BRANCH " $",
.vcsTag = "$@PACKAGE_NAME@VCSTag: " @PACKAGE_NAME_UCASE@_VCS_TAG " $",
.vcsAuthor = "$@PACKAGE_NAME@VCSAuthor: " @PACKAGE_NAME_UCASE@_VCS_AUTHOR " $",
.vcsCommitter = "$@PACKAGE_NAME@VCSCommitter: " @PACKAGE_NAME_UCASE@_VCS_COMMITTER " $",
.vcsClean = "$@PACKAGE_NAME@VCSClean: " @PACKAGE_NAME_UCASE@_VCS_CLEAN " $",
.vcsStatus = "$@PACKAGE_NAME@VCSStatus: " @PACKAGE_NAME_UCASE@_VCS_STATUS " $",
.configureArgs = "$@PACKAGE_NAME@ConfigureArgs: " @PACKAGE_NAME_UCASE@_CONFIGURE_ARGS " $",
.configureDate = "$@PACKAGE_NAME@ConfigureDate: " @PACKAGE_NAME_UCASE@_CONFIGURE_DATE " $",
.buildDate = "$@PACKAGE_NAME@BuildDate: " @PACKAGE_NAME_UCASE@_BUILD_DATE " $",
};
const LALVCSInfo *const lal@PACKAGE_NAME_NOLAL@VCSInfoList[32] = {
/* NULL-terminated list of library and dependencies VCS and build information */
const LALVCSInfoList lal@PACKAGE_NAME_NOLAL@VCSInfoList = {
#if defined(HAVE_LIBLAL)
&lalVCSInfo,
#endif
......@@ -130,7 +136,3 @@ const LALVCSInfo *const lal@PACKAGE_NAME_NOLAL@VCSInfoList[32] = {
&lal@PACKAGE_NAME_NOLAL@VCSInfo,
NULL
};
/*
* vim: tw=0 ts=2 et
*/
/*
* @PACKAGE_NAME@VCSInfo.h - @PACKAGE_NAME@ VCS Information
* Copyright (C) 2014, 2016 Karl Wette
* Copyright (C) 2009-2013 Adam Mercer
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -15,9 +16,6 @@
* along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright (C) 2009-2013 Adam Mercer
* Copyright (C) 2014 Karl Wette
*/
#ifndef _@PACKAGE_NAME_UCASE@VCSINFO_H
......@@ -32,47 +30,18 @@ extern "C" {
/**
* \defgroup @PACKAGE_NAME@VCSInfo_h Header @PACKAGE_NAME@VCSInfo.h
* \ingroup @PACKAGE_NAME_LCASE@_general
* \brief VCS information for @PACKAGE_NAME@
* \brief VCS and build information for @PACKAGE_NAME@
*/
/*@{*/
/** \name Global variables for @PACKAGE_NAME@ VCS information */
/*@{*/
extern const char *const lal@PACKAGE_NAME_NOLAL@VCSVersion;
extern const char *const lal@PACKAGE_NAME_NOLAL@VCSId;
extern const char *const lal@PACKAGE_NAME_NOLAL@VCSDate;
extern const char *const lal@PACKAGE_NAME_NOLAL@VCSBranch;
extern const char *const lal@PACKAGE_NAME_NOLAL@VCSTag;
extern const char *const lal@PACKAGE_NAME_NOLAL@VCSAuthor;
extern const char *const lal@PACKAGE_NAME_NOLAL@VCSCommitter;
extern const char *const lal@PACKAGE_NAME_NOLAL@VCSStatus;
/*@}*/
/** \name Identable global variables for @PACKAGE_NAME@ VCS information */
/*@{*/
extern const char *const lal@PACKAGE_NAME_NOLAL@VCSIdentId;
extern const char *const lal@PACKAGE_NAME_NOLAL@VCSIdentDate;
extern const char *const lal@PACKAGE_NAME_NOLAL@VCSIdentBranch;
extern const char *const lal@PACKAGE_NAME_NOLAL@VCSIdentTag;
extern const char *const lal@PACKAGE_NAME_NOLAL@VCSIdentAuthor;
extern const char *const lal@PACKAGE_NAME_NOLAL@VCSIdentCommitter;
extern const char *const lal@PACKAGE_NAME_NOLAL@VCSIdentStatus;
/*@}*/
/** @PACKAGE_NAME@ VCS information */
/** VCS and build information for @PACKAGE_NAME@ */
extern const LALVCSInfo lal@PACKAGE_NAME_NOLAL@VCSInfo;
/** List of VCS information for @PACKAGE_NAME@ and its LALSuite dependencies (<tt>NULL</tt>-terminated) */
extern const LALVCSInfo *const lal@PACKAGE_NAME_NOLAL@VCSInfoList[32];
/** @PACKAGE_NAME@ <tt>configure</tt> arguments */
extern const char *const lal@PACKAGE_NAME_NOLAL@ConfigureArgs;
/** @PACKAGE_NAME@ <tt>configure</tt> date */
extern const char *const lal@PACKAGE_NAME_NOLAL@ConfigureDate;
/** Identable VCS and build information for @PACKAGE_NAME@ */
extern const LALVCSInfo lal@PACKAGE_NAME_NOLAL@VCSIdentInfo;
/** @PACKAGE_NAME@ build date */
extern const char *const lal@PACKAGE_NAME_NOLAL@BuildDate;
/** <tt>NULL</tt>-terminated list of VCS and build information for @PACKAGE_NAME@ and its dependencies */
extern const LALVCSInfoList lal@PACKAGE_NAME_NOLAL@VCSInfoList;
/*@}*/
......@@ -81,7 +50,3 @@ extern const char *const lal@PACKAGE_NAME_NOLAL@BuildDate;
#endif
#endif /* _@PACKAGE_NAME_UCASE@VCSINFO_H */
/*
* vim: tw=0 ts=2 et
*/
/*
* @PACKAGE_NAME@VCSInfo.h - @PACKAGE_NAME@ VCS Information Header
* Copyright (C) 2014, 2016 Karl Wette
* Copyright (C) 2009-2013 Adam Mercer
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -15,9 +16,10 @@
* along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright (C) 2009-2013 Adam Mercer
* Copyright (C) 2014 Karl Wette
*/
/*
* @PACKAGE_NAME@VCSInfo.h - @PACKAGE_NAME@ VCS Information Header
*/
/** \cond DONT_DOXYGEN */
......@@ -33,7 +35,7 @@
extern "C" {
#endif
/* VCS information defines */
/* VCS information */
#define @PACKAGE_NAME_UCASE@_NAME "@PACKAGE_NAME@"
#define @PACKAGE_NAME_UCASE@_VCS_ID "@ID@"
#define @PACKAGE_NAME_UCASE@_VCS_DATE "@DATE@"
......@@ -41,17 +43,9 @@ extern "C" {
#define @PACKAGE_NAME_UCASE@_VCS_TAG "@TAG@"
#define @PACKAGE_NAME_UCASE@_VCS_AUTHOR "@AUTHOR@"
#define @PACKAGE_NAME_UCASE@_VCS_COMMITTER "@COMMITTER@"
#define @PACKAGE_NAME_UCASE@_VCS_CLEAN "@CLEAN@"
#define @PACKAGE_NAME_UCASE@_VCS_STATUS "@STATUS@"
/* Identable VCS information defines */
#define @PACKAGE_NAME_UCASE@_VCS_IDENT_ID "$" "@PACKAGE_NAME@Id: @ID@ " "$"
#define @PACKAGE_NAME_UCASE@_VCS_IDENT_DATE "$" "@PACKAGE_NAME@Date: @DATE@ " "$"
#define @PACKAGE_NAME_UCASE@_VCS_IDENT_BRANCH "$" "@PACKAGE_NAME@Branch: @BRANCH@ " "$"
#define @PACKAGE_NAME_UCASE@_VCS_IDENT_TAG "$" "@PACKAGE_NAME@Tag: @TAG@ " "$"
#define @PACKAGE_NAME_UCASE@_VCS_IDENT_AUTHOR "$" "@PACKAGE_NAME@Author: @AUTHOR@ " "$"
#define @PACKAGE_NAME_UCASE@_VCS_IDENT_COMMITTER "$" "@PACKAGE_NAME@Committer: @COMMITTER@ " "$"
#define @PACKAGE_NAME_UCASE@_VCS_IDENT_STATUS "$" "@PACKAGE_NAME@Status: @STATUS@ " "$"
/* Header VCS information structure */
static const LALVCSInfo lal@PACKAGE_NAME_NOLAL@VCSInfoHeader = { \
@PACKAGE_NAME_UCASE@_NAME, \
......@@ -62,7 +56,9 @@ static const LALVCSInfo lal@PACKAGE_NAME_NOLAL@VCSInfoHeader = { \
@PACKAGE_NAME_UCASE@_VCS_TAG, \
@PACKAGE_NAME_UCASE@_VCS_AUTHOR, \
@PACKAGE_NAME_UCASE@_VCS_COMMITTER, \
@PACKAGE_NAME_UCASE@_VCS_STATUS \
@PACKAGE_NAME_UCASE@_VCS_CLEAN, \
@PACKAGE_NAME_UCASE@_VCS_STATUS, \
NULL, NULL, NULL, \
};
#ifdef __cplusplus
......@@ -72,7 +68,3 @@ static const LALVCSInfo lal@PACKAGE_NAME_NOLAL@VCSInfoHeader = { \
#endif /* _@PACKAGE_NAME_UCASE@VCSINFOHEADER_H */
/** \endcond */
/*
* vim: tw=0 ts=2 et
*/
......@@ -30,10 +30,12 @@ pkginclude_HEADERS = \
liblal_la_SOURCES = \
LALMisc.c \
LALVCSInfo.c \
$(END_OF_LIST)
nodist_liblal_la_SOURCES = LALBuildInfo.c
nodist_liblal_la_SOURCES = \
LALBuildInfoHeader.h \
LALVCSInfo.c \
$(END_OF_LIST)
liblal_la_DEPENDENCIES = \
std/libstd.la \
......@@ -60,9 +62,10 @@ EXTRA_DIST = \
DISTCLEANFILES = config.h
vcs_build_info_source = LALVCSInfo.c
vcs_info_sources = LALVCSInfoHeader.h
build_info_source = LALBuildInfo.c
$(build_info_source): $(liblal_la_DEPENDENCIES)
build_info_source = LALBuildInfoHeader.h
build_info_dependencies = $(liblal_la_DEPENDENCIES)
LDADD = liblal.la
......
/*
* LALVCSInfoType.c - LAL VCS Information Type
* Copyright (C) 2014, 2016 Karl Wette
* Copyright (C) 2009-2013 Adam Mercer
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -15,8 +16,6 @@
* along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright (C) 2009-2013 Adam Mercer
*/
#include <string.h>
......@@ -41,7 +40,3 @@ int XLALVCSInfoCompare(const LALVCSInfo *vcs1, const LALVCSInfo *vcs2)
/* vcs1 == vcs2 */
return 0;
}
/*
* vim: tw=0 ts=2 et
*/
/*
* LALVCSInfoType.h - LAL VCS Information Type
* Copyright (C) 2014, 2016 Karl Wette
* Copyright (C) 2009-2013 Adam Mercer
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -15,8 +16,6 @@
* along with with program; see the file COPYING. If not, write to the
* Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
* Copyright (C) 2009-2013 Adam Mercer
*/
#ifndef _LALVCSINFOTYPE_H
......@@ -29,13 +28,13 @@ extern "C" {
/**
* \defgroup LALVCSInfoType_h Header LALVCSInfoType.h
* \ingroup lal_std
* \author Adam Mercer
* \brief Contains routines for dealing with VCS information
* \author Adam Mercer, Karl Wette
* \brief Contains routines for dealing with VCS and build information
*/
/*@{*/
/**
* VCS information structure
* VCS and build information structure
*/
typedef struct tagLALVCSInfo
{
......@@ -47,9 +46,18 @@ typedef struct tagLALVCSInfo
const char *const vcsTag; /**< Tag of last commit */
const char *const vcsAuthor; /**< Author of last commit */
const char *const vcsCommitter; /**< Committer of last commit */
const char *const vcsClean; /**< (UN)CLEAN */
const char *const vcsStatus; /**< (UN)CLEAN: Status message */
const char *const configureArgs; /**< <tt>configure</tt> arguments */
const char *const configureDate; /**< <tt>configure</tt> date */
const char *const buildDate; /**< Build date */
} LALVCSInfo;
/**
* <tt>NULL</tt>-terminated list of VCS and build information structures
*/
typedef const LALVCSInfo *const LALVCSInfoList[16];
/**
* Compare two VCS information structures \p vcs1 and \p vcs2
* \returns Zero if the structures are identical, non-zero otherwise
......@@ -63,7 +71,3 @@ int XLALVCSInfoCompare(const LALVCSInfo *vcs1, const LALVCSInfo *vcs2);
#endif
#endif /* _LALVCSINFOTYPE_H */
/*
* vim: tw=0 ts=2 et
*/
......@@ -63,8 +63,8 @@ LALVersion(LALStatus * status, CHAR * message, UINT4 size, INT4 verbose)
"Configure Date: %s\n"
"Configure Arguments: %s\n",
lalVersion, lalVCSInfo.vcsId,
lalVCSInfo.vcsTag, lalBuildDate, lalConfigureDate,
lalConfigureArgs) : snprintf(message, size,
lalVCSInfo.vcsTag, lalVCSInfo.buildDate, lalVCSInfo.configureDate,
lalVCSInfo.configureArgs) : snprintf(message, size,
"LAL Version: %s\n",
lalVersion);
......
......@@ -149,7 +149,7 @@ src/inspiral/posterior/lalinference_pipe
src/inspiral/posterior/lalinference_pipe_roq
src/inspiral/posterior/lalinference_pp_pipe
src/inspiral/posterior/lalinference_review_test
src/lalapps/LALAppsBuildInfo.c
src/lalapps/LALAppsBuildInfoHeader.h
src/lalapps/LALAppsVCSInfo.c
src/lalapps/LALAppsVCSInfo.h
src/lalapps/LALAppsVCSInfoHeader.h
......
......@@ -324,12 +324,12 @@ int WriteFrame(int argc,char *argv[],struct CommandLineArgsTag CLA)
/* Add lalapps info */
snprintf( lalappsconfargs, sizeof( lalappsconfargs), "LALApps Info:\n LALApps Version: %s\n Git Tag: %s\n Git ID: %s\n Configure Date: %s\n Configure Arguments: %s",
LALAPPS_VERSION , lalAppsVCSInfo.vcsTag, lalAppsVCSInfo.vcsId, lalAppsConfigureDate, lalAppsConfigureArgs );
LALAPPS_VERSION , lalAppsVCSInfo.vcsTag, lalAppsVCSInfo.vcsId, lalAppsVCSInfo.configureDate, lalAppsVCSInfo.configureArgs );
XLALFrameAddFrHistory( frame, __FILE__, lalappsconfargs);
/* Add lal info */
snprintf( lalconfargs, sizeof( lalconfargs), "LAL Info:\n LAL Version: %s\n Git Tag: %s\n Git ID: %s\n Configure Date: %s\n Configure Arguments: %s",
LAL_VERSION , lalVCSInfo.vcsTag, lalVCSInfo.vcsId, lalAppsConfigureDate, lalAppsConfigureArgs );
LAL_VERSION , lalVCSInfo.vcsTag, lalVCSInfo.vcsId, lalAppsVCSInfo.configureDate, lalAppsVCSInfo.configureArgs );
XLALFrameAddFrHistory( frame, __FILE__, lalconfargs);
/* Create string with all command line arguments and add it to history */
......
......@@ -1771,8 +1771,8 @@ void BankEfficiencyPrintResultsXml(
XLALGPSTimeNow ( &(templateBank.processTable->start_time)) ;
XLALPopulateProcessTable(templateBank.processTable, \
PROGRAM_NAME, lalAppsVCSIdentId, lalAppsVCSIdentStatus, \
lalAppsVCSIdentDate, 0);
PROGRAM_NAME, lalAppsVCSIdentInfo.vcsId, lalAppsVCSIdentInfo.vcsStatus, \
lalAppsVCSIdentInfo.vcsDate, 0);
this_proc_param = processParamsTable.processParamsTable =
(ProcessParamsTable *) calloc( 1, sizeof(ProcessParamsTable) );
......@@ -1908,8 +1908,8 @@ BankEfficiencyPrintProtoXml(
XLALGPSTimeNow (&(templateBank.processTable->start_time));
XLALPopulateProcessTable(templateBank.processTable, \
PROGRAM_NAME, lalAppsVCSIdentId, lalAppsVCSIdentStatus, \
lalAppsVCSIdentDate, 0);
PROGRAM_NAME, lalAppsVCSIdentInfo.vcsId, lalAppsVCSIdentInfo.vcsStatus, \
lalAppsVCSIdentInfo.vcsDate, 0);
this_proc_param = processParamsTable.processParamsTable =
(ProcessParamsTable *) calloc( 1, sizeof(ProcessParamsTable) );
......@@ -2570,8 +2570,8 @@ void BankEfficiencyBankPrintXML(
XLALGPSTimeNow (&(proctable.processTable->start_time));
XLALPopulateProcessTable(proctable.processTable, \
PROGRAM_NAME, lalAppsVCSIdentId, lalAppsVCSIdentStatus, \
lalAppsVCSIdentDate, 0);
PROGRAM_NAME, lalAppsVCSIdentInfo.vcsId, lalAppsVCSIdentInfo.vcsStatus, \
lalAppsVCSIdentInfo.vcsDate, 0);
this_proc_param = processParamsTable.processParamsTable =
(ProcessParamsTable *) calloc( 1, sizeof(ProcessParamsTable) );
......
......@@ -504,8 +504,8 @@ int main( int argc, char *argv[] )
proctable.processTable = (ProcessTable *)
calloc( 1, sizeof(ProcessTable) );
XLALGPSTimeNow(&(proctable.processTable->start_time));
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentId,
lalAppsVCSIdentStatus, lalAppsVCSIdentDate, 0);
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentInfo.vcsId,
lalAppsVCSIdentInfo.vcsStatus, lalAppsVCSIdentInfo.vcsDate, 0);
snprintf( proctable.processTable->comment, LIGOMETA_COMMENT_MAX, " " );
this_proc_param = procparams.processParamsTable = (ProcessParamsTable *)
calloc( 1, sizeof(ProcessParamsTable) );
......
......@@ -244,8 +244,8 @@ int main( int argc, char *argv[] )
/* create the process and process params tables */
proctable.processTable = (ProcessTable *) calloc( 1, sizeof(ProcessTable) );
XLALGPSTimeNow(&(proctable.processTable->start_time));
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentId,
lalAppsVCSIdentStatus, lalAppsVCSIdentDate, 0);
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentInfo.vcsId,
lalAppsVCSIdentInfo.vcsStatus, lalAppsVCSIdentInfo.vcsDate, 0);
this_proc_param = procparams.processParamsTable = (ProcessParamsTable *)
calloc( 1, sizeof(ProcessParamsTable) );
memset( comment, 0, LIGOMETA_COMMENT_MAX * sizeof(CHAR) );
......
......@@ -412,8 +412,8 @@ int main( int argc, char *argv[] )
proctable.processTable = (ProcessTable *) calloc( 1, sizeof(ProcessTable) );
XLALGPSTimeNow(&(proctable.processTable->start_time));
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentId,
lalAppsVCSIdentStatus, lalAppsVCSIdentDate, 0);
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentInfo.vcsId,
lalAppsVCSIdentInfo.vcsStatus, lalAppsVCSIdentInfo.vcsDate, 0);
this_proc_param = procparams.processParamsTable = (ProcessParamsTable *)
calloc( 1, sizeof(ProcessParamsTable) );
......
......@@ -229,8 +229,8 @@ int main( int argc, char *argv[] )
/* create the process and process params tables */
proctable.processTable = (ProcessTable *) calloc( 1, sizeof(ProcessTable) );
XLALGPSTimeNow(&(proctable.processTable->start_time));
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentId,
lalAppsVCSIdentStatus, lalAppsVCSIdentDate, 0);
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentInfo.vcsId,
lalAppsVCSIdentInfo.vcsStatus, lalAppsVCSIdentInfo.vcsDate, 0);
this_proc_param = processParamsTable.processParamsTable =
(ProcessParamsTable *) calloc( 1, sizeof(ProcessParamsTable) );
......
......@@ -206,8 +206,8 @@ int main( int argc, char *argv[] )
proctable.processTable = (ProcessTable *)
calloc( 1, sizeof(ProcessTable) );
XLALGPSTimeNow(&(proctable.processTable->start_time));
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentId,
lalAppsVCSIdentStatus, lalAppsVCSIdentDate, 0);
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentInfo.vcsId,
lalAppsVCSIdentInfo.vcsStatus, lalAppsVCSIdentInfo.vcsDate, 0);
this_proc_param = procparams.processParamsTable = (ProcessParamsTable *)
calloc( 1, sizeof(ProcessParamsTable) );
memset( comment, 0, LIGOMETA_COMMENT_MAX * sizeof(CHAR) );
......
......@@ -237,8 +237,8 @@ int main( int argc, char *argv[] )
proctable.processTable = (ProcessTable *)
calloc( 1, sizeof(ProcessTable) );
XLALGPSTimeNow(&(proctable.processTable->start_time));
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentId,
lalAppsVCSIdentStatus, lalAppsVCSIdentDate, 0);
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentInfo.vcsId,
lalAppsVCSIdentInfo.vcsStatus, lalAppsVCSIdentInfo.vcsDate, 0);
this_proc_param = procparams.processParamsTable = (ProcessParamsTable *)
calloc( 1, sizeof(ProcessParamsTable) );
memset( comment, 0, LIGOMETA_COMMENT_MAX * sizeof(CHAR) );
......
......@@ -237,8 +237,8 @@ int main( int argc, char *argv[] )
proctable.processTable = (ProcessTable *)
calloc( 1, sizeof(ProcessTable) );
XLALGPSTimeNow(&(proctable.processTable->start_time));
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentId,
lalAppsVCSIdentStatus, lalAppsVCSIdentDate, 0);
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentInfo.vcsId,
lalAppsVCSIdentInfo.vcsStatus, lalAppsVCSIdentInfo.vcsDate, 0);
this_proc_param = procparams.processParamsTable = (ProcessParamsTable *)
calloc( 1, sizeof(ProcessParamsTable) );
memset( comment, 0, LIGOMETA_COMMENT_MAX * sizeof(CHAR) );
......
......@@ -382,7 +382,7 @@ INT4 main(INT4 argc, CHAR **argv)
snprintf(str_spin2x, HISTORY_COMMENT, "spin2x:%s", md_spin2x);
snprintf(str_spin2y, HISTORY_COMMENT, "spin2y:%s", md_spin2y);
snprintf(str_spin2z, HISTORY_COMMENT, "spin2z:%s", md_spin2z);
snprintf(str_creator, HISTORY_COMMENT, "creator:%s(git:%s)", PROGRAM_NAME, lalAppsVCSId);
snprintf(str_creator, HISTORY_COMMENT, "creator:%s(git:%s)", PROGRAM_NAME, lalAppsVCSInfo.vcsId);
/* format specific metadata */
if (strcmp(metadata_format, "NINJA1") == 0)
......
......@@ -669,8 +669,8 @@ int main( int argc, char *argv[] )
/* create the process and process params tables */
proctable.processTable = (ProcessTable *) calloc( 1, sizeof(ProcessTable) );
XLALGPSTimeNow(&(proctable.processTable->start_time));
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentId,
lalAppsVCSIdentStatus, lalAppsVCSIdentDate, 0);
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentInfo.vcsId,
lalAppsVCSIdentInfo.vcsStatus, lalAppsVCSIdentInfo.vcsDate, 0);
this_proc_param = processParamsTable.processParamsTable =
(ProcessParamsTable *) calloc( 1, sizeof(ProcessParamsTable) );
memset( comment, 0, LIGOMETA_COMMENT_MAX * sizeof(CHAR) );
......
......@@ -434,8 +434,8 @@ int main( int argc, char *argv[] )
/* create the process and process params tables */
proctable.processTable = (ProcessTable *) calloc( 1, sizeof(ProcessTable) );
XLALGPSTimeNow(&(proctable.processTable->start_time));
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentId,
lalAppsVCSIdentStatus, lalAppsVCSIdentDate, 0);
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentInfo.vcsId,
lalAppsVCSIdentInfo.vcsStatus, lalAppsVCSIdentInfo.vcsDate, 0);
this_proc_param = procparams.processParamsTable = (ProcessParamsTable *)
calloc( 1, sizeof(ProcessParamsTable) );
memset( comment, 0, LIGOMETA_COMMENT_MAX * sizeof(CHAR) );
......
......@@ -2037,8 +2037,8 @@ int main( int argc, char *argv[] )
proctable.processTable = (ProcessTable *)
calloc( 1, sizeof(ProcessTable) );
XLALGPSTimeNow(&(proctable.processTable->start_time));
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentId,
lalAppsVCSIdentStatus, lalAppsVCSIdentDate, 0);
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentInfo.vcsId,
lalAppsVCSIdentInfo.vcsStatus, lalAppsVCSIdentInfo.vcsDate, 0);
snprintf( proctable.processTable->comment, LIGOMETA_COMMENT_MAX, " " );
this_proc_param = procparams.processParamsTable = (ProcessParamsTable *)
calloc( 1, sizeof(ProcessParamsTable) );
......
......@@ -832,8 +832,8 @@ int main( int argc, char *argv[] )
/* create the process and process params tables */
proctable.processTable = (ProcessTable *) calloc( 1, sizeof(ProcessTable) );
XLALGPSTimeNow(&(proctable.processTable->start_time));
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentId,
lalAppsVCSIdentStatus, lalAppsVCSIdentDate, 0);
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentInfo.vcsId,
lalAppsVCSIdentInfo.vcsStatus, lalAppsVCSIdentInfo.vcsDate, 0);
this_proc_param = procparams.processParamsTable = (ProcessParamsTable *)
calloc( 1, sizeof(ProcessParamsTable) );
memset( comment, 0, LIGOMETA_COMMENT_MAX * sizeof(CHAR) );
......
......@@ -322,8 +322,8 @@ int main(INT4 argc, CHAR *argv[])
proctable.processTable = (ProcessTable *)LALCalloc(1, sizeof(ProcessTable));
XLALGPSTimeNow(&(proctable.processTable->start_time));
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentId,
lalAppsVCSIdentStatus, lalAppsVCSIdentDate, 0);
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentInfo.vcsId,
lalAppsVCSIdentInfo.vcsStatus, lalAppsVCSIdentInfo.vcsDate, 0);
snprintf(proctable.processTable->comment, LIGOMETA_COMMENT_MAX, " ");
memset(&xmlfp, 0, sizeof(LIGOLwXMLStream));
......
......@@ -443,8 +443,8 @@ int main(int argc, char *argv[])
proctable.processTable =
(ProcessTable *) calloc(1, sizeof(ProcessTable));
XLALGPSTimeNow(&(proctable.processTable->start_time));
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentId,
lalAppsVCSIdentStatus, lalAppsVCSIdentDate, 0);
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentInfo.vcsId,
lalAppsVCSIdentInfo.vcsStatus, lalAppsVCSIdentInfo.vcsDate, 0);
this_proc_param = procparams.processParamsTable =
(ProcessParamsTable *) calloc(1, sizeof(ProcessParamsTable));
memset(comment, 0, LIGOMETA_COMMENT_MAX * sizeof(CHAR));
......
......@@ -128,8 +128,8 @@ int main ( int argc, char *argv[] )
proctable.processTable = (ProcessTable *)
calloc( 1, sizeof(ProcessTable) );
XLALGPSTimeNow(&(proctable.processTable->start_time));
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentId,
lalAppsVCSIdentStatus, lalAppsVCSIdentDate, 0);
XLALPopulateProcessTable(proctable.processTable, PROGRAM_NAME, lalAppsVCSIdentInfo.vcsId,
lalAppsVCSIdentInfo.vcsStatus, lalAppsVCSIdentInfo.vcsDate, 0);
this_proc_param = procparams.processParamsTable = (ProcessParamsTable *)
calloc( 1, sizeof(ProcessParamsTable) );
...