summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2002-08-05 15:39:30 +0000
committerJack Jansen <jack.jansen@cwi.nl>2002-08-05 15:39:30 +0000
commitaaebdd6a02dd4d650b14e2192e327336ecb62a98 (patch)
tree4afe45b89281ab71ca8d2f66265adc4a09dd5544
parentff8dec7427ac1084ea375bbf904e365138b69aae (diff)
downloadcpython-git-aaebdd6a02dd4d650b14e2192e327336ecb62a98.tar.gz
Enable building of Carbon toolbox modules with unix-Python.
Diffstat
-rw-r--r--Mac/Modules/ae/aescan.py3
-rw-r--r--Mac/Modules/app/appscan.py3
-rw-r--r--Mac/Modules/carbonevt/CarbonEvtscan.py4
-rw-r--r--Mac/Modules/cf/cfscan.py3
-rwxr-xr-xMac/Modules/cg/cgscan.py3
-rw-r--r--Mac/Modules/cm/cmscan.py3
-rw-r--r--Mac/Modules/ctl/ctlscan.py3
-rw-r--r--Mac/Modules/dlg/dlgscan.py3
-rw-r--r--Mac/Modules/drag/dragscan.py3
-rw-r--r--Mac/Modules/evt/evtscan.py3
-rw-r--r--Mac/Modules/fm/fmscan.py3
-rw-r--r--Mac/Modules/help/helpscan.py3
-rw-r--r--Mac/Modules/htmlrender/htmlscan.py3
-rw-r--r--Mac/Modules/ibcarbon/IBCarbonscan.py5
-rw-r--r--Mac/Modules/icn/icnscan.py3
-rw-r--r--Mac/Modules/list/listscan.py3
-rw-r--r--Mac/Modules/menu/menuscan.py3
-rw-r--r--Mac/Modules/mlte/mltescan.py3
-rw-r--r--Mac/Modules/qd/qdscan.py3
-rw-r--r--Mac/Modules/qdoffs/qdoffsscan.py3
-rw-r--r--Mac/Modules/qt/qtscan.py3
-rw-r--r--Mac/Modules/res/resscan.py3
-rw-r--r--Mac/Modules/scrap/scrapscan.py6
-rw-r--r--Mac/Modules/snd/sndscan.py3
-rw-r--r--Mac/Modules/te/tescan.py3
-rw-r--r--Mac/Modules/win/winscan.py3
26 files changed, 26 insertions, 58 deletions
diff --git a/Mac/Modules/ae/aescan.py b/Mac/Modules/ae/aescan.py
index 21d5299261..b406ce784f 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 fe6b30d840..286d3ce516 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 0cc048a326..467b8a848a 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 85178e4006..0bcf914842 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 f67647008d..4ed2127be7 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 1136fe5d73..c846eb00af 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 0e0a80aa15..aac2cc4446 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 b1f9a14779..828fd54069 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 1a8d269dde..833fca1ec9 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 82b92608b6..dcb9ee040d 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 7b2b142aee..8deee504dd 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 6932793c53..fdfd78028e 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 db6285869d..ff2de327e3 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 9312629b31..c0dea7e901 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 3b24a6df6f..519d9e52e6 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 0817e76f6e..d9638aa32a 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 11be8f2190..625e7ed71a 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 80c966eb32..e55f222703 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 756291514f..1258a303db 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 4f188a6cf2..b2b55b22fc 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 f0e3d1eca1..bcd16d91d9 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 8c51528e40..cf4bcb136f 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 6227446c80..dbb083b364 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 560e2fd0eb..fc665bb4bc 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 c9cff60449..5ad1f18ea7 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 cfe3eb3c33..0052fad60c 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
View Lorry Controller Status