X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkNt32Pkg%2FSec%2FSecMain_build.xml;h=fc26a10779233a1e7a5e1d686600ac04d9949c3b;hp=b0436d385b8b25f73893ee7a161edc8970e3b8c2;hb=b1ef40155e611a662af7bd328c6eea214564c8c8;hpb=878ddf1fc3540a715f63594ed22b6929e881afb4

diff --git a/EdkNt32Pkg/Sec/SecMain_build.xml b/EdkNt32Pkg/Sec/SecMain_build.xml
index b0436d385b..fc26a10779 100644
--- a/EdkNt32Pkg/Sec/SecMain_build.xml
+++ b/EdkNt32Pkg/Sec/SecMain_build.xml
@@ -24,103 +24,87 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <!-- Compile all dependency Library instances. --> 
 
   <target name="libraries">
-    <ant antfile="${WORKSPACE_DIR}\MdePkg\Library\BaseLib\build.xml" inheritAll="false" target="BaseLib">
-      <property name="WORKSPACE_DIR" value="${WORKSPACE_DIR}" /> 
-      <property name="PACKAGE_DIR" value="${WORKSPACE_DIR}\MdePkg/" /> 
-      <property name="ARCH" value="${ARCH}" /> 
-      <property name="TARGET" value="${TARGET}" /> 
-      <property name="PACKAGE" value="MdePkg" /> 
-    </ant>
-    <ant antfile="${WORKSPACE_DIR}\MdePkg\Library\BaseMemoryLib\build.xml" inheritAll="false" target="BaseMemoryLib">
-      <property name="WORKSPACE_DIR" value="${WORKSPACE_DIR}" /> 
-      <property name="PACKAGE_DIR" value="${WORKSPACE_DIR}\MdePkg/" /> 
-      <property name="ARCH" value="${ARCH}" /> 
-      <property name="TARGET" value="${TARGET}" /> 
-      <property name="PACKAGE" value="MdePkg" /> 
-    </ant>
-    <ant antfile="${WORKSPACE_DIR}\MdePkg\Library\BasePrintLib\build.xml" inheritAll="false" target="BasePrintLib">
-      <property name="WORKSPACE_DIR" value="${WORKSPACE_DIR}" /> 
-      <property name="PACKAGE_DIR" value="${WORKSPACE_DIR}\MdePkg/" /> 
-      <property name="ARCH" value="${ARCH}" /> 
-      <property name="TARGET" value="${TARGET}" /> 
-      <property name="PACKAGE" value="MdePkg" /> 
-    </ant>
-    <ant antfile="${WORKSPACE_DIR}\MdePkg\Library\BasePeCoffLib\build.xml" inheritAll="false" target="BasePeCoffLib">
-      <property name="WORKSPACE_DIR" value="${WORKSPACE_DIR}" /> 
-      <property name="PACKAGE_DIR" value="${WORKSPACE_DIR}\MdePkg/" /> 
-      <property name="ARCH" value="${ARCH}" /> 
-      <property name="TARGET" value="${TARGET}" /> 
-      <property name="PACKAGE" value="MdePkg" /> 
-    </ant>
-    <ant antfile="${WORKSPACE_DIR}\MdePkg\Library\BaseReportStatusCodeLibNull\build.xml" inheritAll="false" target="BaseReportStatusCodeLibNull">
-      <property name="WORKSPACE_DIR" value="${WORKSPACE_DIR}" /> 
-      <property name="PACKAGE_DIR" value="${WORKSPACE_DIR}\MdePkg/" /> 
-      <property name="ARCH" value="${ARCH}" /> 
-      <property name="TARGET" value="${TARGET}" /> 
-      <property name="PACKAGE" value="MdePkg" /> 
-    </ant>
-    <ant antfile="${WORKSPACE_DIR}\MdePkg\Library\BaseDebugLibNull\build.xml" inheritAll="false" target="BaseDebugLibNull">
-      <property name="WORKSPACE_DIR" value="${WORKSPACE_DIR}" /> 
-      <property name="PACKAGE_DIR" value="${WORKSPACE_DIR}\MdePkg/" /> 
-      <property name="ARCH" value="${ARCH}" /> 
-      <property name="TARGET" value="${TARGET}" /> 
-      <property name="PACKAGE" value="MdePkg" /> 
-    </ant>
-    <Expand />
+    <GenBuild type="build">
+      <property name="ARCH" value="${ARCH}"/>
+      <property name="MODULE_GUID" value="27d67720-ea68-48ae-93da-a3a074c90e30"/>
+      <property name="MODULE_VERSION" value=""/>
+      <property name="PLATFORM" value="${PLATFORM}"/>
+      <property name="PACKAGE_GUID" value="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      <property name="PACKAGE_VERSION" value=""/>
+    </GenBuild>
+    <GenBuild type="build">
+      <property name="ARCH" value="${ARCH}"/>
+      <property name="MODULE_GUID" value="fd44e603-002a-4b29-9f5f-529e815b6165"/>
+      <property name="MODULE_VERSION" value=""/>
+      <property name="PLATFORM" value="${PLATFORM}"/>
+      <property name="PACKAGE_GUID" value="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      <property name="PACKAGE_VERSION" value=""/>
+    </GenBuild>
+    <GenBuild type="build">
+      <property name="ARCH" value="${ARCH}"/>
+      <property name="MODULE_GUID" value="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3"/>
+      <property name="MODULE_VERSION" value=""/>
+      <property name="PLATFORM" value="${PLATFORM}"/>
+      <property name="PACKAGE_GUID" value="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      <property name="PACKAGE_VERSION" value=""/>
+    </GenBuild>
+    <GenBuild type="build">
+      <property name="ARCH" value="${ARCH}"/>
+      <property name="MODULE_GUID" value="556f5d10-7309-4af4-b80a-8196bd60946f"/>
+      <property name="MODULE_VERSION" value=""/>
+      <property name="PLATFORM" value="${PLATFORM}"/>
+      <property name="PACKAGE_GUID" value="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      <property name="PACKAGE_VERSION" value=""/>
+    </GenBuild>
+    <GenBuild type="build">
+      <property name="ARCH" value="${ARCH}"/>
+      <property name="MODULE_GUID" value="9ba1d976-0624-41a3-8650-28165e8d9ae8"/>
+      <property name="MODULE_VERSION" value=""/>
+      <property name="PLATFORM" value="${PLATFORM}"/>
+      <property name="PACKAGE_GUID" value="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
+      <property name="PACKAGE_VERSION" value=""/>
+    </GenBuild>
   </target>
   <target name="sourcefiles">
-      <Build_AUTOGEN FILENAME="AutoGen" FILEPATH=".">
+      <Build_Init>
+        <EXTRA.INC>
+          <includepath path="${INCLUDE_PATHS}"/>
+        </EXTRA.INC>
+      </Build_Init>
+      <Build_AUTOGEN FILEEXT="c" FILENAME="AutoGen" FILEPATH=".">
          <EXTRA.INC>
-            <includepath path="${WORKSPACE_DIR}\MdePkg\Include"/>
-            <includepath path="${WORKSPACE_DIR}\MdePkg\Include\${ARCH}"/>
-            <includepath path="${WORKSPACE_DIR}\EdkModulePkg\Include"/>
-            <includepath path="${WORKSPACE_DIR}\EdkModulePkg\Include\${ARCH}"/>
-            <includepath path="${WORKSPACE_DIR}\EdkNt32Pkg\Include"/>
-            <includepath path="${WORKSPACE_DIR}\EdkNt32Pkg\Include\${ARCH}"/>
-            <includepath path="${DEST_DIR_DEBUG}"/>
+            <includepath path="${INCLUDE_PATHS}"/>
          </EXTRA.INC>
        </Build_AUTOGEN>
-      <Build_C_Code FILENAME="FwVol" FILEPATH=".">
+      <Build_CCode FILEEXT="c" FILENAME="FwVol" FILEPATH=".">
          <EXTRA.INC>
-            <includepath path="${WORKSPACE_DIR}\MdePkg\Include"/>
-            <includepath path="${WORKSPACE_DIR}\MdePkg\Include\${ARCH}"/>
-            <includepath path="${WORKSPACE_DIR}\EdkModulePkg\Include"/>
-            <includepath path="${WORKSPACE_DIR}\EdkModulePkg\Include\${ARCH}"/>
-            <includepath path="${WORKSPACE_DIR}\EdkNt32Pkg\Include"/>
-            <includepath path="${WORKSPACE_DIR}\EdkNt32Pkg\Include\${ARCH}"/>
-            <includepath path="${DEST_DIR_DEBUG}"/>
+            <includepath path="${INCLUDE_PATHS}"/>
          </EXTRA.INC>
-      </Build_C_Code>
-      <Build_C_Code FILENAME="WinNtThunk" FILEPATH=".">
+      </Build_CCode>
+      <Build_CCode FILEEXT="c" FILENAME="WinNtThunk" FILEPATH=".">
          <EXTRA.INC>
-            <includepath path="${WORKSPACE_DIR}\MdePkg\Include"/>
-            <includepath path="${WORKSPACE_DIR}\MdePkg\Include\${ARCH}"/>
-            <includepath path="${WORKSPACE_DIR}\EdkModulePkg\Include"/>
-            <includepath path="${WORKSPACE_DIR}\EdkModulePkg\Include\${ARCH}"/>
-            <includepath path="${WORKSPACE_DIR}\EdkNt32Pkg\Include"/>
-            <includepath path="${WORKSPACE_DIR}\EdkNt32Pkg\Include\${ARCH}"/>
-            <includepath path="${DEST_DIR_DEBUG}"/>
+            <includepath path="${INCLUDE_PATHS}"/>
          </EXTRA.INC>
-      </Build_C_Code>
-      <Build_C_Code FILENAME="SecMain" FILEPATH=".">
+      </Build_CCode>
+      <Build_CCode FILEEXT="c" FILENAME="SecMain" FILEPATH=".">
          <EXTRA.INC>
-            <includepath path="${WORKSPACE_DIR}\MdePkg\Include"/>
-            <includepath path="${WORKSPACE_DIR}\MdePkg\Include\${ARCH}"/>
-            <includepath path="${WORKSPACE_DIR}\EdkModulePkg\Include"/>
-            <includepath path="${WORKSPACE_DIR}\EdkModulePkg\Include\${ARCH}"/>
-            <includepath path="${WORKSPACE_DIR}\EdkNt32Pkg\Include"/>
-            <includepath path="${WORKSPACE_DIR}\EdkNt32Pkg\Include\${ARCH}"/>
-            <includepath path="${DEST_DIR_DEBUG}"/>
+            <includepath path="${INCLUDE_PATHS}"/>
          </EXTRA.INC>
-      </Build_C_Code>
+      </Build_CCode>
     </target>
+
     <target name="sections" />
+
     <target name="output" >
-      <echo message="##Entering Output!" />
-      
+      <if>
+        <available type="file" file="${DEST_DIR_OUTPUT}/AutoGen.h.obj"/>
+        <then>
+          <var name="SLINK_FLAGS" value="${SLINK_FLAGS} ${DEST_DIR_OUTPUT}/AutoGen.h.obj"/>
+        </then>
+      </if>
       <OnDependency>
         <sourcefiles>
-          <file list="${OBJECTS}"/>
+          <fileset dir="${DEST_DIR_OUTPUT}" includes="${OBJECTS}" />
           <file list="${LIBS}"/>
         </sourcefiles>
         <targetfiles>
@@ -128,26 +112,29 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </targetfiles>
         
         <sequential>
-          <shellscript shell="cmd.exe" tmpsuffix=".cmd">
+          <cc userdefine="on">
+            <command type="SLINK" cmd="${SLINK}" family="${SLINK_FAMILY}"
+                outputFile="${DEST_DIR_OUTPUT}/SecMainLocal.lib" dpath="${SLINK_DPATH}">
+                
+              <argument value="${SLINK_FLAGS}"/>
+
+              <fileset dir="${DEST_DIR_OUTPUT}" includes="${OBJECTS}"/>
+            </command>
+          </cc>
+
+          <var name="LIBS" value="${LIBS} ${DEST_DIR_OUTPUT}/SecMainLocal.lib" />
+         
+          <shellscript shell="cmd.exe" tmpsuffix=".cmd" >
+            <arg line="/q"/>
             <arg line="/c"/>
             <arg line="call"/>
-            "${LINK}" /LIBPATH:"${env.MSVCDir}\Lib" /LIBPATH:"${env.MSVCDir}\PlatformSdk\Lib" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MsvcRt.lib Gdi32.lib User32.lib Winmm.lib ${OBJECTS} ${LIBS} /base:0x10000000 /out:${BIN_DIR}\SecMain.exe /pdb:${DEST_DIR_DEBUG}\SecMain.pdb
+            PATH ${DLINK_DPATH};%path%
+            "${DLINK}" /LIBPATH:"${env.MSVCDir}\Lib" /LIBPATH:"${env.MSVCDir}\PlatformSdk\Lib" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib Winmm.lib ${LIBS} /base:0x10000000 /out:${BIN_DIR}\SecMain.exe /pdb:${DEST_DIR_DEBUG}\SecMain.pdb
           </shellscript>
         </sequential>
       </OnDependency>
-      <!--      
-      <cc userdefine="on">
-        <command type="LINK">
-          <argument value="/LIBPATH:&quot;${env.MSVCDir}\Lib&quot; /LIBPATH:&quot;${env.MSVCDir}\PlatformSdk\Lib&quot;" />
-          <argument value="/NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG" />
-          <argument value="Kernel32.lib MsvcRt.lib Gdi32.lib User32.lib Winmm.lib" />
-          <argument value="${OBJECTS}" />
-          <argument value="${LIBS}" />
-          <argument value="/base:0x10000000 /out:${BIN_DIR}\SecMain.exe /pdb:${DEST_DIR_DEBUG}\SecMain.pdb" />
-      </command>
-    </cc>
-    -->
   </target>
+  
   <target name="clean" ></target>
 
   <target name="cleanAll"></target>