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
2006-08-01 23:58:18 +00:00
parent c80da0c442
commit af1dd46d37
42 changed files with 960 additions and 1804 deletions
--- a/Tools/Source/TianoTools/Pccts/dlg/build.xml
+++ b/Tools/Source/TianoTools/Pccts/dlg/build.xml
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 -->
 <project default="GenTool" basedir=".">
 <!--
-    EDK dlg Tool
+    EDK Pccts Tool: dlg
  Copyright (c) 2006, Intel Corporation
 -->
  <property name="ToolName" value="dlg"/>
@@ -23,51 +23,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
  <property name="PACKAGE_DIR" value="${WORKSPACE}/Tools"/>

  <target name="init">
-    <echo message="The EDK Tool: ${ToolName}"/>
-    <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="CheckDepends">
 		  <uptodate targetfile="${WORKSPACE}/Tools/bin/dlg.exe">
 			  <srcfiles dir="." includes="*.c *.h *.g"/>
@@ -78,42 +33,61 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 			<then>
 				<echo message="Executable, dlg.exe, is up to date."/>
 			</then>
+      <else>
+        <echo message="Building the EDK Pccts Tool: ${ToolName}"/>
+      </else>
 		</if>
  </target>

  <target name="GenTool" depends="init" unless="CheckDepends">
-    <echo message="Building the EDK Tool: ${ToolName}"/>
    <if>
      <equals arg1="${ToolChain}" arg2="msvc"/>
 			<then>
-    	  <exec dir="${basedir}" executable="nmake" failonerror="TRUE">
+    	  <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="nmake" failonerror="TRUE">
 	    	  <arg line="-f DlgMS.mak"/>
    		</exec>
 		  </then>
 		<elseif>
+      <istrue value="${cygwin}"/>
+      <then>
+    	  <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="make" failonerror="TRUE">
+	    	  <arg line="-f makefile.cygwin"/>
+    		</exec>
+      </then>
+    </elseif>
+		<elseif>
      <equals arg1="${ToolChain}" arg2="gcc"/>
 			<then>
-    	  <exec dir="${basedir}" executable="make" failonerror="TRUE">
+    	  <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="make" failonerror="TRUE">
 	    	  <arg line="-f makefile"/>
    		</exec>
 		  </then>
 		</elseif>
 		</if>
+    <echo message="The EDK Tool: ${ToolName} build has completed!"/>
 	</target>

-  <target name="clean" depends="init">
+  <target name="clean">
    <echo message="Removing Intermediate Files Only"/>  
    <if>
      <equals arg1="${ToolChain}" arg2="msvc"/>
 			<then>
-    	  <exec dir="${basedir}" executable="nmake" failonerror="TRUE">
+    	  <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="nmake" failonerror="TRUE">
 	    	  <arg line="-f DlgMS.mak clean"/>
    		</exec>
 		  </then>
+    <elseif>
+      <istrue value="${cygwin}"/>
+      <then>
+    	  <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="make" failonerror="TRUE">
+	    	  <arg line="-f makefile.cygwin clean"/>
+    		</exec>
+      </then>
+		</elseif>
 		<elseif>
      <equals arg1="${ToolChain}" arg2="gcc"/>
 			<then>
-    	  <exec dir="${basedir}" executable="make" failonerror="TRUE">
+    	  <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="make" failonerror="TRUE">
 	    	  <arg line="-f makefile clean"/>
    		</exec>
 		  </then>
@@ -121,24 +95,27 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 		</if>
  </target>

-  <target name="cleanall" depends="init">
+  <target name="cleanall">
    <echo message="Removing Object Files and the Executable: ${ToolName}${ext_exe}"/>  
    <if>
      <equals arg1="${ToolChain}" arg2="msvc"/>
 			<then>
-    	  <exec dir="${basedir}" executable="nmake" failonerror="FALSE">
+    	  <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="nmake" failonerror="FALSE">
 	    	  <arg line="-f DlgMS.mak clean"/>
    		</exec>
 		  </then>
 		<elseif>
      <equals arg1="${ToolChain}" arg2="gcc"/>
 			<then>
-    	  <exec dir="${basedir}" executable="make" failonerror="FALSE">
+    	  <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="make" failonerror="FALSE">
 	    	  <arg line="-f makefile clean"/>
    		</exec>
 		  </then>
 		</elseif>
 		</if>
+    <delete failonerror="false" quiet="true" includeEmptyDirs="true">
+      <fileset file="${BIN_DIR}/${ToolName}${ext_exe}"/>
+    </delete>
  </target>

 </project>
--- a/Tools/Source/TianoTools/Pccts/dlg/makefile
+++ b/Tools/Source/TianoTools/Pccts/dlg/makefile
@@ -116,8 +116,8 @@ PCCTS_H=../h
 #
 CC=cc
 COPT=-O
-ANTLR=../bin/antlr
-DLG=../bin/dlg
+ANTLR=${BIN_DIR}/antlr
+DLG=${BIN_DIR}/dlg
 CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536
 OBJ_EXT=o
 OUT_OBJ = -o
@@ -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

 dlg : $(OBJ) $(SRC)
-		$(CC) $(CFLAGS) -o ${WORKSPACE}/Tools/bin/dlg $(OBJ)
+		$(CC) $(CFLAGS) -o ${BIN_DIR}/dlg $(OBJ)

 SRC = dlg_p.c dlg_a.c main.c err.c $(SET)/set.c support.c output.c \
        relabel.c automata.c
--- a/Tools/Source/TianoTools/Pccts/dlg/makefile.cygwin
+++ b/Tools/Source/TianoTools/Pccts/dlg/makefile.cygwin
@@ -0,0 +1,157 @@
+#
+# Makefile for DLG 1.33
+# Terence Parr
+# Purdue University, U of MN, Parr Research Corporation
+# 1989-1994
+#
+# Ported to IBM C-Set/2 and Microsoft 6.0 by
+# Ed Harfmann
+# Micro Data Base Systems
+# Lafayette, Indiana
+#
+SET=../support/set
+PCCTS_H=../h
+
+##
+## Uncomment the appropriate section to build
+##
+
+#
+#   OS/2 & DOS 16 bit using MSC 6.0
+#
+#CC=cl
+#ANTLR=..\bin\antlr
+#DLG=..\bin\dlg
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) /AL /Za /W3 -DPC -DUSER_ZZSYN
+#OUT_OBJ = -Fo
+#LIBS=/NOD:LLIBCE LLIBCEP
+#OBJ_EXT = obj
+#
+#dlg.exe : dlg_p.obj dlg_a.obj main.obj err.obj set.obj support.obj \
+#        output.obj relabel.obj automata.obj
+#        link @<<
+#$** /NOI
+#$@ /STACK:16384
+#
+#$(LIBS: = +^
+#)
+#$(DEF_FILE) $(LFLAGS) ;
+#<<
+#        bind $@ c:\os2\doscalls.lib
+#        copy *.exe ..\bin
+#
+
+#
+#   Borland C++ for DOS
+#
+#CC=bcc
+#ANTLR=..\bin\antlr
+#DLG=..\bin\dlg
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) -ml -ff- -w- -DPC -DUSER_ZZSYN
+#OUT_OBJ = -o
+#LIBS= emu mathl cl
+#OBJ_EXT = obj
+#
+#dlg.exe : dlg_p.obj dlg_a.obj main.obj err.obj set.obj support.obj \
+#        output.obj relabel.obj automata.obj
+#       tlink @&&|
+#C0L $**
+#$@ /Tde /c
+#
+#$(LIBS)
+#$(DEF_FILE) $(LFLAGS) ;
+#|
+#        copy *.exe ..\bin
+#
+
+#
+# C-Set/2 for OS/2
+#
+#CC=icc
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) /Sa /W3 /DUSER_ZZSYN
+#OUT_OBJ = -Fo
+#LIBS=
+#ANTLR=..\bin\antlr
+#DLG=..\bin\dlg
+#OBJ_EXT=obj
+#
+#dlg.exe : dlg_p.obj dlg_a.obj main.obj err.obj set.obj support.obj \
+#        output.obj relabel.obj automata.obj
+#        link386 @<<
+#$** /NOI
+#$@ /STACK:32768
+#
+#$(LIBS: = +^
+#)
+#$(DEF_FILE) $(LFLAGS) ;
+#<<
+#        copy *.exe ..\bin
+#
+
+#
+# Borland C++ for OS/2
+#
+#CC=bcc
+#CFLAGS= -I. -I$(SET) -I$(PCCTS_H) -w- -DUSER_ZZSYN
+#OUT_OBJ = -o
+#LIBS= c2 os2
+#
+#ANTLR=..\bin\antlr
+#DLG=..\bin\dlg
+#OBJ_EXT = obj
+#dlg.exe : dlg_p.obj dlg_a.obj main.obj err.obj set.obj support.obj \
+#        output.obj relabel.obj automata.obj
+#        tlink @&&|
+#c02 $** -c
+#dlg.exe
+#
+#C2 os2
+#
+#|
+#        copy *.exe ..\bin
+#
+
+#
+#   UNIX
+#
+BIN_DIR=../../../../bin
+CC=cc
+COPT=-O
+ANTLR=${BIN_DIR}/antlr.exe
+DLG=${BIN_DIR}/dlg.exe
+CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536
+OBJ_EXT=o
+OUT_OBJ = -o
+OBJ = dlg_p.o dlg_a.o main.o err.o set.o support.o output.o \
+        relabel.o automata.o
+
+dlg : $(OBJ) $(SRC)
+		$(CC) $(CFLAGS) -o ${BIN_DIR}/dlg.exe $(OBJ)
+
+SRC = dlg_p.c dlg_a.c main.c err.c $(SET)/set.c support.c output.c \
+        relabel.c automata.c
+
+#dlg_p.c parser.dlg err.c tokens.h : dlg_p.g
+#	$(ANTLR) dlg_p.g
+
+#dlg_a.c mode.h : parser.dlg
+#	$(DLG) -C2 parser.dlg dlg_a.c
+
+dlg_p.$(OBJ_EXT) : dlg_p.c dlg.h tokens.h mode.h
+	$(CC) $(CFLAGS) -c dlg_p.c
+
+dlg_a.$(OBJ_EXT) : dlg_a.c dlg.h tokens.h mode.h
+	$(CC) $(CFLAGS) -c dlg_a.c
+
+main.$(OBJ_EXT) : main.c dlg.h
+	$(CC) $(CFLAGS) -c main.c
+
+set.$(OBJ_EXT) : $(SET)/set.c
+	$(CC) -c $(CFLAGS) $(SET)/set.c
+
+lint:
+	lint *.c
+
+#clean up all the intermediate files
+clean:
+	rm -f *.$(OBJ_EXT) core