7903187: jextract should support --version option

sundararajana · mcimadamore · commit cf154cd5fbfc · 2022-05-13T15:50:41.000Z
Reviewed-by: mcimadamore
diff --git a/src/main/java/org/openjdk/jextract/JextractTool.java b/src/main/java/org/openjdk/jextract/JextractTool.java
@@ -25,6 +25,7 @@
 
 package org.openjdk.jextract;
 
+import org.openjdk.jextract.clang.LibClang;
 import org.openjdk.jextract.impl.ClangException;
 import org.openjdk.jextract.impl.CommandLine;
 import org.openjdk.jextract.impl.IncludeHelper;
@@ -342,6 +343,7 @@ private int run(String[] args) {
         parser.accepts("--output", format("help.output"), true);
         parser.accepts("--source", format("help.source"), false);
         parser.accepts("-t", List.of("--target-package"), format("help.t"), true);
+        parser.accepts("--version", format("help.version"), false);
 
         OptionSet optionSet;
         try {
@@ -351,6 +353,13 @@ private int run(String[] args) {
             return OPTION_ERROR;
         }
 
+        if (optionSet.has("--version")) {
+            err.printf("%s %s\n", "jextract", System.getProperty("java.version"));
+            err.printf("%s %s\n", "JDK version", System.getProperty("java.runtime.version"));
+            err.printf("%s\n", LibClang.version());
+            return SUCCESS;
+        }
+
         if (optionSet.has("-h")) {
             return printHelp(SUCCESS);
         }
diff --git a/src/main/resources/org/openjdk/jextract/impl/resources/Messages.properties b/src/main/resources/org/openjdk/jextract/impl/resources/Messages.properties
@@ -43,6 +43,7 @@ help.l=specify a library
 help.output=specify the directory to place generated files
 help.source=generate java sources
 help.t=target package for specified header files
+help.version=print version information and exit
 help.non.option=header file
 jextract.usage=\
 Usage: jextract <options> <header file>                                  \n\
@@ -63,4 +64,5 @@ Option                         Description                               \n\
 -l <library>                   specify a library name or absolute library path   \n\
 --output <path>                specify the directory to place generated files    \n\
 --source                       generate java sources                     \n\
--t, --target-package <package> target package for specified header files \n
+-t, --target-package <package> target package for specified header files \n\
+--version                      print version information and exit        \n
diff --git a/test/testng/org/openjdk/jextract/test/toolprovider/JextractToolProviderTest.java b/test/testng/org/openjdk/jextract/test/toolprovider/JextractToolProviderTest.java
@@ -44,6 +44,11 @@ public void testHelp() {
         run("-?").checkSuccess();
     }
 
+    @Test
+    public void testVersion() {
+        run("--version").checkSuccess();
+    }
+
     // error for non-existent args file
     @Test
     public void testNonExistentArgsFile() {
