[sword-svn] r3735 - in trunk: . utilities utilities/diatheke

[scribe at crosswire.org]

Author: scribe
Date: 2020-05-08 12:14:22 -0700 (Fri, 08 May 2020)
New Revision: 3735

Modified:
   trunk/configure.ac
   trunk/utilities/diatheke/diatheke.cpp
   trunk/utilities/osis2mod.cpp
Log:
Added support putting reponumber into nano position of SWORD version string and output current SWORD version in osis2mod and diatheke


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2020-05-07 16:32:14 UTC (rev 3734)
+++ trunk/configure.ac	2020-05-08 19:14:22 UTC (rev 3735)
@@ -5,7 +5,8 @@
 # Version change: Change line 8 only !
 # Change it immediately after a release
 
-AC_INIT(sword, 1.8.900, sword-bugs at crosswire.org, sword, http://crosswire.org/sword)
+define([svnversion], esyscmd([sh -c "svnversion -n"]))dnl
+AC_INIT(sword, 1.8.900.svnversion, sword-bugs at crosswire.org, sword, http://crosswire.org/sword)
 AC_CONFIG_SRCDIR(sword.bmp)
 AC_PREREQ(2.52)
 AC_REVISION($Revision: 1.45 $)

Modified: trunk/utilities/diatheke/diatheke.cpp
===================================================================
--- trunk/utilities/diatheke/diatheke.cpp	2020-05-07 16:32:14 UTC (rev 3734)
+++ trunk/utilities/diatheke/diatheke.cpp	2020-05-08 19:14:22 UTC (rev 3735)
@@ -29,6 +29,7 @@
 #include "diathekemgr.h"
 #include "diafiltmgr.h"
 #include <utilstr.h>
+#include <swversion.h>
 
 using std::cout;
 
@@ -37,7 +38,7 @@
 
 void printsyntax() { 
 	//if we got this far without exiting, something went wrong, so print syntax
-	fprintf (stderr, "Diatheke command-line SWORD frontend Version 4.8\n");
+	fprintf (stderr, "Diatheke command-line SWORD frontend Version 4.8 (with SWORD: %s)\n", SWVersion::currentVersion.getText());
 	fprintf (stderr, "Copyright 1999-2018 by the CrossWire Bible Society\n");
 	fprintf (stderr, "http://www.crosswire.org/sword/diatheke/\n");
 	fprintf (stderr, "\n");

Modified: trunk/utilities/osis2mod.cpp
===================================================================
--- trunk/utilities/osis2mod.cpp	2020-05-07 16:32:14 UTC (rev 3734)
+++ trunk/utilities/osis2mod.cpp	2020-05-08 19:14:22 UTC (rev 3735)
@@ -42,6 +42,7 @@
 #include <utilxml.h>
 #include <listkey.h>
 #include <versekey.h>
+#include <swversion.h>
 
 #include <ztext.h>
 #include <ztext4.h>
@@ -482,7 +483,7 @@
 void writeEntry(SWBuf &text, bool force = false) {
 	char keyOsisID[255];
 
-	static const char* revision = "<milestone type=\"x-importer\" subType=\"x-osis2mod\" n=\"$Rev$\"/>";
+	static SWBuf revision; revision.setFormatted("<milestone type=\"x-importer\" subType=\"x-osis2mod\" n=\"$Rev$ (SWORD: %s)\"/>", SWVersion::currentVersion.getText());
 	static bool firstOT = true;
 	static bool firstNT = true;
 
@@ -1846,7 +1847,7 @@
 
 int main(int argc, char **argv) {
 
-	fprintf(stderr, "You are running osis2mod: $Rev$\n");
+	fprintf(stderr, "You are running osis2mod: $Rev$ (with SWORD: %s)\n", SWVersion::currentVersion.getText());
 	
 	if (argc > 1) {
 		for (int i = 1; i < argc; i++) {