- renamed the --copyfile option to --file.

- tweaked the help text a little.
(Jack: up to you to change your client code.)

diff --git a/Lib/plat-mac/bundlebuilder.py b/Lib/plat-mac/bundlebuilder.py
index b02a4f21893dd21621166abdbd359ca9924f7371..09953e30385ff942ce9a02359b157f46723bf88e 100755 (executable)
--- a/Lib/plat-mac/bundlebuilder.py
+++ b/Lib/plat-mac/bundlebuilder.py
@@ -699,7 +699,8 @@ 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
+  -f, --file=SRC:DST     extra file or folder to be copied into the bundle;
+                         DST must be a path relative to the bundle root
   -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
@@ -732,7 +733,7 @@ def main(builder=None):
                builder = AppBuilder(verbosity=1)
 
        shortopts = "b:n:r:f:e:m:c:p:lx:i:hvqa"
-       longopts = ("builddir=", "name=", "resource=", "copyfile=", "executable=",
+       longopts = ("builddir=", "name=", "resource=", "file=", "executable=",
                "mainprogram=", "creator=", "nib=", "plist=", "link",
                "link-exec", "help", "verbose", "quiet", "argv", "standalone",
                "exclude=", "include=", "package=", "strip", "iconfile=")
@@ -749,10 +750,11 @@ def main(builder=None):
                        builder.name = arg
                elif opt in ('-r', '--resource'):
                        builder.resources.append(arg)
-               elif opt in ('-f', '--copyfile'):
+               elif opt in ('-f', '--file'):
                        srcdst = arg.split(':')
                        if len(srcdst) != 2:
-                               usage()
+                               usage("-f or --file argument must be an absolute path and "
+                                     "a relative path, separated by a colon")
                        builder.files.append(srcdst)
                elif opt in ('-e', '--executable'):
                        builder.executable = arg