SF.net SVN: edk2-buildtools:[2507] trunk/BaseTools

[<lg...@us...>]

Revision: 2507
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2507&view=rev
Author:   lgao4
Date:     2012-03-27 05:56:14 +0000 (Tue, 27 Mar 2012)
Log Message:
-----------
Add LzmaF86Compress tool to only use the standard options. 
Signed-off-by: Liming Gao <lim...@in...>
Reviewed-by: Larry Hauch <lar...@in...>

Modified Paths:
--------------
    trunk/BaseTools/Conf/tools_def.template
    trunk/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py

Added Paths:
-----------
    trunk/BaseTools/Bin/CYGWIN_NT-5.1-i686/LzmaF86Compress
    trunk/BaseTools/BinWrappers/PosixLike/LzmaF86Compress

Added: trunk/BaseTools/Bin/CYGWIN_NT-5.1-i686/LzmaF86Compress
===================================================================
--- trunk/BaseTools/Bin/CYGWIN_NT-5.1-i686/LzmaF86Compress	                        (rev 0)
+++ trunk/BaseTools/Bin/CYGWIN_NT-5.1-i686/LzmaF86Compress	2012-03-27 05:56:14 UTC (rev 2507)
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+#
+# This script will exec LzmaCompress tool with --f86 option that enables converter for x86 code.
+#
+# Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>
+# 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.
+#
+
+for arg in $*; do
+  if [ "arg" = "-e" -o "arg" = "-d" ]; then
+    FLAG=--f86
+    break;
+  fi
+done
+
+LzmaCompress $* $FLAG


Property changes on: trunk/BaseTools/Bin/CYGWIN_NT-5.1-i686/LzmaF86Compress
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/BaseTools/BinWrappers/PosixLike/LzmaF86Compress
===================================================================
--- trunk/BaseTools/BinWrappers/PosixLike/LzmaF86Compress	                        (rev 0)
+++ trunk/BaseTools/BinWrappers/PosixLike/LzmaF86Compress	2012-03-27 05:56:14 UTC (rev 2507)
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+#
+# This script will exec LzmaCompress tool with --f86 option that enables converter for x86 code.
+#
+# Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>
+# 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.
+#
+
+for arg in $*; do
+  if [ "arg" = "-e" -o "arg" = "-d" ]; then
+    FLAG=--f86
+    break;
+  fi
+done
+
+LzmaCompress $* $FLAG


Property changes on: trunk/BaseTools/BinWrappers/PosixLike/LzmaF86Compress
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/BaseTools/Conf/tools_def.template
===================================================================
--- trunk/BaseTools/Conf/tools_def.template	2012-03-23 07:00:57 UTC (rev 2506)
+++ trunk/BaseTools/Conf/tools_def.template	2012-03-27 05:56:14 UTC (rev 2507)
@@ -4370,13 +4370,12 @@
 *_*_*_LZMA_GUID          = EE4E5898-3914-4259-9D6E-DC7BD79403CF
 
 ##################
-# LzmaCompress tool definitions with converter for x86 code.
+# LzmaF86Compress tool definitions with converter for x86 code.
 # It can improve the compression ratio if the input file is IA32 or X64 PE image.
 # Notes: If X64 PE image is built based on GCC44, it may not get the better compression.
 ##################
-*_*_*_LZMAF86_PATH         = LzmaCompress
+*_*_*_LZMAF86_PATH         = LzmaF86Compress
 *_*_*_LZMAF86_GUID         = D42AE6BD-1352-4bfb-909A-CA72A6EAE889
-*_*_*_LZMAF86_FLAGS        = --f86
 
 ##################
 # TianoCompress tool definitions

Modified: trunk/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
===================================================================
--- trunk/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py	2012-03-23 07:00:57 UTC (rev 2506)
+++ trunk/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py	2012-03-27 05:56:14 UTC (rev 2507)
@@ -1,7 +1,7 @@
 ## @file
 # Global variables for GenFds
 #
-#  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -581,7 +581,7 @@
                 sys.stdout.write('\n')
 
         try:
-            PopenObject = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr= subprocess.PIPE)
+            PopenObject = subprocess.Popen(' '.join(cmd), stdout=subprocess.PIPE, stderr= subprocess.PIPE, shell=True)
         except Exception, X:
             EdkLogger.error("GenFds", COMMAND_FAILURE, ExtraData="%s: %s" % (str(X), cmd[0]))
         (out, error) = PopenObject.communicate()

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.