API: Enhance C and C++ wrappers generation.

epam · Oct 6, 2023 · 215930d · 215930d
1 parent 42d386f
commit 215930d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 16 deletions.
diff --git a/java/nativeWrappers/src/main/java/com/epam/deltix/dfp/CxxWrappers.java b/java/nativeWrappers/src/main/java/com/epam/deltix/dfp/CxxWrappers.java
@@ -6,48 +6,57 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.List;
+import java.util.Locale;
 import java.util.regex.Pattern;
 
 import static com.epam.deltix.dfp.ApiEntry.getCppType;
 
 public class CxxWrappers {
-    public static void make(final String outputC, final String outputCpp, final List<ApiEntry> api, final String decimalNativePrefix) throws IOException {
+    public static void make(final String outputC, final String outputCpp, final List<ApiEntry> api, final String decimalNativePrefix, final String versionThreeDigits) throws IOException {
         final String dfpType = "decimal_native_t";
         final String dfpClassType = "Decimal64_t";
 
         try (final BufferedWriter outFileH = Files.newBufferedWriter(Paths.get(outputC), StandardCharsets.UTF_8);
              final BufferedWriter outFileHpp = Files.newBufferedWriter(Paths.get(outputCpp), StandardCharsets.UTF_8)) {
+
+            final String outputCDefine = Paths.get(outputC).getFileName().toString()
+                .replace('.', '_').replace('-', '_').toUpperCase(Locale.ROOT);
+            final String outputCppDefine = Paths.get(outputCpp).getFileName().toString()
+                .replace('.', '_').replace('-', '_').toUpperCase(Locale.ROOT);
+
             outFileH.write(
-                "#ifndef DECIMALNATIVE_H\n" +
-                    "#define DECIMALNATIVE_H\n" +
+                "#ifndef " + outputCDefine + "\n" +
+                    "#define " + outputCDefine + "\n" +
                     "\n" +
                     "#ifdef __cplusplus\n" +
                     "#include <cstdint>\n" +
                     "#else\n" +
                     "#include <stdint.h>\n" +
                     "#endif\n" +
                     "\n" +
+                    "#define " + outputCDefine + "_VERSION \"" + versionThreeDigits + "\"\n" +
+                    "\n" +
                     "#ifdef __cplusplus\n" +
-                    "#define DECIMALNATIVE_MANGLING \"C\"\n" +
+                    "#define " + outputCDefine + "_MANGLING \"C\"\n" +
                     "#else\n" +
-                    "#define DECIMALNATIVE_MANGLING\n" +
+                    "#define " + outputCDefine + "_MANGLING\n" +
                     "#endif\n" +
                     "\n" +
-                    "#ifdef DECIMALNATIVE_EXPORTS\n" +
+                    "#ifdef " + outputCDefine + "_EXPORTS\n" +
                     "#if defined(_WIN64)\n" +
-                    "#define DECIMALNATIVE_API(x) extern DECIMALNATIVE_MANGLING __declspec(dllexport) x __fastcall\n" +
+                    "#define " + outputCDefine + "_API(x) extern " + outputCDefine + "_MANGLING __declspec(dllexport) x __fastcall\n" +
                     "#elif defined(_WIN32)\n" +
-                    "#define DECIMALNATIVE_API(x) extern DECIMALNATIVE_MANGLING __declspec(dllexport) x __stdcall\n" +
+                    "#define " + outputCDefine + "_API(x) extern " + outputCDefine + "_MANGLING __declspec(dllexport) x __stdcall\n" +
                     "#else\n" +
-                    "#define DECIMALNATIVE_API(x) extern DECIMALNATIVE_MANGLING x __attribute__ ((visibility(\"default\")))\n" +
+                    "#define " + outputCDefine + "_API(x) extern " + outputCDefine + "_MANGLING x __attribute__ ((visibility(\"default\")))\n" +
                     "#endif\n" +
                     "#else\n" +
                     "#if defined(_WIN64)\n" +
-                    "#define DECIMALNATIVE_API(x) extern DECIMALNATIVE_MANGLING __declspec(dllimport) x __fastcall\n" +
+                    "#define " + outputCDefine + "_API(x) extern " + outputCDefine + "_MANGLING __declspec(dllimport) x __fastcall\n" +
                     "#elif defined(_WIN32)\n" +
-                    "#define DECIMALNATIVE_API(x) extern DECIMALNATIVE_MANGLING __declspec(dllimport) x __stdcall\n" +
+                    "#define " + outputCDefine + "_API(x) extern " + outputCDefine + "_MANGLING __declspec(dllimport) x __stdcall\n" +
                     "#else\n" +
-                    "#define DECIMALNATIVE_API(x) extern DECIMALNATIVE_MANGLING x __attribute__ ((visibility(\"default\")))\n" +
+                    "#define " + outputCDefine + "_API(x) extern " + outputCDefine + "_MANGLING x __attribute__ ((visibility(\"default\")))\n" +
                     "#endif\n" +
                     "#endif\n" +
                     "\n" +
@@ -89,8 +98,8 @@ public static void make(final String outputC, final String outputCpp, final List
 
             outFileHpp.write(
                 "#pragma once\n" +
-                    "#ifndef DECIMALNATIVE_HPP\n" +
-                    "#define DECIMALNATIVE_HPP\n" +
+                    "#ifndef " + outputCppDefine + "\n" +
+                    "#define " + outputCppDefine + "\n" +
                     "\n" +
                     "#include \"DecimalNative.h\"\n" +
                     "#include <iostream>\n" +
@@ -269,7 +278,7 @@ public static void make(final String outputC, final String outputCpp, final List
                 final String fnCall = fnCallBuilder.toString();
                 fnArg = fnArgBuilder.toString();
 
-                outFileH.write("DECIMALNATIVE_API(" + fnRet + ") " + fnNameC + "(" + fnArg + ");\n");
+                outFileH.write(outputCDefine + "_API(" + fnRet + ") " + fnNameC + "(" + fnArg + ");\n");
 
                 String preOutHpp = "";
                 String outHpp = "";

diff --git a/java/nativeWrappers/src/main/java/com/epam/deltix/dfp/NativeWrappers.java b/java/nativeWrappers/src/main/java/com/epam/deltix/dfp/NativeWrappers.java
@@ -34,7 +34,7 @@ public static void main(final String[] args) throws IOException, InterruptedExce
         final List<ApiEntry> api = collectApi(preprocess, apiPrefix);
 
         if (!outputC.isEmpty() && !outputCpp.isEmpty()) {
-            CxxWrappers.make(outputC, outputCpp, api, apiPrefix);
+            CxxWrappers.make(outputC, outputCpp, api, apiPrefix, versionThreeDigits);
         }
 
         CsWrappers.make(outputCs, api, apiPrefix);