Architecture rename

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@19 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Source/TianoTools/GenFvImage/build.gcc b/Tools/Source/TianoTools/GenFvImage/build.gcc
index 6cc8a9959fd0f7b051c53d2f23a1a5d9bdee9e02..24e1a7944449a6a9cf22117e47f5264c706b0c40 100644 (file)
--- a/Tools/Source/TianoTools/GenFvImage/build.gcc
+++ b/Tools/Source/TianoTools/GenFvImage/build.gcc
@@ -1,3 +1,3 @@
-gcc -I $WORKSPACE/MdePkg/Include/ToBeRemoved -I "$WORKSPACE/MdePkg/Include/" -I"$WORKSPACE/MdePkg/Include/Ia32/" -I"../Common/" -I$WORKSPACE/MdePkg/Include/Protocol/ -I$WORKSPACE/MdePkg/Include/Common/  Ia32/*.c *.c -o GenFvImage_IA32 -L../Library-cygwin -lCommon -L/usr/lib/e2fsprogs -luuid\r
-gcc -I $WORKSPACE/MdePkg/Include/ToBeRemoved -I "$WORKSPACE/MdePkg/Include/" -I"$WORKSPACE/MdePkg/Include/Ia32/" -I"../Common/" -I$WORKSPACE/MdePkg/Include/Protocol/ -I$WORKSPACE/MdePkg/Include/Common/  x64/*.c *.c -o GenFvImage_X64 -L../Library-cygwin -lCommon -L/usr/lib/e2fsprogs -luuid\r
-gcc -I $WORKSPACE/MdePkg/Include/ToBeRemoved -I "$WORKSPACE/MdePkg/Include/" -I"$WORKSPACE/MdePkg/Include/Ia32/" -I"../Common/" -I$WORKSPACE/MdePkg/Include/Protocol/ -I$WORKSPACE/MdePkg/Include/Common/  Ipf/*.c *.c -o GenFvImage_IPF -L../Library-cygwin -lCommon -L/usr/lib/e2fsprogs -luuid\r
+gcc -I $WORKSPACE/MdePkg/Include/ToBeRemoved -I "$WORKSPACE/MdePkg/Include/" -I"$WORKSPACE/MdePkg/Include/Ia32/" -I"../Common/" -I$WORKSPACE/MdePkg/Include/Protocol/ -I$WORKSPACE/MdePkg/Include/Common/  Ia32/*.c *.c -o GenFvImage_Ia32 -L../Library-cygwin -lCommon -L/usr/lib/e2fsprogs -luuid
+gcc -I $WORKSPACE/MdePkg/Include/ToBeRemoved -I "$WORKSPACE/MdePkg/Include/" -I"$WORKSPACE/MdePkg/Include/Ia32/" -I"../Common/" -I$WORKSPACE/MdePkg/Include/Protocol/ -I$WORKSPACE/MdePkg/Include/Common/  x64/*.c *.c -o GenFvImage_X64 -L../Library-cygwin -lCommon -L/usr/lib/e2fsprogs -luuid
+gcc -I $WORKSPACE/MdePkg/Include/ToBeRemoved -I "$WORKSPACE/MdePkg/Include/" -I"$WORKSPACE/MdePkg/Include/Ia32/" -I"../Common/" -I$WORKSPACE/MdePkg/Include/Protocol/ -I$WORKSPACE/MdePkg/Include/Common/  Ipf/*.c *.c -o GenFvImage_Ipf -L../Library-cygwin -lCommon -L/usr/lib/e2fsprogs -luuid

diff --git a/Tools/Source/TianoTools/GenFvImage/build.xml b/Tools/Source/TianoTools/GenFvImage/build.xml
index 3de81237babacb76e7ccda83fadba194ccbdee90..3ea273bda43de6db710d31b3d547844aa1b29b37 100644 (file)
--- a/Tools/Source/TianoTools/GenFvImage/build.xml
+++ b/Tools/Source/TianoTools/GenFvImage/build.xml
@@ -65,25 +65,25 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       </echo>\r
     </else>\r
     </if>\r
-               <if>\r
-                 <equals arg1="${ToolChain}" arg2="msvc"/>\r
-                       <then>\r
+    <if>\r
+      <equals arg1="${ToolChain}" arg2="msvc"/>\r
+      <then>\r
         <property name="ext_static" value=".lib"/>\r
         <property name="ext_dynamic" value=".dll"/>\r
         <property name="ext_exe" value=".exe"/>\r
-                       </then>\r
-                       <elseif>\r
-                         <equals arg1="${ToolChain}" arg2="gcc"/>\r
-                               <then>\r
+      </then>\r
+      <elseif>\r
+        <equals arg1="${ToolChain}" arg2="gcc"/>\r
+        <then>\r
           <property name="ext_static" value=".a"/>\r
           <property name="ext_dynamic" value=".so"/>\r
           <property name="ext_exe" value=""/>\r
-                               </then>\r
-                       </elseif>\r
-               </if>\r
+        </then>\r
+      </elseif>\r
+    </if>\r
   </target>\r
 \r
-  <target name="Tool" depends="init, GenFvImage, GenFvImage_IA32, GenFvImage_X64, GenFvImage_IPF"/>\r
+  <target name="Tool" depends="init, GenFvImage, GenFvImage_Ia32, GenFvImage_X64, GenFvImage_Ipf"/>\r
 \r
   <target name="GenFvImage">\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR_IA32}" \r
@@ -112,17 +112,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${env.WORKSPACE}/MdePkg/Include/ToBeRemoved"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
 \r
-                       <linkerarg value="${LIB_DIR}/CommonTools.lib"/>\r
-                       <linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>\r
-                       <linkerarg value="/nodefaultlib:libc.lib"/>\r
-                       <linkerarg value="RpcRT4.Lib"/>\r
+      <linkerarg value="${LIB_DIR}/CommonTools.lib"/>\r
+      <linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>\r
+      <linkerarg value="/nodefaultlib:libc.lib"/>\r
+      <linkerarg value="RpcRT4.Lib"/>\r
 \r
     </cc>\r
   </target>\r
 \r
-  <target name="GenFvImage_IA32">\r
+  <target name="GenFvImage_Ia32">\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR_IA32}" \r
-        outfile="${BIN_DIR}/${ToolName}_IA32"\r
+        outfile="${BIN_DIR}/${ToolName}_Ia32"\r
         outtype="executable"\r
         libtool="${haveLibtool}"\r
         optimize="speed">\r
@@ -147,10 +147,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${env.WORKSPACE}/MdePkg/Include/ToBeRemoved"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
 \r
-                       <linkerarg value="${LIB_DIR}/CommonTools.lib"/>\r
-                       <linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>\r
-                       <linkerarg value="/nodefaultlib:libc.lib"/>\r
-                       <linkerarg value="RpcRT4.Lib"/>\r
+      <linkerarg value="${LIB_DIR}/CommonTools.lib"/>\r
+      <linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>\r
+      <linkerarg value="/nodefaultlib:libc.lib"/>\r
+      <linkerarg value="RpcRT4.Lib"/>\r
 \r
     </cc>\r
   </target>\r
@@ -181,17 +181,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${env.WORKSPACE}/MdePkg/Include/ToBeRemoved"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
 \r
-                       <linkerarg value="${LIB_DIR}/CommonTools.lib"/>\r
-                       <linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>\r
-                       <linkerarg value="/nodefaultlib:libc.lib"/>\r
-                       <linkerarg value="RpcRT4.Lib"/>\r
+      <linkerarg value="${LIB_DIR}/CommonTools.lib"/>\r
+      <linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>\r
+      <linkerarg value="/nodefaultlib:libc.lib"/>\r
+      <linkerarg value="RpcRT4.Lib"/>\r
 \r
     </cc>\r
   </target>\r
 \r
-  <target name="GenFvImage_IPF">\r
+  <target name="GenFvImage_Ipf">\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR_IPF}" \r
-        outfile="${BIN_DIR}/${ToolName}_IPF"\r
+        outfile="${BIN_DIR}/${ToolName}_Ipf"\r
         outtype="executable"\r
         libtool="${haveLibtool}"\r
         optimize="speed">\r
@@ -215,10 +215,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${env.WORKSPACE}/MdePkg/Include/ToBeRemoved"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
 \r
-                       <linkerarg value="${LIB_DIR}/CommonTools.lib"/>\r
-                       <linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>\r
-                       <linkerarg value="/nodefaultlib:libc.lib"/>\r
-                       <linkerarg value="RpcRT4.Lib"/>\r
+      <linkerarg value="${LIB_DIR}/CommonTools.lib"/>\r
+      <linkerarg value="${LIB_DIR}/CustomizedCompress.lib"/>\r
+      <linkerarg value="/nodefaultlib:libc.lib"/>\r
+      <linkerarg value="RpcRT4.Lib"/>\r
 \r
     </cc>\r
   </target>\r
@@ -235,11 +235,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <target name="cleanall" depends="init">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
     <delete dir="${PACKAGE_DIR}/${ToolName}/tmp">\r
-           \r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}_IA32${ext_exe}"/>\r
+      \r
+      <fileset dir="${BIN_DIR}" includes="${ToolName}_Ia32${ext_exe}"/>\r
       <fileset dir="${BIN_DIR}" includes="${ToolName}_X64${ext_exe}"/>\r
       <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}_IPF${ext_exe}"/>\r
+      <fileset dir="${BIN_DIR}" includes="${ToolName}_Ipf${ext_exe}"/>\r
     </delete>\r
   </target>\r
 \r