Changeset 8424

Show
Ignore:
Timestamp:
11/05/08 17:22:50 (5 years ago)
Author:
shereef
Message:

merged ossiedev/trunk to my branch

Location:
ossiedev/branches/ssayed/devs/src/system
Files:
9 removed
20 modified
42 copied

Legend:

Unmodified
Added
Removed
  • ossiedev/branches/ssayed/devs/src/system/SigProc/butter.cpp

    r5571 r8424  
    3838 
    3939#include "SigProc.h" 
    40  
     40#include <cstdlib> 
    4141namespace SigProc { 
    4242 
  • ossiedev/branches/ssayed/devs/src/system/SigProc/filters.cpp

    r6493 r8424  
    2222 
    2323#include "SigProc.h" 
    24  
     24#include <cstring> 
     25#include <climits> 
    2526namespace SigProc { 
    2627 
  • ossiedev/branches/ssayed/devs/src/system/SigProc/modem.cpp

    r5252 r8424  
    2222 
    2323#include "SigProc.h" 
    24  
     24#include <cstdlib> 
    2525namespace SigProc { 
    2626 
  • ossiedev/branches/ssayed/devs/src/system/SigProc/pll.cpp

    r4528 r8424  
    2222 
    2323#include "SigProc.h" 
    24  
     24#include <climits> 
    2525namespace SigProc { 
    2626 
  • ossiedev/branches/ssayed/devs/src/system/SigProc/scaling.cpp

    r4528 r8424  
    2222 
    2323#include "SigProc.h" 
    24  
     24#include <cstdlib> 
     25#include <climits> 
    2526namespace SigProc { 
    2627 
  • ossiedev/branches/ssayed/devs/src/system/SigProc/sequencing.cpp

    r4844 r8424  
    2626 
    2727#include "SigProc.h" 
    28  
     28#include <cstring> 
    2929namespace SigProc { 
    3030 
  • ossiedev/branches/ssayed/devs/src/system/SigProc/sources.cpp

    r4766 r8424  
    2222 
    2323#include "SigProc.h" 
    24  
     24#include <climits> 
    2525namespace SigProc { 
    2626 
  • ossiedev/branches/ssayed/devs/src/system/SigProc/utility.cpp

    r5533 r8424  
    2222 
    2323#include "SigProc.h" 
    24  
     24#include <cstdlib> 
     25#include <climits> 
    2526namespace SigProc { 
    2627 
  • ossiedev/branches/ssayed/devs/src/system/customInterfaces/configure.ac

    r5782 r8424  
    33 
    44AM_INIT_AUTOMAKE(nostdinc) 
     5 
     6AM_PATH_PYTHON([2.5]) 
    57 
    68AC_PROG_CC 
  • ossiedev/branches/ssayed/devs/src/system/customInterfaces/customInterfaces.pc

    r5782 r8424  
    1 prefix=/usr/local 
     1prefix=/opt/sdr/ 
    22includedir=${prefix}/include 
    33 
  • ossiedev/branches/ssayed/devs/src/system/nodebooter/configure.ac

    r7784 r8424  
    1 AC_INIT(nodebooter, 0.6.2) 
     1AC_INIT([nodebooter],[0.6.2]) 
    22AM_INIT_AUTOMAKE 
    33 
     
    1717AC_CHECK_LIB([omniDynamic4], [main], [], [AC_MSG_ERROR([cannot find omniDynamic4 library])]) 
    1818AC_CHECK_HEADERS([omniORB4/CORBA.h], [], [AC_MSG_ERROR([cannot find omniORB4 header files])]) 
     19#AC_CHECK_LIB([], [main], [], [AC_MSG_ERROR([cannot find ossiecf library])]) 
     20#AC_CHECK_HEADERS([ossie/cf.h], [], [AC_MSG_ERROR([cannot find cf header files])]) 
    1921 
    2022AC_LANG_POP 
  • ossiedev/branches/ssayed/devs/src/system/nodebooter/nodebooter.cpp

    r7853 r8424  
    7777    CF::DeviceManager_var DeviceManager_objref; 
    7878 
    79  
     79        // Start CORBA 
     80    ORB *orb_obj = new ORB(argc, argv); 
    8081 
    8182    // parse command line options 
     
    9091    int startDomainManager = 0; 
    9192 
     93    // Start CORBA 
     94    ORB *orb_obj = new ORB(argc, argv); 
    9295 
    9396    while ((c = getopt(argc, argv, "D::n:d:h")) > 0) { 
     
    106109            break; 
    107110 
    108         case 'n': 
    109             devMgrNode = new string(optarg); 
    110             break; 
     111    case 'n': 
     112        devMgrNode = new string(optarg); 
     113        break; 
    111114 
    112115        case 'h': 
     
    122125        exit (0); 
    123126    } 
    124  
    125     // Start CORBA 
    126  
    127     ORB *orb_obj = new ORB(argc, argv); 
    128    
    129127 
    130128    // Start Domain Manager if requested 
  • ossiedev/branches/ssayed/devs/src/system/ossie/Doxyfile

    r2833 r8424  
    1 # Doxyfile 1.3.6 
     1# Doxyfile 1.5.4 
    22 
    33# This file describes the settings to be used by the documentation system 
     
    1515#--------------------------------------------------------------------------- 
    1616 
     17# This tag specifies the encoding used for all characters in the config file that  
     18# follow. The default is UTF-8 which is also the encoding used for all text before  
     19# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into  
     20# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of  
     21# possible encodings. 
     22 
     23DOXYFILE_ENCODING      = UTF-8 
     24 
    1725# The PROJECT_NAME tag is a single word (or a sequence of words surrounded  
    1826# by quotes) that should identify the project. 
    1927 
    20 PROJECT_NAME           = "OSSIE Framework" 
     28PROJECT_NAME           = "OSSIE Framework " 
    2129 
    2230# The PROJECT_NUMBER tag can be used to enter a project or revision number.  
     
    3139# where doxygen was started. If left blank the current directory will be used. 
    3240 
    33 OUTPUT_DIRECTORY       =  
     41OUTPUT_DIRECTORY       = "documentation " 
     42 
     43# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create  
     44# 4096 sub-directories (in 2 levels) under the output directory of each output  
     45# format and will distribute the generated files over these directories.  
     46# Enabling this option can be useful when feeding doxygen a huge amount of  
     47# source files, where putting all generated files in the same directory would  
     48# otherwise cause performance problems for the file system. 
     49 
     50CREATE_SUBDIRS         = NO 
    3451 
    3552# The OUTPUT_LANGUAGE tag is used to specify the language in which all  
     
    3754# information to generate all constant output in the proper language.  
    3855# The default language is English, other supported languages are:  
    39 # Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch,  
    40 # Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en  
    41 # (Japanese with English messages), Korean, Korean-en, Norwegian, Polish, Portuguese,  
    42 # Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. 
     56# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,  
     57# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian,  
     58# Italian, Japanese, Japanese-en (Japanese with English messages), Korean,  
     59# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian,  
     60# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. 
    4361 
    4462OUTPUT_LANGUAGE        = English 
    45  
    46 # This tag can be used to specify the encoding used in the generated output.  
    47 # The encoding is not always determined by the language that is chosen,  
    48 # but also whether or not the output is meant for Windows or non-Windows users.  
    49 # In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES  
    50 # forces the Windows encoding (this is the default for the Windows binary),  
    51 # whereas setting the tag to NO uses a Unix-style encoding (the default for  
    52 # all platforms other than Windows). 
    53  
    54 USE_WINDOWS_ENCODING   = NO 
    5563 
    5664# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will  
     
    7179# that is used to form the text in various listings. Each string  
    7280# in this list, if found as the leading text of the brief description, will be  
    73 # stripped from the text and the result after processing the whole list, is used  
    74 # as the annotated text. Otherwise, the brief description is used as-is. If left  
    75 # blank, the following values are used ("$name" is automatically replaced with the  
    76 # name of the entity): "The $name class" "The $name widget" "The $name file"  
    77 # "is" "provides" "specifies" "contains" "represents" "a" "an" "the" 
     81# stripped from the text and the result after processing the whole list, is  
     82# used as the annotated text. Otherwise, the brief description is used as-is.  
     83# If left blank, the following values are used ("$name" is automatically  
     84# replaced with the name of the entity): "The $name class" "The $name widget"  
     85# "The $name file" "is" "provides" "specifies" "contains"  
     86# "represents" "a" "an" "the" 
    7887 
    7988ABBREVIATE_BRIEF       =  
     
    8594ALWAYS_DETAILED_SEC    = NO 
    8695 
    87 # If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited  
    88 # members of a class in the documentation of that class as if those members were  
    89 # ordinary class members. Constructors, destructors and assignment operators of  
    90 # the base classes will not be shown. 
     96# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all  
     97# inherited members of a class in the documentation of that class as if those  
     98# members were ordinary class members. Constructors, destructors and assignment  
     99# operators of the base classes will not be shown. 
    91100 
    92101INLINE_INHERITED_MEMB  = YES 
     
    101110# can be used to strip a user-defined part of the path. Stripping is  
    102111# only done if one of the specified strings matches the left-hand part of  
    103 # the path. It is allowed to use relative paths in the argument list.  
     112# the path. The tag can be used to show relative paths in the file list.  
    104113# If left blank the directory from which doxygen is run is used as the  
    105114# path to strip. 
    106115 
    107116STRIP_FROM_PATH        =  
     117 
     118# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of  
     119# the path mentioned in the documentation of a class, which tells  
     120# the reader which header file to include in order to use a class.  
     121# If left blank only the name of the header file containing the class  
     122# definition is used. Otherwise one should specify the include paths that  
     123# are normally passed to the compiler using the -I flag. 
     124 
     125STRIP_FROM_INC_PATH    =  
    108126 
    109127# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter  
     
    116134# will interpret the first line (until the first dot) of a JavaDoc-style  
    117135# comment as the brief description. If set to NO, the JavaDoc  
    118 # comments will behave just like the Qt-style comments (thus requiring an  
    119 # explicit @brief command for a brief description. 
     136# comments will behave just like regular Qt-style comments  
     137# (thus requiring an explicit @brief command for a brief description.) 
    120138 
    121139JAVADOC_AUTOBRIEF      = NO 
     140 
     141# If the QT_AUTOBRIEF tag is set to YES then Doxygen will  
     142# interpret the first line (until the first dot) of a Qt-style  
     143# comment as the brief description. If set to NO, the comments  
     144# will behave just like regular Qt-style comments (thus requiring  
     145# an explicit \brief command for a brief description.) 
     146 
     147QT_AUTOBRIEF           = NO 
    122148 
    123149# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen  
     
    142168INHERIT_DOCS           = YES 
    143169 
    144 # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC  
    145 # tag is set to YES, then doxygen will reuse the documentation of the first  
    146 # member in the group (if any) for the other members of the group. By default  
    147 # all members of a group must be documented explicitly. 
    148  
    149 DISTRIBUTE_GROUP_DOC   = NO 
     170# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce  
     171# a new page for each member. If set to NO, the documentation of a member will  
     172# be part of the file/class/namespace that contains it. 
     173 
     174SEPARATE_MEMBER_PAGES  = NO 
    150175 
    151176# The TAB_SIZE tag can be used to set the number of spaces in a tab.  
     
    163188ALIASES                =  
    164189 
    165 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources  
    166 # only. Doxygen will then generate output that is more tailored for C.  
     190# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C  
     191# sources only. Doxygen will then generate output that is more tailored for C.  
    167192# For instance, some of the names that are used will be different. The list  
    168193# of all members will be omitted, etc. 
     
    170195OPTIMIZE_OUTPUT_FOR_C  = NO 
    171196 
    172 # Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources  
    173 # only. Doxygen will then generate output that is more tailored for Java.  
     197# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java  
     198# sources only. Doxygen will then generate output that is more tailored for Java.  
    174199# For instance, namespaces will be presented as packages, qualified scopes  
    175200# will look different, etc. 
    176201 
    177202OPTIMIZE_OUTPUT_JAVA   = NO 
     203 
     204# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to  
     205# include (a tag file for) the STL sources as input, then you should  
     206# set this tag to YES in order to let doxygen match functions declarations and  
     207# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.  
     208# func(std::string) {}). This also make the inheritance and collaboration  
     209# diagrams that involve STL classes more complete and accurate. 
     210 
     211BUILTIN_STL_SUPPORT    = NO 
     212 
     213# If you use Microsoft's C++/CLI language, you should set this option to YES to 
     214# enable parsing support. 
     215 
     216CPP_CLI_SUPPORT        = NO 
     217 
     218# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.  
     219# Doxygen will parse them like normal C++ but will assume all classes use public  
     220# instead of private inheritance when no explicit protection keyword is present. 
     221 
     222SIP_SUPPORT            = NO 
     223 
     224# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC  
     225# tag is set to YES, then doxygen will reuse the documentation of the first  
     226# member in the group (if any) for the other members of the group. By default  
     227# all members of a group must be documented explicitly. 
     228 
     229DISTRIBUTE_GROUP_DOC   = NO 
    178230 
    179231# Set the SUBGROUPING tag to YES (the default) to allow class member groups of  
     
    185237SUBGROUPING            = YES 
    186238 
     239# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct (or union) is  
     240# documented as struct with the name of the typedef. So  
     241# typedef struct TypeS {} TypeT, will appear in the documentation as a struct  
     242# with name TypeT. When disabled the typedef will appear as a member of a file,  
     243# namespace, or class. And the struct will be named TypeS. This can typically  
     244# be useful for C code where the coding convention is that all structs are  
     245# typedef'ed and only the typedef is referenced never the struct's name. 
     246 
     247TYPEDEF_HIDES_STRUCT   = NO 
     248 
    187249#--------------------------------------------------------------------------- 
    188250# Build related configuration options 
     
    211273 
    212274EXTRACT_LOCAL_CLASSES  = YES 
     275 
     276# This flag is only useful for Objective-C code. When set to YES local  
     277# methods, which are defined in the implementation section but not in  
     278# the interface are included in the documentation.  
     279# If set to NO (the default) only methods in the interface are included. 
     280 
     281EXTRACT_LOCAL_METHODS  = NO 
     282 
     283# If this flag is set to YES, the members of anonymous namespaces will be extracted  
     284# and appear in the documentation as a namespace called 'anonymous_namespace{file}',  
     285# where file will be replaced with the base name of the file that contains the anonymous  
     286# namespace. By default anonymous namespace are hidden. 
     287 
     288EXTRACT_ANON_NSPACES   = NO 
    213289 
    214290# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all  
     
    252328# allowed. This is useful if you have classes or files whose names only differ  
    253329# in case and if your file system supports case sensitive file names. Windows  
    254 # users are advised to set this option to NO. 
     330# and Mac users are advised to set this option to NO. 
    255331 
    256332CASE_SENSE_NAMES       = YES 
     
    342418SHOW_USED_FILES        = YES 
    343419 
     420# If the sources in your project are distributed over multiple directories  
     421# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy  
     422# in the documentation. The default is NO. 
     423 
     424SHOW_DIRECTORIES       = NO 
     425 
     426# The FILE_VERSION_FILTER tag can be used to specify a program or script that  
     427# doxygen should invoke to get the current version for each file (typically from the  
     428# version control system). Doxygen will invoke the program by executing (via  
     429# popen()) the command <command> <input-file>, where <command> is the value of  
     430# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file  
     431# provided by doxygen. Whatever the program writes to standard output  
     432# is used as the file version. See the manual for examples. 
     433 
     434FILE_VERSION_FILTER    =  
     435 
    344436#--------------------------------------------------------------------------- 
    345437# configuration options related to warning and progress messages 
     
    370462WARN_IF_DOC_ERROR      = YES 
    371463 
     464# This WARN_NO_PARAMDOC option can be abled to get warnings for  
     465# functions that are documented, but have no documentation for their parameters  
     466# or return value. If set to NO (the default) doxygen will only warn about  
     467# wrong or incomplete parameter documentation, but not about the absence of  
     468# documentation. 
     469 
     470WARN_NO_PARAMDOC       = NO 
     471 
    372472# The WARN_FORMAT tag determines the format of the warning messages that  
    373473# doxygen can produce. The string should contain the $file, $line, and $text  
    374474# tags, which will be replaced by the file and line number from which the  
    375 # warning originated and the warning text. 
    376  
    377 WARN_FORMAT            = "$file:$line: $text" 
     475# warning originated and the warning text. Optionally the format may contain  
     476# $version, which will be replaced by the version of the file (if it could  
     477# be obtained via FILE_VERSION_FILTER) 
     478 
     479WARN_FORMAT            = "$file:$line: $text " 
    378480 
    379481# The WARN_LOGFILE tag can be used to specify a file to which warning  
     
    392494# with spaces. 
    393495 
    394 INPUT                  = main_page.txt parser framework include/ossie 
     496INPUT                  = main_page.txt \ 
     497                         parser \ 
     498                         framework \ 
     499                         include/ossie 
     500 
     501# This tag can be used to specify the character encoding of the source files that  
     502# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default  
     503# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding.  
     504# See http://www.gnu.org/software/libiconv for the list of possible encodings. 
     505 
     506INPUT_ENCODING         = UTF-8 
    395507 
    396508# If the value of the INPUT tag contains directories, you can use the  
     
    398510# and *.h) to filter out the source-files in the directories. If left  
    399511# blank the following patterns are tested:  
    400 # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp  
    401 # *.h++ *.idl *.odl *.cs *.php *.php3 *.inc 
     512# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx  
     513# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 
    402514 
    403515FILE_PATTERNS          =  
     
    415527EXCLUDE                =  
    416528 
    417 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories  
    418 # that are symbolic links (a Unix filesystem feature) are excluded from the input. 
     529# The EXCLUDE_SYMLINKS tag can be used select whether or not files or  
     530# directories that are symbolic links (a Unix filesystem feature) are excluded  
     531# from the input. 
    419532 
    420533EXCLUDE_SYMLINKS       = NO 
     
    422535# If the value of the INPUT tag contains directories, you can use the  
    423536# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude  
    424 # certain files from those directories. 
     537# certain files from those directories. Note that the wildcards are matched  
     538# against the file with absolute path, so to exclude all test directories  
     539# for example use the pattern */test/* 
    425540 
    426541EXCLUDE_PATTERNS       =  
     542 
     543# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names  
     544# (namespaces, classes, functions, etc.) that should be excluded from the output.  
     545# The symbol name can be a fully qualified name, a word, or if the wildcard * is used,  
     546# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test 
     547 
     548EXCLUDE_SYMBOLS        =  
    427549 
    428550# The EXAMPLE_PATH tag can be used to specify one or more files or  
     
    457579# is the value of the INPUT_FILTER tag, and <input-file> is the name of an  
    458580# input file. Doxygen will then use the output that the filter program writes  
    459 # to standard output. 
     581# to standard output.  If FILTER_PATTERNS is specified, this tag will be  
     582# ignored. 
    460583 
    461584INPUT_FILTER           =  
     585 
     586# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern  
     587# basis.  Doxygen will compare the file name with each pattern and apply the  
     588# filter if there is a match.  The filters are a list of the form:  
     589# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further  
     590# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER  
     591# is applied to all files. 
     592 
     593FILTER_PATTERNS        =  
    462594 
    463595# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using  
     
    474606# be generated. Documented entities will be cross-referenced with these sources.  
    475607# Note: To get rid of all source code in the generated output, make sure also  
    476 # VERBATIM_HEADERS is set to NO. 
     608# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH  
     609# then you must also enable this option. If you don't then doxygen will produce  
     610# a warning and turn it on anyway 
    477611 
    478612SOURCE_BROWSER         = YES 
     
    500634 
    501635REFERENCES_RELATION    = YES 
     636 
     637# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) 
     638# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from 
     639# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will 
     640# link to the source code.  Otherwise they will link to the documentstion. 
     641 
     642REFERENCES_LINK_SOURCE = YES 
     643 
     644# If the USE_HTAGS tag is set to YES then the references to source code  
     645# will point to the HTML generated by the htags(1) tool instead of doxygen  
     646# built-in source browser. The htags tool is part of GNU's global source  
     647# tagging system (see http://www.gnu.org/software/global/global.html). You  
     648# will need version 4.8.6 or higher. 
     649 
     650USE_HTAGS              = NO 
    502651 
    503652# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen  
     
    585734GENERATE_HTMLHELP      = NO 
    586735 
     736# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML  
     737# documentation will contain sections that can be hidden and shown after the  
     738# page has loaded. For this to work a browser that supports  
     739# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox  
     740# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). 
     741 
     742HTML_DYNAMIC_SECTIONS  = NO 
     743 
    587744# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can  
    588745# be used to specify the file name of the resulting .chm file. You  
     
    8871044# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES  
    8881045# then the macro expansion is limited to the macros specified with the  
    889 # PREDEFINED and EXPAND_AS_PREDEFINED tags. 
     1046# PREDEFINED and EXPAND_AS_DEFINED tags. 
    8901047 
    8911048EXPAND_ONLY_PREDEF     = NO 
     
    9131070# gcc). The argument of the tag is a list of macros of the form: name  
    9141071# or name=definition (no spaces). If the definition and the = are  
    915 # omitted =1 is assumed. 
     1072# omitted =1 is assumed. To prevent a macro definition from being  
     1073# undefined via #undef or recursively expanded use the := operator  
     1074# instead of the = operator. 
    9161075 
    9171076PREDEFINED             =  
     
    9271086# doxygen's preprocessor will remove all function-like macros that are alone  
    9281087# on a line, have an all uppercase name, and do not end with a semicolon. Such  
    929 # function macros are typically used for boiler-plate code, and will confuse the  
    930 # parser if not removed. 
     1088# function macros are typically used for boiler-plate code, and will confuse  
     1089# the parser if not removed. 
    9311090 
    9321091SKIP_FUNCTION_MACROS   = YES 
     
    9801139 
    9811140# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will  
    982 # generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or  
    983 # super classes. Setting the tag to NO turns the diagrams off. Note that this  
    984 # option is superseded by the HAVE_DOT option below. This is only a fallback. It is  
    985 # recommended to install and use dot, since it yields more powerful graphs. 
     1141# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base  
     1142# or super classes. Setting the tag to NO turns the diagrams off. Note that  
     1143# this option is superseded by the HAVE_DOT option below. This is only a  
     1144# fallback. It is recommended to install and use dot, since it yields more  
     1145# powerful graphs. 
    9861146 
    9871147CLASS_DIAGRAMS         = YES 
     1148 
     1149# You can define message sequence charts within doxygen comments using the \msc  
     1150# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to  
     1151# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to  
     1152# specify the directory where the mscgen tool resides. If left empty the tool is assumed to  
     1153# be found in the default search path. 
     1154 
     1155MSCGEN_PATH            =  
    9881156 
    9891157# If set to YES, the inheritance and collaboration graphs will hide  
     
    10141182COLLABORATION_GRAPH    = YES 
    10151183 
     1184# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen  
     1185# will generate a graph for groups, showing the direct groups dependencies 
     1186 
     1187GROUP_GRAPHS           = YES 
     1188 
    10161189# If the UML_LOOK tag is set to YES doxygen will generate inheritance and  
    10171190# collaboration diagrams in a style similar to the OMG's Unified Modeling  
     
    10391212INCLUDED_BY_GRAPH      = YES 
    10401213 
    1041 # If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will  
     1214# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will  
    10421215# generate a call dependency graph for every global function or class method.  
    10431216# Note that enabling this option will significantly increase the time of a run.  
     
    10471220CALL_GRAPH             = YES 
    10481221 
     1222# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will  
     1223# generate a caller dependency graph for every global function or class method.  
     1224# Note that enabling this option will significantly increase the time of a run.  
     1225# So in most cases it will be better to enable caller graphs for selected  
     1226# functions only using the \callergraph command. 
     1227 
     1228CALLER_GRAPH           = NO 
     1229 
    10491230# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen  
    10501231# will graphical hierarchy of all classes instead of a textual one. 
    10511232 
    10521233GRAPHICAL_HIERARCHY    = YES 
     1234 
     1235# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES  
     1236# then doxygen will show the dependencies a directory has on other directories  
     1237# in a graphical way. The dependency relations are determined by the #include 
     1238# relations between the files in the directories. 
     1239 
     1240DIRECTORY_GRAPH        = YES 
    10531241 
    10541242# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images  
     
    10591247 
    10601248# The tag DOT_PATH can be used to specify the path where the dot tool can be  
    1061 # found. If left blank, it is assumed the dot tool can be found on the path. 
     1249# found. If left blank, it is assumed the dot tool can be found in the path. 
    10621250 
    10631251DOT_PATH               =  
     
    10691257DOTFILE_DIRS           =  
    10701258 
    1071 # The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width  
    1072 # (in pixels) of the graphs generated by dot. If a graph becomes larger than  
    1073 # this value, doxygen will try to truncate the graph, so that it fits within  
    1074 # the specified constraint. Beware that most browsers cannot cope with very  
    1075 # large images. 
    1076  
    1077 MAX_DOT_GRAPH_WIDTH    = 1024 
    1078  
    1079 # The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height  
    1080 # (in pixels) of the graphs generated by dot. If a graph becomes larger than  
    1081 # this value, doxygen will try to truncate the graph, so that it fits within  
    1082 # the specified constraint. Beware that most browsers cannot cope with very  
    1083 # large images. 
    1084  
    1085 MAX_DOT_GRAPH_HEIGHT   = 1024 
     1259# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of  
     1260# nodes that will be shown in the graph. If the number of nodes in a graph  
     1261# becomes larger than this value, doxygen will truncate the graph, which is  
     1262# visualized by representing a node as a red box. Note that doxygen if the number  
     1263# of direct children of the root node in a graph is already larger than  
     1264# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note  
     1265# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. 
     1266 
     1267DOT_GRAPH_MAX_NODES    = 50 
    10861268 
    10871269# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the  
    10881270# graphs generated by dot. A depth value of 3 means that only nodes reachable  
    1089 # from the root by following a path via at most 3 edges will be shown. Nodes that  
    1090 # lay further from the root node will be omitted. Note that setting this option to  
    1091 # 1 or 2 may greatly reduce the computation time needed for large code bases. Also  
    1092 # note that a graph may be further truncated if the graph's image dimensions are  
    1093 # not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT).  
    1094 # If 0 is used for the depth value (the default), the graph is not depth-constrained. 
     1271# from the root by following a path via at most 3 edges will be shown. Nodes  
     1272# that lay further from the root node will be omitted. Note that setting this  
     1273# option to 1 or 2 may greatly reduce the computation time needed for large  
     1274# code bases. Also note that the size of a graph can be further restricted by  
     1275# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. 
    10951276 
    10961277MAX_DOT_GRAPH_DEPTH    = 0 
     1278 
     1279# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent  
     1280# background. This is disabled by default, which results in a white background.  
     1281# Warning: Depending on the platform used, enabling this option may lead to  
     1282# badly anti-aliased labels on the edges of a graph (i.e. they become hard to  
     1283# read). 
     1284 
     1285DOT_TRANSPARENT        = YES 
     1286 
     1287# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output  
     1288# files in one run (i.e. multiple -o and -T options on the command line). This  
     1289# makes dot run faster, but since only newer versions of dot (>1.8.10)  
     1290# support this, this feature is disabled by default. 
     1291 
     1292DOT_MULTI_TARGETS      = NO 
    10971293 
    10981294# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will  
  • ossiedev/branches/ssayed/devs/src/system/ossie/configure.ac

    r7809 r8424  
    1 AC_INIT(ossie, 0.6.2) 
    2 AC_PREREQ(2.59) 
     1AC_INIT([ossie],[0.6.2]) 
     2AC_PREREQ(2.61) 
    33 
    44AM_INIT_AUTOMAKE(nostdinc) 
     
    1313AC_CHECK_LIB([omnithread], [main], [], [AC_MSG_ERROR([cannot find omnithread library])]) 
    1414AC_CHECK_HEADERS([omniORB4/CORBA.h], [], [AC_MSG_ERROR([cannot find omniORB4 header files])]) 
    15 AC_CHECK_PROG([IDL], [omniidl], [omniidl], [AC_MSG_ERROR([cannot find omniidl prgram])]) 
     15AC_CHECK_PROG([IDL], [omniidl], [AC_MSG_ERROR([cannot find omniidl program])]) 
    1616 
    1717AC_CHECK_HEADERS([boost/filesystem/operations.hpp], [], [AC_MSG_ERROR([boost filesystem library headers not installed.])]) 
     18 
    1819AC_CHECK_LIB([boost_filesystem], [main], [], [AC_MSG_ERROR([cannot find boost_filesystem library.])]) 
    1920 
  • ossiedev/branches/ssayed/devs/src/system/ossie/idl/cpp/Makefile.am

    r5734 r8424  
     1IDL_BIN = $(shell which omniidl) 
     2 
    13%SK.cpp %.h %DynSK.cpp : ../%.idl 
    2         @IDL@ -bcxx -Wba -Wbd=DynSK.cpp -Wbh=.h -Wbs=SK.cpp $< 
     4        $(IDL_BIN) -bcxx -Wba -Wbd=DynSK.cpp -Wbh=.h -Wbs=SK.cpp $< 
    35        cp $*.h ../../include/ossie 
    46 
  • ossiedev/branches/ssayed/devs/src/system/ossie/idl/python/ossie.pth

    r5916 r8424  
    2222 
    2323# OSSIE tools 
    24 /sdr/tools 
     24/usr/local/lib/python2.5/site-packages 
  • ossiedev/branches/ssayed/devs/src/system/ossie/parser/orb_wrap.cpp

    r7065 r8424  
    3030#include <iostream> 
    3131#include <sstream> 
    32  
     32#include <cstdlib> 
    3333#include <assert.h> 
    3434 
  • ossiedev/branches/ssayed/devs/src/system/ossie/parser/prop_helpers.cpp

    r7065 r8424  
    2323#include <string> 
    2424#include <vector> 
    25  
     25#include <cstdlib> 
    2626#ifdef HAVE_OMNIORB4_CORBA_H 
    2727#include "omniORB4/CORBA.h" 
  • ossiedev/branches/ssayed/devs/src/system/standardInterfaces/Makefile.am

    r5785 r8424  
     1IDL_BIN = $(shell which omniidl) 
     2 
    13%.pp.idl : %.idl 
    2         @CC@ -E -x c++ $< > $@ 
     4        gcc -E -x c++ $< > $@ 
    35 
    46%SK.cpp %.h %DynSK.cpp : %.idl 
    5         @IDL@ @IDL_FLAGS@ -bcxx -Wba -Wbd=DynSK.cpp -Wbh=.h -Wbs=SK.cpp -Wbkeep_inc_path $< 
     7        $(IDL_BIN) -I/usr/local/include -bcxx -Wba -Wbd=DynSK.cpp -Wbh=.h -Wbs=SK.cpp -Wbkeep_inc_path -Wbuse_quotes $< 
    68        cp $*.h include/standardinterfaces 
    79 
     
    2224    soundControlSK.cpp      \ 
    2325    stereoSoundSK.cpp       \ 
    24     Radio_ControlSK.cpp 
     26    Radio_ControlSK.cpp      
    2527 
    2628nodist_pkginclude_HEADERS = \ 
     
    3638    complexLong.h           \ 
    3739    FM_Control.h            \ 
    38         soundControl.h          \ 
     40    soundControl.h          \ 
    3941    stereoSound.h           \ 
    40     Radio_Control.h  
     42    Radio_Control.h 
    4143 
    4244AM_CXXFLAGS = -Wall -g 
     
    5961    soundControl.idl        \ 
    6062    stereoSound.idl         \ 
    61     sampleRateConvertorControl.idl  
     63    sampleRateConvertorControl.idl 
    6264 
    6365pkgconfigdir = $(libdir)/pkgconfig 
     
    9294    complexCharSK.cpp       \ 
    9395    complexLongSK.cpp       \ 
    94     Radio_ControlSK.cpp  
     96    Radio_ControlSK.cpp 
    9597 
    9698libstandardInterfaces_la_LDFLAGS = -version-info 0:6:0 
  • ossiedev/branches/ssayed/devs/src/system/standardInterfaces/configure.ac

    r5785 r8424  
    1616AC_CHECK_PROG([IDL], [omniidl], [omniidl], [AC_MSG_ERROR([cannot find omniidl prgram])]) 
    1717 
     18AM_PATH_PYTHON([2.5]) 
     19 
    1820AC_LANG_POP 
    1921 
     
    2527AC_SUBST(IDL_FLAGS) 
    2628 
    27 AC_CONFIG_FILES(Makefile python/Makefile include/Makefile include/standardinterfaces/Makefile standardInterfaces.pc) 
     29AC_CONFIG_FILES( 
     30        Makefile 
     31        python/Makefile 
     32        include/Makefile 
     33        include/standardinterfaces/Makefile 
     34        standardInterfaces.pc) 
    2835AC_OUTPUT 
    2936