From 7bdd1bb0f95355b2d585022e9722f3d0db904feb Mon Sep 17 00:00:00 2001
From: stepan <stepan.sindelar@oracle.com>
Date: Mon, 2 Jan 2017 16:05:43 +0100
Subject: [PATCH] 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.
---
.../truffle/r/parser/processor/GenerateRParserProcessor.java | 4 ++--
mx.fastr/copyrights/overrides | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/com.oracle.truffle.r.parser.processor/src/com/oracle/truffle/r/parser/processor/GenerateRParserProcessor.java b/com.oracle.truffle.r.parser.processor/src/com/oracle/truffle/r/parser/processor/GenerateRParserProcessor.java
index 31da2dca52..daf4dc919c 100644
--- a/com.oracle.truffle.r.parser.processor/src/com/oracle/truffle/r/parser/processor/GenerateRParserProcessor.java
+++ b/com.oracle.truffle.r.parser.processor/src/com/oracle/truffle/r/parser/processor/GenerateRParserProcessor.java
@@ -1,5 +1,5 @@
/*
- * 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.
*
* This code is free software; you can redistribute it and/or modify it
@@ -66,7 +66,7 @@ public class GenerateRParserProcessor extends AbstractProcessor {
Filer filer = processingEnv.getFiler();
File srcGenDir = getSrcGenDir(filer);
// note("srcgendir: " + srcGenDir.getAbsolutePath());
- File suiteRoot = srcGenDir.getParentFile().getParentFile().getParentFile();
+ File suiteRoot = srcGenDir.getCanonicalFile().getParentFile().getParentFile().getParentFile();
// note("suiteRoot: " + suiteRoot.getAbsolutePath());
// path to ANTLR jar
diff --git a/mx.fastr/copyrights/overrides b/mx.fastr/copyrights/overrides
index 602b12154d..53a014c748 100644
--- a/mx.fastr/copyrights/overrides
+++ b/mx.fastr/copyrights/overrides
@@ -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/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/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/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
--
GitLab