diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-09-22 17:35:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-22 17:35:15 +0200 |
commit | 211edf5c7dbe196de62acf68a0ceff06823e2919 (patch) | |
tree | 67d0c8c798467d739674c437d514186d49cac624 /configgen | |
parent | 4abf2d0c8d2b95be6d2c437db8040bc8af87c726 (diff) | |
parent | 1548e86d63ca9bbccf60bfdb9520cb7f7e158c24 (diff) |
Merge pull request #19248 from vespa-engine/arnej/simplify-cpp-configgen
Arnej/simplify cpp configgen
Diffstat (limited to 'configgen')
-rw-r--r-- | configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java b/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java index c2539b53b28..cc234ea51d7 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/CppClassBuilder.java @@ -98,8 +98,12 @@ public class CppClassBuilder implements ClassBuilder { String newHeader = headerWriter.toString(); String newBody = bodyWriter.toString(); - File headerFile = new File(rootDir, relativePathUnderRoot + "/" + getFileName(root, "h")); - File bodyFile = new File(rootDir, relativePathUnderRoot + "/" + getFileName(root, "cpp")); + String prefix = ""; + if (relativePathUnderRoot != null) { + prefix = relativePathUnderRoot + "/"; + } + File headerFile = new File(rootDir, prefix + getFileName(root, "h")); + File bodyFile = new File(rootDir, prefix + getFileName(root, "cpp")); writeFile(headerFile, newHeader); writeFile(bodyFile, newBody); |