Replaced addpack by handcrafted code to find the bgen stuff.

diff --git a/Mac/Modules/ae/aescan.py b/Mac/Modules/ae/aescan.py
index 620a91c8a749cf10a37739b71063b4ba16f9124f..c1f4251a4700a0f019f3e9ca04b25f085f915b76 100644 (file)
--- a/Mac/Modules/ae/aescan.py
+++ b/Mac/Modules/ae/aescan.py
@@ -1,15 +1,16 @@
 # Scan AppleEvents.h header file, generate aegen.py and AppleEvents.py files.
 # Then run aesupport to generate AEmodule.c.
-0# (Should learn how to tell the compiler to compile it as well.)
+# (Should learn how to tell the compiler to compile it as well.)
 
-import addpack
-addpack.addpack(':Tools:bgen:bgen')
 import sys
 import os
 import string
 import regex
 import regsub
 import MacOS
+
+BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen')
+sys.path.append(BGENDIR)
 from bgenlocations import TOOLBOXDIR
 
 from scantools import Scanner

diff --git a/Mac/Modules/ae/aesupport.py b/Mac/Modules/ae/aesupport.py
index f2c947fcb836fd08354aebeb7e585f36243fc426..58af2df9be363614cf7f7c3d76fce628cb78d46f 100644 (file)
--- a/Mac/Modules/ae/aesupport.py
+++ b/Mac/Modules/ae/aesupport.py
@@ -3,8 +3,6 @@
 # It execs the file aegen.py which contain the function definitions
 # (aegen.py was generated by aescan.py, scanning the <AppleEvents.h> header file).
 
-import addpack
-addpack.addpack(':Tools:bgen:bgen')
 
 from macsupport import *
 

diff --git a/Mac/Modules/ae/nsremote.py b/Mac/Modules/ae/nsremote.py
index cace37450ea31cc9bac77e983173bf5958a4b262..d823216bcb6739ec5e8b4e4d99f352b08ccd1a19 100644 (file)
--- a/Mac/Modules/ae/nsremote.py
+++ b/Mac/Modules/ae/nsremote.py
@@ -11,13 +11,8 @@ Jack Jansen, CWI, January 1996.
 # be nicer to use the more "object oriented" standard OSA stuff, when it
 # is implemented in Netscape.
 #
-import addpack
 import sys
 
-addpack.addpack('Tools')
-addpack.addpack('bgen')
-addpack.addpack('ae')
-
 import aetools
 import Standard_Suite
 import WWW_Suite

diff --git a/Mac/Modules/cm/cmscan.py b/Mac/Modules/cm/cmscan.py
index 3e091a6dd86b08758eb077fa3d78f06b5d387449..e1db4b4d4be82b6db8374a96eac2fcc1b2123edb 100644 (file)
--- a/Mac/Modules/cm/cmscan.py
+++ b/Mac/Modules/cm/cmscan.py
@@ -1,7 +1,9 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
-import addpack
-addpack.addpack(':tools:bgen:bgen')
+import sys
+import os
+BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen')
+sys.path.append(BGENDIR)
 from scantools import Scanner
 from bgenlocations import TOOLBOXDIR
 

diff --git a/Mac/Modules/ctl/ctlscan.py b/Mac/Modules/ctl/ctlscan.py
index 311295bdec389169faefbf5ee8ac8eac9fcb95b5..4c4dbd1711a7163cfe3d2589f60255fb08bce24d 100644 (file)
--- a/Mac/Modules/ctl/ctlscan.py
+++ b/Mac/Modules/ctl/ctlscan.py
@@ -1,6 +1,8 @@
 # Scan <Controls.h>, generating ctlgen.py.
-import addpack
-addpack.addpack(':Tools:bgen:bgen')
+import sys
+import os
+BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen')
+sys.path.append(BGENDIR)
 
 from scantools import Scanner
 from bgenlocations import TOOLBOXDIR

diff --git a/Mac/Modules/ctl/ctlsupport.py b/Mac/Modules/ctl/ctlsupport.py
index a905970b8fe347b42a24f8344d494b12a3b91ad9..cee9a4c39e9ad13e4d0ad8b81431d667a087e0d3 100644 (file)
--- a/Mac/Modules/ctl/ctlsupport.py
+++ b/Mac/Modules/ctl/ctlsupport.py
@@ -5,9 +5,6 @@
 
 import string
 
-import addpack
-addpack.addpack(':Tools:bgen:bgen')
-
 # Declarations that change for each manager
 MACHEADERFILE = 'Controls.h'           # The Apple header file
 MODNAME = 'Ctl'                                # The name of the module

diff --git a/Mac/Modules/dlg/dlgscan.py b/Mac/Modules/dlg/dlgscan.py
index d51a2d1e26bb9b742ff9f76c0091e037d64c27fd..7ae13410fef2197d4a10e383d718869863650c73 100644 (file)
--- a/Mac/Modules/dlg/dlgscan.py
+++ b/Mac/Modules/dlg/dlgscan.py
@@ -1,7 +1,9 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
-import addpack
-addpack.addpack(':Tools:bgen:bgen')
+import sys
+import os
+BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen')
+sys.path.append(BGENDIR)
 
 from scantools import Scanner
 from bgenlocations import TOOLBOXDIR

diff --git a/Mac/Modules/dlg/dlgsupport.py b/Mac/Modules/dlg/dlgsupport.py
index b8531ca9e7c542c3afba6a096b583c83f8164b2b..cbec13032bf1a103c3019066e60dd2ff62631fd2 100644 (file)
--- a/Mac/Modules/dlg/dlgsupport.py
+++ b/Mac/Modules/dlg/dlgsupport.py
@@ -3,9 +3,6 @@
 # It execs the file dlggen.py which contain the function definitions
 # (dlggen.py was generated by dlgscan.py, scanning the <Dialogs.h> header file).
 
-import addpack
-addpack.addpack(':Tools:bgen:bgen')
-
 from macsupport import *
 
 # Create the type objects

diff --git a/Mac/Modules/evt/evtscan.py b/Mac/Modules/evt/evtscan.py
index 676c839f58e88dd9b93aa041c0669346469b0c74..3b3765fc34b86164c6d042e4c95804cd89b3c035 100644 (file)
--- a/Mac/Modules/evt/evtscan.py
+++ b/Mac/Modules/evt/evtscan.py
@@ -1,7 +1,9 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
-import addpack
-addpack.addpack(':tools:bgen:bgen')
+import sys
+import os
+BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen')
+sys.path.append(BGENDIR)
 from scantools import Scanner
 from bgenlocations import TOOLBOXDIR
 

diff --git a/Mac/Modules/fm/fmscan.py b/Mac/Modules/fm/fmscan.py
index 3f0e51b97129f791317c43be0d4b5e9dc9f936c0..d111964b5c9b42660e99e046622a143fabfadc46 100644 (file)
--- a/Mac/Modules/fm/fmscan.py
+++ b/Mac/Modules/fm/fmscan.py
@@ -1,7 +1,9 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
-import addpack
-addpack.addpack(':tools:bgen:bgen')
+import sys
+import os
+BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen')
+sys.path.append(BGENDIR)
 from scantools import Scanner
 from bgenlocations import TOOLBOXDIR
 

diff --git a/Mac/Modules/help/helpscan.py b/Mac/Modules/help/helpscan.py
index 3b1db65df10062bf060adc22d3a6722299799e02..da95e857072c344e47a5d84ff7863b79ca8369ee 100644 (file)
--- a/Mac/Modules/help/helpscan.py
+++ b/Mac/Modules/help/helpscan.py
@@ -1,7 +1,9 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
-import addpack
-addpack.addpack(':tools:bgen:bgen')
+import sys
+import os
+BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen')
+sys.path.append(BGENDIR)
 from scantools import Scanner
 from bgenlocations import TOOLBOXDIR
 

diff --git a/Mac/Modules/list/listscan.py b/Mac/Modules/list/listscan.py
index dbaed68eaf35ebda1cbf12901b7e0f1487287a90..d713c39ec56235d3935b3ccee6cec6f29eac8e7d 100644 (file)
--- a/Mac/Modules/list/listscan.py
+++ b/Mac/Modules/list/listscan.py
@@ -1,7 +1,9 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
-import addpack
-addpack.addpack(':tools:bgen:bgen')
+import sys
+import os
+BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen')
+sys.path.append(BGENDIR)
 from scantools import Scanner
 from bgenlocations import TOOLBOXDIR
 

diff --git a/Mac/Modules/menu/menuscan.py b/Mac/Modules/menu/menuscan.py
index cf00dcc1d293b3ea7631d26cecbf1ec6a67d8f41..37ced2ff99bf6e811d190d458c480f085de6c898 100644 (file)
--- a/Mac/Modules/menu/menuscan.py
+++ b/Mac/Modules/menu/menuscan.py
@@ -1,6 +1,8 @@
 # Scan <Menus.h>, generating menugen.py.
-import addpack
-addpack.addpack(':Tools:bgen:bgen')
+import sys
+import os
+BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen')
+sys.path.append(BGENDIR)
 
 from scantools import Scanner
 from bgenlocations import TOOLBOXDIR

diff --git a/Mac/Modules/menu/menusupport.py b/Mac/Modules/menu/menusupport.py
index 80b08b1ee0d0c7af2c695e4832aefef1a5752ac3..cbd57bf52a76d23c52397a7e31a3ee8caef3dbd7 100644 (file)
--- a/Mac/Modules/menu/menusupport.py
+++ b/Mac/Modules/menu/menusupport.py
@@ -5,9 +5,6 @@
 
 import string
 
-import addpack
-addpack.addpack(':Tools:bgen:bgen')
-
 # Declarations that change for each manager
 MACHEADERFILE = 'Menus.h'              # The Apple header file
 MODNAME = 'Menu'                       # The name of the module

diff --git a/Mac/Modules/qd/qdscan.py b/Mac/Modules/qd/qdscan.py
index 46adaaa585a21b2496bced1f253bfd40944381e4..2619d363e6e3f771f8d530af3708ed30c7d18217 100644 (file)
--- a/Mac/Modules/qd/qdscan.py
+++ b/Mac/Modules/qd/qdscan.py
@@ -1,7 +1,9 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
-import addpack
-addpack.addpack(':Tools:bgen:bgen')
+import sys
+import os
+BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen')
+sys.path.append(BGENDIR)
 
 from scantools import Scanner
 from bgenlocations import TOOLBOXDIR

diff --git a/Mac/Modules/qd/qdsupport.py b/Mac/Modules/qd/qdsupport.py
index 461d27f0ff469dab64261db4d0eb1269b49f8985..9b1151b88b3e04b831b6f37dee025993dbf8184c 100644 (file)
--- a/Mac/Modules/qd/qdsupport.py
+++ b/Mac/Modules/qd/qdsupport.py
@@ -5,9 +5,6 @@
 
 import string
 
-import addpack
-addpack.addpack(':Tools:bgen:bgen')
-
 # Declarations that change for each manager
 MACHEADERFILE = 'QuickDraw.h'          # The Apple header file
 MODNAME = 'Qd'                         # The name of the module

diff --git a/Mac/Modules/qt/qtscan.py b/Mac/Modules/qt/qtscan.py
index ebef23bbb2b75a50c8dcdeb0cee8f32fe2120baa..9f326a68451421ffec46835ba56071757bd2d623 100644 (file)
--- a/Mac/Modules/qt/qtscan.py
+++ b/Mac/Modules/qt/qtscan.py
@@ -1,7 +1,9 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
-import addpack
-addpack.addpack(':tools:bgen:bgen')
+import sys
+import os
+BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen')
+sys.path.append(BGENDIR)
 from scantools import Scanner
 from bgenlocations import TOOLBOXDIR
 

diff --git a/Mac/Modules/res/resscan.py b/Mac/Modules/res/resscan.py
index eff0005a8cc8ee86f33362c390f358ae9abf9fbb..efb538c791c2ffd0283c0e97b4c4fb8eb96b7487 100644 (file)
--- a/Mac/Modules/res/resscan.py
+++ b/Mac/Modules/res/resscan.py
@@ -8,8 +8,9 @@ import string
 import regex
 import regsub
 import MacOS
-import addpack
-addpack.addpack(':Tools:bgen:bgen')
+
+BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen')
+sys.path.append(BGENDIR)
 from bgenlocations import TOOLBOXDIR
 
 from scantools import Scanner

diff --git a/Mac/Modules/res/ressupport.py b/Mac/Modules/res/ressupport.py
index 4b4bd2f90d7773d9836ffa1f39abf48844e299d4..5d45f2ebd00dbe4018443e15a4fc7ca59bb4fa5f 100644 (file)
--- a/Mac/Modules/res/ressupport.py
+++ b/Mac/Modules/res/ressupport.py
@@ -3,9 +3,6 @@
 # It execs the file resgen.py which contain the function definitions
 # (resgen.py was generated by resscan.py, scanning the <Resources.h> header file).
 
-import addpack
-addpack.addpack(':Tools:bgen:bgen')
-
 from macsupport import *
 
 

diff --git a/Mac/Modules/scrap/scrapscan.py b/Mac/Modules/scrap/scrapscan.py
index 0bad7c264b4514adba6d05b723028d30cc0b0a7d..95bf1bb1143dc17a456e6024b9c0197e12bacd61 100644 (file)
--- a/Mac/Modules/scrap/scrapscan.py
+++ b/Mac/Modules/scrap/scrapscan.py
@@ -3,8 +3,10 @@
 # Note that the scrap-manager include file is so weird that this
 # generates a boilerplate to be edited by hand.
 
-import addpack
-addpack.addpack(':tools:bgen:bgen')
+import sys
+import os
+BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen')
+sys.path.append(BGENDIR)
 from scantools import Scanner
 from bgenlocations import TOOLBOXDIR
 

diff --git a/Mac/Modules/snd/sndscan.py b/Mac/Modules/snd/sndscan.py
index c7ca36bcc3d18cc51d506578d0205999a5eb6bb5..f2f19ecf48f6369b7a2b6a01900a1677e4bfe519 100644 (file)
--- a/Mac/Modules/snd/sndscan.py
+++ b/Mac/Modules/snd/sndscan.py
@@ -2,8 +2,10 @@
 # Then import sndsupport (which execs sndgen.py) to generate Sndmodule.c.
 # (Should learn how to tell the compiler to compile it as well.)
 
-import addpack
-addpack.addpack(':Tools:bgen:bgen')
+import sys
+import os
+BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen')
+sys.path.append(BGENDIR)
 from bgenlocations import TOOLBOXDIR
 
 from scantools import Scanner

diff --git a/Mac/Modules/snd/sndsupport.py b/Mac/Modules/snd/sndsupport.py
index 279f22a4812a6704ff76c0d815958b16462dd1d0..9856e79a1e85b6eefa0e78fa7fc3fa6317a3635d 100644 (file)
--- a/Mac/Modules/snd/sndsupport.py
+++ b/Mac/Modules/snd/sndsupport.py
@@ -3,9 +3,6 @@
 # It execs the file sndgen.py which contain the function definitions
 # (sndgen.py was generated by sndscan.py, scanning the <Sound.h> header file).
 
-import addpack
-addpack.addpack(':Tools:bgen:bgen')
-
 from macsupport import *
 
 

diff --git a/Mac/Modules/te/TEmodule.c b/Mac/Modules/te/TEmodule.c
index 70891fffcc728cc55b74077fa5e1e3f32e791406..1c7e4f454850d6fab10c77eb2edd08836f78b915 100644 (file)
--- a/Mac/Modules/te/TEmodule.c
+++ b/Mac/Modules/te/TEmodule.c
@@ -217,7 +217,7 @@ static PyObject *TEObj_TEKey(_self, _args)
 {
        PyObject *_res = NULL;
        CharParameter key;
-       if (!PyArg_ParseTuple(_args, "c",
+       if (!PyArg_ParseTuple(_args, "h",
                              &key))
                return NULL;
        TEKey(key,

diff --git a/Mac/Modules/te/tescan.py b/Mac/Modules/te/tescan.py
index 8d919e86658003eb3cc1a6374511578cdcc276a6..0e537abef9971bda7a488905055703c14d3dde1d 100644 (file)
--- a/Mac/Modules/te/tescan.py
+++ b/Mac/Modules/te/tescan.py
@@ -1,7 +1,9 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
-import addpack
-addpack.addpack(':tools:bgen:bgen')
+import sys
+import os
+BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen')
+sys.path.append(BGENDIR)
 from scantools import Scanner
 from bgenlocations import TOOLBOXDIR
 

diff --git a/Mac/Modules/waste/wastescan.py b/Mac/Modules/waste/wastescan.py
index ee9fa41eb44a9ccf0e981303037156ba0439fc9d..25f8d5d38168b6adf3b1f2c69a0d29849664f50a 100644 (file)
--- a/Mac/Modules/waste/wastescan.py
+++ b/Mac/Modules/waste/wastescan.py
@@ -1,7 +1,9 @@
 # Scan an Apple header file, generating a Python file of generator calls.
 
-import addpack
-addpack.addpack(':tools:bgen:bgen')
+import sys
+import os
+BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen')
+sys.path.append(BGENDIR)
 from scantools import Scanner_PreUH3
 from bgenlocations import MWERKSDIR, TOOLBOXDIR
 

diff --git a/Mac/Modules/win/winscan.py b/Mac/Modules/win/winscan.py
index ae0462f821e31f9fa1bcff15d15c44573199721b..f15fb168cc04e9aecfd5bd57ed74d6c9bbd11c89 100644 (file)
--- a/Mac/Modules/win/winscan.py
+++ b/Mac/Modules/win/winscan.py
@@ -1,6 +1,8 @@
 # Scan an Apple header file, generating a Python file of generator calls.
-import addpack
-addpack.addpack(':Tools:bgen:bgen')
+import sys
+import os
+BGENDIR=os.path.join(sys.prefix, ':Tools:bgen:bgen')
+sys.path.append(BGENDIR)
 from bgenlocations import TOOLBOXDIR
 
 from scantools import Scanner

diff --git a/Mac/Modules/win/winsupport.py b/Mac/Modules/win/winsupport.py
index 001a4a463399aad7cf372516937ff67dd2707f3d..c7e1f7ac72156b1f9eff514881091ce7210cd0bd 100644 (file)
--- a/Mac/Modules/win/winsupport.py
+++ b/Mac/Modules/win/winsupport.py
@@ -5,9 +5,6 @@
 
 import string
 
-import addpack
-addpack.addpack(':Tools:bgen:bgen')
-
 # Declarations that change for each manager
 MACHEADERFILE = 'Windows.h'            # The Apple header file
 MODNAME = 'Win'                                # The name of the module