0
0
mirror of https://github.com/python/cpython.git synced 2024-11-27 23:47:29 +01:00

Merged revisions 79119 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r79119 | benjamin.peterson | 2010-03-19 16:42:45 -0500 (Fri, 19 Mar 2010) | 1 line

  update mac installer script from the trunk #8068
........
This commit is contained in:
Benjamin Peterson 2010-03-19 21:48:54 +00:00
parent 5a0a85e838
commit f7239567ea

View File

@ -40,16 +40,19 @@ def grepValue(fn, variable):
if ln.startswith(variable): if ln.startswith(variable):
value = ln[len(variable):].strip() value = ln[len(variable):].strip()
return value[1:-1] return value[1:-1]
raise RuntimeError, "Cannot find variable %s" % variable[:-1]
def getVersion(): def getVersion():
return grepValue(os.path.join(SRCDIR, 'configure'), 'PACKAGE_VERSION') return grepValue(os.path.join(SRCDIR, 'configure'), 'PACKAGE_VERSION')
def getVersionTuple():
return tuple([int(n) for n in getVersion().split('.')])
def getFullVersion(): def getFullVersion():
fn = os.path.join(SRCDIR, 'Include', 'patchlevel.h') fn = os.path.join(SRCDIR, 'Include', 'patchlevel.h')
for ln in open(fn): for ln in open(fn):
if 'PY_VERSION' in ln: if 'PY_VERSION' in ln:
return ln.split()[-1][1:-1] return ln.split()[-1][1:-1]
raise RuntimeError, "Cannot find full version??" raise RuntimeError, "Cannot find full version??"
# The directory we'll use to create the build (will be erased and recreated) # The directory we'll use to create the build (will be erased and recreated)
@ -61,12 +64,33 @@ DEPSRC = os.path.join(WORKDIR, 'third-party')
DEPSRC = os.path.expanduser('~/Universal/other-sources') DEPSRC = os.path.expanduser('~/Universal/other-sources')
# Location of the preferred SDK # Location of the preferred SDK
### There are some issues with the SDK selection below here,
### The resulting binary doesn't work on all platforms that
### it should. Always default to the 10.4u SDK until that
### isue is resolved.
###
##if int(os.uname()[2].split('.')[0]) == 8:
## # Explicitly use the 10.4u (universal) SDK when
## # building on 10.4, the system headers are not
## # useable for a universal build
## SDKPATH = "/Developer/SDKs/MacOSX10.4u.sdk"
##else:
## SDKPATH = "/"
SDKPATH = "/Developer/SDKs/MacOSX10.4u.sdk" SDKPATH = "/Developer/SDKs/MacOSX10.4u.sdk"
#SDKPATH = "/"
universal_opts_map = { '32-bit': ('i386', 'ppc',), universal_opts_map = { '32-bit': ('i386', 'ppc',),
'64-bit': ('x86_64', 'ppc64',), '64-bit': ('x86_64', 'ppc64',),
'all': ('i386', 'ppc', 'x86_64', 'ppc64',) } 'intel': ('i386', 'x86_64'),
'3-way': ('ppc', 'i386', 'x86_64'),
'all': ('i386', 'ppc', 'x86_64', 'ppc64',) }
default_target_map = {
'64-bit': '10.5',
'3-way': '10.5',
'intel': '10.5',
'all': '10.5',
}
UNIVERSALOPTS = tuple(universal_opts_map.keys()) UNIVERSALOPTS = tuple(universal_opts_map.keys())
@ -84,6 +108,17 @@ SRCDIR = os.path.dirname(
# $MACOSX_DEPLOYMENT_TARGET -> minimum OS X level # $MACOSX_DEPLOYMENT_TARGET -> minimum OS X level
DEPTARGET = '10.3' DEPTARGET = '10.3'
target_cc_map = {
'10.3': 'gcc-4.0',
'10.4': 'gcc-4.0',
'10.5': 'gcc-4.0',
'10.6': 'gcc-4.2',
}
CC = target_cc_map[DEPTARGET]
PYTHON_3 = getVersionTuple() >= (3, 0)
USAGE = textwrap.dedent("""\ USAGE = textwrap.dedent("""\
Usage: build_python [options] Usage: build_python [options]
@ -104,177 +139,203 @@ USAGE = textwrap.dedent("""\
# [The recipes are defined here for convenience but instantiated later after # [The recipes are defined here for convenience but instantiated later after
# command line options have been processed.] # command line options have been processed.]
def library_recipes(): def library_recipes():
return [ result = []
dict(
name="Bzip2 1.0.4",
url="http://www.bzip.org/1.0.4/bzip2-1.0.4.tar.gz",
checksum='fc310b254f6ba5fbb5da018f04533688',
configure=None,
install='make install PREFIX=%s/usr/local/ CFLAGS="-arch %s -isysroot %s"'%(
shellQuote(os.path.join(WORKDIR, 'libraries')),
' -arch '.join(ARCHLIST),
SDKPATH,
),
),
dict(
name="ZLib 1.2.3",
url="http://www.gzip.org/zlib/zlib-1.2.3.tar.gz",
checksum='debc62758716a169df9f62e6ab2bc634',
configure=None,
install='make install prefix=%s/usr/local/ CFLAGS="-arch %s -isysroot %s"'%(
shellQuote(os.path.join(WORKDIR, 'libraries')),
' -arch '.join(ARCHLIST),
SDKPATH,
),
),
dict(
# Note that GNU readline is GPL'd software
name="GNU Readline 5.1.4",
url="http://ftp.gnu.org/pub/gnu/readline/readline-5.1.tar.gz" ,
checksum='7ee5a692db88b30ca48927a13fd60e46',
patchlevel='0',
patches=[
# The readline maintainers don't do actual micro releases, but
# just ship a set of patches.
'http://ftp.gnu.org/pub/gnu/readline/readline-5.1-patches/readline51-001',
'http://ftp.gnu.org/pub/gnu/readline/readline-5.1-patches/readline51-002',
'http://ftp.gnu.org/pub/gnu/readline/readline-5.1-patches/readline51-003',
'http://ftp.gnu.org/pub/gnu/readline/readline-5.1-patches/readline51-004',
]
),
if DEPTARGET < '10.5':
result.extend([
dict(
name="Bzip2 1.0.5",
url="http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz",
checksum='3c15a0c8d1d3ee1c46a1634d00617b1a',
configure=None,
install='make install CC=%s PREFIX=%s/usr/local/ CFLAGS="-arch %s -isysroot %s"'%(
CC,
shellQuote(os.path.join(WORKDIR, 'libraries')),
' -arch '.join(ARCHLIST),
SDKPATH,
),
),
dict(
name="ZLib 1.2.3",
url="http://www.gzip.org/zlib/zlib-1.2.3.tar.gz",
checksum='debc62758716a169df9f62e6ab2bc634',
configure=None,
install='make install CC=%s prefix=%s/usr/local/ CFLAGS="-arch %s -isysroot %s"'%(
CC,
shellQuote(os.path.join(WORKDIR, 'libraries')),
' -arch '.join(ARCHLIST),
SDKPATH,
),
),
dict(
# Note that GNU readline is GPL'd software
name="GNU Readline 5.1.4",
url="http://ftp.gnu.org/pub/gnu/readline/readline-5.1.tar.gz" ,
checksum='7ee5a692db88b30ca48927a13fd60e46',
patchlevel='0',
patches=[
# The readline maintainers don't do actual micro releases, but
# just ship a set of patches.
'http://ftp.gnu.org/pub/gnu/readline/readline-5.1-patches/readline51-001',
'http://ftp.gnu.org/pub/gnu/readline/readline-5.1-patches/readline51-002',
'http://ftp.gnu.org/pub/gnu/readline/readline-5.1-patches/readline51-003',
'http://ftp.gnu.org/pub/gnu/readline/readline-5.1-patches/readline51-004',
]
),
dict(
name="SQLite 3.6.11",
url="http://www.sqlite.org/sqlite-3.6.11.tar.gz",
checksum='7ebb099696ab76cc6ff65dd496d17858',
configure_pre=[
'--enable-threadsafe',
'--enable-tempstore',
'--enable-shared=no',
'--enable-static=yes',
'--disable-tcl',
]
),
dict(
name="NCurses 5.5",
url="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.5.tar.gz",
checksum='e73c1ac10b4bfc46db43b2ddfd6244ef',
configure_pre=[
"--without-cxx",
"--without-ada",
"--without-progs",
"--without-curses-h",
"--enable-shared",
"--with-shared",
"--datadir=/usr/share",
"--sysconfdir=/etc",
"--sharedstatedir=/usr/com",
"--with-terminfo-dirs=/usr/share/terminfo",
"--with-default-terminfo-dir=/usr/share/terminfo",
"--libdir=/Library/Frameworks/Python.framework/Versions/%s/lib"%(getVersion(),),
"--enable-termcap",
],
patches=[
"ncurses-5.5.patch",
],
useLDFlags=False,
install='make && make install DESTDIR=%s && cd %s/usr/local/lib && ln -fs ../../../Library/Frameworks/Python.framework/Versions/%s/lib/lib* .'%(
shellQuote(os.path.join(WORKDIR, 'libraries')),
shellQuote(os.path.join(WORKDIR, 'libraries')),
getVersion(),
),
),
])
result.extend([
dict( dict(
name="SQLite 3.6.11", name="Sleepycat DB 4.7.25",
url="http://www.sqlite.org/sqlite-3.6.11.tar.gz", url="http://download.oracle.com/berkeley-db/db-4.7.25.tar.gz",
checksum='7ebb099696ab76cc6ff65dd496d17858', checksum='ec2b87e833779681a0c3a814aa71359e',
buildDir="build_unix",
configure="../dist/configure",
configure_pre=[ configure_pre=[
'--enable-threadsafe', '--includedir=/usr/local/include/db4',
'--enable-tempstore',
'--enable-shared=no',
'--enable-static=yes',
'--disable-tcl',
] ]
), ),
])
return result
dict(
name="NCurses 5.5",
url="http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.5.tar.gz",
checksum='e73c1ac10b4bfc46db43b2ddfd6244ef',
configure_pre=[
"--without-cxx",
"--without-ada",
"--without-progs",
"--without-curses-h",
"--enable-shared",
"--with-shared",
"--datadir=/usr/share",
"--sysconfdir=/etc",
"--sharedstatedir=/usr/com",
"--with-terminfo-dirs=/usr/share/terminfo",
"--with-default-terminfo-dir=/usr/share/terminfo",
"--libdir=/Library/Frameworks/Python.framework/Versions/%s/lib"%(getVersion(),),
"--enable-termcap",
],
patches=[
"ncurses-5.5.patch",
],
useLDFlags=False,
install='make && make install DESTDIR=%s && cd %s/usr/local/lib && ln -fs ../../../Library/Frameworks/Python.framework/Versions/%s/lib/lib* .'%(
shellQuote(os.path.join(WORKDIR, 'libraries')),
shellQuote(os.path.join(WORKDIR, 'libraries')),
getVersion(),
),
),
]
# Instructions for building packages inside the .mpkg. # Instructions for building packages inside the .mpkg.
PKG_RECIPES = [ def pkg_recipes():
dict( unselected_for_python3 = ('selected', 'unselected')[PYTHON_3]
name="PythonFramework", result = [
long_name="Python Framework", dict(
source="/Library/Frameworks/Python.framework", name="PythonFramework",
readme="""\ long_name="Python Framework",
This package installs Python.framework, that is the python source="/Library/Frameworks/Python.framework",
interpreter and the standard library. This also includes Python readme="""\
wrappers for lots of Mac OS X API's. This package installs Python.framework, that is the python
""", interpreter and the standard library. This also includes Python
postflight="scripts/postflight.framework", wrappers for lots of Mac OS X API's.
selected='selected', """,
), postflight="scripts/postflight.framework",
dict( selected='selected',
name="PythonApplications", ),
long_name="GUI Applications", dict(
source="/Applications/Python %(VER)s", name="PythonApplications",
readme="""\ long_name="GUI Applications",
This package installs IDLE (an interactive Python IDE), source="/Applications/Python %(VER)s",
Python Launcher and Build Applet (create application bundles readme="""\
from python scripts). This package installs IDLE (an interactive Python IDE),
Python Launcher and Build Applet (create application bundles
from python scripts).
It also installs a number of examples and demos. It also installs a number of examples and demos.
""", """,
required=False, required=False,
selected='selected', selected='selected',
), ),
dict( dict(
name="PythonUnixTools", name="PythonUnixTools",
long_name="UNIX command-line tools", long_name="UNIX command-line tools",
source="/usr/local/bin", source="/usr/local/bin",
readme="""\ readme="""\
This package installs the unix tools in /usr/local/bin for This package installs the unix tools in /usr/local/bin for
compatibility with older releases of Python. This package compatibility with older releases of Python. This package
is not necessary to use Python. is not necessary to use Python.
""", """,
required=False, required=False,
selected='selected', selected='selected',
), ),
dict( dict(
name="PythonDocumentation", name="PythonDocumentation",
long_name="Python Documentation", long_name="Python Documentation",
topdir="/Library/Frameworks/Python.framework/Versions/%(VER)s/Resources/English.lproj/Documentation", topdir="/Library/Frameworks/Python.framework/Versions/%(VER)s/Resources/English.lproj/Documentation",
source="/pydocs", source="/pydocs",
readme="""\ readme="""\
This package installs the python documentation at a location This package installs the python documentation at a location
that is useable for pydoc and IDLE. If you have installed Xcode that is useable for pydoc and IDLE. If you have installed Xcode
it will also install a link to the documentation in it will also install a link to the documentation in
/Developer/Documentation/Python /Developer/Documentation/Python
""", """,
postflight="scripts/postflight.documentation", postflight="scripts/postflight.documentation",
required=False, required=False,
selected='selected', selected='selected',
), ),
dict( dict(
name="PythonProfileChanges", name="PythonProfileChanges",
long_name="Shell profile updater", long_name="Shell profile updater",
readme="""\ readme="""\
This packages updates your shell profile to make sure that This packages updates your shell profile to make sure that
the Python tools are found by your shell in preference of the Python tools are found by your shell in preference of
the system provided Python tools. the system provided Python tools.
If you don't install this package you'll have to add If you don't install this package you'll have to add
"/Library/Frameworks/Python.framework/Versions/%(VER)s/bin" "/Library/Frameworks/Python.framework/Versions/%(VER)s/bin"
to your PATH by hand. to your PATH by hand.
""", """,
postflight="scripts/postflight.patch-profile", postflight="scripts/postflight.patch-profile",
topdir="/Library/Frameworks/Python.framework", topdir="/Library/Frameworks/Python.framework",
source="/empty-dir", source="/empty-dir",
required=False, required=False,
selected='unselected', selected=unselected_for_python3,
), ),
dict( ]
name="PythonSystemFixes",
long_name="Fix system Python", if DEPTARGET < '10.4':
readme="""\ result.append(
This package updates the system python installation on dict(
Mac OS X 10.3 to ensure that you can build new python extensions name="PythonSystemFixes",
using that copy of python after installing this version. long_name="Fix system Python",
""", readme="""\
postflight="../Tools/fixapplepython23.py", This package updates the system python installation on
topdir="/Library/Frameworks/Python.framework", Mac OS X 10.3 to ensure that you can build new python extensions
source="/empty-dir", using that copy of python after installing this version.
required=False, """,
selected='unselected', postflight="../Tools/fixapplepython23.py",
) topdir="/Library/Frameworks/Python.framework",
] source="/empty-dir",
required=False,
selected=unselected_for_python3,
)
)
return result
def fatal(msg): def fatal(msg):
""" """
@ -322,10 +383,10 @@ def checkEnvironment():
""" """
if platform.system() != 'Darwin': if platform.system() != 'Darwin':
fatal("This script should be run on a Mac OS X 10.4 system") fatal("This script should be run on a Mac OS X 10.4 (or later) system")
if platform.release() <= '8.': if int(platform.release().split('.')[0]) < 8:
fatal("This script should be run on a Mac OS X 10.4 system") fatal("This script should be run on a Mac OS X 10.4 (or later) system")
if not os.path.exists(SDKPATH): if not os.path.exists(SDKPATH):
fatal("Please install the latest version of Xcode and the %s SDK"%( fatal("Please install the latest version of Xcode and the %s SDK"%(
@ -338,7 +399,7 @@ def parseOptions(args=None):
Parse arguments and update global settings. Parse arguments and update global settings.
""" """
global WORKDIR, DEPSRC, SDKPATH, SRCDIR, DEPTARGET global WORKDIR, DEPSRC, SDKPATH, SRCDIR, DEPTARGET
global UNIVERSALOPTS, UNIVERSALARCHS, ARCHLIST global UNIVERSALOPTS, UNIVERSALARCHS, ARCHLIST, CC
if args is None: if args is None:
args = sys.argv[1:] args = sys.argv[1:]
@ -355,6 +416,7 @@ def parseOptions(args=None):
print "Additional arguments" print "Additional arguments"
sys.exit(1) sys.exit(1)
deptarget = None
for k, v in options: for k, v in options:
if k in ('-h', '-?', '--help'): if k in ('-h', '-?', '--help'):
print USAGE print USAGE
@ -374,11 +436,16 @@ def parseOptions(args=None):
elif k in ('--dep-target', ): elif k in ('--dep-target', ):
DEPTARGET=v DEPTARGET=v
deptarget=v
elif k in ('--universal-archs', ): elif k in ('--universal-archs', ):
if v in UNIVERSALOPTS: if v in UNIVERSALOPTS:
UNIVERSALARCHS = v UNIVERSALARCHS = v
ARCHLIST = universal_opts_map[UNIVERSALARCHS] ARCHLIST = universal_opts_map[UNIVERSALARCHS]
if deptarget is None:
# Select alternate default deployment
# target
DEPTARGET = default_target_map.get(v, '10.3')
else: else:
raise NotImplementedError, v raise NotImplementedError, v
@ -390,6 +457,8 @@ def parseOptions(args=None):
SDKPATH=os.path.abspath(SDKPATH) SDKPATH=os.path.abspath(SDKPATH)
DEPSRC=os.path.abspath(DEPSRC) DEPSRC=os.path.abspath(DEPSRC)
CC=target_cc_map[DEPTARGET]
print "Settings:" print "Settings:"
print " * Source directory:", SRCDIR print " * Source directory:", SRCDIR
print " * Build directory: ", WORKDIR print " * Build directory: ", WORKDIR
@ -397,6 +466,7 @@ def parseOptions(args=None):
print " * Third-party source:", DEPSRC print " * Third-party source:", DEPSRC
print " * Deployment target:", DEPTARGET print " * Deployment target:", DEPTARGET
print " * Universal architectures:", ARCHLIST print " * Universal architectures:", ARCHLIST
print " * C compiler:", CC
print "" print ""
@ -614,8 +684,8 @@ def buildPythonDocs():
runCommand('make update') runCommand('make update')
runCommand('make html') runCommand('make html')
os.chdir(curDir) os.chdir(curDir)
if os.path.exists(docdir): if not os.path.exists(docdir):
os.rmdir(docdir) os.mkdir(docdir)
os.rename(os.path.join(buildDir, 'build', 'html'), docdir) os.rename(os.path.join(buildDir, 'build', 'html'), docdir)
@ -650,18 +720,20 @@ def buildPython():
'libraries', 'usr', 'local', 'lib') 'libraries', 'usr', 'local', 'lib')
print "Running configure..." print "Running configure..."
runCommand("%s -C --enable-framework --enable-universalsdk=%s " runCommand("%s -C --enable-framework --enable-universalsdk=%s "
"--with-universal-archs=%s --with-computed-gotos " "--with-universal-archs=%s "
"%s "
"LDFLAGS='-g -L%s/libraries/usr/local/lib' " "LDFLAGS='-g -L%s/libraries/usr/local/lib' "
"OPT='-g -O3 -I%s/libraries/usr/local/include' 2>&1"%( "OPT='-g -O3 -I%s/libraries/usr/local/include' 2>&1"%(
shellQuote(os.path.join(SRCDIR, 'configure')), shellQuote(SDKPATH), shellQuote(os.path.join(SRCDIR, 'configure')), shellQuote(SDKPATH),
UNIVERSALARCHS, UNIVERSALARCHS,
(' ', '--with-computed-gotos ')[PYTHON_3],
shellQuote(WORKDIR)[1:-1], shellQuote(WORKDIR)[1:-1],
shellQuote(WORKDIR)[1:-1])) shellQuote(WORKDIR)[1:-1]))
print "Running make" print "Running make"
runCommand("make") runCommand("make")
print "Running make frameworkinstall" print "Running make install"
runCommand("make install DESTDIR=%s"%( runCommand("make install DESTDIR=%s"%(
shellQuote(rootDir))) shellQuote(rootDir)))
@ -685,8 +757,6 @@ def buildPython():
frmDir = os.path.join(rootDir, 'Library', 'Frameworks', 'Python.framework') frmDir = os.path.join(rootDir, 'Library', 'Frameworks', 'Python.framework')
gid = grp.getgrnam('admin').gr_gid gid = grp.getgrnam('admin').gr_gid
for dirpath, dirnames, filenames in os.walk(frmDir): for dirpath, dirnames, filenames in os.walk(frmDir):
for dn in dirnames: for dn in dirnames:
os.chmod(os.path.join(dirpath, dn), 0775) os.chmod(os.path.join(dirpath, dn), 0775)
@ -733,12 +803,11 @@ def buildPython():
os.chdir(curdir) os.chdir(curdir)
# Remove the 'Current' link, that way we don't accidently mess with an already installed if PYTHON_3:
# version of python # Remove the 'Current' link, that way we don't accidently mess
os.unlink(os.path.join(rootDir, 'Library', 'Frameworks', 'Python.framework', 'Versions', 'Current')) # with an already installed version of python 2
os.unlink(os.path.join(rootDir, 'Library', 'Frameworks',
'Python.framework', 'Versions', 'Current'))
def patchFile(inPath, outPath): def patchFile(inPath, outPath):
data = fileContents(inPath) data = fileContents(inPath)
@ -872,9 +941,9 @@ def makeMpkgPlist(path):
IFPkgFlagPackageList=[ IFPkgFlagPackageList=[
dict( dict(
IFPkgFlagPackageLocation='%s-%s.pkg'%(item['name'], getVersion()), IFPkgFlagPackageLocation='%s-%s.pkg'%(item['name'], getVersion()),
IFPkgFlagPackageSelection=item['selected'], IFPkgFlagPackageSelection=item.get('selected', 'selected'),
) )
for item in PKG_RECIPES for item in pkg_recipes()
], ],
IFPkgFormatVersion=0.10000000149011612, IFPkgFormatVersion=0.10000000149011612,
IFPkgFlagBackgroundScaling="proportional", IFPkgFlagBackgroundScaling="proportional",
@ -901,7 +970,7 @@ def buildInstaller():
pkgroot = os.path.join(outdir, 'Python.mpkg', 'Contents') pkgroot = os.path.join(outdir, 'Python.mpkg', 'Contents')
pkgcontents = os.path.join(pkgroot, 'Packages') pkgcontents = os.path.join(pkgroot, 'Packages')
os.makedirs(pkgcontents) os.makedirs(pkgcontents)
for recipe in PKG_RECIPES: for recipe in pkg_recipes():
packageFromRecipe(pkgcontents, recipe) packageFromRecipe(pkgcontents, recipe)
rsrcDir = os.path.join(pkgroot, 'Resources') rsrcDir = os.path.join(pkgroot, 'Resources')
@ -949,9 +1018,9 @@ def buildDMG():
shutil.rmtree(outdir) shutil.rmtree(outdir)
imagepath = os.path.join(outdir, imagepath = os.path.join(outdir,
'python-%s-macosx'%(getFullVersion(),)) 'python-%s-macosx%s'%(getFullVersion(),DEPTARGET))
if INCLUDE_TIMESTAMP: if INCLUDE_TIMESTAMP:
imagepath = imagepath + '%04d-%02d-%02d'%(time.localtime()[:3]) imagepath = imagepath + '-%04d-%02d-%02d'%(time.localtime()[:3])
imagepath = imagepath + '.dmg' imagepath = imagepath + '.dmg'
os.mkdir(outdir) os.mkdir(outdir)
@ -1009,6 +1078,7 @@ def main():
checkEnvironment() checkEnvironment()
os.environ['MACOSX_DEPLOYMENT_TARGET'] = DEPTARGET os.environ['MACOSX_DEPLOYMENT_TARGET'] = DEPTARGET
os.environ['CC'] = CC
if os.path.exists(WORKDIR): if os.path.exists(WORKDIR):
shutil.rmtree(WORKDIR) shutil.rmtree(WORKDIR)
@ -1055,11 +1125,8 @@ def main():
print >> fp, "# By:", pwd.getpwuid(os.getuid()).pw_gecos print >> fp, "# By:", pwd.getpwuid(os.getuid()).pw_gecos
fp.close() fp.close()
# And copy it to a DMG # And copy it to a DMG
buildDMG() buildDMG()
if __name__ == "__main__": if __name__ == "__main__":
main() main()