Changeset 2130

Show
Ignore:
Timestamp:
09/18/07 22:13:03 (10 months ago)
Author:
arj..@yirdis.nl
Message:

Merged changes from [2115].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gaphor/branches/gaphor-0.12/setup.py

    r2125 r2130  
    88""" 
    99 
    10 VERSION = '0.12.2' 
     10VERSION = '0.12.3' 
    1111 
    1212import os 

  • gaphor/branches/gaphor-0.12/utils/command/build_uml.py

    r1238 r2130  
    77""" 
    88 
    9 ## 
    10 ## The Command 
    11 ## 
    12  
    139import os.path 
    1410from distutils.core import Command 
    15 from distutils.command.build import build 
    1611from distutils.util import byte_compile 
    1712from distutils.dep_util import newer 
    …… 
    6560        byte_compile([outfile]) 
    6661 
    67 build.sub_commands.append(('build_uml', None)) 
    6862 
     63# Wrap setuptools' build_py command, so we're sure build_uml is performed 
     64# before the build_py code. 
     65 
     66from setuptools.command.build_py import build_py 
     67 
     68def build_py_run(self, run=build_py.run): 
     69    for cmd_name in self.get_sub_commands(): 
     70        self.run_command(cmd_name) 
     71 
     72    run(self) 
     73     
     74build_py.run = build_py_run 
     75 
     76build_py.sub_commands.append(('build_uml', None)) 
    6977 
    7078# vim:sw=4:et