Update CI, help text and README

Author: mwthinker

.github/workflows/ci.yml

@@ -45,8 +45,8 @@ jobs:
           cmake --version
           ls
           cd target
-          echo ./cppgen CppProject --test --cmake -v
-          ./cppgen CppProject --test --cmake -v 
+          echo ./cppgen CppProject --test --cmake -V
+          ./cppgen CppProject --test --cmake -V 
         if: runner.os != 'Windows'
 
       - name: Run binary file Windows
@@ -56,8 +56,8 @@ jobs:
           cmake --version
           ls
           cd target
-          echo ./cppgen.exe CppProject --test -v
-          ./cppgen.exe CppProject --test -v
+          echo ./cppgen.exe CppProject --test -V
+          ./cppgen.exe CppProject --test -V
         if: runner.os == 'Windows'
 
       - name: Set C++/C compiler on macOS

README.md

@@ -1,35 +1,36 @@
 # cpp-generator-cli [![CI build](https://github.com/mwthinker/cpp-generator-cli/actions/workflows/ci.yml/badge.svg)](https://github.com/mwthinker/cpp-generator-cli/actions/workflows/ci.yml) [![codecov](https://codecov.io/gh/mwthinker/cpp-generator-cli/graph/badge.svg?token=T6CE5XBPEQ)](https://codecov.io/gh/mwthinker/cpp-generator-cli) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-A java application based on JDK 21 and maven. Implements a C++ generator CLI.
+A java application based on JDK 25 and maven. Implements a C++ generator CLI.
 
 ## How to use
-Generates a C++ project template based on cmake and vcpkg.  
+Generates a C++ project template based on cmake and vcpkg.
 
 Usage of the generated binary file:  
 ```bash
 cppgen --help
 Script to generate a CMake C++ project
 
-Usage: cppgen [-cghotvV] [-d=DESCRIPTION] [-l=LICENSE] -n=NEW
-C++ generator
-  -c, --cmake             run cmake
+Usage: cppgen [-cghkotvV] [-d=DESCRIPTION] [-l=LICENSE] [PROJECT_NAME]
+C++ generator using CMake
+      [PROJECT_NAME]      The project name.
+  -c, --cmake             Run cmake.
   -d, --description=DESCRIPTION
-                          short description used in the template
-  -g, --gui               add gui library
-  -h, --help              display a help message
-  -l, --license=LICENSE   add MIT license with author
-  -n, --new=NEW           the project name
-  -o, --open              open visual studio solution
-  -t, --test              add test
-  -V, --version           display version info
-  -v, --verbose           show verbose output
+                          Short description set in CMakeLists.txt.
+  -g, --gui               Add gui library.
+  -h, --help              Display this help message.
+  -k, --keepFiles         Keep generated files on error.
+  -l, --license=LICENSE   Add MIT license with author.
+  -o, --open              Open visual studio solution.
+  -t, --test              Add test.
+  -v, --version           Display version info.
+  -V, --verbose           Show verbose output.
 ```
 
 Example of generating a C++ project and open in Visual Studio C++ 2022:
 ```bash
 cppgen.exe --new NewProject -o
 ```
 
-A Visual Studio C++ 2022 solution should be opened and ready to be used. Assumes that vcpkg is installed and environment variable VCPKG_ROOT pointing to it. Visual Studio 2022 and CMake 3.24 must also be installed and available in the PATH environment variable.
+A Visual Studio C++ 2022 solution should be opened and ready to be used. Assumes that vcpkg is installed and environment variable VCPKG_ROOT pointing to it. Visual Studio 2022 and CMake >=3.24v must also be installed and available in the PATH environment variable.
 
 ## License
 MIT

src/main/java/se/mwthinker/GeneratorCli.java

@@ -1,5 +1,6 @@
 package se.mwthinker;
 
+import org.apache.commons.lang3.SystemUtils;
 import org.jline.consoleui.elements.ConfirmChoice;
 import org.jline.consoleui.prompt.ConsolePrompt;
 import org.jline.consoleui.prompt.PromptResultItemIF;
@@ -19,7 +20,6 @@
 
 @SuppressWarnings({"SpellCheckingInspection", "java:S106"})
 @Command(name = "cppgen",
-        mixinStandardHelpOptions = true,
         description = "C++ generator using CMake"
 )
 public class GeneratorCli implements Closeable, Flushable {
@@ -53,6 +53,9 @@ public class GeneratorCli implements Closeable, Flushable {
     @Option(names = { "-v", "--version" }, versionHelp = true, description = "Display version info.")
     private boolean versionRequested = false;
 
+    @Option(names = { "-h", "--help" }, usageHelp = true, description = "Display this help message.")
+    private boolean help = false;
+
     private Terminal terminal;
 
     static void main(String[] args) {
@@ -85,13 +88,11 @@ public void run(String[] args) {
         try {
             commandLine.parseArgs(args);
         } catch (CommandLine.ParameterException e) {
-            builder.createText()
-                    .addLine("Argument error: " + e.getMessage())
-                    .addPrompt();
+            System.err.println("Argument error: " + e.getMessage());
             System.exit(2);
         }
 
-        if (commandLine.isUsageHelpRequested()) {
+        if (help) {
             commandLine.usage(System.out);
             System.exit(0);
         } else if (versionRequested) {
@@ -138,13 +139,17 @@ private void interactivePrompt(ConsolePrompt prompt, PromptBuilder builder) {
                 .name("cmake")
                 .message("Run cmake after generation?")
                 .defaultValue(ConfirmChoice.ConfirmationValue.NO)
-                .addPrompt()
-                .createConfirmPromp()
-                .name("open")
-                .message("Open Visual Studio solution?")
-                .defaultValue(ConfirmChoice.ConfirmationValue.NO)
-                .addPrompt()
-                .createConfirmPromp()
+                .addPrompt();
+
+        if (SystemUtils.IS_OS_WINDOWS) {
+            builder.createConfirmPromp()
+                    .name("open")
+                    .message("Open Visual Studio solution?")
+                    .defaultValue(ConfirmChoice.ConfirmationValue.NO)
+                    .addPrompt();
+        }
+
+        builder.createConfirmPromp()
                 .name("verbose")
                 .message("Show verbose output?")
                 .defaultValue(ConfirmChoice.ConfirmationValue.NO)