Updated to handle cygwin/gcc and moved msvc,gcc property settings to the TianoTools/build.xml file. Properties are inherited, so we only need to set them one. Cleaned up clean and cleanall targets to remove the executables and library files. Added makefile.cygwin to antlr and dlg programs to generate the .exe needed for cygwin.

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

2 files changed, 38 insertions, 61 deletions

diff --git a/Tools/Source/TianoTools/VfrCompile/VfrCompile.g b/Tools/Source/TianoTools/VfrCompile/VfrCompile.g
index db0ba95582..44820bc31b 100644
--- a/Tools/Source/TianoTools/VfrCompile/VfrCompile.g
+++ b/Tools/Source/TianoTools/VfrCompile/VfrCompile.g
@@ -62,6 +62,7 @@ public:
   { 

     printf ("unrecognized input '%s'\n", Text); 

   }

+

 };

 

 //

diff --git a/Tools/Source/TianoTools/VfrCompile/build.xml b/Tools/Source/TianoTools/VfrCompile/build.xml
index 67442dfed3..995cf7d6a5 100644
--- a/Tools/Source/TianoTools/VfrCompile/build.xml
+++ b/Tools/Source/TianoTools/VfrCompile/build.xml
@@ -9,7 +9,7 @@ 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.

 -->

-<project default="GenTool" basedir=".">

+<project default="GenTool" basedir="." name="VfrCompile">

 <!--

     EDK VfrCompile Tool

   Copyright (c) 2006, Intel Corporation

@@ -25,90 +25,58 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BUILD_DIR" value="${PACKAGE_DIR}/${ToolName}/tmp"/>

 

   <target name="GenTool" depends="init, Antlr, Dlg, Tool">

-    <echo message="Building the EDK Tool: ${ToolName}"/>

+    <echo message="The EDK Tool: ${ToolName} build has completed"/>

   </target>

 

   <target name="init">

-    <echo message="The EDK Tool: ${ToolName}"/>

+

+    <echo message="Building the EDK Tool: ${ToolName}"/>

     <mkdir dir="${BUILD_DIR}"/>

-    <if>

-      <equals arg1="${GCC}" arg2="cygwin"/>

-      <then>

-        <echo message="Cygwin Family"/>

-        <property name="ToolChain" value="gcc"/>

-      </then>

-    <elseif>

-      <os family="dos"/>

-      <then>

-        <echo message="Windows Family"/>

-        <property name="ToolChain" value="msvc"/>

-      </then>

-    </elseif>

-    <elseif>

-      <os family="unix"/>

-      <then>

-        <echo message="UNIX Family"/>

-        <property name="ToolChain" value="gcc"/>

-      </then>

-    </elseif>

-

-    <else>

-      <echo>

-        Unsupported Operating System

-        Please Contact Intel Corporation

-      </echo>

-    </else>

-    </if>

-    <if>

-      <equals arg1="${ToolChain}" arg2="msvc"/>

-      <then>

-        <property name="ext_static" value=".lib"/>

-        <property name="ext_dynamic" value=".dll"/>

-        <property name="ext_exe" value=".exe"/>

-      </then>

-      <elseif>

-        <equals arg1="${ToolChain}" arg2="gcc"/>

-        <then>

-          <property name="ext_static" value=".a"/>

-          <property name="ext_dynamic" value=".so"/>

-          <property name="ext_exe" value=""/>

-        </then>

-      </elseif>

-    </if>

+

+    <condition property="AntlrDepends">

+      <uptodate targetfile="${PACKAGE_DIR}/VfrCompile/parser.dlg" srcfile="${PACKAGE_DIR}/VfrCompile/VfrCompile.g" value="true"/>

+    </condition>

+

+    <condition property="DlgDepends">

+      <uptodate targetfile="${PACKAGE_DIR}/VfrCompile/DLGLexer.cpp" srcfile="${PACKAGE_DIR}/VfrCompile/parser.dlg" value="true"/>

+    </condition>

+

     <condition property="CheckDepends">

-      <uptodate targetfile="${WORKSPACE}/Tools/bin/VfrCompile${ext_exe}">

-        <srcfiles dir="${WORKSPACE}/Tools/Source/TianoTools/VfrCompile" 

-        includes="EfiVfrParser.cpp DLGLexer.cpp VfrCompile.cpp VfrCompile.g VfrServices.cpp parser.dlg"/>

-      </uptodate>

+      <or>

+        <isset property="AntlrDepends"/>

+        <isset property="DlgDepends"/>

+      </or>

     </condition>

 

     <condition property="gxx_extra_libs" value="stdc++ System gcc_s.10.4 gcc">

       <os family="mac"/>

-  </condition>

+    </condition>

     

     <condition property="gxx_extra_libs" value="stdc++">

       <os name="linux"/>

-  </condition>

+    </condition>

     

     <condition property="gxx_extra_libs" value="stdc++">

       <os family="windows"/>

-  </condition>

+    </condition>

     

   </target>

 

-  <target name="Antlr" depends="init" unless="CheckDepends">

+  <target name="Antlr" depends="init" unless="AntlrDepends">

+    <echo message="Executing ANTLR"/>

     <exec dir="${basedir}/${ToolName}" executable="${env.FRAMEWORK_TOOLS_PATH}/antlr" failonerror="TRUE">

       <arg line="-CC -e3 -ck 3 -o . VfrCompile.g"/>

     </exec>

   </target>

 

-  <target name="Dlg" depends="Antlr" unless="CheckDepends">

+  <target name="Dlg" depends="Antlr" unless="DlgDepends">

+    <echo message="Executing DLG"/>

     <exec dir="${basedir}/${ToolName}" executable="${env.FRAMEWORK_TOOLS_PATH}/dlg" failonerror="TRUE">

       <arg line="-C2 -i -CC -o . parser.dlg"/>

     </exec>

   </target>

 

-  <target name="Tool" depends="init, Dlg">

+  <target name="Tool" depends="init">

     <cc name="${ToolChain}" objdir="${BUILD_DIR}" 

         outfile="${BIN_DIR}/${ToolName}"

         outtype="executable"

@@ -129,17 +97,25 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </cc>

   </target>

 

-  <target name="clean" depends="init">

+  <target name="clean">

     <echo message="Removing Intermediate Files Only"/>

     <delete>

       <fileset dir="${BUILD_DIR}" includes="*.obj"/>

     </delete>

   </target>

 

-  <target name="cleanall" depends="init">

+  <target name="cleanall">

     <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>

-    <delete dir="${BUILD_DIR}">

-      <fileset dir="${BIN_DIR}" includes="${ToolName}${ext_exe}"/>

+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">

+      <fileset dir="${BUILD_DIR}"/>

+      <fileset file="${basedir}/${ToolName}/DLGLexer.cpp"/>

+      <fileset file="${basedir}/${ToolName}/DLGLexer.h"/>

+      <fileset file="${basedir}/${ToolName}/EfiVfrParser.cpp"/>

+      <fileset file="${basedir}/${ToolName}/EfiVfrParser.h"/>

+      <fileset file="${basedir}/${ToolName}/parser.dlg"/>

+      <fileset file="${basedir}/${ToolName}/tokens.h"/>

+      <fileset file="${basedir}/${ToolName}/VfrCompile.cpp"/>

+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>

     </delete>

   </target>