diff options
| author | Thomas White <taw@physics.org> | 2020-07-29 15:44:02 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2020-07-29 18:53:45 +0200 |
| commit | 42898f7d59e215434fa2aead84223f64b30fcee8 (patch) | |
| tree | 5cdfb4c0c279c766efcbbc6c455ee58a5c8741f1 /src/ambigator.c | |
| parent | 6105a7797b96418d940ced7d88c6cf2b308b9711 (diff) | |
New way of injecting version information
Also, this fixes some incorrect headers and adds --version flags to
programs which didn't yet have them.
Diffstat (limited to 'src/ambigator.c')
| -rw-r--r-- | src/ambigator.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/ambigator.c b/src/ambigator.c index a172df48..2b59bd1e 100644 --- a/src/ambigator.c +++ b/src/ambigator.c @@ -55,6 +55,8 @@ #include <cell-utils.h> #include <thread-pool.h> +#include "version.h" + static void show_help(const char *s) { @@ -765,7 +767,8 @@ static void write_reindexed_stream(const char *infile, const char *outfile, done = 1; /* Add our own header */ - fprintf(ofh, "Re-indexed by ambigator "CRYSTFEL_VERSIONSTRING"\n"); + fprintf(ofh, "Re-indexed by ambigator %s\n", + crystfel_version_string()); if ( argc > 0 ) { for ( i=0; i<argc; i++ ) { if ( i > 0 ) fprintf(ofh, " "); @@ -1094,8 +1097,10 @@ int main(int argc, char *argv[]) return 0; case 10 : - printf("CrystFEL: " CRYSTFEL_VERSIONSTRING "\n"); - printf(CRYSTFEL_BOILERPLATE"\n"); + printf("CrystFEL: %s\n", + crystfel_version_string()); + printf("%s\n", + crystfel_licence_string()); return 0; case 'o' : |