Skip to content

Commit 765dd48

Browse files
SamCarlbergAustinShalit
authored andcommitted
Fix code generation with Windows native app (#694)
Closes #684
1 parent 54d98ea commit 765dd48

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

ui/src/main/java/edu/wpi/grip/ui/codegeneration/Exporter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void run() {
7777
context.put("vmLoc", templateDir);
7878
VelocityEngine ve = new VelocityEngine();
7979
Properties props = new Properties();
80-
props.put("velocimacro.library", templateDir + File.separator + "macros.vm");
80+
props.put("velocimacro.library", templateDir + "/macros.vm");
8181
props.put(RuntimeConstants.RESOURCE_LOADER, "classpath");
8282
props.put("classpath.resource.loader.class", ClasspathResourceLoader.class.getName());
8383
ve.init(props);
@@ -136,7 +136,7 @@ private boolean isExportable(Step step) {
136136
*/
137137
private void generateCode(VelocityEngine ve, String templateDir, File file,
138138
VelocityContext context) {
139-
Template tm = ve.getTemplate(templateDir + File.separator + PIPELINE_TEMPLATE);
139+
Template tm = ve.getTemplate(templateDir + "/" + PIPELINE_TEMPLATE);
140140
StringWriter sw = new StringWriter();
141141
tm.merge(context, sw);
142142
try (PrintWriter writer = new PrintWriter(file.getAbsolutePath(), "UTF-8")) {
@@ -157,11 +157,11 @@ private void generateCode(VelocityEngine ve, String templateDir, File file,
157157
*/
158158
private void generateH(VelocityEngine ve, String templateDir, File file,
159159
VelocityContext context) {
160-
Template tm = ve.getTemplate(templateDir + File.separator + PIPELINE_HTEMPLATE);
160+
Template tm = ve.getTemplate(templateDir + "/" + PIPELINE_HTEMPLATE);
161161
StringWriter sw = new StringWriter();
162162
tm.merge(context, sw);
163163
try (PrintWriter writer = new PrintWriter(file.getParentFile().getAbsolutePath()
164-
+ File.separator + file.getName().replace(".cpp", ".h"), "UTF-8")) {
164+
+ "/" + file.getName().replace(".cpp", ".h"), "UTF-8")) {
165165
writer.println(sw);
166166
} catch (UnsupportedEncodingException | FileNotFoundException e) {
167167
logger.log(Level.SEVERE, "Unable to write to file", e);

0 commit comments

Comments
 (0)