Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

ide/Project: Only making CF_DIR relative when inside project dir & on…

…ly using CF_DIR env. var. when absolute
  • Loading branch information...
commit 997cab8607d48e9cf9e100d3515651920d7e97f2 1 parent ae70201
@jerstlouis jerstlouis authored
Showing with 8 additions and 3 deletions.
  1. +8 −3 ide/src/project/Project.ec
View
11 ide/src/project/Project.ec
@@ -1209,8 +1209,8 @@ private:
// Using a relative path makes it less likely to run into spaces issues
// Even with escaped spaces, there still seems to be issues including a config file
// in a path containing spaces
-
- MakePathRelative(temp, topNode.path, cfDir);
+ if(IsPathInsideOf(cfDir, topNode.path))
+ MakePathRelative(temp, topNode.path, cfDir);
}
if(cfDir && cfDir[0] && cfDir[strlen(cfDir)-1] != '/')
strcat(cfDir, "/");
@@ -2135,7 +2135,12 @@ private:
strcat(cfDir, "/");
}
else
- strcpy(cfDir, "$(CF_DIR)");
+ {
+ GetIDECompilerConfigsDir(cfDir, true, true);
+ // Use CF_DIR environment variable for absolute paths only
+ if(cfDir[0] == '/' || (cfDir[0] && cfDir[1] == ':'))
+ strcpy(cfDir, "$(CF_DIR)");
+ }
f.Printf("_CF_DIR = %s\n", cfDir);
f.Printf("\n");
Please sign in to comment.
Something went wrong with that request. Please try again.