Skip to content
Snippets Groups Projects
Commit 7bdd1bb0 authored by stepan's avatar stepan
Browse files

Bit more robust suite path construction in GenerateRParserProcessor

getCanonicalFile() removes any '..' from the path. Some IDEs (intellij) put
'..' into StandardLocation.SOURCE_OUTPUT. With '..' the getParentFile() does
not work as intended.
parent c627e0f1
Branches
No related tags found
No related merge requests found
/* /*
* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -66,7 +66,7 @@ public class GenerateRParserProcessor extends AbstractProcessor { ...@@ -66,7 +66,7 @@ public class GenerateRParserProcessor extends AbstractProcessor {
Filer filer = processingEnv.getFiler(); Filer filer = processingEnv.getFiler();
File srcGenDir = getSrcGenDir(filer); File srcGenDir = getSrcGenDir(filer);
// note("srcgendir: " + srcGenDir.getAbsolutePath()); // note("srcgendir: " + srcGenDir.getAbsolutePath());
File suiteRoot = srcGenDir.getParentFile().getParentFile().getParentFile(); File suiteRoot = srcGenDir.getCanonicalFile().getParentFile().getParentFile().getParentFile();
// note("suiteRoot: " + suiteRoot.getAbsolutePath()); // note("suiteRoot: " + suiteRoot.getAbsolutePath());
// path to ANTLR jar // path to ANTLR jar
......
...@@ -228,7 +228,6 @@ com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/UpdateSlotNode. ...@@ -228,7 +228,6 @@ com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/UpdateSlotNode.
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/CastTypeNode.java,purdue.copyright com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/binary/CastTypeNode.java,purdue.copyright
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/CallMatcherNode.java,purdue.copyright com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/CallMatcherNode.java,purdue.copyright
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/S3FunctionLookupNode.java,purdue.copyright com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/S3FunctionLookupNode.java,purdue.copyright
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/function/UseMethodInternalNode.java,purdue.copyright
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/objects/AsS4.java,gnu_r_gentleman_ihaka.copyright com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/objects/AsS4.java,gnu_r_gentleman_ihaka.copyright
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/objects/DispatchGeneric.java,gnu_r_gentleman_ihaka.copyright com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/objects/DispatchGeneric.java,gnu_r_gentleman_ihaka.copyright
com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/objects/ExecuteMethod.java,gnu_r_gentleman_ihaka.copyright com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/objects/ExecuteMethod.java,gnu_r_gentleman_ihaka.copyright
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment