Replaced addpack by handcrafted code to find the bgen stuff.

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

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 *
 

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

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
 

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

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

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

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

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
 

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
 

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
 

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
 

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

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

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

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

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
 

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

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 *
 
 

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
 

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

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 *
 
 

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,

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
 

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
 

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

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