mirror of https://github.com/acidanthera/audk.git
add EdkModule Guid
nmake.() git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1557 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
d946661a82
commit
77dd49a7d1
|
@ -36,6 +36,9 @@ public class MigrationTool {
|
||||||
//MigrationTool.ui.yesOrNo("go on replace?");
|
//MigrationTool.ui.yesOrNo("go on replace?");
|
||||||
SourceFileReplacer.fireAt(mi); // some adding library actions are taken here,so it must be put before "MsaWriter"
|
SourceFileReplacer.fireAt(mi); // some adding library actions are taken here,so it must be put before "MsaWriter"
|
||||||
|
|
||||||
|
//MigrationTool.ui.yesOrNo("go on delete?");
|
||||||
|
Common.deleteDir(mi.modulepath + File.separator + "temp");
|
||||||
|
|
||||||
//MigrationTool.ui.yesOrNo("go on show?");
|
//MigrationTool.ui.yesOrNo("go on show?");
|
||||||
// show result
|
// show result
|
||||||
if (MigrationTool.printModuleInfo) {
|
if (MigrationTool.printModuleInfo) {
|
||||||
|
@ -60,9 +63,6 @@ public class MigrationTool {
|
||||||
Critic.fireAt(ModuleInfoMap.get(mi) + File.separator + "Migration_" + mi.modulename);
|
Critic.fireAt(ModuleInfoMap.get(mi) + File.separator + "Migration_" + mi.modulename);
|
||||||
}
|
}
|
||||||
|
|
||||||
//MigrationTool.ui.yesOrNo("go on delete?");
|
|
||||||
Common.deleteDir(mi.modulepath + File.separator + "temp");
|
|
||||||
|
|
||||||
MigrationTool.ui.println("Errors Left : " + MigrationTool.db.error);
|
MigrationTool.ui.println("Errors Left : " + MigrationTool.db.error);
|
||||||
MigrationTool.ui.println("Complete!");
|
MigrationTool.ui.println("Complete!");
|
||||||
//MigrationTool.ui.println("Your R9 module was placed here: " + mi.modulepath + File.separator + "result");
|
//MigrationTool.ui.println("Your R9 module was placed here: " + mi.modulepath + File.separator + "result");
|
||||||
|
|
|
@ -97,7 +97,7 @@ public final class ModuleReader implements Common.ForDoAll {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (mtrsection.group(1).matches("nmake.common")) {
|
if (mtrsection.group(1).contains("nmake.")) {
|
||||||
mtrinfequation = ptninfequation.matcher(mtrsection.group(2));
|
mtrinfequation = ptninfequation.matcher(mtrsection.group(2));
|
||||||
while (mtrinfequation.find()) {
|
while (mtrinfequation.find()) {
|
||||||
if (mtrinfequation.group(1).matches("IMAGE_ENTRY_POINT")) {
|
if (mtrinfequation.group(1).matches("IMAGE_ENTRY_POINT")) {
|
||||||
|
@ -130,7 +130,7 @@ public final class ModuleReader implements Common.ForDoAll {
|
||||||
|
|
||||||
private final void preProcessModule() throws Exception {
|
private final void preProcessModule() throws Exception {
|
||||||
// according to .inf file, add extraordinary includes and sourcefiles
|
// according to .inf file, add extraordinary includes and sourcefiles
|
||||||
Common.dirCopy(mi.modulepath, mi.modulepath + File.separator + "temp");
|
Common.dirCopy(mi.modulepath, mi.modulepath + File.separator + "temp"); // collect all Laplace.namechange to here???
|
||||||
|
|
||||||
if (!mi.infincludes.isEmpty()) {
|
if (!mi.infincludes.isEmpty()) {
|
||||||
Iterator<String> it = mi.infincludes.iterator();
|
Iterator<String> it = mi.infincludes.iterator();
|
||||||
|
|
|
@ -123,6 +123,7 @@ public class MsaWriter {
|
||||||
md.setOutputFileBasename(mi.modulename);
|
md.setOutputFileBasename(mi.modulename);
|
||||||
|
|
||||||
pd.addNewPackage().setPackageGuid("5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec");
|
pd.addNewPackage().setPackageGuid("5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec");
|
||||||
|
pd.addNewPackage().setPackageGuid("68169ab0-d41b-4009-9060-292c253ac43d");
|
||||||
externs.addNewSpecification().setStringValue("EFI_SPECIFICATION_VERSION 0x00020000");
|
externs.addNewSpecification().setStringValue("EFI_SPECIFICATION_VERSION 0x00020000");
|
||||||
externs.addNewSpecification().setStringValue("EDK_RELEASE_VERSION 0x00020000");
|
externs.addNewSpecification().setStringValue("EDK_RELEASE_VERSION 0x00020000");
|
||||||
externs.addNewExtern().setModuleEntryPoint(mi.entrypoint);
|
externs.addNewExtern().setModuleEntryPoint(mi.entrypoint);
|
||||||
|
|
Loading…
Reference in New Issue