diff options
26 files changed, 26 insertions, 58 deletions
diff --git a/Mac/Modules/ae/aescan.py b/Mac/Modules/ae/aescan.py index 21d52992..b406ce7 100644 --- a/Mac/Modules/ae/aescan.py +++ b/Mac/Modules/ae/aescan.py @@ -7,9 +7,8 @@ import os import string import MacOS -BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen') +from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) -from bgenlocations import TOOLBOXDIR from scantools import Scanner diff --git a/Mac/Modules/app/appscan.py b/Mac/Modules/app/appscan.py index fe6b30d..286d3ce 100644 --- a/Mac/Modules/app/appscan.py +++ b/Mac/Modules/app/appscan.py @@ -2,10 +2,9 @@ import sys import os -BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen') +from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) from scantools import Scanner -from bgenlocations import TOOLBOXDIR LONG = "Appearance" SHORT = "app" diff --git a/Mac/Modules/carbonevt/CarbonEvtscan.py b/Mac/Modules/carbonevt/CarbonEvtscan.py index 0cc048a..467b8a8 100644 --- a/Mac/Modules/carbonevt/CarbonEvtscan.py +++ b/Mac/Modules/carbonevt/CarbonEvtscan.py @@ -6,11 +6,9 @@ import string import MacOS import sys -BGENDIR= os.path.join(sys.prefix, ':Tools:bgen:bgen:') +from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) -from bgenlocations import TOOLBOXDIR - from scantools import Scanner, Scanner_OSX def main(): diff --git a/Mac/Modules/cf/cfscan.py b/Mac/Modules/cf/cfscan.py index 85178e4..0bcf914 100644 --- a/Mac/Modules/cf/cfscan.py +++ b/Mac/Modules/cf/cfscan.py @@ -2,10 +2,9 @@ import sys import os -BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen') +from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) from scantools import Scanner_OSX -from bgenlocations import TOOLBOXDIR LONG = "CoreFoundation" SHORT = "cf" diff --git a/Mac/Modules/cg/cgscan.py b/Mac/Modules/cg/cgscan.py index f676470..4ed2127 100755 --- a/Mac/Modules/cg/cgscan.py +++ b/Mac/Modules/cg/cgscan.py @@ -2,10 +2,9 @@ import sys import os -BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen') +from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) from scantools import Scanner_OSX -from bgenlocations import TOOLBOXDIR LONG = "CoreGraphics" SHORT = "cg" diff --git a/Mac/Modules/cm/cmscan.py b/Mac/Modules/cm/cmscan.py index 1136fe5..c846eb0 100644 --- a/Mac/Modules/cm/cmscan.py +++ b/Mac/Modules/cm/cmscan.py @@ -2,10 +2,9 @@ import sys import os -BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen') +from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) from scantools import Scanner -from bgenlocations import TOOLBOXDIR LONG = "Components" SHORT = "cm" diff --git a/Mac/Modules/ctl/ctlscan.py b/Mac/Modules/ctl/ctlscan.py index 0e0a80a..aac2cc4 100644 --- a/Mac/Modules/ctl/ctlscan.py +++ b/Mac/Modules/ctl/ctlscan.py @@ -1,11 +1,10 @@ # Scan <Controls.h>, generating ctlgen.py. import sys import os -BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen') +from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) from scantools import Scanner -from bgenlocations import TOOLBOXDIR def main(): # input = "Controls.h" # Universal Headers < 3.3 diff --git a/Mac/Modules/dlg/dlgscan.py b/Mac/Modules/dlg/dlgscan.py index b1f9a14..828fd54 100644 --- a/Mac/Modules/dlg/dlgscan.py +++ b/Mac/Modules/dlg/dlgscan.py @@ -2,11 +2,10 @@ import sys import os -BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen') +from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) from scantools import Scanner -from bgenlocations import TOOLBOXDIR LONG = "Dialogs" SHORT = "dlg" diff --git a/Mac/Modules/drag/dragscan.py b/Mac/Modules/drag/dragscan.py index 1a8d269..833fca1 100644 --- a/Mac/Modules/drag/dragscan.py +++ b/Mac/Modules/drag/dragscan.py @@ -1,11 +1,10 @@ # Scan <Drag.h>, generating draggen.py. import sys import os -BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen') +from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) from scantools import Scanner -from bgenlocations import TOOLBOXDIR, INCLUDEDIR MISSING_DEFINES=""" kDragHasLeftSenderWindow = (1 << 0) diff --git a/Mac/Modules/evt/evtscan.py b/Mac/Modules/evt/evtscan.py index 82b9260..dcb9ee0 100644 --- a/Mac/Modules/evt/evtscan.py +++ b/Mac/Modules/evt/evtscan.py @@ -2,10 +2,9 @@ import sys import os -BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen') +from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) from scantools import Scanner -from bgenlocations import TOOLBOXDIR LONG = "Events" SHORT = "evt" diff --git a/Mac/Modules/fm/fmscan.py b/Mac/Modules/fm/fmscan.py index 7b2b142..8deee50 100644 --- a/Mac/Modules/fm/fmscan.py +++ b/Mac/Modules/fm/fmscan.py @@ -2,10 +2,9 @@ import sys import os -BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen') +from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) from scantools import Scanner -from bgenlocations import TOOLBOXDIR LONG = "Fonts" SHORT = "fm" diff --git a/Mac/Modules/help/helpscan.py b/Mac/Modules/help/helpscan.py index 6932793..fdfd780 100644 --- a/Mac/Modules/help/helpscan.py +++ b/Mac/Modules/help/helpscan.py @@ -2,10 +2,9 @@ import sys import os -BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen') +from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) from scantools import Scanner -from bgenlocations import TOOLBOXDIR LONG = "Balloons" SHORT = "help" diff --git a/Mac/Modules/htmlrender/htmlscan.py b/Mac/Modules/htmlrender/htmlscan.py index db62858..ff2de32 100644 --- a/Mac/Modules/htmlrender/htmlscan.py +++ b/Mac/Modules/htmlrender/htmlscan.py @@ -2,11 +2,10 @@ import sys import os -BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen') +from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) from scantools import Scanner -from bgenlocations import TOOLBOXDIR LONG = "HtmlRendering" SHORT = "html" diff --git a/Mac/Modules/ibcarbon/IBCarbonscan.py b/Mac/Modules/ibcarbon/IBCarbonscan.py index 9312629..c0dea7e 100644 --- a/Mac/Modules/ibcarbon/IBCarbonscan.py +++ b/Mac/Modules/ibcarbon/IBCarbonscan.py @@ -3,12 +3,9 @@ import sys import os import string -import MacOS -BGENDIR= '/Users/jack/src/python/Tools/bgen/bgen' +from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) -print sys.path, sys.prefix -from bgenlocations import TOOLBOXDIR from scantools import Scanner_OSX diff --git a/Mac/Modules/icn/icnscan.py b/Mac/Modules/icn/icnscan.py index 3b24a6d..519d9e5 100644 --- a/Mac/Modules/icn/icnscan.py +++ b/Mac/Modules/icn/icnscan.py @@ -2,10 +2,9 @@ import sys import os -BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen') +from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) from scantools import Scanner -from bgenlocations import TOOLBOXDIR LONG = "Icons" SHORT = "icn" diff --git a/Mac/Modules/list/listscan.py b/Mac/Modules/list/listscan.py index 0817e76..d9638aa 100644 --- a/Mac/Modules/list/listscan.py +++ b/Mac/Modules/list/listscan.py @@ -2,10 +2,9 @@ import sys import os -BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen') +from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) from scantools import Scanner -from bgenlocations import TOOLBOXDIR LONG = "Lists" SHORT = "list" diff --git a/Mac/Modules/menu/menuscan.py b/Mac/Modules/menu/menuscan.py index 11be8f2..625e7ed 100644 --- a/Mac/Modules/menu/menuscan.py +++ b/Mac/Modules/menu/menuscan.py @@ -1,11 +1,10 @@ # Scan <Menus.h>, generating menugen.py. import sys import os -BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen') +from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) from scantools import Scanner -from bgenlocations import TOOLBOXDIR def main(): input = "Menus.h" diff --git a/Mac/Modules/mlte/mltescan.py b/Mac/Modules/mlte/mltescan.py index 80c966e..e55f222 100644 --- a/Mac/Modules/mlte/mltescan.py +++ b/Mac/Modules/mlte/mltescan.py @@ -2,10 +2,9 @@ import sys import os -BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen') +from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) from scantools import Scanner_OSX -from bgenlocations import TOOLBOXDIR LONG = "MacTextEditor" SHORT = "mlte" diff --git a/Mac/Modules/qd/qdscan.py b/Mac/Modules/qd/qdscan.py index 7562915..1258a30 100644 --- a/Mac/Modules/qd/qdscan.py +++ b/Mac/Modules/qd/qdscan.py @@ -2,11 +2,10 @@ import sys import os -BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen') +from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) from scantools import Scanner -from bgenlocations import TOOLBOXDIR def main(): input = "QuickDraw.h" diff --git a/Mac/Modules/qdoffs/qdoffsscan.py b/Mac/Modules/qdoffs/qdoffsscan.py index 4f188a6..b2b55b2 100644 --- a/Mac/Modules/qdoffs/qdoffsscan.py +++ b/Mac/Modules/qdoffs/qdoffsscan.py @@ -1,9 +1,8 @@ # Scan an Apple header file, generating a Python file of generator calls. import sys import os -BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen') +from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) -from bgenlocations import TOOLBOXDIR from scantools import Scanner diff --git a/Mac/Modules/qt/qtscan.py b/Mac/Modules/qt/qtscan.py index f0e3d1e..bcd16d9 100644 --- a/Mac/Modules/qt/qtscan.py +++ b/Mac/Modules/qt/qtscan.py @@ -2,10 +2,9 @@ import sys import os -BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen') +from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) from scantools import Scanner -from bgenlocations import TOOLBOXDIR LONG = "QuickTime" SHORT = "qt" diff --git a/Mac/Modules/res/resscan.py b/Mac/Modules/res/resscan.py index 8c51528..cf4bcb1 100644 --- a/Mac/Modules/res/resscan.py +++ b/Mac/Modules/res/resscan.py @@ -7,9 +7,8 @@ import os import string import MacOS -BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen') +from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) -from bgenlocations import TOOLBOXDIR from scantools import Scanner diff --git a/Mac/Modules/scrap/scrapscan.py b/Mac/Modules/scrap/scrapscan.py index 6227446..dbb083b 100644 --- a/Mac/Modules/scrap/scrapscan.py +++ b/Mac/Modules/scrap/scrapscan.py @@ -5,13 +5,9 @@ import sys import os -if os.sep == ':': - BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen') -else: - BGENDIR="../../../Tools/bgen/bgen" +from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) from scantools import Scanner -from bgenlocations import TOOLBOXDIR LONG = "Scrap" SHORT = "scrap" diff --git a/Mac/Modules/snd/sndscan.py b/Mac/Modules/snd/sndscan.py index 560e2fd..fc665bb 100644 --- a/Mac/Modules/snd/sndscan.py +++ b/Mac/Modules/snd/sndscan.py @@ -4,9 +4,8 @@ import sys import os -BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen') +from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) -from bgenlocations import TOOLBOXDIR from scantools import Scanner diff --git a/Mac/Modules/te/tescan.py b/Mac/Modules/te/tescan.py index c9cff60..5ad1f18 100644 --- a/Mac/Modules/te/tescan.py +++ b/Mac/Modules/te/tescan.py @@ -2,10 +2,9 @@ import sys import os -BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen') +from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) from scantools import Scanner -from bgenlocations import TOOLBOXDIR LONG = "TextEdit" SHORT = "te" diff --git a/Mac/Modules/win/winscan.py b/Mac/Modules/win/winscan.py index cfe3eb3..0052fad 100644 --- a/Mac/Modules/win/winscan.py +++ b/Mac/Modules/win/winscan.py @@ -1,9 +1,8 @@ # Scan an Apple header file, generating a Python file of generator calls. import sys import os -BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen') +from bgenlocations import TOOLBOXDIR, BGENDIR sys.path.append(BGENDIR) -from bgenlocations import TOOLBOXDIR from scantools import Scanner |