Compute Saxon version correctly, rearrange how the version message is…

… printed so that the Saxon version can be included.
ndw · Jul 28, 2013 · 05ac4ad · 05ac4ad
1 parent c8172a8
commit 05ac4ad
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/com/xmlcalabash/core/XProcConstants.java b/src/com/xmlcalabash/core/XProcConstants.java
@@ -132,7 +132,6 @@ protected XProcConstants() {
     }
 
     private static String initializeVersion() {
-        String sver = "(for Saxon 9.4.x)";
         Properties config = new Properties();
         InputStream stream = null;
         try {
@@ -147,7 +146,7 @@ private static String initializeVersion() {
             if (major == null || minor == null || release == null) {
                 throw new UnsupportedOperationException("Invalid version.properties in JAR file!?");
             }
-            return major + "." + minor + "." + release + " " + sver;
+            return major + "." + minor + "." + release;
         } catch (IOException ioe) {
             throw new UnsupportedOperationException("No version.properties in JAR file!?");
         }

diff --git a/src/com/xmlcalabash/core/XProcRuntime.java b/src/com/xmlcalabash/core/XProcRuntime.java
@@ -469,7 +469,9 @@ public String getProductName() {
     }
 
     public String getProductVersion() {
-        return XProcConstants.XPROC_VERSION;
+        String sver = processor.getSaxonProductVersion();
+        String sed = processor.getUnderlyingConfiguration().getEditionCode();
+        return XProcConstants.XPROC_VERSION + " (for Saxon " + sver + "/" + sed + ")";
     }
 
     public String getVendor() {

diff --git a/src/com/xmlcalabash/drivers/Main.java b/src/com/xmlcalabash/drivers/Main.java
@@ -93,10 +93,6 @@ public void run(String[] args) throws IOException {
         try {
             XProcConfiguration config = userArgs.createConfiguration();
 
-            if (userArgs.isShowVersion()) {
-                showVersion();
-            }
-
             if (run(userArgs, config)) {
                 // It's just sooo much nicer if there's a newline at the end.
                 System.out.println();
@@ -143,6 +139,10 @@ boolean run(UserArgs userArgs, XProcConfiguration config) throws SaxonApiExcepti
         runtime = new XProcRuntime(config);
         debug = config.debug;
 
+        if (userArgs.isShowVersion()) {
+            showVersion();
+        }
+
         XPipeline pipeline = null;
 
         if (userArgs.getPipeline() != null) {