Changeset 509

Show
Ignore:
Timestamp:
Mon Jul 28 15:50:05 2008
Author:
htgoebel
Message:

Changed builddir and distdir into build/ and dist/ to match commonly used setuptools.

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/Makespec.py

    r507 r509  
    37 37           a.binaries,  
    38 38           a.zipfiles,  
    39             name='%(exename)s',  
      39           name='%(distdir)s/%(exename)s',  
    39 39           debug=%(debug)s,  
    40 40           strip=%(strip)s,  
    41 41           upx=%(upx)s,  
    42 42           console=%(console)s %(exe_options)s)  
    43   """ # pathex scripts exename tkpkg debug console  
      43 """ # pathex scripts exename tkpkg debug console distdir  
    43 43  
    44 44 collecttmplt = """# -*- mode: python -*-  
    …… 
    61 61                strip=%(strip)s,  
    62 62                upx=%(upx)s,  
    63                  name='%(distdir)s')  
    64   """ # scripts pathex, exename, debug, console tktree distdir  
      63                name='%(distdir)s/%(name)s')  
      64 """ # scripts pathex, exename, debug, console tktree distdir name  
    65 65  
    66 66 comsrvrtmplt = """# -*- mode: python -*-  
    …… 
    86 86                strip=%(strip)s,  
    87 87                upx=%(upx)s,  
    88                  name='%(distdir)s')  
    89   """ # scripts pathex, exename, debug, console tktree distdir  
      88                name='%(distdir)s/%(name)s')  
      89 """ # scripts pathex, exename, debug, console tktree distdir name  
    90 90  
    91 91 HOME = os.path.dirname(sys.argv[0])  
    92 92 HOME = os.path.abspath(HOME)  
    93 93  
    94   iswin = sys.platform[:3] == "win"  
    95   cygwin = sys.platform == "cygwin"  
    96    
    97 94 def quote_win_filepath( path ):  
    98 95     # quote all \ with another \ after using normpath to clean up the path  
    …… 
    151 148         name = os.path.splitext(os.path.basename(scripts[0]))[0]  
    152 149  
    153       distdir = "dist%s" % name  
    154       builddir = "build%s" % name  
      150     distdir = "dist"  
      151     builddir = "build/pyi.%s/%s" % (config['target_platform'], name)  
    155 152      
    156 153     pathex = pathex[:]  
    …… 
    178 175          'scripts':scripts,  
    179 176          'pathex' :pathex,  
    180            'exename': '',  
      177          #'exename': '',  
      178          'name': name,  
    181 179          'distdir': distdir,  
    182 180          'builddir': builddir,  
    …… 
    196 194             scripts.insert(0, Path(HOME, 'support', 'useTK.py'))  
    197 195     scripts.insert(0, Path(HOME, 'support', '_mountzlib.py'))  
    198       if iswin or cygwin:  
      196     if config['target_platform'][:3] == "win" or \  
      197        config['target_platform'] == 'cygwin':  
    199 198         d['exename'] = name+'.exe'  
    200 199         d['dllname'] = name+'.dll'