[Python-checkins] python/dist/src/Mac/Lib appletrawmain.py,NONE,1.1 buildtools.py,1.14,1.15

[jackjansen@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Mac/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv26419

Modified Files:
	buildtools.py 
Added Files:
	appletrawmain.py 
Log Message:
Final step in making applets first-class citizens: if the applet wants
argv emulation (i.e. if the end user drops files and folders on the
applets these will show up in sys.argv) BuildApplet will add the required
code to the applet bundle, in __rawmain__.pyc.

This code is compiled from appletrawmain.py, it creates sys.argv, cleans
up most of the mess and executes either __main__.py or __main__.pyc.


--- NEW FILE: appletrawmain.py ---
# Emulate sys.argv and run __main__.py or __main__.pyc in an environment that
# is as close to "normal" as possible.
#
# This script is put into __rawmain__.pyc for applets that need argv
# emulation, by BuildApplet and friends.
#
import argvemulator
import os
import sys
import marshal

#
# Create sys.argv
#
argvemulator.ArgvCollector().mainloop()
#
# Find the realy main program to run
#
_dir = os.path.split(sys.argv[0])[0]
__file__ = os.path.join(_dir, '__main__.py')
if os.path.exists(__file__):
	#
	# Setup something resembling a normal environment and go.
	#
	sys.argv[0] = __file__
	del argvemulator, os, sys, _dir
	execfile(__file__)
else:
	__file__ = os.path.join(_dir, '__main__.pyc')
	if os.path.exists(__file__):
		#
		# If we have only a .pyc file we read the code object from that
		#
		sys.argv[0] = __file__
		_fp = open(__file__, 'rb')
		_fp.read(8)
		__code__ = marshal.load(_fp)
		#
		# Again, we create an almost-normal environment (only __code__ is
		# funny) and go.
		#
		del argvemulator, os, sys, marshal, _dir, _fp
		exec __code__
	else:
		sys.stderr.write("%s: neither __main__.py nor __main__.pyc found\n"%sys.argv[0])
		sys.exit(1)

Index: buildtools.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Lib/buildtools.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** buildtools.py	2 Aug 2002 14:04:15 -0000	1.14
--- buildtools.py	2 Aug 2002 14:57:43 -0000	1.15
***************
*** 399,402 ****
--- 399,412 ----
  		else:
  			pycname = '__main__.pyc'
+ 			# And we also create __rawmain__.pyc
+ 			outputfilename = os.path.join(destname, 'Contents', 'Resources', '__rawmain__.pyc')
+ 			if progress:
+ 				progress.label('Creating __rawmain__.pyc')
+ 				progress.inc(0)
+ 			rawsourcefile = os.path.join(sys.prefix, 'Mac', 'Lib', 'appletrawmain.py')
+ 			rawsource = open(rawsourcefile, 'rU').read()
+ 			rawcode = compile(rawsource, rawsourcefile, 'exec')
+ 			writepycfile(rawcode, outputfilename)
+ 			
  		outputfilename = os.path.join(destname, 'Contents', 'Resources', pycname)
  		if progress: