Changeset ef87ee


Ignore:
Timestamp:
Dec 16, 2009, 11:47:47 AM (16 years ago)
Author:
Frederik Heber <heber@…>
Children:
35f733, 59b9dd
Parents:
02911f
Message:

Added versioning to each executable.

  • credits to Ralf Wildenhues for writing the Makefile.am code
  • version.c section added to Makefile.am (pcp, molecuilder and util)
  • src/version.h to each pcp, molecuilder and util
  • each of the executables includes version.h and prints version in main()

Signed-off-by: Frederik Heber <heber@…>

Files:
14 edited

Legend:

Unmodified
Added
Removed

  • molecuilder/src/Makefile.am

    r02911f ref87ee  
    2525
    2626#EXTRA_DIST = ${molecuilder_DATA}
     27
     28FORCE:
     29$(srcdir)/.git-version: FORCE
     30        @if (test -d $(top_srcdir)/../.git && cd $(srcdir) && git describe --tags HEAD) > .git-version-t 2>/dev/null \
     31          && ! diff .git-version-t $(srcdir)/.git-version >/dev/null 2>&1; then \
     32          mv -f .git-version-t $(srcdir)/.git-version; \
     33        else \
     34          rm -f .git-version-t; \
     35        fi
     36
     37EXTRA_DIST = $(srcdir)/.git-version
     38
     39$(srcdir)/version.c: $(srcdir)/.git-version
     40        echo "const char *ESPACKVersion = \"$(PACKAGE_NAME) -- git version: "`cat $(srcdir)/.git-version`"\";" > $@
     41
     42molecuilder_SOURCES += $(srcdir)/version.c

  • molecuilder/src/builder.cpp

    r02911f ref87ee  
    6565#include "molecule.hpp"
    6666#include "periodentafel.hpp"
     67#include "version.h"
    6768
    6869/********************************************* Subsubmenu routine ************************************/
    … …  
    22222223  int j;
    22232224
     2225  cout << ESPACKVersion << endl;
     2226
    22242227  setVerbosity(0);
    22252228

  • pcp/src/Makefile.am

    r02911f ref87ee  
    55pcp_SOURCES = ${SOURCE} ${HEADER}
    66
     7FORCE:
     8$(srcdir)/.git-version: FORCE
     9        @if (test -d $(top_srcdir)/../.git && cd $(srcdir) && git describe --tags HEAD) > .git-version-t 2>/dev/null \
     10          && ! diff .git-version-t $(srcdir)/.git-version >/dev/null 2>&1; then \
     11          mv -f .git-version-t $(srcdir)/.git-version; \
     12        else \
     13          rm -f .git-version-t; \
     14        fi
     15
     16EXTRA_DIST = $(srcdir)/.git-version
     17
     18$(srcdir)/version.c: $(srcdir)/.git-version
     19        echo "const char *ESPACKVersion = \"$(PACKAGE_NAME) -- git version: "`cat $(srcdir)/.git-version`"\";" > $@
     20
     21pcp_SOURCES += $(srcdir)/version.c

  • pcp/src/pcp.c

    r02911f ref87ee  
    526526#include<stdio.h>
    527527#include<math.h>
    528 #include"mpi.h"
    529 #include"data.h"
    530 #include"errors.h"
    531 #include"helpers.h"
    532 #include"init.h"
    533 #include"pcp.h"
    534 #include"opt.h"
    535 #include"myfft.h"
    536 #include"gramsch.h"
    537 #include"output.h"
     528
     529#include "data.h"
     530#include "errors.h"
     531#include "gramsch.h"
     532#include "helpers.h"
     533#include "init.h"
     534#include "pcp.h"
     535#include "myfft.h"
     536#include "opt.h"
     537#include "output.h"
    538538#include "run.h"
    539539#include "pcp.h"
     540#include "version.h"
    540541
    541542#define MYSTOPSIGNAL SIGALRM    //!< external signal which gracefully stops calculations
    … …  
    810811*/
    811812int main(int argc, char **argv) {
     813
     814  fprintf(stdout, "%s\n", ESPACKVersion);
     815
    812816  MPI_Init(&argc, &argv);
    813817  Run(argc, argv);

  • util/src/CreateGaAs.c

    r02911f ref87ee  
    1313#include<math.h>
    1414
     15#include "version.h"
     16
    1517int main(int argc, char** argv) {
    1618  int n[3], N[3];
    … …  
    2224  L[1] = 10.47;
    2325  L[2] = 10.47;
     26
     27  fprintf(stdout, "%s\n", ESPACKVersion);
     28
    2429  if(argc < 6) {
    2530    fprintf(stderr,"Not enough arguments\nUsage: CreateGaAs source target nmax\n");

  • util/src/CreateH2.c

    r02911f ref87ee  
    1313#include<math.h>
    1414
     15#include "version.h"
     16
    1517int main(int argc, char** argv) {
    1618  int Steps, s;
    … …  
    2022  FILE *target;
    2123  char dummy[255];
     24
     25  fprintf(stdout, "%s\n", ESPACKVersion);
     26
    2227  if(argc < 8) {
    2328    fprintf(stderr,"Not enough arguments\nUsage: CreateH2 target Steps startx starty startz delta xyz\n");

  • util/src/GetPdb.c

    r02911f ref87ee  
    1010#include<stdio.h>
    1111#include<math.h>
     12
    1213#include"mergesort.h"
     14#include "version.h"
     15
    1316struct Coord {
    1417  double coord[3];
    … …  
    2831  double center[3][2] = {{0.,0.},{0.,0.},{0.,0.}};
    2932  double Bohr = 0.52919;
     33
     34  fprintf(stdout, "%s\n", ESPACKVersion);
     35
    3036  sequence = (struct Coord **)
    3137    malloc(sizeof(struct Coord*)*max);

  • util/src/Makefile.am

    r02911f ref87ee  
    8585bin_SCRIPTS = ${bashscripts} ${perlscripts} ${pythonscripts}
    8686
     87FORCE:
     88$(srcdir)/.git-version: FORCE
     89        @if (test -d $(top_srcdir)/../.git && cd $(srcdir) && git describe --tags HEAD) > .git-version-t 2>/dev/null \
     90          && ! diff .git-version-t $(srcdir)/.git-version >/dev/null 2>&1; then \
     91          mv -f .git-version-t $(srcdir)/.git-version; \
     92        else \
     93          rm -f .git-version-t; \
     94        fi
     95
     96EXTRA_DIST = $(srcdir)/.git-version
     97
     98$(srcdir)/version.c: $(srcdir)/.git-version
     99        echo "const char *ESPACKVersion = \"$(PACKAGE_NAME) -- git version: "`cat $(srcdir)/.git-version`"\";" > $@
     100
     101average_SOURCES += $(srcdir)/version.c
     102CreateGaAs_SOURCES += $(srcdir)/version.c
     103CreateH2_SOURCES += $(srcdir)/version.c
     104diagonalize_SOURCES += $(srcdir)/version.c
     105GetPdb_SOURCES += $(srcdir)/version.c
     106NanoCreator_SOURCES += $(srcdir)/version.c
     107ReadSrcIon_SOURCES += $(srcdir)/version.c
     108stochastik_SOURCES += $(srcdir)/version.c
     109VibrAlyzer_SOURCES += $(srcdir)/version.c
     110

  • util/src/NanoCreator.c

    r02911f ref87ee  
    1111
    1212#include "NanoCreator.h"
     13#include "version.h"
    1314
    1415
    … …  
    678679  int i,j, ggT;
    679680  int length;
     681
     682  fprintf(stdout, "%s\n", ESPACKVersion);
    680683
    681684        // Read command line arguments

  • util/src/ReadSrcIon.c

    r02911f ref87ee  
    1313#include<math.h>
    1414#include<string.h>
     15
     16#include "version.h"
    1517
    1618#define NDIM (3)
    … …  
    150152  FILE *SrcIonDoc, *SrcIonData;
    151153 
     154  fprintf(stdout, "%s\n", ESPACKVersion);
     155
    152156  OpenFile(&SrcIonDoc, suffixsrciondoc, "r");
    153157  if (fscanf(SrcIonDoc,"%i", &Max_Types) != 1)

  • util/src/VibrAlyzer.c

    r02911f ref87ee  
    88#include <stdlib.h>
    99#include <math.h>
     10
     11#include "version.h"
    1012
    1113/** Main routine.
    … …  
    3133        double gauge;                   // conversion to atomic units for time axis
    3234                               
     35  printf("Molecular Vibrations Analyser - VibrAlyzer\n%s\n", ESPACKVersion);
     36
    3337        // Check for needed arguments
    3438        if (argc < 4) {
    35                 printf("Molecular Vibrations Analyser - VibrAlyzer\n\n");
    3639                printf("Usage: %s <time gauge> <freq.step> <temperature file>\n", argv[0]);
    3740                printf("\t<time gauge>\tConversion factor from step count to atomic time\n");

  • util/src/average.cpp

    r02911f ref87ee  
    77#include <string>
    88
     9#include "version.h"
    910
    1011int main(int argc, char **argv) {
    … …  
    1920        stringstream line;
    2021       
     22        cout << ESPACKVersion << endl;
     23
    2124        if (argc < 4) {
    2225                cout << "Usage: " << argv[0] << " <firstCol> <lastCol> <X> <File>\n";

  • util/src/diagonalize.c

    r02911f ref87ee  
    77#include <gsl/gsl_eigen.h>
    88
     9#include "version.h"
     10
    911int main(int argc, char **argv)
    1012{
    1113        double matrix[9];
    1214        int i;
     15
     16        fprintf(stdout, "%s\n", ESPACKVersion);
    1317
    1418        if (argc < 9) {

  • util/src/stochastik.cpp

    r02911f ref87ee  
    66#include <math.h>
    77#include <string>
     8
     9#include "version.h"
    810
    911
    … …  
    1820        stringstream line;
    1921       
     22        cout << ESPACKVersion << endl;
     23
    2024        if (argc < 4) {
    2125                cout << "Usage: " << argv[0] << " <Spalte> <X> <File1> <File2> ...\n";
Note: See TracChangeset for help on using the changeset viewer.