Fix T105. It is caused by cpptasks which change automati cally root directory like C: to C:\C. If we pass C:\ to cpptasks, it's okay now.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1130 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
wuyizhong 2006-07-28 01:39:10 +00:00
parent 7ab6baa9de
commit 9cf435c223
4 changed files with 7 additions and 5 deletions

View File

@ -262,7 +262,7 @@ public class FileProcess {
Element includesEle = document.createElement("EXTRA.INC");
for (int i = 0; i < includePaths.length; i++) {
Element includeEle = document.createElement("includepath");
includeEle.setAttribute("path", includePaths[i]);
includeEle.setAttribute("path", project.replaceProperties(includePaths[i]));
includesEle.appendChild(includeEle);
}
ele.appendChild(includesEle);

View File

@ -96,8 +96,10 @@ public class FrameworkBuildTask extends Task{
//
// Global Data initialization
//
File workspacePath = new File(getProject().getProperty("WORKSPACE"));
getProject().setProperty("WORKSPACE_DIR", workspacePath.getPath().replaceAll("(\\\\)", "/"));
GlobalData.initInfo("Tools" + File.separatorChar + "Conf" + File.separatorChar + "FrameworkDatabase.db",
getProject().getProperty("WORKSPACE_DIR"), toolsDefFilename);
workspacePath.getPath(), toolsDefFilename);

View File

@ -435,7 +435,7 @@ public class ModuleBuildFileGenerator {
//
// WORKSPACE
//
includes.add("${WORKSPACE_DIR}");
includes.add("${WORKSPACE_DIR}" + File.separatorChar);
//
// Module iteself

View File

@ -51,10 +51,10 @@ public class PlatformIdentification extends Identification{
}
public String getRelativeFpdFile (){
return fpdFile.getPath().substring(GlobalData.getWorkspacePath().length());
return fpdFile.getPath().substring(GlobalData.getWorkspacePath().length() + 1);
}
public String getPlatformRelativeDir(){
return fpdFile.getParent().substring(GlobalData.getWorkspacePath().length());
return fpdFile.getParent().substring(GlobalData.getWorkspacePath().length() + 1);
}
}