Updated to handle cygwin/gcc and moved msvc,gcc property settings to the TianoTools...
authorlhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524>
Tue, 1 Aug 2006 23:58:18 +0000 (23:58 +0000)
committerlhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524>
Tue, 1 Aug 2006 23:58:18 +0000 (23:58 +0000)
FlashMap.c needed a newline at the end of the file to remove a warning message in cygwin.

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

42 files changed:
Tools/Source/TianoTools/Common/build.xml
Tools/Source/TianoTools/CompressDll/build.xml
Tools/Source/TianoTools/CreateMtFile/build.xml
Tools/Source/TianoTools/CustomizedCompress/build.xml
Tools/Source/TianoTools/EfiCompress/build.xml
Tools/Source/TianoTools/EfiRom/build.xml
Tools/Source/TianoTools/FlashMap/FlashMap.c
Tools/Source/TianoTools/FlashMap/build.xml
Tools/Source/TianoTools/FwImage/build.xml
Tools/Source/TianoTools/GenAcpiTable/build.xml
Tools/Source/TianoTools/GenCRC32Section/build.xml
Tools/Source/TianoTools/GenCapsuleHdr/build.xml
Tools/Source/TianoTools/GenDepex/build.xml
Tools/Source/TianoTools/GenFfsFile/build.xml
Tools/Source/TianoTools/GenFvImage/build.xml
Tools/Source/TianoTools/GenSection/build.xml
Tools/Source/TianoTools/GenTEImage/build.xml
Tools/Source/TianoTools/GuidChk/build.xml
Tools/Source/TianoTools/MakeDeps/build.xml
Tools/Source/TianoTools/ModifyInf/build.xml
Tools/Source/TianoTools/Pccts/antlr/build.xml
Tools/Source/TianoTools/Pccts/antlr/makefile
Tools/Source/TianoTools/Pccts/antlr/makefile.cygwin [new file with mode: 0644]
Tools/Source/TianoTools/Pccts/antlr/makefile1
Tools/Source/TianoTools/Pccts/build.xml
Tools/Source/TianoTools/Pccts/dlg/build.xml
Tools/Source/TianoTools/Pccts/dlg/makefile
Tools/Source/TianoTools/Pccts/dlg/makefile.cygwin [new file with mode: 0644]
Tools/Source/TianoTools/PeCoffLoader/build.xml
Tools/Source/TianoTools/PeiRebase/build.xml
Tools/Source/TianoTools/SecApResetVectorFixup/build.xml
Tools/Source/TianoTools/SecFixup/build.xml
Tools/Source/TianoTools/SetStamp/build.xml
Tools/Source/TianoTools/SplitFile/build.xml
Tools/Source/TianoTools/StrGather/build.xml
Tools/Source/TianoTools/String/build.xml
Tools/Source/TianoTools/Strip/build.xml
Tools/Source/TianoTools/TianoTools.msa
Tools/Source/TianoTools/VfrCompile/VfrCompile.g
Tools/Source/TianoTools/VfrCompile/build.xml
Tools/Source/TianoTools/ZeroDebugData/build.xml
Tools/Source/TianoTools/build.xml

index b4becb7..b794bd7 100644 (file)
@@ -20,59 +20,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="tmp" value="tmp"/>\r
+  <property name="LibName" value="CommonTool"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/Common/tmp"/>\r
 \r
   <target name="CommonTools.lib" depends="init, ToolsLibrary">\r
-    <echo message="Building the EDK CommonTools Library"/>\r
+    <echo message="The EDK Tool Library: ${LibName} build has completed."/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK CommonTools Library"/>\r
+    <echo message="Building the EDK Tool Library: ${LibName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-      </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
-        </then>\r
-      </elseif>\r
-    </if>\r
   </target>\r
 \r
   <target name="ToolsLibrary" depends="init">\r
@@ -91,17 +50,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only from ${BUILD_DIR}"/>  \r
-    <delete>\r
-      <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
-    </delete>\r
+    <delete dir="${BUILD_DIR}"/>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
-    <echo message="Removing Object Files and the Library: CommonTools${ext_static}"/>  \r
-    <delete dir="${BUILD_DIR}" failonerror="false">\r
-      <fileset dir="${LIB_DIR}" includes="CommonTools${ext_static}"/>\r
+  <target name="cleanall">\r
+    <echo message="Removing Object Files and the Library: ${LibName}${ext_static}"/>  \r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${LIB_DIR}/${LibName}${ext_static}"/>\r
     </delete>\r
   </target>\r
 \r
index 28cd4ae..ff80a6c 100644 (file)
@@ -11,12 +11,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 -->\r
 <project default="GenTool" basedir=".">\r
 <!--\r
-    EDK GenDepex Tool\r
+    EDK CompressDll Tool Library\r
   Copyright (c) 2006, Intel Corporation\r
 -->\r
 \r
   <property name="WORKSPACE" value="${env.WORKSPACE}"/>\r
-  <property name="ToolName" value="CompressDll"/>\r
   <property name="LibName" value="CompressDll"/>\r
   <property name="FileSet" value="CompressDll.c CompressDll.h"/>\r
   <property name="LibFileSet" value="CompressDll.c DepexParser.h"/>\r
@@ -26,56 +25,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
-  <property name="BUILD_DIR" value="${WORKSPACE}/Tools/Source/TianoTools/${ToolName}/tmp"/>\r
+  <property name="BUILD_DIR" value="${WORKSPACE}/Tools/Source/TianoTools/${LibName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init,Lib" >\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+    <echo message="The EDK Tool Library: ${LibName} build has completed!"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
+    <echo message="Building the EDK Tool Library: ${LibName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-      <elseif>\r
-        <os family="dos"/>\r
-        <then>\r
-          <echo message="Windows Family"/>\r
-          <property name="ToolChain" value="msvc"/>\r
-        </then>\r
-      </elseif>\r
-      <elseif>\r
-        <os family="unix"/>\r
-        <then>\r
-          <echo message="UNIX Family"/>\r
-          <property name="ToolChain" value="gcc"/>\r
-        </then>\r
-      </elseif>\r
-      <else>\r
-        <echo>Unsupported Operating System\r
-        Please Contact Intel Corporation</echo>\r
-      </else>\r
-    </if>\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
-          <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
   </target>\r
   \r
   <target name="Lib" depends="init">\r
@@ -86,31 +44,32 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       outfile="${BIN_DIR}/${LibName}"\r
       outputfileproperty="result"\r
       >\r
-      <fileset dir="${ToolName}" includes="${LibFileSet}" defaultexcludes="TRUE" excludes="*.xml *.inf"/>\r
+      <fileset dir="${LibName}" includes="${LibFileSet}" defaultexcludes="TRUE" excludes="*.xml *.inf"/>\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
       <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${env.JAVA_HOME}/include"/>\r
-      <includepath path="${env.JAVA_HOME}/include/linux" if="gcc"/>\r
-      <includepath path="${env.JAVA_HOME}/include/win32" if="windows"/>\r
+      <includepath path="${env.JAVA_HOME}/include/linux" if="cyglinux"/>\r
+      <includepath path="${env.JAVA_HOME}/include/win32" if="msft"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
-      <syslibset libs="kernel32" unless="gcc"/>\r
+      <syslibset libs="kernel32" if="msft"/>\r
     </cc>\r
     <copy file="${result}" tofile="${BIN_DIR}/CompressDll.dll"/>\r
     <chmod file="${BIN_DIR}/CompressDll.dll" perm="ugo+x"/>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>\r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
-    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>\r
-    <delete dir="${BUILD_DIR}">\r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_dynamic}"/>\r
+  <target name="cleanall">\r
+    <echo message="Removing Object Files and the Executable: ${LibName}${ext_shared}"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${BIN_DIR}/${LibName}.*"/>\r
     </delete>\r
   </target>\r
 </project>\r
index 6714257..317ccad 100644 (file)
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, Tool">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-          <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
   </target>\r
 \r
   <target name="Tool" depends="init">\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
         outfile="${BIN_DIR}/${ToolName}"\r
         outtype="executable"\r
-        libtool="${haveLibtool}"\r
         debug="false">\r
 \r
       <fileset dir="${basedir}/${ToolName}" \r
@@ -95,17 +50,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
-    <delete dir="${BUILD_DIR}">\r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
     </delete>\r
   </target>\r
 \r
index 32aa12d..46c9275 100644 (file)
@@ -9,7 +9,7 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 -->\r
-<project default="CustomizedCompress.lib" basedir=".">\r
+<project default="GenLib" basedir="." name="CustomizedCompressLibrary">\r
 <!--\r
     EDK Customized Compress Library\r
   Copyright (c) 2006, Intel Corporation\r
@@ -19,71 +19,27 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
+  <property name="LibName" value="CustomizedCompress"/>\r
   <property name="LINK_OUTPUT_TYPE" value="static"/>\r
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/CustomizedCompress/tmp"/>\r
 \r
-  <target name="CustomizedCompress.lib" depends="ToolsLibrary">\r
-    <echo message="Building the EDK CustomizedCompress Library"/>\r
+  <target name="GenLib" depends="init, CustomizedCompress">\r
+    <echo message="The EDK Tool Library ${LibName} build has completed!"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK CustomizedCompress Library"/>\r
+    <echo message="Building the EDK Tool Library: ${LibName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\r
-\r
-    <echo message="ToolChain: ${ToolChain}"/>\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
-      </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
-        </then>\r
-      </elseif>\r
-    </if>\r
   </target>\r
 \r
-  <target name="ToolsLibrary" depends="init">\r
+  <target name="CustomizedCompress" depends="init">\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
-        outfile="${LIB_DIR}/CustomizedCompress"\r
+        outfile="${LIB_DIR}/${LibName}"\r
         outtype="static"\r
-        libtool="${haveLibtool}"\r
         optimize="speed">\r
 \r
       <fileset dir="${basedir}/CustomizedCompress" \r
-        includes="*.h *.c" \r
+        includes="*.c" \r
         defaultexcludes="TRUE" \r
         excludes="*.xml *.inf"/>\r
 \r
@@ -91,7 +47,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
     </cc>\r
     <if>\r
-      <os family="dos"/>\r
+      <istrue value="msft"/>\r
       <then>\r
         <exec dir="${BUILD_DIR}" executable="lib" failonerror="false">\r
           <arg line="/NOLOGO *.lib /OUT:${LIB_DIR}/CustomizedCompress${ext_static}"/>\r
@@ -108,9 +64,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </target>\r
 \r
   <target name="cleanall">\r
-    <echo message="Removing Object Files and the Library: CustomizedCompress${ext_static}"/>  \r
-    <delete dir="${BUILD_DIR}" failonerror="false">\r
-      <fileset dir="${LIB_DIR}" includes="CustomizedCompress${ext_static}"/>\r
+    <echo message="Removing Object Files and the Library: ${LibName}${ext_static}"/>  \r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${LIB_DIR}/${LibName}${ext_static}"/>\r
     </delete>\r
   </target>\r
 \r
index 093c478..ecd2476 100644 (file)
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, Tool">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-          <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
   </target>\r
 \r
   <target name="Tool" depends="init">\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
         outfile="${BIN_DIR}/${ToolName}"\r
         outtype="executable"\r
-        libtool="${haveLibtool}"\r
         debug="false">\r
 \r
       <fileset dir="${basedir}/${ToolName}" \r
@@ -96,17 +51,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
-    <delete dir="${BUILD_DIR}">\r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
     </delete>\r
   </target>\r
 \r
index 3287617..86e117e 100644 (file)
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, Tool">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-          <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
   </target>\r
 \r
   <target name="Tool" depends="init">\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
         outfile="${BIN_DIR}/${ToolName}"\r
         outtype="executable"\r
-        libtool="${haveLibtool}"\r
         debug="false">\r
 \r
       <fileset dir="${basedir}/${ToolName}" \r
@@ -96,17 +51,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
-    <delete dir="${BUILD_DIR}">\r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
     </delete>\r
   </target>\r
 \r
index 7ce9a57..110ebc4 100644 (file)
@@ -765,4 +765,5 @@ NormalizePath (
   }\r
   \r
   return Visitor;\r
-}
\ No newline at end of file
+}\r
+\r
index 6678967..dee577a 100644 (file)
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, Tool">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-          <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
   </target>\r
 \r
   <target name="Tool" depends="init">\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
         outfile="${BIN_DIR}/${ToolName}"\r
         outtype="executable"\r
-        libtool="${haveLibtool}"\r
         debug="false">\r
 \r
       <defineset>\r
@@ -101,17 +56,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
-    <delete dir="${BUILD_DIR}">\r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
     </delete>\r
   </target>\r
 \r
index 2081283..64340da 100644 (file)
@@ -25,56 +25,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, Tool">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-          <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
   </target>\r
 \r
   <target name="Tool" depends="init">\r
@@ -95,17 +51,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
-    <delete dir="${BUILD_DIR}">\r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
     </delete>\r
   </target>\r
 \r
index b32446c..ba7b74b 100644 (file)
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, Tool">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-          <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
   </target>\r
 \r
   <target name="Tool" depends="init">\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
         outfile="${BIN_DIR}/${ToolName}"\r
         outtype="executable"\r
-        libtool="${haveLibtool}"\r
         debug="false">\r
 \r
       <fileset dir="${basedir}/${ToolName}" \r
@@ -96,17 +51,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
-    <delete dir="${BUILD_DIR}">\r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
     </delete>\r
   </target>\r
 \r
index 6a727e6..74bc300 100644 (file)
@@ -25,56 +25,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, Tool">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-          <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
   </target>\r
 \r
   <target name="Tool" depends="init">\r
@@ -94,17 +50,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
-    <delete dir="${BUILD_DIR}">\r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
     </delete>\r
   </target>\r
 \r
index a322c8e..3095278 100644 (file)
@@ -25,64 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, Tool">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-          <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
-\r
   </target>\r
 \r
   <target name="Tool" depends="init">\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
         outfile="${BIN_DIR}/${ToolName}"\r
         outtype="executable"\r
-        libtool="${haveLibtool}"\r
         debug="false">\r
 \r
       <fileset dir="${basedir}/${ToolName}" \r
@@ -98,17 +52,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
-    <delete dir="${BUILD_DIR}">\r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
     </delete>\r
   </target>\r
 \r
index 5c1c7fc..3878b4a 100644 (file)
@@ -25,56 +25,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, Tool">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-          <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
   </target>\r
 \r
   <target name="Tool" depends="init">\r
@@ -93,17 +49,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
-    <delete dir="${BUILD_DIR}">\r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
     </delete>\r
   </target>\r
 \r
index 731cf73..a6ccc11 100644 (file)
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, Tool">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-          <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
   </target>\r
 \r
   <target name="Tool" depends="init">\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
         outfile="${BIN_DIR}/${ToolName}"\r
         outtype="executable"\r
-        libtool="${haveLibtool}"\r
         optimize="speed">\r
 \r
       <fileset dir="${basedir}/${ToolName}" \r
@@ -96,17 +51,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
-    <delete dir="${BUILD_DIR}">\r
-        <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
     </delete>\r
   </target>\r
 \r
index 40e2fa4..5ba021f 100644 (file)
@@ -25,86 +25,52 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, Tool">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+    <echo message="The EDK Tool: ${ToolName} build has completed"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
     <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
+      <istrue value="${OSX}"/>\r
       <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
+        <property name="syslibdirs" value=""/>\r
+        <property name="syslibs" value=""/>\r
       </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
+    </if>\r
+\r
+    <if>\r
+      <istrue value="${cygwin}"/>\r
       <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
+        <property name="syslibdirs" value="${env.CYGWIN_HOME}/lib/e2fsprogs"/>\r
+        <property name="syslibs" value="uuid"/>\r
       </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
+    </if>\r
+    \r
+    <if>\r
+      <istrue value="${msft}"/>\r
       <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
+        <property name="syslibdirs" value=""/>\r
+        <property name="syslibs" value="uuid"/>\r
       </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
     </if>\r
-        <property name="ToolChain" value="gcc"/>\r
+    \r
     <if>\r
-      <equals arg1="${ToolChain}" arg2="msvc"/>\r
+      <istrue value="${linux}"/>\r
       <then>\r
-        <property name="ext_static" value=".lib"/>\r
-        <property name="ext_dynamic" value=".dll"/>\r
-        <property name="ext_exe" value=".exe"/>\r
+        <if>\r
+          <istrue value="${x86_64_linux}"/>\r
+          <then>\r
+            <property name="syslibdirs" value="/lib64"/>\r
+          </then>\r
+          <else>\r
+            <property name="syslibdirs" value="/usr/lib"/>\r
+          </else>\r
+        </if>\r
+        <property name="syslibs" value="uuid"/>\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
-\r
-    <condition property="syslibdirs" value="">\r
-      <os family="mac"/>\r
-    </condition>\r
-    \r
-    <condition property="syslibs" value="">\r
-      <os family="mac"/>\r
-    </condition>\r
-    \r
-    <condition property="syslibdirs" value="/lib64">\r
-      <istrue value="${x86_64_linux}"/>\r
-    </condition>\r
-    \r
-    <condition property="syslibdirs" value="${env.CYGWIN_HOME}/lib/e2fsprogs">\r
-      <os family="windows"/>\r
-    </condition>\r
-    \r
-    <condition property="syslibs" value="uuid">\r
-      <os family="windows"/>\r
-    </condition>\r
-    \r
-    <condition property="syslibdirs" value="/usr/lib">\r
-      <os name="Linux"/>\r
-    </condition>\r
-    \r
-    <condition property="syslibs" value="uuid">\r
-      <os name="Linux"/>\r
-    </condition>\r
-    \r
+    <echo message="syslibdirs set to: ${syslibdirs}"/>\r
   </target>\r
 \r
   <target name="Tool" depends="init, GenFvImage"/>\r
@@ -129,27 +95,27 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
 \r
-      <linkerarg value="/nodefaultlib:libc.lib" unless="gcc"/>\r
-      <syslibset dir="${syslibdirs}" libs="${syslibs}" if="gcc"/>\r
-      <syslibset libs="RpcRT4" unless="gcc"/>\r
+      <linkerarg value="/nodefaultlib:libc.lib" if="msft"/>\r
+      <syslibset dir="${syslibdirs}" libs="${syslibs}" if="cyglinux"/>\r
+      <syslibset libs="RpcRT4" if="msft"/>\r
     </cc>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\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
-      <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
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}_Ia32${ext_exe}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}_X64${ext_exe}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}_Ipf${ext_exe}"/>\r
     </delete>\r
   </target>\r
 \r
index ee1453c..95987e6 100644 (file)
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, Tool">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-          <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
   </target>\r
 \r
   <target name="Tool" depends="init">\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
         outfile="${BIN_DIR}/${ToolName}"\r
         outtype="executable"\r
-        libtool="${haveLibtool}"\r
         optimize="speed">\r
 \r
       <fileset dir="${basedir}/${ToolName}" \r
@@ -96,17 +51,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
-    <delete dir="${BUILD_DIR}">\r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
     </delete>\r
   </target>\r
 \r
index e923506..58dadc1 100644 (file)
@@ -26,63 +26,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, Tool">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-          <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
   </target>\r
 \r
   <target name="Tool" depends="init">\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
         outfile="${BIN_DIR}/${ToolName}"\r
         outtype="executable"\r
-        libtool="${haveLibtool}"\r
         optimize="speed">\r
 \r
       <fileset dir="${basedir}/${ToolName}" \r
@@ -97,17 +52,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
-    <delete dir="${BUILD_DIR}">\r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
     </delete>\r
   </target>\r
 \r
index 9d798c9..619be66 100644 (file)
@@ -25,55 +25,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, Tool">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
-  </target>\r
-\r
-  <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
-    <mkdir dir="${BUILD_DIR}"/>\r
     <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
+      <isfalse value="${gcc}"/>\r
       <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
+        <echo message="The EDK Tool: ${ToolName} build has completed!"/>\r
       </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
     </if>\r
+  </target>\r
+\r
+  <target name="init">\r
     <if>\r
-      <equals arg1="${ToolChain}" arg2="msvc"/>\r
+      <istrue value="${gcc}"/>\r
       <then>\r
-        <property name="ext_static" value=".lib"/>\r
-        <property name="ext_dynamic" value=".dll"/>\r
-        <property name="ext_exe" value=".exe"/>\r
+        <echo message="The EDK Tool: ${ToolName} is not built for GCC!"/>\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
+      <else>\r
+        <echo message="Building the EDK Tool: ${ToolName}"/>\r
+        <mkdir dir="${BUILD_DIR}"/>\r
+      </else>\r
     </if>\r
   </target>\r
 \r
@@ -81,7 +50,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
         outfile="${BIN_DIR}/${ToolName}"\r
         outtype="executable"\r
-        libtool="${haveLibtool}"\r
         optimize="speed">\r
 \r
       <fileset dir="${basedir}/${ToolName}" \r
@@ -97,17 +65,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
-    <delete>\r
-      <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
-    <delete dir="${BUILD_DIR}">\r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
     </delete>\r
   </target>\r
 \r
index 8828eca..3223732 100755 (executable)
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, Tool">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-          <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
   </target>\r
 \r
   <target name="Tool" depends="init">\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
         outfile="${BIN_DIR}/${ToolName}"\r
         outtype="executable"\r
-        libtool="${haveLibtool}"\r
         optimize="speed">\r
 \r
       <fileset dir="${basedir}/${ToolName}" \r
@@ -96,17 +51,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
-    <delete dir="${BUILD_DIR}">\r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
     </delete>\r
   </target>\r
 \r
index cd2e742..35f5e68 100644 (file)
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, Tool">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-          <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
   </target>\r
 \r
   <target name="Tool" depends="init">\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
         outfile="${BIN_DIR}/${ToolName}"\r
         outtype="executable"\r
-        libtool="${haveLibtool}"\r
         optimize="speed">\r
 \r
       <fileset dir="${basedir}/${ToolName}" \r
@@ -96,17 +51,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
-    <delete dir="${BUILD_DIR}">\r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
     </delete>\r
   </target>\r
 \r
index 4c432c1..6f4a917 100644 (file)
@@ -21,51 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-          <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
                <condition property="CheckDepends">\r
                  <uptodate targetfile="${WORKSPACE}/Tools/bin/antlr.exe">\r
                          <srcfiles dir="." includes="*.c *.h *.g"/>\r
@@ -76,67 +31,99 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
                        <then>\r
                                <echo message="Executable, antlr.exe, is up to date."/>\r
                        </then>\r
+      <else>\r
+        <echo message="Building the EDK Pccts Tool: ${ToolName}"/>\r
+      </else>\r
                </if>\r
   </target>\r
 \r
   <target name="GenTool" depends="init" unless="CheckDepends">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
     <if>\r
       <equals arg1="${ToolChain}" arg2="msvc"/>\r
                        <then>\r
-         <exec dir="${basedir}" executable="nmake" failonerror="TRUE">\r
+         <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="nmake" failonerror="TRUE">\r
                  <arg line="-f AntlrMS.mak"/>\r
                </exec>\r
                  </then>\r
-               <elseif>\r
-      <equals arg1="${ToolChain}" arg2="gcc"/>\r
-                       <then>\r
-         <exec dir="${basedir}" executable="make" failonerror="TRUE">\r
-                 <arg line="-f makefile"/>\r
-               </exec>\r
-                 </then>\r
-               </elseif>\r
+               <elseif>\r
+        <istrue value="${cygwin}"/>\r
+                   <then>\r
+           <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="make" failonerror="TRUE">\r
+                 <arg line="-f makefile.cygwin"/>\r
+               </exec>\r
+                   </then>\r
+      </elseif>\r
+      <elseif>\r
+        <istrue value="${gcc}"/>\r
+        <then>\r
+           <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="make" failonerror="TRUE">\r
+                 <arg line="-f makefile"/>\r
+               </exec>\r
+        </then>\r
+                 </elseif>\r
                </if>\r
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>\r
        </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <if>\r
       <equals arg1="${ToolChain}" arg2="msvc"/>\r
                        <then>\r
-         <exec dir="${basedir}" executable="nmake" failonerror="TRUE">\r
+         <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="nmake" failonerror="TRUE">\r
                  <arg line="-f AntlrMS.mak clean"/>\r
                </exec>\r
                  </then>\r
+    <elseif>\r
+      <istrue value="${cygwin}"/>\r
+      <then>\r
+         <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="make" failonerror="TRUE">\r
+                 <arg line="-f makefile.cygwin clean"/>\r
+               </exec>\r
+      </then>\r
+               </elseif>\r
                <elseif>\r
-      <equals arg1="${ToolChain}" arg2="gcc"/>\r
-                       <then>\r
-         <exec dir="${basedir}" executable="make" failonerror="TRUE">\r
+      <istrue value="${gcc}"/>\r
+      <then>\r
+         <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="make" failonerror="TRUE">\r
                  <arg line="-f makefile clean"/>\r
                </exec>\r
-                 </then>\r
+      </then>\r
                </elseif>\r
                </if>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
     <if>\r
       <equals arg1="${ToolChain}" arg2="msvc"/>\r
                        <then>\r
-         <exec dir="${basedir}" executable="nmake" failonerror="FALSE">\r
+         <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="nmake" failonerror="FALSE">\r
                  <arg line="-f AntlrMS.mak clean"/>\r
                </exec>\r
                  </then>\r
                <elseif>\r
-      <equals arg1="${ToolChain}" arg2="gcc"/>\r
+      <istrue value="${cygwin}"/>\r
                        <then>\r
-         <exec dir="${basedir}" executable="make" failonerror="FALSE">\r
-                 <arg line="-f makefile clean"/>\r
+        <echo message="Building antlr with cygwin gcc"/>\r
+         <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="make" failonerror="FALSE">\r
+                 <arg line="-f makefile.cygwin clean"/>\r
                </exec>\r
                  </then>\r
                </elseif>\r
+               <elseif>\r
+      <istrue value="${gcc}"/>\r
+      <then>\r
+        <echo message="Building antlr with gcc"/>\r
+         <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="make" failonerror="FALSE">\r
+                 <arg line="-f makefile clean"/>\r
+               </exec>\r
+      </then>\r
+               </elseif>\r
                </if>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
+    </delete>\r
   </target>\r
 \r
 </project>\r
index a528001..ab64fc6 100644 (file)
@@ -166,8 +166,8 @@ PCCTS_H=../h
 #\r
 CC=gcc\r
 COPT=-O\r
-ANTLR=../bin/antlr\r
-DLG=../bin/dlg\r
+ANTLR=${BIN_DIR}/antlr\r
+DLG=${BIN_DIR}/dlg\r
 OBJ_EXT=o\r
 OUT_OBJ = -o\r
 CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536\r
@@ -179,7 +179,7 @@ OBJ=antlr.o scan.o err.o bits.o build.o fset2.o fset.o gen.o  \
         globals.o hash.o lex.o main.o misc.o set.o pred.o egman.o mrhoist.o fcache.o\r
 \r
 antlr : $(OBJ) $(SRC)\r
-               $(CC) $(CFLAGS) -o ${WORKSPACE}/Tools/bin/antlr $(OBJ)\r
+               $(CC) $(CFLAGS) -o ${PACKAGE_DIR}/antlr $(OBJ)\r
 \r
 # what files does PCCTS generate (both ANTLR and DLG)\r
 PCCTS_GEN=antlr.c scan.c err.c tokens.h mode.h parser.dlg stdpccts.h remap.h\r
diff --git a/Tools/Source/TianoTools/Pccts/antlr/makefile.cygwin b/Tools/Source/TianoTools/Pccts/antlr/makefile.cygwin
new file mode 100644 (file)
index 0000000..cc590e4
--- /dev/null
@@ -0,0 +1,219 @@
+#\r
+# Makefile for ANTLR 1.33\r
+#\r
+# SOFTWARE RIGHTS\r
+#\r
+# We reserve no LEGAL rights to the Purdue Compiler Construction Tool\r
+# Set (PCCTS) -- PCCTS is in the public domain.  An individual or\r
+# company may do whatever they wish with source code distributed with\r
+# PCCTS or the code generated by PCCTS, including the incorporation of\r
+# PCCTS, or its output, into commerical software.\r
+# \r
+# We encourage users to develop software with PCCTS.  However, we do ask\r
+# that credit is given to us for developing PCCTS.  By "credit",\r
+# we mean that if you incorporate our source code into one of your\r
+# programs (commercial product, research project, or otherwise) that you\r
+# acknowledge this fact somewhere in the documentation, research report,\r
+# etc...  If you like PCCTS and have developed a nice tool with the\r
+# output, please mention that you developed it using PCCTS.  In\r
+# addition, we ask that this header remain intact in our source code.\r
+# As long as these guidelines are kept, we expect to continue enhancing\r
+# this system and expect to make other tools available as they are\r
+# completed.\r
+#\r
+# ANTLR 1.33\r
+# Terence Parr\r
+# Parr Research Corporation\r
+# with Purdue University\r
+# and AHPCRC, University of Minnesota\r
+# 1989-1995\r
+#\r
+# Ported to Borland C++, IBM C-Set/2 and Microsoft 6.0 by\r
+# Ed Harfmann\r
+# Micro Data Base Systems\r
+# Lafayette, Indiana\r
+#\r
+SET=../support/set\r
+PCCTS_H=../h\r
+\r
+##\r
+## Uncomment the appropriate section to build\r
+## (both targets and 'make' variable definitions)\r
+## Note that UNIX is the default\r
+##\r
+\r
+#\r
+#   OS/2 & DOS 16 bit using MSC 6.0\r
+#\r
+#CC=cl\r
+#ANTLR=..\bin\antlr\r
+#DLG=..\bin\dlg\r
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) /AL /Za /W3 -DPC -DUSER_ZZSYN\r
+#OUT_OBJ = -Fo\r
+#LIBS=/NOD:LLIBCE LLIBCEP\r
+#OBJ_EXT = obj\r
+#\r
+#antlr.exe: antlr.obj scan.obj err.obj bits.obj build.obj fset2.obj \\r
+#        fset.obj gen.obj globals.obj hash.obj lex.obj main.obj \\r
+#        misc.obj set.obj pred.obj egamn.obj\r
+#       link @<<\r
+#$** /NOI\r
+#$@ /STACK:14336\r
+#\r
+#$(LIBS: = +^\r
+#)\r
+#$(DEF_FILE) $(LFLAGS) ;\r
+#<<\r
+#        bind $@ c:\os2\doscalls.lib\r
+#        copy *.exe ..\bin\r
+#\r
+\r
+#\r
+#   Borland C++ for DOS\r
+#\r
+#CC=bcc\r
+#ANTLR=..\bin\antlr\r
+#DLG=..\bin\dlg\r
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) -ml -ff- -w- -DPC -DUSER_ZZSYN\r
+#OUT_OBJ = -o\r
+#LIBS= emu mathl cl\r
+#OBJ_EXT = obj\r
+#\r
+#antlr.exe: antlr.obj scan.obj err.obj bits.obj build.obj fset2.obj \\r
+#        fset.obj gen.obj globals.obj hash.obj lex.obj main.obj \\r
+#        misc.obj set.obj pred.obj egman.obj mrhoist.obj fcache.obj\r
+#       tlink @&&|\r
+#C0L $**\r
+#$@ /Tde /c\r
+#\r
+#$(LIBS)\r
+#$(DEF_FILE) $(LFLAGS) ;\r
+#|\r
+#        copy *.exe ..\bin\r
+#\r
+\r
+#\r
+# C-Set/2 for OS/2\r
+#\r
+#CC=icc\r
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) /Sa /W3 -DUSER_ZZSYN -D__STDC__\r
+#OUT_OBJ = -Fo\r
+#LIBS=\r
+#ANTLR=..\bin\antlr\r
+#DLG=..\bin\dlg\r
+#OBJ_EXT = obj\r
+#\r
+#antlr.exe: antlr.obj scan.obj err.obj bits.obj build.obj fset2.obj \\r
+#        fset.obj gen.obj globals.obj hash.obj lex.obj main.obj \\r
+#        misc.obj set.obj pred.obj egman.obj mrhoist.obj fcache.obj\r
+#        link386 @<<\r
+#$** /NOI\r
+#$@ /STACK:32768\r
+#\r
+#$(LIBS: = +^\r
+#)\r
+#$(DEF_FILE) $(LFLAGS) ;\r
+#<<\r
+#        copy *.exe ..\bin\r
+#\r
+\r
+#\r
+# Borland C++ for OS/2\r
+#\r
+#CC=bcc\r
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) -w- -v -DUSER_ZZSYN\r
+#OUT_OBJ = -o\r
+#LIBS= c2 os2\r
+#\r
+#ANTLR=..\bin\antlr\r
+#DLG=..\bin\dlg\r
+#OBJ_EXT = obj\r
+#antlr.exe: antlr.obj scan.obj err.obj bits.obj build.obj fset2.obj \\r
+#        fset.obj gen.obj globals.obj hash.obj lex.obj main.obj \\r
+#        misc.obj set.obj pred.obj egman.obj mrhoist.obj fcache.obj\r
+#        tlink @&&|\r
+#c02 $** -c -v\r
+#antlr.exe\r
+#\r
+#C2 os2\r
+#\r
+#|\r
+#        copy *.exe ..\bin\r
+#\r
+\r
+# *********** Target list of PC machines ***********\r
+#\r
+# Don't worry about the ambiguity messages coming from antlr\r
+# for making antlr.c etc...  [should be 10 of them, I think]\r
+#\r
+#antlr.c stdpccts.h parser.dlg tokens.h err.c : antlr.g\r
+#      $(ANTLR) antlr.g\r
+#\r
+#antlr.$(OBJ_EXT): antlr.c mode.h tokens.h\r
+#\r
+#scan.$(OBJ_EXT): scan.c mode.h tokens.h\r
+#\r
+#scan.c mode.h: parser.dlg\r
+#      $(DLG) -C2 parser.dlg scan.c\r
+#\r
+#set.$(OBJ_EXT): $(SET)/set.c\r
+#      $(CC) $(CFLAGS) -c $(OUT_OBJ)set.$(OBJ_EXT) $(SET)/set.c\r
+\r
+\r
+\r
+#\r
+#   UNIX  (default)\r
+#\r
+BIN_DIR=../../../../bin\r
+CC=gcc\r
+COPT=-O\r
+ANTLR=${BIN_DIR}/antlr.exe\r
+DLG=${BIN_DIR}/dlg.exe\r
+OBJ_EXT=o\r
+OUT_OBJ = -o\r
+CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536\r
+#\r
+# SGI Users, use this CFLAGS\r
+#\r
+#CFLAGS= -O -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -woff 3262\r
+OBJ=antlr.o scan.o err.o bits.o build.o fset2.o fset.o gen.o  \\r
+        globals.o hash.o lex.o main.o misc.o set.o pred.o egman.o mrhoist.o fcache.o\r
+\r
+antlr : $(OBJ) $(SRC)\r
+               $(CC) $(CFLAGS) -o ${BIN_DIR}/antlr.exe $(OBJ)\r
+\r
+# what files does PCCTS generate (both ANTLR and DLG)\r
+PCCTS_GEN=antlr.c scan.c err.c tokens.h mode.h parser.dlg stdpccts.h remap.h\r
+\r
+SRC=antlr.c scan.c err.c bits.c build.c fset2.c fset.c gen.c globals.c \\r
+       hash.c lex.c main.c misc.c $(SET)/set.c pred.c egman.c mrhoist.c fcache.c\r
+\r
+#\r
+# Don't worry about the ambiguity messages coming from antlr\r
+# for making antlr.c etc...  [should be 10 of them, I think]\r
+#\r
+#antlr.c stdpccts.h parser.dlg tokens.h err.c : antlr.g\r
+#      $(ANTLR) -gh antlr.g\r
+\r
+antlr.o : antlr.c mode.h tokens.h\r
+\r
+scan.o : scan.c mode.h tokens.h\r
+\r
+#scan.c mode.h: parser.dlg\r
+#      $(DLG) -C2 parser.dlg scan.c\r
+\r
+set.o : $(SET)/set.c\r
+       $(CC) $(CFLAGS) -c -o set.o $(SET)/set.c\r
+\r
+\r
+#\r
+# ****** These next targets are common to UNIX and PC world ********\r
+#\r
+\r
+#clean up all the intermediate files\r
+clean:\r
+       rm -f *.$(OBJ_EXT) core\r
+\r
+#remove everything in clean plus the PCCTS files generated\r
+scrub:\r
+       rm -f $(PCCTS_GEN) *.$(OBJ_EXT) core\r
index 5c4a275..dffc709 100644 (file)
@@ -40,8 +40,8 @@ PCCTS_H=../h
 #   UNIX  (default)\r
 #\r
 CC=cc\r
-ANTLR=../bin/antlr\r
-DLG=../bin/dlg\r
+ANTLR=${WORKSPACE}/Tools/bin/antlr\r
+DLG=${WORKSPACE}/Tools/bin/dlg\r
 OBJ_EXT=o\r
 OUT_OBJ = -o\r
 ANSI=-ansi\r
@@ -57,7 +57,7 @@ OBJ=antlr.o scan.o err.o bits.o build.o fset2.o fset.o gen.o \
 \r
 antlr : $(OBJ) $(SRC)\r
                $(CC) $(CFLAGS) -o antlr $(OBJ)\r
-               mv antlr ../bin\r
+               mv antlr ${WORKSPACE}/Tools/bin\r
 \r
 # what files does PCCTS generate (both ANTLR and DLG)\r
 PCCTS_GEN=antlr.c scan.c err.c tokens.h mode.h parser.dlg stdpccts.h remap.h\r
index 355ed2c..4f4e0a9 100644 (file)
@@ -13,73 +13,36 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 <!--\r
     EDK Pccts Tool\r
   Copyright (c) 2006, Intel Corporation\r
--->\r
   <property name="ToolName" value="Pccts"/>\r
+-->\r
 \r
   <taskdef resource="cpptasks.tasks"/>\r
   <typedef resource="cpptasks.types"/>\r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
+    <echo message="Building the EDK Pccts Tools"/>\r
+  </target>\r
 \r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-          <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
+  <target name="GenTool" depends="init, Pccts">\r
+    <echo message="The EDK Pccts Tools build has completed!"/>\r
   </target>\r
 \r
-  <target name="GenTool" depends="init">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
-    <ant dir="${PACKAGE_DIR}/Pccts/antlr" inheritAll="true"/>\r
-    <ant dir="${PACKAGE_DIR}/Pccts/dlg" inheritAll="true"/>\r
+  <target name="Pccts" depends="init">\r
+    <subant target="" inheritall="true">\r
+       <fileset dir="${PACKAGE_DIR}/Pccts/antlr" includes="build.xml"/>\r
+    </subant>\r
+    <subant target="" inheritall="true">\r
+      <fileset dir="${PACKAGE_DIR}/Pccts/dlg" includes="build.xml"/>\r
+    </subant>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <ant dir="${PACKAGE_DIR}/Pccts/antlr" target="clean" inheritAll="true"/>\r
     <ant dir="${PACKAGE_DIR}/Pccts/dlg" target="clean" inheritAll="true"/>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <ant dir="${PACKAGE_DIR}/Pccts/antlr" target="cleanall" inheritAll="true"/>\r
     <ant dir="${PACKAGE_DIR}/Pccts/dlg" target="cleanall" inheritAll="true"/>\r
   </target>\r
index efdae43..89e7aaa 100644 (file)
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 -->\r
 <project default="GenTool" basedir=".">\r
 <!--\r
-    EDK dlg Tool\r
+    EDK Pccts Tool: dlg\r
   Copyright (c) 2006, Intel Corporation\r
 -->\r
   <property name="ToolName" value="dlg"/>\r
@@ -23,51 +23,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="PACKAGE_DIR" value="${WORKSPACE}/Tools"/>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-          <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
                <condition property="CheckDepends">\r
                  <uptodate targetfile="${WORKSPACE}/Tools/bin/dlg.exe">\r
                          <srcfiles dir="." includes="*.c *.h *.g"/>\r
@@ -78,42 +33,61 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
                        <then>\r
                                <echo message="Executable, dlg.exe, is up to date."/>\r
                        </then>\r
+      <else>\r
+        <echo message="Building the EDK Pccts Tool: ${ToolName}"/>\r
+      </else>\r
                </if>\r
   </target>\r
 \r
   <target name="GenTool" depends="init" unless="CheckDepends">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
     <if>\r
       <equals arg1="${ToolChain}" arg2="msvc"/>\r
                        <then>\r
-         <exec dir="${basedir}" executable="nmake" failonerror="TRUE">\r
+         <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="nmake" failonerror="TRUE">\r
                  <arg line="-f DlgMS.mak"/>\r
                </exec>\r
                  </then>\r
                <elseif>\r
+      <istrue value="${cygwin}"/>\r
+      <then>\r
+         <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="make" failonerror="TRUE">\r
+                 <arg line="-f makefile.cygwin"/>\r
+               </exec>\r
+      </then>\r
+    </elseif>\r
+               <elseif>\r
       <equals arg1="${ToolChain}" arg2="gcc"/>\r
                        <then>\r
-         <exec dir="${basedir}" executable="make" failonerror="TRUE">\r
+         <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="make" failonerror="TRUE">\r
                  <arg line="-f makefile"/>\r
                </exec>\r
                  </then>\r
                </elseif>\r
                </if>\r
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>\r
        </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <if>\r
       <equals arg1="${ToolChain}" arg2="msvc"/>\r
                        <then>\r
-         <exec dir="${basedir}" executable="nmake" failonerror="TRUE">\r
+         <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="nmake" failonerror="TRUE">\r
                  <arg line="-f DlgMS.mak clean"/>\r
                </exec>\r
                  </then>\r
+    <elseif>\r
+      <istrue value="${cygwin}"/>\r
+      <then>\r
+         <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="make" failonerror="TRUE">\r
+                 <arg line="-f makefile.cygwin clean"/>\r
+               </exec>\r
+      </then>\r
+               </elseif>\r
                <elseif>\r
       <equals arg1="${ToolChain}" arg2="gcc"/>\r
                        <then>\r
-         <exec dir="${basedir}" executable="make" failonerror="TRUE">\r
+         <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="make" failonerror="TRUE">\r
                  <arg line="-f makefile clean"/>\r
                </exec>\r
                  </then>\r
@@ -121,24 +95,27 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
                </if>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
     <if>\r
       <equals arg1="${ToolChain}" arg2="msvc"/>\r
                        <then>\r
-         <exec dir="${basedir}" executable="nmake" failonerror="FALSE">\r
+         <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="nmake" failonerror="FALSE">\r
                  <arg line="-f DlgMS.mak clean"/>\r
                </exec>\r
                  </then>\r
                <elseif>\r
       <equals arg1="${ToolChain}" arg2="gcc"/>\r
                        <then>\r
-         <exec dir="${basedir}" executable="make" failonerror="FALSE">\r
+         <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="make" failonerror="FALSE">\r
                  <arg line="-f makefile clean"/>\r
                </exec>\r
                  </then>\r
                </elseif>\r
                </if>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
+    </delete>\r
   </target>\r
 \r
 </project>\r
index 1658394..d5cceb8 100644 (file)
@@ -116,8 +116,8 @@ PCCTS_H=../h
 #\r
 CC=cc\r
 COPT=-O\r
-ANTLR=../bin/antlr\r
-DLG=../bin/dlg\r
+ANTLR=${BIN_DIR}/antlr\r
+DLG=${BIN_DIR}/dlg\r
 CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536\r
 OBJ_EXT=o\r
 OUT_OBJ = -o\r
@@ -125,7 +125,7 @@ OBJ = dlg_p.o dlg_a.o main.o err.o set.o support.o output.o \
         relabel.o automata.o\r
 \r
 dlg : $(OBJ) $(SRC)\r
-               $(CC) $(CFLAGS) -o ${WORKSPACE}/Tools/bin/dlg $(OBJ)\r
+               $(CC) $(CFLAGS) -o ${BIN_DIR}/dlg $(OBJ)\r
 \r
 SRC = dlg_p.c dlg_a.c main.c err.c $(SET)/set.c support.c output.c \\r
         relabel.c automata.c\r
diff --git a/Tools/Source/TianoTools/Pccts/dlg/makefile.cygwin b/Tools/Source/TianoTools/Pccts/dlg/makefile.cygwin
new file mode 100644 (file)
index 0000000..02e4c89
--- /dev/null
@@ -0,0 +1,157 @@
+#\r
+# Makefile for DLG 1.33\r
+# Terence Parr\r
+# Purdue University, U of MN, Parr Research Corporation\r
+# 1989-1994\r
+#\r
+# Ported to IBM C-Set/2 and Microsoft 6.0 by\r
+# Ed Harfmann\r
+# Micro Data Base Systems\r
+# Lafayette, Indiana\r
+#\r
+SET=../support/set\r
+PCCTS_H=../h\r
+\r
+##\r
+## Uncomment the appropriate section to build\r
+##\r
+\r
+#\r
+#   OS/2 & DOS 16 bit using MSC 6.0\r
+#\r
+#CC=cl\r
+#ANTLR=..\bin\antlr\r
+#DLG=..\bin\dlg\r
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) /AL /Za /W3 -DPC -DUSER_ZZSYN\r
+#OUT_OBJ = -Fo\r
+#LIBS=/NOD:LLIBCE LLIBCEP\r
+#OBJ_EXT = obj\r
+#\r
+#dlg.exe : dlg_p.obj dlg_a.obj main.obj err.obj set.obj support.obj \\r
+#        output.obj relabel.obj automata.obj\r
+#        link @<<\r
+#$** /NOI\r
+#$@ /STACK:16384\r
+#\r
+#$(LIBS: = +^\r
+#)\r
+#$(DEF_FILE) $(LFLAGS) ;\r
+#<<\r
+#        bind $@ c:\os2\doscalls.lib\r
+#        copy *.exe ..\bin\r
+#\r
+\r
+#\r
+#   Borland C++ for DOS\r
+#\r
+#CC=bcc\r
+#ANTLR=..\bin\antlr\r
+#DLG=..\bin\dlg\r
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) -ml -ff- -w- -DPC -DUSER_ZZSYN\r
+#OUT_OBJ = -o\r
+#LIBS= emu mathl cl\r
+#OBJ_EXT = obj\r
+#\r
+#dlg.exe : dlg_p.obj dlg_a.obj main.obj err.obj set.obj support.obj \\r
+#        output.obj relabel.obj automata.obj\r
+#       tlink @&&|\r
+#C0L $**\r
+#$@ /Tde /c\r
+#\r
+#$(LIBS)\r
+#$(DEF_FILE) $(LFLAGS) ;\r
+#|\r
+#        copy *.exe ..\bin\r
+#\r
+\r
+#\r
+# C-Set/2 for OS/2\r
+#\r
+#CC=icc\r
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) /Sa /W3 /DUSER_ZZSYN\r
+#OUT_OBJ = -Fo\r
+#LIBS=\r
+#ANTLR=..\bin\antlr\r
+#DLG=..\bin\dlg\r
+#OBJ_EXT=obj\r
+#\r
+#dlg.exe : dlg_p.obj dlg_a.obj main.obj err.obj set.obj support.obj \\r
+#        output.obj relabel.obj automata.obj\r
+#        link386 @<<\r
+#$** /NOI\r
+#$@ /STACK:32768\r
+#\r
+#$(LIBS: = +^\r
+#)\r
+#$(DEF_FILE) $(LFLAGS) ;\r
+#<<\r
+#        copy *.exe ..\bin\r
+#\r
+\r
+#\r
+# Borland C++ for OS/2\r
+#\r
+#CC=bcc\r
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) -w- -DUSER_ZZSYN\r
+#OUT_OBJ = -o\r
+#LIBS= c2 os2\r
+#\r
+#ANTLR=..\bin\antlr\r
+#DLG=..\bin\dlg\r
+#OBJ_EXT = obj\r
+#dlg.exe : dlg_p.obj dlg_a.obj main.obj err.obj set.obj support.obj \\r
+#        output.obj relabel.obj automata.obj\r
+#        tlink @&&|\r
+#c02 $** -c\r
+#dlg.exe\r
+#\r
+#C2 os2\r
+#\r
+#|\r
+#        copy *.exe ..\bin\r
+#\r
+\r
+#\r
+#   UNIX\r
+#\r
+BIN_DIR=../../../../bin\r
+CC=cc\r
+COPT=-O\r
+ANTLR=${BIN_DIR}/antlr.exe\r
+DLG=${BIN_DIR}/dlg.exe\r
+CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536\r
+OBJ_EXT=o\r
+OUT_OBJ = -o\r
+OBJ = dlg_p.o dlg_a.o main.o err.o set.o support.o output.o \\r
+        relabel.o automata.o\r
+\r
+dlg : $(OBJ) $(SRC)\r
+               $(CC) $(CFLAGS) -o ${BIN_DIR}/dlg.exe $(OBJ)\r
+\r
+SRC = dlg_p.c dlg_a.c main.c err.c $(SET)/set.c support.c output.c \\r
+        relabel.c automata.c\r
+\r
+#dlg_p.c parser.dlg err.c tokens.h : dlg_p.g\r
+#      $(ANTLR) dlg_p.g\r
+\r
+#dlg_a.c mode.h : parser.dlg\r
+#      $(DLG) -C2 parser.dlg dlg_a.c\r
+\r
+dlg_p.$(OBJ_EXT) : dlg_p.c dlg.h tokens.h mode.h\r
+       $(CC) $(CFLAGS) -c dlg_p.c\r
+\r
+dlg_a.$(OBJ_EXT) : dlg_a.c dlg.h tokens.h mode.h\r
+       $(CC) $(CFLAGS) -c dlg_a.c\r
+\r
+main.$(OBJ_EXT) : main.c dlg.h\r
+       $(CC) $(CFLAGS) -c main.c\r
+\r
+set.$(OBJ_EXT) : $(SET)/set.c\r
+       $(CC) -c $(CFLAGS) $(SET)/set.c\r
+\r
+lint:\r
+       lint *.c\r
+\r
+#clean up all the intermediate files\r
+clean:\r
+       rm -f *.$(OBJ_EXT) core\r
index e1b41ed..26f52ac 100644 (file)
@@ -24,60 +24,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR_X64" value="${PACKAGE_DIR}/${LibName}/tmp/X64"/>\r
   <property name="BUILD_DIR_IPF" value="${PACKAGE_DIR}/${LibName}/tmp/Ipf"/>\r
 \r
-  <target name="GenTool" depends="init, Tool">\r
-    <echo message="Building the EDK Tool: ${LibName}"/>\r
+  <target name="GenTool" depends="init, PeCoffLoaderLib">\r
+    <echo message="The EDK Library: ${LibName} build has completed!"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Library: ${LibName}"/>\r
+    <echo message="Building the EDK Library: ${LibName}"/>\r
     <mkdir dir="${BUILD_DIR_IA32}"/>\r
     <mkdir dir="${BUILD_DIR_X64}"/>\r
     <mkdir dir="${BUILD_DIR_IPF}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\r
-        <property name="ToolChain" value="gcc"/>\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
-          <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
 \r
     <condition property="syslibdirs" value="">\r
       <os family="mac"/>\r
@@ -105,7 +60,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     \r
   </target>\r
 \r
-  <target name="Tool" depends="init, PeCoffLoader_Ia32, PeCoffLoader_Ipf, PeCoffLoader_X64"/>\r
+  <target name="PeCoffLoaderLib" depends="init, PeCoffLoader_Ia32, PeCoffLoader_Ipf, PeCoffLoader_X64"/>\r
 \r
   <target name="PeCoffLoader_Ia32" >\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR_IA32}" \r
@@ -171,7 +126,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </target>\r
 \r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <delete>\r
       <fileset dir="${BUILD_DIR_IA32}" includes="*.obj"/>\r
@@ -180,10 +135,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${LibName}${ext_exe}"/>  \r
     <delete dir="${PACKAGE_DIR}/${LibName}/tmp">\r
     </delete>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${LIB_DIR}/${LibName}_Ia32${ext_static}"/>\r
+      <fileset file="${BIN_DIR}/${LibName}_X64${ext_static}"/>\r
+      <fileset file="${BIN_DIR}/${LibName}_IPF${ext_static}"/>\r
+    </delete>\r
   </target>\r
 \r
 </project>\r
index 4da3cd8..e9fb8e5 100644 (file)
@@ -25,58 +25,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, Tool">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+    <echo message="The EDK Tool: ${ToolName} build has completed"/>\r
   </target>\r
 \r
   <target name="Tool" depends="init, PeiRebase_Ia32, PeiRebase_Ipf, PeiRebase_X64"/>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-          <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
   </target>\r
 \r
   <target name="PeiRebase_Ia32" depends="init">\r
@@ -127,17 +83,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
-    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
-    <delete dir="${BUILD_DIR}">\r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+  <target name="cleanall">\r
+    <echo message="Removing Object Files and the Executable: ${ToolName}_*${ext_exe}"/>  \r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}_Ia32${ext_exe}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}_Ipf${ext_exe}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}_X64${ext_exe}"/>\r
     </delete>\r
   </target>\r
 \r
index 34b0383..2632575 100644 (file)
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, Tool">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+    <echo message="The EDK Tool: ${ToolName} build has completed"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-          <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
   </target>\r
 \r
   <target name="Tool" depends="init">\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
         outfile="${BIN_DIR}/${ToolName}"\r
         outtype="executable"\r
-        libtool="${haveLibtool}"\r
         debug="false">\r
 \r
       <fileset dir="${basedir}/${ToolName}" \r
@@ -96,17 +51,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
-    <delete dir="${BUILD_DIR}">\r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
     </delete>\r
   </target>\r
 \r
index 2df362a..08a1118 100644 (file)
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, Tool">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-          <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
   </target>\r
 \r
   <target name="Tool" depends="init">\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
         outfile="${BIN_DIR}/${ToolName}"\r
         outtype="executable"\r
-        libtool="${haveLibtool}"\r
         debug="false">\r
 \r
       <fileset dir="${basedir}/${ToolName}" \r
@@ -96,17 +51,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
-    <delete dir="${BUILD_DIR}">\r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
     </delete>\r
   </target>\r
 \r
index 6b47bb8..792ebe2 100644 (file)
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, Tool">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-          <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
   </target>\r
 \r
   <target name="Tool" depends="init">\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
         outfile="${BIN_DIR}/${ToolName}"\r
         outtype="executable"\r
-        libtool="${haveLibtool}"\r
         optimize="speed">\r
 \r
       <fileset dir="${basedir}/${ToolName}" \r
@@ -96,17 +51,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
-    <delete dir="${BUILD_DIR}">\r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
     </delete>\r
   </target>\r
 \r
index f4dbae9..135747c 100644 (file)
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, Tool">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-          <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
   </target>\r
 \r
   <target name="Tool" depends="init">\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
         outfile="${BIN_DIR}/${ToolName}"\r
         outtype="executable"\r
-        libtool="${haveLibtool}"\r
         debug="false">\r
 \r
       <fileset dir="${basedir}/${ToolName}" \r
@@ -95,17 +50,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
-    <delete dir="${BUILD_DIR}">\r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
     </delete>\r
   </target>\r
 \r
index 98ace14..7e4a967 100644 (file)
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, Tool">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-          <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
   </target>\r
 \r
   <target name="Tool" depends="init">\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
         outfile="${BIN_DIR}/${ToolName}"\r
         outtype="executable"\r
-        libtool="${haveLibtool}"\r
         debug="false">\r
 \r
       <compilerarg value="-fshort-wchar" if="gcc"/>\r
@@ -98,17 +53,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
-    <delete dir="${BUILD_DIR}">\r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
     </delete>\r
   </target>\r
 \r
index 06c0975..f238a87 100644 (file)
@@ -23,57 +23,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${LibName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, String">\r
-    <echo message="Building the EDK Tool: ${LibName}"/>\r
+    <echo message="The EDK Library: ${LibName} build has completed!"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Library: ${LibName}"/>\r
+    <echo message="Building the EDK Library: ${LibName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\r
-        <property name="ToolChain" value="gcc"/>\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
-          <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
 \r
     <condition property="syslibdirs" value="">\r
       <os family="mac"/>\r
@@ -121,17 +76,21 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </target>\r
 \r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
-    <echo message="Removing Object Files and the Executable: ${LibName}${ext_exe}"/>  \r
+  <target name="cleanall">\r
+    <echo message="Removing Object Files and the Library: ${LibName}${ext_static}"/>  \r
     <delete dir="${PACKAGE_DIR}/${LibName}/tmp">\r
     </delete>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${LIB_DIR}/${LibName}${ext_static}"/>\r
+    </delete>\r
   </target>\r
 \r
 </project>\r
index 50bf76f..6b9959c 100644 (file)
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, Tool">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-          <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
   </target>\r
 \r
   <target name="Tool" depends="init">\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
         outfile="${BIN_DIR}/${ToolName}"\r
         outtype="executable"\r
-        libtool="${haveLibtool}"\r
         debug="false">\r
 \r
       <fileset dir="${basedir}/${ToolName}" \r
@@ -95,17 +50,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
-    <delete dir="${BUILD_DIR}">\r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
     </delete>\r
   </target>\r
 \r
index 805a022..2e4b27c 100644 (file)
@@ -6,25 +6,24 @@
     <GuidValue>A169C678-3F55-4b6a-80BF-FD8B8DCAB883</GuidValue>\r
     <Version>2.0</Version>\r
     <Abstract>This is the TianoTools Module</Abstract>\r
-    <Description>This Module provides the EFI/Tiano Tools that are used to create EFI/Tiano\r
-      Modules and Platform Binary Files (PBF)\r
-      These tools require compilation only once if the Developer Workstation and\r
-      the Developer's choice of HOST tool chain are stable.  If the developer\r
+    <Description>This Module provides the EFI/Tiano Tools that are used to create EFI/Tiano
+      Modules and Platform Binary Files (PBF)
+      These tools require compilation only once if the Developer Workstation and
+      the Developer's choice of HOST tool chain are stable.  If the developer
       updates either the OS or the HOST tool chain, these tools should be rebuilt.</Description>\r
     <Copyright>Copyright 2006, Intel Corporation</Copyright>\r
-    <License>All rights reserved.\r
-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the \r
-BSD License which accompanies this distribution.  The full text of the \r
-license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+    <License URL="http://opensource.org/licenses/bsd-license.php">All rights reserved.  This program and the accompanying materials
+are licensed and made available under the terms and conditions of the 
+BSD License which accompanies this distribution.  The full text of the 
+license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
   <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <SupportedArchitectures>EBC IA32 X64 IPF</SupportedArchitectures>\r
     <BinaryModule>false</BinaryModule>\r
     <OutputFileBasename>NULL</OutputFileBasename>\r
   </ModuleDefinitions>\r
@@ -314,4 +313,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</L
     <Filename>ZeroDebugData/build.xml</Filename>\r
     <Filename>ZeroDebugData/ZeroDebugData.c</Filename>\r
   </SourceFiles>\r
-</ModuleSurfaceArea>\r
+</ModuleSurfaceArea>
\ No newline at end of file
index db0ba95..44820bc 100644 (file)
@@ -62,6 +62,7 @@ public:
   { \r
     printf ("unrecognized input '%s'\n", Text); \r
   }\r
+\r
 };\r
 \r
 //\r
index 67442df..995cf7d 100644 (file)
@@ -9,7 +9,7 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 -->\r
-<project default="GenTool" basedir=".">\r
+<project default="GenTool" basedir="." name="VfrCompile">\r
 <!--\r
     EDK VfrCompile Tool\r
   Copyright (c) 2006, Intel Corporation\r
@@ -25,90 +25,58 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, Antlr, Dlg, Tool">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+    <echo message="The EDK Tool: ${ToolName} build has completed"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
+\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-          <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
+\r
+    <condition property="AntlrDepends">\r
+      <uptodate targetfile="${PACKAGE_DIR}/VfrCompile/parser.dlg" srcfile="${PACKAGE_DIR}/VfrCompile/VfrCompile.g" value="true"/>\r
+    </condition>\r
+\r
+    <condition property="DlgDepends">\r
+      <uptodate targetfile="${PACKAGE_DIR}/VfrCompile/DLGLexer.cpp" srcfile="${PACKAGE_DIR}/VfrCompile/parser.dlg" value="true"/>\r
+    </condition>\r
+\r
     <condition property="CheckDepends">\r
-      <uptodate targetfile="${WORKSPACE}/Tools/bin/VfrCompile${ext_exe}">\r
-        <srcfiles dir="${WORKSPACE}/Tools/Source/TianoTools/VfrCompile" \r
-        includes="EfiVfrParser.cpp DLGLexer.cpp VfrCompile.cpp VfrCompile.g VfrServices.cpp parser.dlg"/>\r
-      </uptodate>\r
+      <or>\r
+        <isset property="AntlrDepends"/>\r
+        <isset property="DlgDepends"/>\r
+      </or>\r
     </condition>\r
 \r
     <condition property="gxx_extra_libs" value="stdc++ System gcc_s.10.4 gcc">\r
       <os family="mac"/>\r
-  </condition>\r
+    </condition>\r
     \r
     <condition property="gxx_extra_libs" value="stdc++">\r
       <os name="linux"/>\r
-  </condition>\r
+    </condition>\r
     \r
     <condition property="gxx_extra_libs" value="stdc++">\r
       <os family="windows"/>\r
-  </condition>\r
+    </condition>\r
     \r
   </target>\r
 \r
-  <target name="Antlr" depends="init" unless="CheckDepends">\r
+  <target name="Antlr" depends="init" unless="AntlrDepends">\r
+    <echo message="Executing ANTLR"/>\r
     <exec dir="${basedir}/${ToolName}" executable="${env.FRAMEWORK_TOOLS_PATH}/antlr" failonerror="TRUE">\r
       <arg line="-CC -e3 -ck 3 -o . VfrCompile.g"/>\r
     </exec>\r
   </target>\r
 \r
-  <target name="Dlg" depends="Antlr" unless="CheckDepends">\r
+  <target name="Dlg" depends="Antlr" unless="DlgDepends">\r
+    <echo message="Executing DLG"/>\r
     <exec dir="${basedir}/${ToolName}" executable="${env.FRAMEWORK_TOOLS_PATH}/dlg" failonerror="TRUE">\r
       <arg line="-C2 -i -CC -o . parser.dlg"/>\r
     </exec>\r
   </target>\r
 \r
-  <target name="Tool" depends="init, Dlg">\r
+  <target name="Tool" depends="init">\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
         outfile="${BIN_DIR}/${ToolName}"\r
         outtype="executable"\r
@@ -129,17 +97,25 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>\r
     <delete>\r
       <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>\r
-    <delete dir="${BUILD_DIR}">\r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${basedir}/${ToolName}/DLGLexer.cpp"/>\r
+      <fileset file="${basedir}/${ToolName}/DLGLexer.h"/>\r
+      <fileset file="${basedir}/${ToolName}/EfiVfrParser.cpp"/>\r
+      <fileset file="${basedir}/${ToolName}/EfiVfrParser.h"/>\r
+      <fileset file="${basedir}/${ToolName}/parser.dlg"/>\r
+      <fileset file="${basedir}/${ToolName}/tokens.h"/>\r
+      <fileset file="${basedir}/${ToolName}/VfrCompile.cpp"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
     </delete>\r
   </target>\r
 \r
index 0c11f5c..9d60609 100644 (file)
@@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>\r
 \r
   <target name="GenTool" depends="init, Tool">\r
-    <echo message="Building the EDK Tool: ${ToolName}"/>\r
+    <echo message="The EDK Tool: ${ToolName} build  has completed"/>\r
   </target>\r
 \r
   <target name="init">\r
-    <echo message="The EDK Tool: ${ToolName}"/>\r
+    <echo message="Building the EDK Tool: ${ToolName}"/>\r
     <mkdir dir="${BUILD_DIR}"/>\r
-    <if>\r
-      <equals arg1="${GCC}" arg2="cygwin"/>\r
-      <then>\r
-        <echo message="Cygwin Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    <elseif>\r
-      <os family="dos"/>\r
-      <then>\r
-        <echo message="Windows Family"/>\r
-        <property name="ToolChain" value="msvc"/>\r
-      </then>\r
-    </elseif>\r
-    <elseif>\r
-      <os family="unix"/>\r
-      <then>\r
-        <echo message="UNIX Family"/>\r
-        <property name="ToolChain" value="gcc"/>\r
-      </then>\r
-    </elseif>\r
-\r
-    <else>\r
-      <echo>\r
-        Unsupported Operating System\r
-        Please Contact Intel Corporation\r
-      </echo>\r
-    </else>\r
-    </if>\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
-          <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
   </target>\r
 \r
   <target name="Tool" depends="init">\r
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
         outfile="${BIN_DIR}/${ToolName}"\r
         outtype="executable"\r
-        libtool="${haveLibtool}"\r
         debug="false">\r
 \r
       <fileset dir="${basedir}/${ToolName}" \r
@@ -95,17 +50,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>\r
   </target>\r
 \r
-  <target name="clean" depends="init">\r
+  <target name="clean">\r
     <echo message="Removing Intermediate Files Only"/>  \r
-    <delete>\r
-      <fileset dir="${BUILD_DIR}" includes="*.obj"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
     </delete>\r
   </target>\r
 \r
-  <target name="cleanall" depends="init">\r
+  <target name="cleanall">\r
     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  \r
-    <delete dir="${BUILD_DIR}">\r
-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>\r
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">\r
+      <fileset dir="${BUILD_DIR}"/>\r
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>\r
     </delete>\r
   </target>\r
 \r
index 065cb6c..d304f0a 100644 (file)
@@ -9,21 +9,15 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 -->\r
-<project default="all" basedir=".">\r
+<project default="all" basedir="." name="C_Code">\r
 <!-- Copyright (c) 2006, Intel Corporation -->\r
 <!-- Filename: Tools/Source/build.xml -->\r
 \r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
+\r
+  <property name="ReallyVerbose" value="false"/>\r
   <property environment="env" />\r
-  <condition property="HostArch" value="x64">\r
-    <os arch="amd64"/>\r
-  </condition>\r
-  <condition property="HostArch" value="Ia32">\r
-    <os arch="x86"/>\r
-  </condition>\r
-  <condition property="HostArch" value="Ia32">\r
-    <os arch="i386"/>\r
-  </condition>\r
+\r
   <property name="WORKSPACE" value="${env.WORKSPACE}" />\r
   <property name="WORKSPACE_DIR" value="${WORKSPACE}" />\r
   <property name="PACKAGE" value="Tools" />\r
@@ -32,7 +26,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BIN_DIR" value="${WORKSPACE}/Tools/bin" />\r
   <property name="BUILD_MODE" value="PACKAGE" />\r
   <property name="Libs" \r
-    value="String/build.xml Common/build.xml CustomizedCompress/build.xml PeCoffLoader/build.xml"/>\r
+    value="Common/build.xml CustomizedCompress/build.xml PeCoffLoader/build.xml String/build.xml"/>\r
 \r
   <import file="${WORKSPACE_DIR}/Tools/Conf/BuildMacro.xml" />\r
 \r
@@ -41,46 +35,71 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <fileset dir="${env.XMLBEANS_HOME}/lib" includes="*.jar"/>\r
   </path>\r
 \r
-  <target name="all" depends="init, Tools" />\r
-  \r
-  <target name="init">\r
-    <taskdef classpathref="classpath" resource="GenBuild.tasks" />\r
-    <taskdef classpathref="classpath" resource="net/sf/antcontrib/antlib.xml" />\r
+  <taskdef classpathref="classpath" resource="GenBuild.tasks" />\r
+  <taskdef classpathref="classpath" resource="net/sf/antcontrib/antlib.xml" />\r
 \r
-    <taskdef classpathref="classpath" resource="cpptasks.tasks"/>\r
-    <typedef classpathref="classpath" resource="cpptasks.types"/>\r
+  <taskdef classpathref="classpath" resource="cpptasks.tasks"/>\r
+  <typedef classpathref="classpath" resource="cpptasks.types"/>\r
 \r
+  <target name="all" depends="init, Tools">\r
+    <echo message="The EDK II C Tools build complete!"/>\r
+  </target>\r
+  \r
+  <target name="init">\r
+    <echo message="EDK C Code Tools, build initialization"/>\r
     <mkdir dir="${BIN_DIR}" />\r
     <mkdir dir="${LIB_DIR}" />\r
+\r
+    <condition property="HostArch" value="X64">\r
+      <os arch="amd64"/>\r
+    </condition>\r
+    <condition property="HostArch" value="Ia32">\r
+      <or>\r
+        <os arch="x86"/>\r
+        <os arch="i386"/>\r
+      </or>\r
+    </condition>\r
+    <condition property="HostArch" value="Ia32">\r
+      <os arch="i386"/>\r
+    </condition> \r
+\r
     <if>\r
       <os family="unix" />\r
       <then>\r
-        <echo message="OS Family UNIX" />\r
+        <echo message="OS Family UNIX, ${HostArch}" />\r
       </then>\r
       <elseif>\r
         <os family="dos" />\r
         <then>\r
-          <echo message="OS Family DOS" />\r
+          <echo message="OS Family DOS, ${HostArch}" />\r
         </then>\r
       </elseif>\r
       <elseif>\r
         <os family="mac" />\r
         <then>\r
-          <echo message="OS Family OS X" />\r
+          <echo message="OS Family OS X, ${HostArch}" />\r
         </then>\r
       </elseif>\r
       <else>\r
-        <echo message="OS Family Unsupported" />\r
+        <fail message="OS Family Unsupported, ${HostArch}" />\r
       </else>\r
     </if>\r
 \r
     <if>\r
-        <isset property="env.TOOL_CHAIN" />\r
+      <not>\r
+        <isset property="ToolChain" />\r
+      </not>\r
       <then>\r
-        <property name="ToolChain" value="${env.TOOL_CHAIN}"/>\r
-        <condition property="gcc">\r
-          <equals arg1="${ToolChain}" arg2="gcc"/>\r
-        </condition>\r
+        <if>\r
+          <isset property="env.TOOL_CHAIN" />\r
+          <then>\r
+            <property name="ToolChain" value="${env.TOOL_CHAIN}"/>\r
+          </then>\r
+          <else>\r
+            <!-- Default Tool Chain is Microsoft Visual Studio -->\r
+            <property name="ToolChain" value="msvc"/>\r
+          </else>\r
+        </if>\r
       </then>\r
     </if>\r
 \r
@@ -88,10 +107,37 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <os name="Linux"/>\r
     </condition>\r
     \r
+    <condition property="intel_win">\r
+      <and>\r
+        <os family="dos"/>\r
+        <equals arg1="${ToolChain}" arg2="intel"/>\r
+      </and>\r
+    </condition>\r
+    \r
+    <condition property="intel_linux">\r
+      <and>\r
+        <os name="Linux"/>\r
+        <equals arg1="${ToolChain}" arg2="intel"/>\r
+      </and>\r
+    </condition>\r
+    \r
+    <condition property="intel_mac">\r
+      <and>\r
+        <os family="mac"/>\r
+        <equals arg1="${ToolChain}" arg2="intel"/>\r
+      </and>\r
+    </condition>\r
+    \r
+    <condition property="gcc">\r
+      <and>\r
+        <equals arg1="${ToolChain}" arg2="gcc"/>\r
+      </and>\r
+    </condition>\r
+\r
     <condition property="cygwin">\r
       <and>\r
         <os family="dos"/>\r
-        <istrue value="${gcc}"/>\r
+        <equals arg1="${ToolChain}" arg2="gcc"/>\r
       </and>\r
     </condition>\r
     \r
@@ -109,10 +155,74 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <condition property="OSX" value="true">\r
       <os family="Mac"/>\r
     </condition>\r
-    \r
+\r
+    <condition property="cyglinux">\r
+      <or>\r
+        <istrue value="linux"/>\r
+        <istrue value="${cygwin}"/>\r
+      </or>\r
+    </condition>\r
+\r
+    <!-- msft is a family, used by both Microsoft and Intel Windows compiler tool chains -->\r
+    <condition property="msft">\r
+      <isfalse value="${gcc}"/>\r
+    </condition>\r
+\r
+    <if>\r
+      <istrue value="${ReallyVerbose}"/>\r
+      <then>\r
+        <echo message="Test property msvc:         ${msvc}"/> \r
+        <echo message="Test property gcc:          ${gcc}"/> \r
+        <echo message="Test property intel_win:    ${intel_win}"/> \r
+        <echo message="Test property intel_linux:  ${intel_linux}"/> \r
+        <echo message="Test property intel_mac:    ${intel_mac}"/> \r
+        <echo message="Test property msft:         ${msft}"/> \r
+        <echo message="Test property cygwin:       ${cygwin}"/> \r
+        <echo message="Test property cyglinux:     ${cyglinux}"/> \r
+        <echo message="Test property windows:      ${windows}"/> \r
+        <echo message="Test property linux:        ${linux}"/> \r
+        <echo message="Test property OSX:          ${OSX}"/> \r
+        <echo message="Test property x86_64_linux: ${x86_64_linux}"/> \r
+       </then>\r
+    </if>\r
+\r
+    <property name="haveLibtool" value="false"/>\r
+    <if>\r
+      <and>\r
+        <not>\r
+          <isset property="env.CYGWIN_HOME"/>\r
+        </not>\r
+          <isset property="cygwin"/>\r
+      </and>\r
+      <then>\r
+        <fail message="You must set the environment variable: CYGWIN_HOME"/>\r
+      </then>\r
+    </if>\r
+\r
+    <if>\r
+        <istrue value="${gcc}"/>\r
+      <then>\r
+        <property name="ext_static" value=".a"/>\r
+        <property name="ext_dynamic" value=".so"/>\r
+        <if>\r
+          <istrue value="${cygwin}"/>\r
+          <then>\r
+            <property name="ext_exe" value=".exe"/>\r
+          </then>\r
+          <else>\r
+            <property name="ext_exe" value=""/>\r
+          </else>\r
+        </if>\r
+      </then>\r
+      <else>\r
+        <property name="ext_static" value=".lib"/>\r
+        <property name="ext_dynamic" value=".dll"/>\r
+        <property name="ext_exe" value=".exe"/>\r
+      </else>\r
+    </if>\r
   </target>\r
-  \r
-  <target name="Libraries">\r
+\r
+  <target name="Libraries" depends="init">\r
     <subant target="" inheritall="true">\r
       <fileset dir="${PACKAGE_DIR}" \r
         includes="${Libs}"/>\r
@@ -126,13 +236,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </subant>\r
   </target>\r
 \r
-  <target name="clean">\r
+  <target name="clean" depends="init">\r
     <subant target="clean" inheritall="true">\r
       <fileset dir="${PACKAGE_DIR}" includes="*/build.xml"/>\r
     </subant>\r
   </target>\r
 \r
-  <target name="cleanall">\r
+  <target name="cleanall" depends="init">\r
     <subant target="cleanall" inheritall="true">\r
       <fileset dir="${PACKAGE_DIR}" includes="*/build.xml"/>\r
     </subant>\r