Enable building of Carbon toolbox modules with unix-Python.

diff --git a/Mac/Modules/ae/aescan.py b/Mac/Modules/ae/aescan.py
index 21d5299261fbac9bd6162c25c485b06cce39e736..b406ce784f40a5a3a43c68caa55ff074494061e3 100644 (file)
--- 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 fe6b30d840e61b3d09f6d2fbda11d815a03cd20b..286d3ce5167daa12953afbec88cd3f7044774b6d 100644 (file)
--- 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 0cc048a3268334d2545b92eedb61efbad137646a..467b8a848af7bca2299092cc0649131c16bbadb6 100644 (file)
--- 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 85178e4006b1a9bf1cee0bd1b45500f38acd018b..0bcf914842e7c8d20200e69a749215370e5978fb 100644 (file)
--- 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 f67647008d195cf923f91059833914e42c36efb0..4ed2127be76542fa15b0832754cb43231838a965 100755 (executable)
--- 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 1136fe5d73d048e9198c59029cca65ee8d6df118..c846eb00af7b9c5d15a1003cdb021da4bb2c34c3 100644 (file)
--- 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 0e0a80aa1584aae08b00482170235c4a1f96b3bc..aac2cc44468615e8b9d55098a382a8ab95820272 100644 (file)
--- 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 b1f9a1477976a981155618d1c0b9a65843824061..828fd540692193445e6cfbe9f6afe5733c92cba4 100644 (file)
--- 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 1a8d269dde7cbcc42465e0a77a44e2dc2797739c..833fca1ec92a8734211ecb384c457ceec6c9b43f 100644 (file)
--- 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 82b92608b627a9eca4e17a345cc1dd6efd0d8181..dcb9ee040de020e05072e0e56a1f95e274820201 100644 (file)
--- 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 7b2b142aee128ab5cd82c944a0f47805444c2fb1..8deee504dd6cb0c419c0cecde8bd3880a3f9fb90 100644 (file)
--- 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 6932793c5326a2c4d7d66c207f30d4ec3f80a5db..fdfd78028eb46fcaee49ae3f953505a18e71cf4d 100644 (file)
--- 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 db6285869d0a4cf84b41d833109c937e628f65ce..ff2de327e356e7091dea496033ab162de0d46c9a 100644 (file)
--- 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 9312629b318d16a6c2229e16151a3e93907d0dfb..c0dea7e901825b52194f424486875e4d5f2eaffd 100644 (file)
--- 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 3b24a6df6fdcbcb12c70e161fdd5528db0fe47fa..519d9e52e6226c1b7ec6dc09905df54d3fdc6d4e 100644 (file)
--- 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 0817e76f6e4457e9f1124961761da757c9b64196..d9638aa32adec1949aef801ac54be7ba1c05c972 100644 (file)
--- 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 11be8f219092b4d56f4dc8326ceaf4e947398ccd..625e7ed71a69b245d660a0ac1d06c1dd6b690b78 100644 (file)
--- 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 80c966eb327ff2a2f1309ce56f381aa9d715b3ad..e55f22270300ac24ef00a05df2449d714191f90d 100644 (file)
--- 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 756291514ffbb393b829af5ee9d573bdfe4ab52f..1258a303db14c2f69fb1f85453c2b4e95bc467a1 100644 (file)
--- 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 4f188a6cf266ef35ca5c24a8832ef980f57fab17..b2b55b22fc5f03e006b36d5bf5175d9d4e50d1ac 100644 (file)
--- 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 f0e3d1eca1086043d0a0603effe24d73bc2bb147..bcd16d91d9ea0abe5375ec6228ce0d8356d68173 100644 (file)
--- 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 8c51528e40c85c2a7987aa86043200ae6422d85d..cf4bcb136f420d98b52a5af7a32944984984c7b5 100644 (file)
--- 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 6227446c80daea8e18e8f657d4b114c117fa8131..dbb083b3643d72d1d27d12a40d9b1eaa0b846cff 100644 (file)
--- 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 560e2fd0eb88c4f044cdda7b9c4cc6f77ae88031..fc665bb4bcda094cde5d74c16f9bb34d758a1285 100644 (file)
--- 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 c9cff60449e64fba5d1ec9621e1b9ce2b2895d7b..5ad1f18ea776f56ed342677e82510c11cbad7764 100644 (file)
--- 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 cfe3eb3c33ac6a7d75380bff72635b04e4568db9..0052fad60c0600d313b01a6e847e15336e63691c 100644 (file)
--- 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