Common code used to the buildtools module (Just)
diff --git a/Mac/scripts/BuildApplet.py b/Mac/scripts/BuildApplet.py
index 4cff185..b57c425 100644
--- a/Mac/scripts/BuildApplet.py
+++ b/Mac/scripts/BuildApplet.py
@@ -6,64 +6,32 @@
resource named __main__ containing the compiled, marshalled script.
"""
-DEBUG=0
import sys
sys.stdout = sys.stderr
-import string
import os
-import marshal
-import imp
import macfs
-import MACFS
import MacOS
-from Res import *
-import macostools
import EasyDialogs
+import buildtools
-# .pyc file (and 'PYC ' resource magic number)
-MAGIC = imp.get_magic()
-
-# Template file (searched on sys.path)
-TEMPLATE = "PythonApplet"
-
-# Specification of our resource
-RESTYPE = 'PYC '
-RESNAME = '__main__'
-
-# A resource with this name sets the "owner" (creator) of the destination
-# XXXX Should look for id=0
-OWNERNAME = "owner resource"
-
-# OpenResFile mode parameters
-READ = 1
-WRITE = 2
-
-def findtemplate():
- """Locate the applet template along sys.path"""
- for p in sys.path:
- template = os.path.join(p, TEMPLATE)
- try:
- template, d1, d2 = macfs.ResolveAliasFile(template)
- break
- except (macfs.error, ValueError):
- continue
- else:
- die("Template %s not found on sys.path" % `TEMPLATE`)
- return
- template = template.as_pathname()
- return template
def main():
- global DEBUG
- DEBUG=1
+ try:
+ buildapplet()
+ except buildtools.BuildError, detail:
+ EasyDialogs.Message(detail)
+
+
+def buildapplet():
+ buildtools.DEBUG=1
# Find the template
# (there's no point in proceeding if we can't find it)
- template = findtemplate()
-
+ template = buildtools.findtemplate()
+
# Ask for source text if not specified in sys.argv[1:]
if not sys.argv[1:]:
@@ -75,267 +43,24 @@
if tf[-3:] == '.py':
tf = tf[:-3]
else:
- tf = tf + '.out'
+ tf = tf + '.applet'
dstfss, ok = macfs.StandardPutFile('Save application as:', tf)
if not ok: return
dstfilename = dstfss.as_pathname()
cr, tp = MacOS.GetCreatorAndType(filename)
if tp == 'APPL':
- update(template, filename, dstfilename)
+ buildtools.update(template, filename, dstfilename)
else:
- process(template, filename, dstfilename)
+ buildtools.process(template, filename, dstfilename, 1)
else:
# Loop over all files to be processed
for filename in sys.argv[1:]:
cr, tp = MacOS.GetCreatorAndType(filename)
if tp == 'APPL':
- update(template, filename, '')
+ buildtools.update(template, filename, '')
else:
- process(template, filename, '')
-
-def process(template, filename, output):
-
- if DEBUG:
- progress = EasyDialogs.ProgressBar("Processing %s..."%os.path.split(filename)[1], 120)
- progress.label("Compiling...")
- else:
- progress = None
-
- # Read the source and compile it
- # (there's no point overwriting the destination if it has a syntax error)
-
- fp = open(filename)
- text = fp.read()
- fp.close()
- try:
- code = compile(text, filename, "exec")
- except (SyntaxError, EOFError):
- die("Syntax error in script %s" % `filename`)
- return
-
- # Set the destination file name
-
- if string.lower(filename[-3:]) == ".py":
- destname = filename[:-3]
- rsrcname = destname + '.rsrc'
- else:
- destname = filename + ".applet"
- rsrcname = filename + '.rsrc'
-
- if output:
- destname = output
-
- process_common(template, progress, code, rsrcname, destname, 0)
-
-def update(template, filename, output):
- if DEBUG:
- progress = EasyDialogs.ProgressBar("Updating %s..."%os.path.split(filename)[1], 120)
- else:
- progress = None
- if not output:
- output = filename + ' (updated)'
- process_common(template, progress, None, filename, output, 1)
-
-
-def process_common(template, progress, code, rsrcname, destname, is_update):
- # Try removing the output file
- try:
- os.unlink(destname)
- except os.error:
- pass
-
-
- # Create FSSpecs for the various files
-
- template_fss = macfs.FSSpec(template)
- template_fss, d1, d2 = macfs.ResolveAliasFile(template_fss)
- dest_fss = macfs.FSSpec(destname)
-
- # Copy data (not resources, yet) from the template
- if DEBUG:
- progress.label("Copy data fork...")
- progress.set(10)
-
- tmpl = open(template, "rb")
- dest = open(destname, "wb")
- data = tmpl.read()
- if data:
- dest.write(data)
- dest.close()
- tmpl.close()
- del dest
- del tmpl
-
- # Open the output resource fork
-
- if DEBUG:
- progress.label("Copy resources...")
- progress.set(20)
- try:
- output = FSpOpenResFile(dest_fss, WRITE)
- except MacOS.Error:
- CreateResFile(destname)
- output = FSpOpenResFile(dest_fss, WRITE)
-
- # Copy the resources from the target specific resource template, if any
- typesfound, ownertype = [], None
- try:
- input = FSpOpenResFile(rsrcname, READ)
- except (MacOS.Error, ValueError):
- pass
- if DEBUG:
- progress.inc(50)
- else:
- if is_update:
- skip_oldfile = ['cfrg']
- else:
- skip_oldfile = []
- typesfound, ownertype = copyres(input, output, skip_oldfile, 0, progress)
- CloseResFile(input)
-
- # Check which resource-types we should not copy from the template
- skiptypes = []
- if 'SIZE' in typesfound: skiptypes.append('SIZE')
- if 'BNDL' in typesfound: skiptypes = skiptypes + ['BNDL', 'FREF', 'icl4',
- 'icl8', 'ics4', 'ics8', 'ICN#', 'ics#']
- skipowner = (ownertype <> None)
-
- # Copy the resources from the template
-
- input = FSpOpenResFile(template_fss, READ)
- dummy, tmplowner = copyres(input, output, skiptypes, skipowner, progress)
- if ownertype == None:
- ownertype = tmplowner
- CloseResFile(input)
- if ownertype == None:
- die("No owner resource found in either resource file or template")
-
- # Make sure we're manipulating the output resource file now
-
- UseResFile(output)
-
- if code:
- # Delete any existing 'PYC ' resource named __main__
-
- try:
- res = Get1NamedResource(RESTYPE, RESNAME)
- res.RemoveResource()
- except Error:
- pass
-
- # Create the raw data for the resource from the code object
- if DEBUG:
- progress.label("Write PYC resource...")
- progress.set(120)
-
- data = marshal.dumps(code)
- del code
- data = (MAGIC + '\0\0\0\0') + data
-
- # Create the resource and write it
-
- id = 0
- while id < 128:
- id = Unique1ID(RESTYPE)
- res = Resource(data)
- res.AddResource(RESTYPE, id, RESNAME)
- res.WriteResource()
- res.ReleaseResource()
-
- # Close the output file
-
- CloseResFile(output)
-
- # Now set the creator, type and bundle bit of the destination
- dest_finfo = dest_fss.GetFInfo()
- dest_finfo.Creator = ownertype
- dest_finfo.Type = 'APPL'
- dest_finfo.Flags = dest_finfo.Flags | MACFS.kHasBundle
- dest_finfo.Flags = dest_finfo.Flags & ~MACFS.kHasBeenInited
- dest_fss.SetFInfo(dest_finfo)
-
- macostools.touched(dest_fss)
- if DEBUG:
- progress.label("Done.")
-
-
-# Copy resources between two resource file descriptors.
-# skip a resource named '__main__' or (if skipowner is set) 'Owner resource'.
-# Also skip resources with a type listed in skiptypes.
-#
-def copyres(input, output, skiptypes, skipowner, progress=None):
- ctor = None
- alltypes = []
- UseResFile(input)
- ntypes = Count1Types()
- progress_type_inc = 50/ntypes
- for itype in range(1, 1+ntypes):
- type = Get1IndType(itype)
- if type in skiptypes:
- continue
- alltypes.append(type)
- nresources = Count1Resources(type)
- progress_cur_inc = progress_type_inc/nresources
- for ires in range(1, 1+nresources):
- res = Get1IndResource(type, ires)
- id, type, name = res.GetResInfo()
- lcname = string.lower(name)
-## if (type, lcname) == (RESTYPE, RESNAME):
-## continue # Don't copy __main__ from template
- # XXXX should look for id=0
- if lcname == OWNERNAME:
- if skipowner:
- continue # Skip this one
- else:
- ctor = type
- size = res.size
- attrs = res.GetResAttrs()
- if DEBUG and progress:
- progress.label("Copy %s %d %s"%(type, id, name))
- progress.inc(progress_cur_inc)
- res.LoadResource()
- res.DetachResource()
- UseResFile(output)
- try:
- res2 = Get1Resource(type, id)
- except MacOS.Error:
- res2 = None
- if res2:
- if DEBUG and progress:
- progress.label("Overwrite %s %d %s"%(type, id, name))
- res2.RemoveResource()
- res.AddResource(type, id, name)
- res.WriteResource()
- attrs = attrs | res.GetResAttrs()
- res.SetResAttrs(attrs)
- UseResFile(input)
- return alltypes, ctor
-
-
-# Show a message and exit
-
-def die(str):
- message(str)
- sys.exit(1)
-
-
-# Show a message
-
-def message(str, id = 256):
- from Dlg import *
- d = GetNewDialog(id, -1)
- if not d:
- print "Error:", `str`
- print "DLOG id =", id, "not found."
- return
- tp, h, rect = d.GetDialogItem(2)
- SetDialogItemText(h, str)
- d.SetDialogDefaultItem(1)
- while 1:
- n = ModalDialog(None)
- if n == 1: break
- del d
+ buildtools.process(template, filename, '', 1)
if __name__ == '__main__':