diff options
Diffstat (limited to 'Tools/Java/Source/GenBuild')
4 files changed, 11 insertions, 7 deletions
diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/FfsProcess.java b/Tools/Java/Source/GenBuild/org/tianocore/build/FfsProcess.java index 26b9390901..baa9eab9a5 100644 --- a/Tools/Java/Source/GenBuild/org/tianocore/build/FfsProcess.java +++ b/Tools/Java/Source/GenBuild/org/tianocore/build/FfsProcess.java @@ -379,7 +379,7 @@ public class FfsProcess { if (fileName == null) {
ele.setAttribute("file", "${DEST_DIR_OUTPUT}" + File.separatorChar + basename + getSectionExt(type));
} else {
- ele.setAttribute("file", "${PLATFORM_DIR}" + File.separatorChar + fileName);
+ ele.setAttribute("file", fileName);
}
root.appendChild(ele);
} else {
@@ -390,7 +390,7 @@ public class FfsProcess { if (fileName == null) {
ele.setAttribute("fileName", "${DEST_DIR_OUTPUT}" + File.separatorChar + basename + getSectionExt(type));
} else {
- ele.setAttribute("fileName", "${PLATFORM_DIR}" + File.separatorChar + fileName);
+ ele.setAttribute("fileName", fileName);
}
root.appendChild(ele);
}
diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java index 4ba6ec4c6a..3d17befe19 100644 --- a/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java +++ b/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java @@ -77,9 +77,9 @@ public class FrameworkBuildTask extends Task{ private Set<File> msaFiles = new LinkedHashSet<File>();
- //
- // This is only for none-multi-thread build to reduce overriding message
- //
+ ///
+ /// This is only for none-multi-thread build to reduce overriding message
+ ///
public static Hashtable<String, String> originalProperties = new Hashtable<String, String>();
String toolsDefFilename = ToolDefinitions.DEFAULT_TOOLS_DEF_FILE_PATH;
diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java b/Tools/Java/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java index a38c3c69d1..da6847d9da 100644 --- a/Tools/Java/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java +++ b/Tools/Java/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java @@ -465,7 +465,11 @@ public class ModuleBuildFileGenerator { String[] list = fp.getGenSectionElements(document, "${BASE_NAME}", fpdModuleId.getModule().getGuid(), targetFilename);
for (int i = 0; i < list.length; i++) {
- Element ele = document.createElement(list[i]);
+ String sectiontype = list[i];
+ if (sectiontype.equalsIgnoreCase("EFI_SECTION_RAW") && project.getProperty("MODULE_TYPE").equalsIgnoreCase("SEC")) {
+ sectiontype += "_SEC";
+ }
+ Element ele = document.createElement(sectiontype);
ele.setAttribute("FILEPATH", ".");
ele.setAttribute("FILENAME", "${BASE_NAME}");
root.appendChild(ele);
diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java index 86fb256e95..d45abcdcd8 100644 --- a/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java +++ b/Tools/Java/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java @@ -337,10 +337,10 @@ public class FpdParserTask extends Task { }
}
}
+
/**
This method is used for Single Module Build.
-
@throws BuildException
FPD file is not valid.
**/
|