include configure and compiler details in version output

diff --git a/.bzrignore b/.bzrignore
index e34c30c9c992ac9d9d52e520b9dd59c1d18bfc52..0ca950c28f44facdaba2a4938967e0d8494b8c99 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -140,3 +140,5 @@ lib/index.html
 server/index.html
 .DS_Store
 tests/disorder-udplog
+lib/version-string
+lib/version.h

diff --git a/clients/disorder.c b/clients/disorder.c
index 6278295318c595b820031c56c1ff8a95625ac107..7ee9865bad53e39dcd2cc58a7ded0bab7d9941de 100644 (file)
--- a/clients/disorder.c
+++ b/clients/disorder.c
@@ -84,7 +84,7 @@ static void help(void) {
 
 /* display version number and terminate */
 static void version(void) {
-  xprintf("disorder version %s\n", disorder_version_string);
+  xprintf("%s", disorder_version_string);
   xfclose(stdout);
   exit(0);
 }

diff --git a/clients/disorderfm.c b/clients/disorderfm.c
index ccb2472783068fda484c13c2b5a47d80da06d5a4..d8dffb62c959aba1522523b86596acc650c32304 100644 (file)
--- a/clients/disorderfm.c
+++ b/clients/disorderfm.c
@@ -129,7 +129,7 @@ static void help(void) {
 
 /* display version number and terminate */
 static void version(void) {
-  xprintf("disorderfm version %s\n", disorder_version_string);
+  xprintf("%s", disorder_version_string);
   xfclose(stdout);
   exit(0);
 }

diff --git a/clients/playrtp.c b/clients/playrtp.c
index 54107da94a3b9e8f09d960eb59c70736215375f3..484d265110470dc7fd9b200f874ee9e41ec50e4b 100644 (file)
--- a/clients/playrtp.c
+++ b/clients/playrtp.c
@@ -533,7 +533,7 @@ static void help(void) {
 
 /* display version number and terminate */
 static void version(void) {
-  xprintf("disorder-playrtp version %s\n", disorder_version_string);
+  xprintf("%s", disorder_version_string);
   xfclose(stdout);
   exit(0);
 }

diff --git a/disobedience/disobedience.c b/disobedience/disobedience.c
index 5efcc00c3d195b6a03041408e06259e7c03053ac..de71101bb34ca3d6787ce9c9a9a0492e9c313b61 100644 (file)
--- a/disobedience/disobedience.c
+++ b/disobedience/disobedience.c
@@ -409,7 +409,7 @@ static void help(void) {
 
 /* display version number and terminate */
 static void version(void) {
-  xprintf("disorder version %s\n", disorder_version_string);
+  xprintf("%s", disorder_version_string);
   xfclose(stdout);
   exit(0);
 }

diff --git a/lib/Makefile.am b/lib/Makefile.am
index ab856a797bc513635cb0a1213023101d4b4294ad..cf538787ad21ca437069236eab36282d1ef40077 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -71,6 +71,19 @@ libdisorder_a_SOURCES=charset.c charset.h            \
        wstat.c wstat.h                                 \
        disorder.h
 
+version-string: ../config.status ${top_srcdir}/scripts/make-version-string
+       CC="${CC}" ${top_srcdir}/scripts/make-version-string > $@.new
+       @if cmp $@.new $@; then \
+               echo rm -f $@.new; rm -f $@.new; else \
+               echo mv $@.new $@; mv $@.new $@; fi
+
+version.h: version-string ${top_srcdir}/scripts/text2c
+       ${top_srcdir}/scripts/text2c -extern disorder_version_string \
+               version-string > $@.new
+       @if cmp $@.new $@; then \
+               echo rm -f $@.new; rm -f $@.new; else \
+               echo mv $@.new $@; mv $@.new $@; fi
+
 definitions.h: Makefile
        rm -f $@.new
        echo "#define PKGLIBDIR \"${pkglibdir}\"" > $@.new
@@ -84,8 +97,8 @@ definitions.h: Makefile
        @if cmp $@.new $@; then \
                echo rm -f $@.new; rm -f $@.new; else \
                echo mv $@.new $@; mv $@.new $@; fi
-defs.o: definitions.h
-defs.lo: definitions.h
+defs.o: definitions.h version.h
+defs.lo: definitions.h version.h
 
 test_SOURCES=test.c memgc.c
 test_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGC)

diff --git a/lib/defs.c b/lib/defs.c
index c9668c05e4edbb53633a1ec81df89adb774b9ad4..19987cb675f9c08ad68b71befb422bee187ed223 100644 (file)
--- a/lib/defs.c
+++ b/lib/defs.c
@@ -30,7 +30,7 @@
 #include "definitions.h"
 
 /** @brief Software version number */
-const char disorder_version_string[] = VERSION;
+const char disorder_short_version_string[] = VERSION;
 
 /** @brief Package library directory */
 const char pkglibdir[] = PKGLIBDIR;
@@ -59,6 +59,8 @@ const char finkbindir[] = FINKBINDIR;
 /** @brief Package documentation directory */
 const char docdir[] = DOCDIR;
 
+#include "version.h"
+
 /*
 Local Variables:
 c-basic-offset:2

diff --git a/lib/defs.h b/lib/defs.h
index c340e8eca3a58cb9dce601fc37b33a176c00c339..dd75209c7813c27fe875676e69e4eb280b4a0bd2 100644 (file)
--- a/lib/defs.h
+++ b/lib/defs.h
@@ -21,6 +21,7 @@
 #ifndef DEFS_H
 #define DEFS_H
 
+extern const char disorder_short_version_string[];
 extern const char disorder_version_string[];
 extern const char pkglibdir[];
 extern const char pkgconfdir[];

diff --git a/scripts/make-version-string b/scripts/make-version-string
new file mode 100755 (executable)
index 0000000..210e84f
--- /dev/null
+++ b/scripts/make-version-string
@@ -0,0 +1,31 @@
+#! /usr/bin/perl -w
+use strict;
+sub output {
+    print @_ or die "$0: stdout: $!\n";
+}
+my @csv = `../config.status --version`;
+my $version;
+my $options;
+my $cc;
+my $compiler;
+for(@csv) {
+    chomp;
+    if(/disorder config\.status (\S+)/) {
+       $version = $1;
+    }
+    if(/with options \"(.*)\"/) {
+       $options = $1;
+    }
+}
+if(exists $ENV{CC}) {
+    $cc = $ENV{CC};
+    $cc =~ s/\s+/ /g;
+    my @cv = `$cc --version`;
+    $compiler = $cv[0];
+}
+die "no version found\n" unless defined $version;
+output("DisOrder $version\n");
+output(" configure options: $options\n") if defined $options;
+output(" compiler: $cc\n") if defined $compiler;
+output(" version: $compiler\n") if defined $cc;
+close STDOUT or die "$0: stdout: $!\n";

diff --git a/scripts/text2c b/scripts/text2c
index 46b2276efc32a06eb6506c75108f1b30cfc6d962..95d2181ad13d5df51dfb63163acd25531503f8b6 100755 (executable)
--- a/scripts/text2c
+++ b/scripts/text2c
@@ -1,7 +1,12 @@
 #! /usr/bin/perl -w
+my $class = "static";
+if($ARGV[0] eq '-extern') {
+    $class = "";
+    shift;
+}
 my $name = shift;
 push(@out, "/* autogenerated file, do not edit */\n\n");
-push(@out, "static const char $name\[] = \n");
+push(@out, "$class const char $name\[] = \n");
 while(<>) {
     next if /arch-tag/;
     s/[\\\"\?]/\\$&/g;

diff --git a/server/dbupgrade.c b/server/dbupgrade.c
index b856ae5eb36ba312915b5afde9f218da4b27ca93..b4cf58e50d45a891fc80b4478409d8d862f3f945 100644 (file)
--- a/server/dbupgrade.c
+++ b/server/dbupgrade.c
@@ -86,7 +86,7 @@ static void help(void) {
 
 /* display version number and terminate */
 static void version(void) {
-  xprintf("disorder-dbupgrade version %s\n", disorder_version_string);
+  xprintf("%s", disorder_version_string);
   xfclose(stdout);
   exit(0);
 }

diff --git a/server/dcgi.c b/server/dcgi.c
index 07e1825e705f409e9cb1f211c856a010c9725219..6e71ef040184b8df6ef99d6d77f3629382a9131e 100644 (file)
--- a/server/dcgi.c
+++ b/server/dcgi.c
@@ -446,7 +446,7 @@ static void exp_version(int attribute((unused)) nargs,
                        char attribute((unused)) **args,
                        cgi_sink *output,
                        void attribute((unused)) *u) {
-  cgi_output(output, "%s", disorder_version_string);
+  cgi_output(output, "%s", disorder_short_version_string);
 }
 
 static void exp_nonce(int attribute((unused)) nargs,

diff --git a/server/deadlock.c b/server/deadlock.c
index e45694fc1ada3f0efd0a6a9dfac2971847514beb..bce3eee6037e3fadeecf2acbb5a056cdb0ff52cd 100644 (file)
--- a/server/deadlock.c
+++ b/server/deadlock.c
@@ -72,7 +72,7 @@ static void help(void) {
 
 /* display version number and terminate */
 static void version(void) {
-  xprintf("disorder-deadlock version %s\n", disorder_version_string);
+  xprintf("%s", disorder_version_string);
   xfclose(stdout);
   exit(0);
 }

diff --git a/server/decode.c b/server/decode.c
index 47227a29ecb55ef375f3611395cb0f5b1fb053aa..639ad159cd2c8d607286d9378d4de37ff9f33ccf 100644 (file)
--- a/server/decode.c
+++ b/server/decode.c
@@ -440,7 +440,7 @@ static void help(void) {
 
 /* Display version number and terminate. */
 static void version(void) {
-  xprintf("disorder-decode version %s\n", disorder_version_string);
+  xprintf("%s", disorder_version_string);
   xfclose(stdout);
   exit(0);
 }

diff --git a/server/disorderd.c b/server/disorderd.c
index b8f80109d86e557d2676ffb5497616675a018e02..ba18c237ff7c44a2100ec45c331a2f893234ef66 100644 (file)
--- a/server/disorderd.c
+++ b/server/disorderd.c
@@ -94,7 +94,7 @@ static void help(void) {
 
 /* display version number and terminate */
 static void version(void) {
-  xprintf("disorderd version %s\n", disorder_version_string);
+  xprintf("%s", disorder_version_string);
   xfclose(stdout);
   exit(0);
 }

diff --git a/server/dump.c b/server/dump.c
index 7e49111dca841b7e26dd0d952ffc64714dd894aa..119875f55fee3a8a19ac8eafb928cf0778257126 100644 (file)
--- a/server/dump.c
+++ b/server/dump.c
@@ -82,7 +82,7 @@ static void help(void) {
 
 /* display version number and terminate */
 static void version(void) {
-  xprintf("disorder-dump version %s\n", disorder_version_string);
+  xprintf("%s", disorder_version_string);
   xfclose(stdout);
   exit(0);
 }

diff --git a/server/normalize.c b/server/normalize.c
index 085d4dfb126cc3ff06e9b5f61d4f2417b071a44d..87b0f3d7bc5c356419d60e4f4d6e5a391ca5b465 100644 (file)
--- a/server/normalize.c
+++ b/server/normalize.c
@@ -73,7 +73,7 @@ static void help(void) {
 
 /* display version number and terminate */
 static void version(void) {
-  xprintf("disorder-normalize version %s\n", disorder_version_string);
+  xprintf("%s", disorder_version_string);
   xfclose(stdout);
   exit(0);
 }

diff --git a/server/rescan.c b/server/rescan.c
index b878929a82adc97812030d3a898322ec322ac3f8..e45eaa61128eb0cd5aee37a31454e1613dc302d3 100644 (file)
--- a/server/rescan.c
+++ b/server/rescan.c
@@ -84,7 +84,7 @@ static void help(void) {
 
 /* display version number and terminate */
 static void version(void) {
-  xprintf("disorder-rescan version %s\n", disorder_version_string);
+  xprintf("%s", disorder_version_string);
   xfclose(stdout);
   exit(0);
 }

diff --git a/server/server.c b/server/server.c
index 413b43e875273a05a0d6602569ea0634e0eec78a..a36996409331d7105d5d5adf99452675b491eb7d 100644 (file)
--- a/server/server.c
+++ b/server/server.c
@@ -346,7 +346,7 @@ static int c_version(struct conn *c,
                     char attribute((unused)) **vec,
                     int attribute((unused)) nvec) {
   /* VERSION had better only use the basic character set */
-  sink_printf(ev_writer_sink(c->w), "251 %s\n", disorder_version_string);
+  sink_printf(ev_writer_sink(c->w), "251 %s\n", disorder_short_version_string);
   return 1;                    /* completed */
 }
 

diff --git a/server/speaker.c b/server/speaker.c
index a6c5f43e16f4f560b869422013fc0895ca5dd7f6..d21ad7cd8c4e976eff06580ab2e20de92896c9c6 100644 (file)
--- a/server/speaker.c
+++ b/server/speaker.c
@@ -142,7 +142,7 @@ static void help(void) {
 
 /* Display version number and terminate. */
 static void version(void) {
-  xprintf("disorder-speaker version %s\n", disorder_version_string);
+  xprintf("%s", disorder_version_string);
   xfclose(stdout);
   exit(0);
 }

diff --git a/server/stats.c b/server/stats.c
index a12b8f66641065fb7eb880e5370064f10c4e0fdc..c397be8a10a4530ff912bcf9dc83ba4b932d4350 100644 (file)
--- a/server/stats.c
+++ b/server/stats.c
@@ -65,7 +65,7 @@ static void help(void) {
 
 /* display version number and terminate */
 static void version(void) {
-  xprintf("disorder-stats version %s\n", disorder_version_string);
+  xprintf("%s", disorder_version_string);
   xfclose(stdout);
   exit(0);
 }

diff --git a/server/trackname.c b/server/trackname.c
index 1e0bb45589f9b81846cd435445340ecd462ca4f6..b14e9e5a12903d5f2e4a4a77eb7cd8492e51ce70 100644 (file)
--- a/server/trackname.c
+++ b/server/trackname.c
@@ -57,7 +57,7 @@ static void help(void) {
 
 /* display version number and terminate */
 static void version(void) {
-  xprintf("disorder version %s\n", disorder_version_string);
+  xprintf("%s", disorder_version_string);
   xfclose(stdout);
   exit(0);
 }

diff --git a/tests/udplog.c b/tests/udplog.c
index 4d52efc066cb59286b7eaac8e1d5c94b8686f929..eb87651b13d90aa037b30db84658d9c23e2b8dfe 100644 (file)
--- a/tests/udplog.c
+++ b/tests/udplog.c
@@ -61,7 +61,7 @@ static void help(void) {
 
 /* display version number and terminate */
 static void version(void) {
-  xprintf("disorder-udplog version %s\n", disorder_version_string);
+  xprintf("%s", disorder_version_string);
   xfclose(stdout);
   exit(0);
 }