Changeset 3985

Show
Ignore:
Timestamp:
05/28/07 17:14:45 (6 years ago)
Author:
balister
Message:

Changes for new directory structure and new xml parsers.

Location:
components/USRP_TX_Control/trunk/USRP_TX_Control
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • components/USRP_TX_Control/trunk/USRP_TX_Control/Makefile.am

    r3441 r3985  
    11AM_CXXFLAGS = -Wall  
    22 
    3 bin_PROGRAMS = USRP_TX_Control 
     3dombindir = $(prefix)/dom/bin 
     4dombin_PROGRAMS = USRP_TX_Control 
    45 
    56USRP_TX_Control_SOURCES = USRP_TX_Control.cpp USRP_TX_Control.h main.cpp 
    67 
    78ossieName = USRP_TX_Control 
    8 xmldir = $(prefix)/xml/$(ossieName) 
     9xmldir = $(prefix)/dom/xml/$(ossieName) 
    910dist_xml_DATA = USRP_TX_Control.prf.xml USRP_TX_Control.scd.xml \ 
    1011USRP_TX_Control.spd.xml  

  • components/USRP_TX_Control/trunk/USRP_TX_Control/USRP_TX_Control.spd.xml

    r3441 r3985  
    1111    </author> 
    1212    <propertyfile type="PRF"> 
    13         <localfile name="xml/USRP_TX_Control/USRP_TX_Control.prf.xml"/> 
     13        <localfile name="USRP_TX_Control.prf.xml"/> 
    1414    </propertyfile> 
    1515    <descriptor> 
    16         <localfile name="xml/USRP_TX_Control/USRP_TX_Control.scd.xml"/> 
     16        <localfile name="USRP_TX_Control.scd.xml"/> 
    1717    </descriptor> 
    1818    <implementation id="DCE:affa18de-6ab7-11db-91a5-0004236abd3a" aepcompliance="aep_compliant"> 
    1919        <description>Default Description</description>  
    2020        <code type="Executable"> 
    21             <localfile name="bin/USRP_TX_Control"/> 
     21            <localfile name="/bin/USRP_TX_Control"/> 
    2222        </code> 
    2323        <processor name="x86"/> 

  • components/USRP_TX_Control/trunk/USRP_TX_Control/main.cpp

    r3441 r3985  
    11/**************************************************************************** 
    22 
    3 Copyright 2006 Virginia Polytechnic Institute and State University 
     3Copyright 2006, 2007 Virginia Polytechnic Institute and State University 
    44 
    55This file is part of the OSSIE USRP_TX_Control. 
    … …  
    3737    ossieDebugLevel = 3; 
    3838 
    39     if (argc != 3) { 
    40         std::cout << argv[0] << " <id> <usage name> " << std::endl; 
    41         exit (-1); 
    42     } 
    43  
    44     char *uuid = argv[1]; 
    45     char *label = argv[2]; 
    46  
    47     DEBUG(3, USRP_TX_Control, "Identifier - " << uuid << "  Label - " << label) 
     39    ossieSupport::ossieComponent usrp_tx_control(orb, argc, argv); 
    4840 
    4941    USRP_TX_Control_i* usrp_tx_control_servant; 
    … …  
    5244    // Create the usrp_tx_control component servant and object reference 
    5345 
    54     usrp_tx_control_servant = new USRP_TX_Control_i(uuid, component_running); 
     46    usrp_tx_control_servant = new USRP_TX_Control_i(usrp_tx_control.getUuid(), component_running); 
    5547    usrp_tx_control_var = usrp_tx_control_servant->_this(); 
    5648 
    57     orb->bind_object_to_name((CORBA::Object_ptr) usrp_tx_control_var, label); 
     49    usrp_tx_control.bind(usrp_tx_control_var); 
    5850 
    5951    // This bit is ORB specific 
    … …  
    6355 
    6456    component_running->wait(); 
    65     orb->unbind_name(label); 
     57    usrp_tx_control.unbind(); 
    6658    orb->orb->shutdown(0); 
    6759