Changeset 499

Show
Ignore:
Timestamp:
Fri Jul 25 05:35:35 2008
Author:
htgoebel
Message:

Reordered options into option groups.

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/Makespec.py

    r498 r499  
    220 220         usage="python %prog [opts] <scriptname> [<scriptname> ...]"  
    221 221     )  
    222       p.add_option("-F", "--onefile", dest="freeze",  
      222     g = p.add_option_group('What to generate')  
      223     g.add_option("-F", "--onefile", dest="freeze",  
    223 224                  action="store_true", default=False,  
    224 225                  help="create a single file deployment")  
    225       p.add_option("-D", "--onedir", dest="freeze", action="store_false",  
      226     g.add_option("-D", "--onedir", dest="freeze", action="store_false",  
    225 226                  help="create a single directory deployment (default)")  
    226       p.add_option("-w", "--windowed", "--noconsole", dest="console",  
    227                    action="store_false", default=True,  
    228                    help="use a Windows subsystem executable (Windows only)")  
    229       p.add_option("-c", "--nowindowed", "--console", dest="console",  
    230                    action="store_true",  
    231                    help="use a console subsystem executable (Windows only) "  
    232                         "(default)")  
    233       p.add_option("-a", "--ascii", action="store_true", default=False,  
    234                    help="do NOT include unicode encodings "  
    235                         "(default: included if available)")  
    236       p.add_option("-d", "--debug", action="store_true", default=False,  
    237                    help="use the debug (verbose) build of the executable")  
    238       p.add_option("-s", "--strip", action="store_true", default=False,  
    239                    help="strip the exe and shared libs "  
    240                         "(don't try this on Windows)")  
    241       p.add_option("-X", "--upx", action="store_true", default=False,  
    242                    help="use UPX if available (works differently between "  
    243                         "Windows and *nix)")  
    244       p.add_option("-K", "--tk", default=False, action="store_true",  
    245                    help="include TCL/TK in the deployment")  
    246       p.add_option("-o", "--out", type="string", default=None,  
      227     g.add_option("-o", "--out", type="string", default=None,  
    247 228                  dest="workdir", metavar="DIR",  
    248 229                  help="generate the spec file in the specified directory")  
    249       p.add_option("-n", "--name", type="string", default=None,  
    250                    help="name to assign to the project, from which the spec file "  
    251                         "name is generated. (default: use the basename of the "  
    252                         "(first) script)")  
    253       p.add_option("-p", "--paths", type="string", default=[], dest="pathex",  
      230  
      231     g = p.add_option_group('What to bundle, where to seach')  
      232     g.add_option("-p", "--paths", type="string", default=[], dest="pathex",  
    254 233                  metavar="DIR", action="append",  
    255 234                  help="set base path for import (like using PYTHONPATH). "  
    …… 
    258 237                       "with %s, or using this option multiple times"  
    259 238                       % repr(os.pathsep))  
    260       p.add_option("-v", "--version", type="string",  
      239     g.add_option("-K", "--tk", default=False, action="store_true",  
      240                  help="include TCL/TK in the deployment")  
      241     g.add_option("-a", "--ascii", action="store_true", default=False,  
      242                  help="do NOT include unicode encodings "  
      243                       "(default: included if available)")  
      244  
      245     g = p.add_option_group('How to generate')  
      246     g.add_option("-d", "--debug", action="store_true", default=False,  
      247                  help="use the debug (verbose) build of the executable")  
      248     g.add_option("-s", "--strip", action="store_true", default=False,  
      249                  help="strip the exe and shared libs "  
      250                       "(don't try this on Windows)")  
      251     g.add_option("-X", "--upx", action="store_true", default=False,  
      252                  help="use UPX if available (works differently between "  
      253                       "Windows and *nix)")  
      254  
      255     g = p.add_option_group('Windows specific options')  
      256     g.add_option("-c", "--console", "--nowindowed", dest="console",  
      257                  action="store_true",  
      258                  help="use a console subsystem executable (Windows only) "  
      259                       "(default)")  
      260     g.add_option("-w", "--windowed", "--noconsole", dest="console",  
      261                  action="store_false", default=True,  
      262                  help="use a Windows subsystem executable (Windows only)")  
      263     g.add_option("-v", "--version", type="string",  
    261 264                  dest="version_file", metavar="FILE",  
    262 265                  help="add a version resource from FILE to the exe "  
    263 266                       "(Windows only)")  
    264       p.add_option("--icon", type="string", dest="icon_file",  
      267     g.add_option("--icon", type="string", dest="icon_file",  
    264 267                  metavar="FILE.ICO or FILE.EXE,ID",  
    265 268                  help="If FILE is an .ico file, add the icon to the final "