Fix EDKT140(CompressDll.dll does not build under cygwin gcc).

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

diff --git a/Tools/Source/TianoTools/CompressDll/CompressDll.c b/Tools/Source/TianoTools/CompressDll/CompressDll.c
index 3c6fc8cb4d8e597cc4d5e90d6cd6ef55e1d9c3cf..cc06f26c0563e4ed1a005cab3dccbaf5fd16aff5 100644 (file)
--- a/Tools/Source/TianoTools/CompressDll/CompressDll.c
+++ b/Tools/Source/TianoTools/CompressDll/CompressDll.c
@@ -11,6 +11,9 @@
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 **/\r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 **/\r

+#if defined(__GNUC__)\r
+typedef long long __int64;/*For cygwin build*/\r
+#endif\r

 #include "CompressDll.h"\r
 #include "EfiCompress.h"\r
 \r
 #include "CompressDll.h"\r
 #include "EfiCompress.h"\r
 \r

diff --git a/Tools/Source/TianoTools/CompressDll/CompressDll.h b/Tools/Source/TianoTools/CompressDll/CompressDll.h
index 3b0fbb2cee7409e790e17c543833eae8c3122b0c..fa3b83cd107f434fb8d9522aa01d27dec325c0a6 100644 (file)
--- a/Tools/Source/TianoTools/CompressDll/CompressDll.h
+++ b/Tools/Source/TianoTools/CompressDll/CompressDll.h
@@ -1,4 +1,5 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */\r
 /* DO NOT EDIT THIS FILE - it is machine generated */\r

+\r

 #include <jni.h>\r
 /* Header for class org_tianocore_frameworktasks_Compress */\r
 \r
 #include <jni.h>\r
 /* Header for class org_tianocore_frameworktasks_Compress */\r
 \r

diff --git a/Tools/Source/TianoTools/CompressDll/build.xml b/Tools/Source/TianoTools/CompressDll/build.xml
index ff80a6c4ed692699774e2faa7ffffb54eb56fd08..1aa5fb6ac8e335f56ded426bd725c260688e452f 100644 (file)
--- a/Tools/Source/TianoTools/CompressDll/build.xml
+++ b/Tools/Source/TianoTools/CompressDll/build.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
+<?xml version="1.0" encoding="UTF-8"?>\r

 <!--\r
 Copyright (c) 2006, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
 <!--\r
 Copyright (c) 2006, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r


@@ -49,10 +49,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${env.JAVA_HOME}/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="cyglinux"/>\r
+      <includepath path="${env.JAVA_HOME}/include/linux" if="gcc"/>\r
+      <includepath path="${env.JAVA_HOME}/include/win32" if="cygwin"/>\r

       <includepath path="${env.JAVA_HOME}/include/win32" if="msft"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
       <syslibset libs="kernel32" if="msft"/>\r
       <includepath path="${env.JAVA_HOME}/include/win32" if="msft"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
       <syslibset libs="kernel32" if="msft"/>\r

+      <linkerarg value="-mno-cygwin" if="cygwin"/>\r
+      <linkerarg value="--add-stdcall-alias" if="cygwin"/>\r

     </cc>\r
     <copy file="${result}" tofile="${BIN_DIR}/CompressDll.dll"/>\r
     <chmod file="${BIN_DIR}/CompressDll.dll" perm="ugo+x"/>\r
     </cc>\r
     <copy file="${result}" tofile="${BIN_DIR}/CompressDll.dll"/>\r
     <chmod file="${BIN_DIR}/CompressDll.dll" perm="ugo+x"/>\r

diff --git a/Tools/Source/TianoTools/Pccts/antlr/makefile.cygwin b/Tools/Source/TianoTools/Pccts/antlr/makefile.cygwin
index cc590e47e559b37387489205ba2143e295cd57aa..956de0be073c84abc0bbdf69faf8decccb83ce47 100644 (file)
--- a/Tools/Source/TianoTools/Pccts/antlr/makefile.cygwin
+++ b/Tools/Source/TianoTools/Pccts/antlr/makefile.cygwin
@@ -167,7 +167,7 @@ PCCTS_H=../h
 BIN_DIR=../../../../bin\r
 CC=gcc\r
 COPT=-O\r
 BIN_DIR=../../../../bin\r
 CC=gcc\r
 COPT=-O\r

-ANTLR=${BIN_DIR}/antlr.exe\r
+ANTLR=$(BIN_DIR)/antlr.exe\r

 DLG=${BIN_DIR}/dlg.exe\r
 OBJ_EXT=o\r
 OUT_OBJ = -o\r
 DLG=${BIN_DIR}/dlg.exe\r
 OBJ_EXT=o\r
 OUT_OBJ = -o\r


@@ -180,7 +180,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
         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
+               $(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
 # 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/dlg/makefile.cygwin b/Tools/Source/TianoTools/Pccts/dlg/makefile.cygwin
index 02e4c8994a3c4dcccc5bda2c10851ef90ce75c55..bbba820d13c1947a50526258b5657769484051c0 100644 (file)
--- a/Tools/Source/TianoTools/Pccts/dlg/makefile.cygwin
+++ b/Tools/Source/TianoTools/Pccts/dlg/makefile.cygwin
@@ -117,7 +117,7 @@ PCCTS_H=../h
 BIN_DIR=../../../../bin\r
 CC=cc\r
 COPT=-O\r
 BIN_DIR=../../../../bin\r
 CC=cc\r
 COPT=-O\r

-ANTLR=${BIN_DIR}/antlr.exe\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
 DLG=${BIN_DIR}/dlg.exe\r
 CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536\r
 OBJ_EXT=o\r


@@ -126,7 +126,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
         relabel.o automata.o\r
 \r
 dlg : $(OBJ) $(SRC)\r

-               $(CC) $(CFLAGS) -o ${BIN_DIR}/dlg.exe $(OBJ)\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
 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/build.xml b/Tools/Source/TianoTools/build.xml
index d304f0a014c93cab67a3d106252189dca21eaf0b..d17229280916c117cd28d7a2ef5a5cbb9ede3379 100644 (file)
--- a/Tools/Source/TianoTools/build.xml
+++ b/Tools/Source/TianoTools/build.xml
@@ -158,7 +158,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
     <condition property="cyglinux">\r
       <or>\r
 \r
     <condition property="cyglinux">\r
       <or>\r

-        <istrue value="linux"/>\r
+        <istrue value="${linux}"/>\r

         <istrue value="${cygwin}"/>\r
       </or>\r
     </condition>\r
         <istrue value="${cygwin}"/>\r
       </or>\r
     </condition>\r

diff --git a/edksetup.sh b/edksetup.sh
index 08e62bc87757e5e77c3d8fc1642f1312fee0d655..7a3fe33a8f97ff203ccf681a2f2048d6eeda16d2 100644 (file)
--- a/edksetup.sh
+++ b/edksetup.sh
@@ -28,10 +28,22 @@ if [ "$XMLBEANS_HOME" == "" ]
 then
   echo "Please set XMLBEANS_HOME before sourcing this script."
 else
 then
   echo "Please set XMLBEANS_HOME before sourcing this script."
 else

+  
+case "`uname`" in
+  CYGWIN*) 
+    # Convert paths to unix format.
+    # This is to remove possible wrong path when converting CLASSPATH back to windows format
+    export WORKSPACE=`cygpath -u $WORKSPACE`
+    export ANT_HOME=`cygpath -u $ANT_HOME`
+    export XMLBEANS_HOME=`cygpath -u $XMLBEANS_HOME`
+    export FRAMEWORK_TOOLS_PATH=`cygpath -u $FRAMEWORK_TOOLS_PATH`
+    ;;
+esac

 
 # These should be ok as they are.
 export CLASSPATH=$WORKSPACE/Tools/Jars/SurfaceArea.jar:$WORKSPACE/Tools/Jars/frameworktasks.jar:$WORKSPACE/Tools/Jars/cpptasks.jar:$WORKSPACE/Tools/Jars/PcdTools.jar:$WORKSPACE/Tools/Jars/GenBuild.jar:$XMLBEANS_HOME/lib/resolver.jar:$XMLBEANS_HOME/lib/xbean.jar:$XMLBEANS_HOME/lib/xmlpublic.jar:$XMLBEANS_HOME/lib/jsr173_1.0_api.jar:$XMLBEANS_HOME/lib/saxon8.jar:$XMLBEANS_HOME/lib/xbean_xpath.jar
 export CLASSPATH=$CLASSPATH:$WORKSPACE/Tools/Jars/Common.jar
 
 # These should be ok as they are.
 export CLASSPATH=$WORKSPACE/Tools/Jars/SurfaceArea.jar:$WORKSPACE/Tools/Jars/frameworktasks.jar:$WORKSPACE/Tools/Jars/cpptasks.jar:$WORKSPACE/Tools/Jars/PcdTools.jar:$WORKSPACE/Tools/Jars/GenBuild.jar:$XMLBEANS_HOME/lib/resolver.jar:$XMLBEANS_HOME/lib/xbean.jar:$XMLBEANS_HOME/lib/xmlpublic.jar:$XMLBEANS_HOME/lib/jsr173_1.0_api.jar:$XMLBEANS_HOME/lib/saxon8.jar:$XMLBEANS_HOME/lib/xbean_xpath.jar
 export CLASSPATH=$CLASSPATH:$WORKSPACE/Tools/Jars/Common.jar

+export CLASSPATH=$CLASSPATH:$WORKSPACE/Tools/Jars/PcdTools.jar

 export CLASSPATH=$CLASSPATH:$WORKSPACE/Tools/Bin/FrameworkWizard.jar
 export FRAMEWORK_TOOLS_PATH=$WORKSPACE/Tools/bin
 export PATH=$FRAMEWORK_TOOLS_PATH:$ANT_HOME/bin:$JAVA_HOME/bin:$PATH
 export CLASSPATH=$CLASSPATH:$WORKSPACE/Tools/Bin/FrameworkWizard.jar
 export FRAMEWORK_TOOLS_PATH=$WORKSPACE/Tools/bin
 export PATH=$FRAMEWORK_TOOLS_PATH:$ANT_HOME/bin:$JAVA_HOME/bin:$PATH


@@ -45,6 +57,8 @@ case "`uname`" in
   CYGWIN*) 
     # Convert paths to windows format.
     export WORKSPACE=`cygpath -w $WORKSPACE`
   CYGWIN*) 
     # Convert paths to windows format.
     export WORKSPACE=`cygpath -w $WORKSPACE`

+    export ANT_HOME=`cygpath -w -p $ANT_HOME`
+    export XMLBEANS_HOME=`cygpath -w -p $XMLBEANS_HOME`

     export CLASSPATH=`cygpath -w -p $CLASSPATH`
     export FRAMEWORK_TOOLS_PATH=`cygpath -w -p $FRAMEWORK_TOOLS_PATH`
     ;;
     export CLASSPATH=`cygpath -w -p $CLASSPATH`
     export FRAMEWORK_TOOLS_PATH=`cygpath -w -p $FRAMEWORK_TOOLS_PATH`
     ;;