Changeset 10777

Show
Ignore:
Timestamp:
07/08/11 12:25:29 (23 months ago)
Author:
jawil06
Message:

standard and custom interfaces packages conflicted with ossiepyidl

Location:
ossiedev/trunk/system
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • ossiedev/trunk/system/customInterfaces/python/setup.py

    r10776 r10777  
    44import sys 
    55 
    6 ossiepyidl = ['ossie', 'ossie/custominterfaces', 'ossie/custominterfaces/customInterfaces', 'ossie/custominterfaces/customInterfaces__POA', 'ossie/custominterfaces/PortTypes', 'ossie/custominterfaces/PortTypes__POA'] 
     6ossiecipyidl = ['ossie/custominterfaces', 'ossie/custominterfaces/customInterfaces', 'ossie/custominterfaces/customInterfaces__POA', 'ossie/custominterfaces/PortTypes', 'ossie/custominterfaces/PortTypes__POA'] 
    77 
    88setup( 
    9         name='ossiepyidl', 
     9        name='ossiecipyidl', 
    1010        version='0.8.0', 
    11         description='OSSIE Python IDL bindings', 
    12         packages=ossiepyidl, 
     11        description='OSSIE Custom Interfaces Python IDL bindings', 
     12        packages=ossiecipyidl, 
    1313    ) 
  • ossiedev/trunk/system/standardInterfaces/python/setup.py

    r10776 r10777  
    44import sys 
    55 
    6 ossiepyidl = ['ossie', 'ossie/standardinterfaces', 'ossie/standardinterfaces/standardInterfaces', 'ossie/standardinterfaces/CF', 'ossie/standardinterfaces/CF__POA', 'ossie/standardinterfaces/PortTypes', 'ossie/standardinterfaces/PortTypes__POA', 'ossie/standardinterfaces/standardInterfaces__POA'] 
     6ossiesipyidl = ['ossie/standardinterfaces', 'ossie/standardinterfaces/standardInterfaces', 'ossie/standardinterfaces/CF', 'ossie/standardinterfaces/CF__POA', 'ossie/standardinterfaces/PortTypes', 'ossie/standardinterfaces/PortTypes__POA', 'ossie/standardinterfaces/standardInterfaces__POA'] 
    77 
    88setup( 
    9         name='ossiepyidl', 
     9        name='ossiesipyidl', 
    1010        version='0.8.0', 
    11         description='OSSIE Python IDL bindings', 
    12         packages=ossiepyidl, 
     11        description='OSSIE Standard Interfaces Python IDL bindings', 
     12        packages=ossiesipyidl, 
    1313    )