summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2003-02-24 16:27:08 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2003-02-24 16:27:08 (GMT)
commit00cbf07ca714ec562bbf46be06c46f46381e3282 (patch)
tree18fca221f6e0b77346cb08ed8342ff0df27bec44
parentb671c0c418b103605e70b31f7e057b299c0962e1 (diff)
downloadcpython-00cbf07ca714ec562bbf46be06c46f46381e3282.zip
cpython-00cbf07ca714ec562bbf46be06c46f46381e3282.tar.gz
cpython-00cbf07ca714ec562bbf46be06c46f46381e3282.tar.bz2
Added a -c (--copyfile) option with argument src:dst which copies file src
into dst in the bundle. The Python API already had this functionality
-rw-r--r--Lib/plat-mac/buildtools.py5
-rwxr-xr-xLib/plat-mac/bundlebuilder.py10
2 files changed, 12 insertions, 3 deletions
diff --git a/Lib/plat-mac/buildtools.py b/Lib/plat-mac/buildtools.py
index c6430b0..470f016 100644
--- a/Lib/plat-mac/buildtools.py
+++ b/Lib/plat-mac/buildtools.py
@@ -301,7 +301,10 @@ def process_common_macho(template, progress, code, rsrcname, destname, is_update
if rsrcname:
builder.resources.append(rsrcname)
for o in others:
- builder.resources.append(o)
+ if type(o) == str:
+ builder.resources.append(o)
+ else:
+ builder.files.append(o)
if plistname:
import plistlib
builder.plist = plistlib.Plist.fromFile(plistname)
diff --git a/Lib/plat-mac/bundlebuilder.py b/Lib/plat-mac/bundlebuilder.py
index 50320f4..fd19cbb 100755
--- a/Lib/plat-mac/bundlebuilder.py
+++ b/Lib/plat-mac/bundlebuilder.py
@@ -648,6 +648,7 @@ Options:
-b, --builddir=DIR the build directory; defaults to "build"
-n, --name=NAME application name
-r, --resource=FILE extra file or folder to be copied to Resources
+ -f, --copyfile=SRC:DST extra file or folder to be copied into the bundle
-e, --executable=FILE the executable to be used
-m, --mainprogram=FILE the Python main program
-a, --argv add a wrapper main program to create sys.argv
@@ -679,8 +680,8 @@ def main(builder=None):
if builder is None:
builder = AppBuilder(verbosity=1)
- shortopts = "b:n:r:e:m:c:p:lx:i:hvqa"
- longopts = ("builddir=", "name=", "resource=", "executable=",
+ shortopts = "b:n:r:f:e:m:c:p:lx:i:hvqa"
+ longopts = ("builddir=", "name=", "resource=", "copyfile=", "executable=",
"mainprogram=", "creator=", "nib=", "plist=", "link",
"link-exec", "help", "verbose", "quiet", "argv", "standalone",
"exclude=", "include=", "package=", "strip", "iconfile=")
@@ -697,6 +698,11 @@ def main(builder=None):
builder.name = arg
elif opt in ('-r', '--resource'):
builder.resources.append(arg)
+ elif opt in ('-f', '--copyfile'):
+ srcdst = arg.split(':')
+ if len(srcdst) != 2:
+ usage()
+ builder.files.append(srcdst)
elif opt in ('-e', '--executable'):
builder.executable = arg
elif opt in ('-m', '--mainprogram'):