Changed the import path

git-svn-id: https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools@329 7335b38e-4728-0410-8992-fb3ffe349368

diff --git a/Source/Python/AutoGen/AutoGen.py b/Source/Python/AutoGen/AutoGen.py
index e07a45d..ac2cda0 100644 (file)
--- a/Source/Python/AutoGen/AutoGen.py
+++ b/Source/Python/AutoGen/AutoGen.py
@@ -2,19 +2,20 @@
 import sys
 import os
 import re
-import EdkLogger
 import os.path as path
 import imp
+
+import Common.EdkLogger
 import GenC
 import GenMake
 import GenDepex
 
-from EdkIIWorkspaceBuild import *
-from EdkIIWorkspace import *
-from DataType import *
 from BuildInfo import *
 from StrGather import *
-from BuildToolError import *
+from Common.BuildToolError import *
+from Common.EdkIIWorkspaceBuild import *
+from Common.EdkIIWorkspace import *
+from Common.DataType import *
 
 #
 # generate AutoGen.c, AutoGen.h

diff --git a/Source/Python/AutoGen/GenC.py b/Source/Python/AutoGen/GenC.py
index a46722f..ec827ba 100644 (file)
--- a/Source/Python/AutoGen/GenC.py
+++ b/Source/Python/AutoGen/GenC.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 import string
-import EdkLogger
 
-from BuildToolError import *
-from DataType import *
-from EdkIIWorkspace import *
+import Common.EdkLogger
+
+from Common.BuildToolError import *
+from Common.DataType import *
+from Common.EdkIIWorkspace import *
 from BuildInfo import *
 from StrGather import *
 

diff --git a/Source/Python/AutoGen/GenDepex.py b/Source/Python/AutoGen/GenDepex.py
index 24f028c..3a703d0 100644 (file)
--- a/Source/Python/AutoGen/GenDepex.py
+++ b/Source/Python/AutoGen/GenDepex.py
@@ -16,8 +16,8 @@ import os
 import re
 from StringIO import StringIO
 from struct import pack
-from EdkIIWorkspace import CreateDirectory
-from BuildToolError import *
+from Common.EdkIIWorkspace import CreateDirectory
+from Common.BuildToolError import *
 
 gType2Phase = {
     "BASE"              :   None,

diff --git a/Source/Python/AutoGen/GenMake.py b/Source/Python/AutoGen/GenMake.py
index d1d2f03..d0fd779 100644 (file)
--- a/Source/Python/AutoGen/GenMake.py
+++ b/Source/Python/AutoGen/GenMake.py
@@ -2,14 +2,16 @@
 \r
 """Create makefile for MS nmake and GNU make"""\r
 \r
-import os, sys, string, re\r
+import os\r
+import sys\r
+import string\r
+import re\r
 import os.path as path\r
 \r
-from SequentialDict import *\r
-from EdkIIWorkspaceBuild import *\r
-from EdkIIWorkspace import *\r
+from Common.EdkIIWorkspaceBuild import *\r
+from Common.EdkIIWorkspace import *\r
+from Common.BuildToolError import *\r
 from BuildInfo import *\r
-from BuildToolError import *\r
 \r
 gDependencyDatabase = {}    # file path : [dependent files list]\r
 gIncludePattern = re.compile("^[ \t#]*include[ \t]+[\"<]*([^\"<>]+)[>\" \t\n\r]*", re.MULTILINE | re.UNICODE)\r

diff --git a/Source/Python/AutoGen/StrGather.py b/Source/Python/AutoGen/StrGather.py
index b93582a..84ea97b 100644 (file)
--- a/Source/Python/AutoGen/StrGather.py
+++ b/Source/Python/AutoGen/StrGather.py
@@ -11,9 +11,9 @@
 #This file is used to parse a strings file and create or add to a string database file.\r
 #\r
 \r
-import EdkLogger\r
+import Common.EdkLogger\r
+from Common.BuildToolError import *\r
 from UniClassObject import *\r
-from BuildToolError import *\r
 \r
 HexHeader = '0x'\r
 \r

diff --git a/Source/Python/AutoGen/UniClassObject.py b/Source/Python/AutoGen/UniClassObject.py
index 282149b..429a853 100644 (file)
--- a/Source/Python/AutoGen/UniClassObject.py
+++ b/Source/Python/AutoGen/UniClassObject.py
@@ -12,8 +12,8 @@
 #\r
 \r
 import os, codecs\r
-import EdkLogger\r
-from BuildToolError import *\r
+import Common.EdkLogger\r
+from Common.BuildToolError import *\r
 \r
 UNICODE_WIDE_CHAR = u'\\wide'\r
 UNICODE_NARROW_CHAR = u'\\narrow'\r

diff --git a/Source/Python/AutoGen/__init__.py b/Source/Python/AutoGen/__init__.py
index e69de29..d6fa5ec 100644 (file)
--- a/Source/Python/AutoGen/__init__.py
+++ b/Source/Python/AutoGen/__init__.py
@@ -0,0 +1,10 @@
+# Copyright (c) 2007, Intel Corporation\r
+# All rights reserved. This program and the accompanying materials\r
+# are licensed and made available under the terms and conditions of the BSD License\r
+# which accompanies this distribution.  The full text of the license may be found at\r
+# http://opensource.org/licenses/bsd-license.php\r
+#\r
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+\r
+__all__ = ["AutoGen"]\r

diff --git a/Source/Python/Common/EdkIIWorkspaceBuild.py b/Source/Python/Common/EdkIIWorkspaceBuild.py
index 7fa455a..50d713e 100644 (file)
--- a/Source/Python/Common/EdkIIWorkspaceBuild.py
+++ b/Source/Python/Common/EdkIIWorkspaceBuild.py
@@ -25,9 +25,9 @@ from DecClassObject import *
 from DscClassObject import *\r
 from String import *\r
 from ClassObjects.CommonClassObject import *\r
-from FdfParser import *\r
+from GenFds.FdfParser import *\r
 from BuildToolError import *\r
-from Region import *\r
+from GenFds.Region import *\r
 \r
 class ModuleSourceFilesClassObject(object):\r
     def __init__(self, SourceFile = '', PcdFeatureFlag = '', TagName = '', ToolCode = '', ToolChainFamily = '', String = ''):\r

diff --git a/Source/Python/GenFds/FfsInfStatement.py b/Source/Python/GenFds/FfsInfStatement.py
index a389148..0deb481 100644 (file)
--- a/Source/Python/GenFds/FfsInfStatement.py
+++ b/Source/Python/GenFds/FfsInfStatement.py
@@ -7,7 +7,7 @@ import sys
 import Section\r
 import RuleSimpleFile\r
 import RuleComplexFile\r
-from String import *\r
+from Common.String import *\r
 \r
 class FfsInfStatement(Ffs.Ffs):\r
     def __init__(self):\r

diff --git a/Source/Python/GenFds/GenFds.py b/Source/Python/GenFds/GenFds.py
index f4eceb4..4755589 100644 (file)
--- a/Source/Python/GenFds/GenFds.py
+++ b/Source/Python/GenFds/GenFds.py
@@ -3,7 +3,7 @@ import sys
 import os\r
 import FdfParser\r
 from GenFdsGlobalVariable import GenFdsGlobalVariable\r
-import EdkIIWorkspaceBuild\r
+import Common.EdkIIWorkspaceBuild\r
 import RuleComplexFile\r
 from EfiSection import EfiSection\r
 import StringIO\r