diff options
| author | wuyizhong <wuyizhong@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-07-28 01:39:10 +0000 |
|---|---|---|
| committer | wuyizhong <wuyizhong@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-07-28 01:39:10 +0000 |
| commit | 9cf435c223091dc504a21559b791fafbfaf83135 (patch) | |
| tree | ea1f671b70ea2d45d06fc81502fcb47d7ee3796c /Tools/Source | |
| parent | 7ab6baa9de2937578a96719eeaba0b4706bd8579 (diff) | |
| download | edk2-platforms-9cf435c223091dc504a21559b791fafbfaf83135.tar.xz | |
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
Diffstat (limited to 'Tools/Source')
4 files changed, 7 insertions, 5 deletions
diff --git a/Tools/Source/GenBuild/org/tianocore/build/FileProcess.java b/Tools/Source/GenBuild/org/tianocore/build/FileProcess.java index 28ebfc8d35..32b94d8225 100644 --- a/Tools/Source/GenBuild/org/tianocore/build/FileProcess.java +++ b/Tools/Source/GenBuild/org/tianocore/build/FileProcess.java @@ -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);
diff --git a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java index c5c51bed6b..b2c3e15f00 100644 --- a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java +++ b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java @@ -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);
diff --git a/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java b/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java index 3e775e514e..e9e2770957 100644 --- a/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java +++ b/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java @@ -435,7 +435,7 @@ public class ModuleBuildFileGenerator { //
// WORKSPACE
//
- includes.add("${WORKSPACE_DIR}");
+ includes.add("${WORKSPACE_DIR}" + File.separatorChar);
//
// Module iteself
diff --git a/Tools/Source/GenBuild/org/tianocore/build/id/PlatformIdentification.java b/Tools/Source/GenBuild/org/tianocore/build/id/PlatformIdentification.java index 530ecedc86..39a13d92d6 100644 --- a/Tools/Source/GenBuild/org/tianocore/build/id/PlatformIdentification.java +++ b/Tools/Source/GenBuild/org/tianocore/build/id/PlatformIdentification.java @@ -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);
}
}
\ No newline at end of file |