stevedlawrence commented on a change in pull request #701:
URL: https://github.com/apache/daffodil/pull/701#discussion_r765952027
##########
File path:
daffodil-runtime2/src/main/resources/org/apache/daffodil/runtime2/c/libcli/daffodil_getopt.c
##########
@@ -17,10 +17,10 @@
// clang-format off
#include "daffodil_getopt.h"
-#include <string.h> // for strcmp, strrchr
-#include <unistd.h> // for optarg, getopt, optopt, optind
-#include "cli_errors.h" // for CLI_UNEXPECTED_ARGUMENT, CLI_HELP_USAGE,
CLI_INVALID_COMMAND, CLI_INVALID_INFOSET, CLI_INVALID_OPTION,
CLI_MISSING_COMMAND, CLI_MISSING_VALUE, CLI_PROGRAM_ERROR, CLI_PROGRAM_VERSION
-#include "version.h"
+#include <string.h> // for strcmp, strrchr
+#include <unistd.h> // for optarg, getopt, optopt, optind
+#include "cli_errors.h" // for CLI_UNEXPECTED_ARGUMENT, CLI_HELP_USAGE,
CLI_INVALID_COMMAND, CLI_INVALID_INFOSET, CLI_INVALID_OPTION,
CLI_MISSING_COMMAND, CLI_MISSING_VALUE, CLI_PROGRAM_ERROR, CLI_PROGRAM_VERSION
+#include "daffodil_version.h" // for daffodil_program_version
Review comment:
`CodeGenerator.scala` also needs a change to reference
`daffodil_version.h` instead of `version.h`, since it overwrites the file with
the correct version number.
Though, another option might be to create an sbt resource generator that
generates `daffodil_version.h` rather than having a dummy file that the code
generator overwrites. I can see if I can whip that up if you like that better.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]