Changeset ef87ee for util/src

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@…>

Location:

util/src

Files:

• CreateGaAs.c (modified) (2 diffs)
• CreateH2.c (modified) (2 diffs)
• GetPdb.c (modified) (2 diffs)
• Makefile.am (modified) (1 diff)
• NanoCreator.c (modified) (2 diffs)
• ReadSrcIon.c (modified) (2 diffs)
• VibrAlyzer.c (modified) (2 diffs)
• average.cpp (modified) (2 diffs)
• diagonalize.c (modified) (1 diff)
• stochastik.cpp (modified) (2 diffs)

util/src/CreateGaAs.c

@@ -13 +13 @@
 #include<math.h>
 
+#include "version.h"
+
 int main(int argc, char** argv) {
   int n[3], N[3];
@@ -22 +24 @@
   L[1] = 10.47;
   L[2] = 10.47;
+
+  fprintf(stdout, "%s\n", ESPACKVersion);
+
   if(argc < 6) {
     fprintf(stderr,"Not enough arguments\nUsage: CreateGaAs source target nmax\n");

util/src/CreateH2.c

@@ -13 +13 @@
 #include<math.h>
 
+#include "version.h"
+
 int main(int argc, char** argv) {
   int Steps, s;
@@ -20 +22 @@
   FILE *target;
   char dummy[255];
+
+  fprintf(stdout, "%s\n", ESPACKVersion);
+
   if(argc < 8) {
     fprintf(stderr,"Not enough arguments\nUsage: CreateH2 target Steps startx starty startz delta xyz\n");

util/src/GetPdb.c

@@ -10 +10 @@
 #include<stdio.h> 
 #include<math.h>
+
 #include"mergesort.h"
+#include "version.h"
+
 struct Coord {
   double coord[3];
@@ -28 +31 @@
   double center[3][2] = {{0.,0.},{0.,0.},{0.,0.}};
   double Bohr = 0.52919;
+
+  fprintf(stdout, "%s\n", ESPACKVersion);
+
   sequence = (struct Coord **)
     malloc(sizeof(struct Coord*)*max);

util/src/Makefile.am

@@ -85 +85 @@
 bin_SCRIPTS = ${bashscripts} ${perlscripts} ${pythonscripts}
 
+FORCE:
+$(srcdir)/.git-version: FORCE
+        @if (test -d $(top_srcdir)/../.git && cd $(srcdir) && git describe --tags HEAD) > .git-version-t 2>/dev/null \
+          && ! diff .git-version-t $(srcdir)/.git-version >/dev/null 2>&1; then \
+          mv -f .git-version-t $(srcdir)/.git-version; \
+        else \
+          rm -f .git-version-t; \
+        fi
+
+EXTRA_DIST = $(srcdir)/.git-version
+
+$(srcdir)/version.c: $(srcdir)/.git-version
+        echo "const char *ESPACKVersion = \"$(PACKAGE_NAME) -- git version: "`cat $(srcdir)/.git-version`"\";" > $@
+
+average_SOURCES += $(srcdir)/version.c
+CreateGaAs_SOURCES += $(srcdir)/version.c
+CreateH2_SOURCES += $(srcdir)/version.c
+diagonalize_SOURCES += $(srcdir)/version.c
+GetPdb_SOURCES += $(srcdir)/version.c
+NanoCreator_SOURCES += $(srcdir)/version.c
+ReadSrcIon_SOURCES += $(srcdir)/version.c
+stochastik_SOURCES += $(srcdir)/version.c
+VibrAlyzer_SOURCES += $(srcdir)/version.c
+

util/src/NanoCreator.c

@@ -11 +11 @@
 
 #include "NanoCreator.h"
+#include "version.h"
 
 
@@ -678 +679 @@
   int i,j, ggT;
   int length;
+
+  fprintf(stdout, "%s\n", ESPACKVersion);
 
         // Read command line arguments

util/src/ReadSrcIon.c

@@ -13 +13 @@
 #include<math.h>
 #include<string.h>
+
+#include "version.h"
 
 #define NDIM (3)
@@ -150 +152 @@
   FILE *SrcIonDoc, *SrcIonData;
   
+  fprintf(stdout, "%s\n", ESPACKVersion);
+
   OpenFile(&SrcIonDoc, suffixsrciondoc, "r");
   if (fscanf(SrcIonDoc,"%i", &Max_Types) != 1)

util/src/VibrAlyzer.c

@@ -8 +8 @@
 #include <stdlib.h>
 #include <math.h>
+
+#include "version.h"
 
 /** Main routine.
@@ -31 +33 @@
         double gauge;                   // conversion to atomic units for time axis
                                 
+  printf("Molecular Vibrations Analyser - VibrAlyzer\n%s\n", ESPACKVersion);
+
         // Check for needed arguments
         if (argc < 4) {
-                printf("Molecular Vibrations Analyser - VibrAlyzer\n\n");
                 printf("Usage: %s <time gauge> <freq.step> <temperature file>\n", argv[0]);
                 printf("\t<time gauge>\tConversion factor from step count to atomic time\n");

util/src/average.cpp

@@ -7 +7 @@
 #include <string>
 
+#include "version.h"
 
 int main(int argc, char **argv) {
@@ -19 +20 @@
         stringstream line;
         
+        cout << ESPACKVersion << endl;
+
         if (argc < 4) {
                 cout << "Usage: " << argv[0] << " <firstCol> <lastCol> <X> <File>\n";

util/src/diagonalize.c

@@ -7 +7 @@
 #include <gsl/gsl_eigen.h>
 
+#include "version.h"
+
 int main(int argc, char **argv)
 {
         double matrix[9];
         int i;
+
+        fprintf(stdout, "%s\n", ESPACKVersion);
 
         if (argc < 9) {

util/src/stochastik.cpp

@@ -6 +6 @@
 #include <math.h>
 #include <string>
+
+#include "version.h"
 
 
@@ -18 +20 @@
         stringstream line;
         
+        cout << ESPACKVersion << endl;
+
         if (argc < 4) {
                 cout << "Usage: " << argv[0] << " <Spalte> <X> <File1> <File2> ...\n";