From: lhauch Date: Tue, 1 Aug 2006 23:58:18 +0000 (+0000) Subject: Updated to handle cygwin/gcc and moved msvc,gcc property settings to the TianoTools... X-Git-Tag: edk2-stable201903~24698 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=af1dd46d37b6f6e3f9bed4c6a485d0c4832a2dd6 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 --- diff --git a/Tools/Source/TianoTools/Common/build.xml b/Tools/Source/TianoTools/Common/build.xml index b4becb71d5..b794bd7f14 100644 --- a/Tools/Source/TianoTools/Common/build.xml +++ b/Tools/Source/TianoTools/Common/build.xml @@ -20,59 +20,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + - + - + - - - - - - - - - - - - - - - - - - - - - - - - Unsupported Operating System - Please Contact Intel Corporation - - - - - - - - - - - - - - - - - @@ -91,17 +50,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + - - - + - - - - + + + + + diff --git a/Tools/Source/TianoTools/CompressDll/build.xml b/Tools/Source/TianoTools/CompressDll/build.xml index 28cd4aec74..ff80a6c4ed 100644 --- a/Tools/Source/TianoTools/CompressDll/build.xml +++ b/Tools/Source/TianoTools/CompressDll/build.xml @@ -11,12 +11,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. --> - @@ -26,56 +25,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + - + - + - - - - - - - - - - - - - - - - - - - - - - Unsupported Operating System - Please Contact Intel Corporation - - - - - - - - - - - - - - - - - - @@ -86,31 +44,32 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. outfile="${BIN_DIR}/${LibName}" outputfileproperty="result" > - + - - + + - + - + - - - - + + + + + diff --git a/Tools/Source/TianoTools/CreateMtFile/build.xml b/Tools/Source/TianoTools/CreateMtFile/build.xml index 67142578b3..317ccad411 100644 --- a/Tools/Source/TianoTools/CreateMtFile/build.xml +++ b/Tools/Source/TianoTools/CreateMtFile/build.xml @@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + - + - - - - - - - - - - - - - - - - - - - - - - - - Unsupported Operating System - Please Contact Intel Corporation - - - - - - - - - - - - - - - - - - - - + - + - - + + + diff --git a/Tools/Source/TianoTools/CustomizedCompress/build.xml b/Tools/Source/TianoTools/CustomizedCompress/build.xml index 32aa12d1a9..46c9275f92 100644 --- a/Tools/Source/TianoTools/CustomizedCompress/build.xml +++ b/Tools/Source/TianoTools/CustomizedCompress/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. --> - + +--> - - - - - - - - - - - - - - - - - - - - - + + - - - Unsupported Operating System - Please Contact Intel Corporation - - - - - - - - - - - - - - - - - - - + + - - - - + + + + + + + - + - + diff --git a/Tools/Source/TianoTools/Pccts/dlg/build.xml b/Tools/Source/TianoTools/Pccts/dlg/build.xml index efdae432d8..89e7aaa22e 100644 --- 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. --> @@ -23,51 +23,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - - - - - - - - - - - - - - - - - - - - - - - - - Unsupported Operating System - Please Contact Intel Corporation - - - - - - - - - - - - - - - - - - - @@ -78,42 +33,61 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + + + - - + + + + + + + + + - + + - + - + + + + + + + + + - + @@ -121,24 +95,27 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + - + - + + + + diff --git a/Tools/Source/TianoTools/Pccts/dlg/makefile b/Tools/Source/TianoTools/Pccts/dlg/makefile index 1658394130..d5cceb8be5 100644 --- 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 diff --git a/Tools/Source/TianoTools/Pccts/dlg/makefile.cygwin b/Tools/Source/TianoTools/Pccts/dlg/makefile.cygwin new file mode 100644 index 0000000000..02e4c8994a --- /dev/null +++ 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 diff --git a/Tools/Source/TianoTools/PeCoffLoader/build.xml b/Tools/Source/TianoTools/PeCoffLoader/build.xml index e1b41ed3a4..26f52ac48f 100644 --- a/Tools/Source/TianoTools/PeCoffLoader/build.xml +++ b/Tools/Source/TianoTools/PeCoffLoader/build.xml @@ -24,60 +24,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - Unsupported Operating System - Please Contact Intel Corporation - - - - - - - - - - - - - - - - - - - - @@ -105,7 +60,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + - + @@ -180,10 +135,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + + + + + + + diff --git a/Tools/Source/TianoTools/PeiRebase/build.xml b/Tools/Source/TianoTools/PeiRebase/build.xml index 4da3cd8269..e9fb8e5cfb 100644 --- a/Tools/Source/TianoTools/PeiRebase/build.xml +++ b/Tools/Source/TianoTools/PeiRebase/build.xml @@ -25,58 +25,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + - + - - - - - - - - - - - - - - - - - - - - - - - - Unsupported Operating System - Please Contact Intel Corporation - - - - - - - - - - - - - - - - - - - @@ -127,17 +83,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + - - - - + + + + + + + diff --git a/Tools/Source/TianoTools/SecApResetVectorFixup/build.xml b/Tools/Source/TianoTools/SecApResetVectorFixup/build.xml index 34b0383981..2632575f38 100644 --- a/Tools/Source/TianoTools/SecApResetVectorFixup/build.xml +++ b/Tools/Source/TianoTools/SecApResetVectorFixup/build.xml @@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + - + - - - - - - - - - - - - - - - - - - - - - - - - Unsupported Operating System - Please Contact Intel Corporation - - - - - - - - - - - - - - - - - - - - + - + - - + + + diff --git a/Tools/Source/TianoTools/SecFixup/build.xml b/Tools/Source/TianoTools/SecFixup/build.xml index 2df362a62d..08a1118a8a 100644 --- a/Tools/Source/TianoTools/SecFixup/build.xml +++ b/Tools/Source/TianoTools/SecFixup/build.xml @@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + - + - - - - - - - - - - - - - - - - - - - - - - - - Unsupported Operating System - Please Contact Intel Corporation - - - - - - - - - - - - - - - - - - - - + - + - - + + + diff --git a/Tools/Source/TianoTools/SetStamp/build.xml b/Tools/Source/TianoTools/SetStamp/build.xml index 6b47bb8581..792ebe2e12 100644 --- a/Tools/Source/TianoTools/SetStamp/build.xml +++ b/Tools/Source/TianoTools/SetStamp/build.xml @@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + - + - - - - - - - - - - - - - - - - - - - - - - - - Unsupported Operating System - Please Contact Intel Corporation - - - - - - - - - - - - - - - - - - - - + - + - - + + + diff --git a/Tools/Source/TianoTools/SplitFile/build.xml b/Tools/Source/TianoTools/SplitFile/build.xml index f4dbae920b..135747c629 100644 --- a/Tools/Source/TianoTools/SplitFile/build.xml +++ b/Tools/Source/TianoTools/SplitFile/build.xml @@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + - + - - - - - - - - - - - - - - - - - - - - - - - - Unsupported Operating System - Please Contact Intel Corporation - - - - - - - - - - - - - - - - - - - - + - + - - + + + diff --git a/Tools/Source/TianoTools/StrGather/build.xml b/Tools/Source/TianoTools/StrGather/build.xml index 98ace14756..7e4a96731d 100644 --- a/Tools/Source/TianoTools/StrGather/build.xml +++ b/Tools/Source/TianoTools/StrGather/build.xml @@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + - + - - - - - - - - - - - - - - - - - - - - - - - - Unsupported Operating System - Please Contact Intel Corporation - - - - - - - - - - - - - - - - - - - @@ -98,17 +53,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + - + - - + + + diff --git a/Tools/Source/TianoTools/String/build.xml b/Tools/Source/TianoTools/String/build.xml index 06c0975a00..f238a8712b 100644 --- a/Tools/Source/TianoTools/String/build.xml +++ b/Tools/Source/TianoTools/String/build.xml @@ -23,57 +23,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + - + - - - - - - - - - - - - - - - - - - - - - - - - Unsupported Operating System - Please Contact Intel Corporation - - - - - - - - - - - - - - - - - - - - @@ -121,17 +76,21 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + - - + + + + + + diff --git a/Tools/Source/TianoTools/Strip/build.xml b/Tools/Source/TianoTools/Strip/build.xml index 50bf76f253..6b9959ca29 100644 --- a/Tools/Source/TianoTools/Strip/build.xml +++ b/Tools/Source/TianoTools/Strip/build.xml @@ -25,63 +25,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + - + - - - - - - - - - - - - - - - - - - - - - - - - Unsupported Operating System - Please Contact Intel Corporation - - - - - - - - - - - - - - - - - - - - + - + - - + + + diff --git a/Tools/Source/TianoTools/TianoTools.msa b/Tools/Source/TianoTools/TianoTools.msa index 805a022361..2e4b27c19d 100644 --- a/Tools/Source/TianoTools/TianoTools.msa +++ b/Tools/Source/TianoTools/TianoTools.msa @@ -6,25 +6,24 @@ A169C678-3F55-4b6a-80BF-FD8B8DCAB883 2.0 This is the TianoTools Module - 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 + 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. Copyright 2006, Intel Corporation - 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, + 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. FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052 - IA32 X64 IPF EBC + EBC IA32 X64 IPF false NULL @@ -314,4 +313,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.ZeroDebugData/build.xml ZeroDebugData/ZeroDebugData.c - + \ No newline at end of file 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. --> - + - + + + - - - - - - - - - + @@ -32,7 +26,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + value="Common/build.xml CustomizedCompress/build.xml PeCoffLoader/build.xml String/build.xml"/> @@ -41,46 +35,71 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - - - - - + + - - + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + + + - - - - + + + + + + + + + + @@ -88,10 +107,37 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -109,10 +155,74 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -126,13 +236,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - + - +