Changeset 593

Show
Ignore:
Timestamp:
07/15/08 07:20:41 (4 months ago)
Author:
weyrick
Message:

more organization

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/rphp/runtime/CMakeLists.txt

    r591 r593  
    77cmake_minimum_required(VERSION 2.6) 
    88 
    9 include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${Boost_INCLUDE_DIRS}) 
     9include_directories (${CMAKE_SOURCE_DIR}/include ${CMAKE_BINARY_DIR} ${Boost_INCLUDE_DIRS}) 
    1010 
    11 # runtime library 
    1211set(RUNTIME_SRC_FILES 
    13   rphp_hash.cpp 
    14   rphp_object.cpp 
    15   rphp_types.cpp 
     12  pHash.cpp 
     13  pObject.cpp 
     14  pTypes.cpp 
    1615) 
    1716 
    18 add_library( rphp_runtime SHARED ${RUNTIME_SRC_FILES} ) 
     17add_library( rphp-runtime SHARED ${RUNTIME_SRC_FILES} ) 
    1918 
    20  

  • trunk/rphp/runtime/include/pHash.h

    r592 r593  
    1717 * ***** END LICENSE BLOCK ***** */ 
    1818 
    19 #ifndef RPHP_HASH_H_ 
    20 #define RPHP_HASH_H_ 
     19#ifndef RPHP_PHASH_H_ 
     20#define RPHP_PHASH_H_ 
    2121 
    2222#include <boost/multi_index_container.hpp> 
    …… 
    2626#include <iostream> 
    2727 
    28 #include "rphp_pvar.h" 
     28#include "pVar.h" 
    2929 
    3030// hash function for use with rphp::pUString 
    …… 
    7272    /** 
    7373     * pHash definition 
    74      * 
    7574     */ 
    7675    class pHash { 
    …… 
    120119} /* namespace rphp */ 
    121120 
    122 #endif /* RPHP_HASH_H_ */ 
     121#endif /* RPHP_PHASH_H_ */ 

  • trunk/rphp/runtime/include/pObject.h

    r592 r593  
    1717 * ***** END LICENSE BLOCK ***** */ 
    1818 
    19 #ifndef RPHP_OBJECT_H_ 
    20 #define RPHP_OBJECT_H_ 
     19#ifndef RPHP_POBJECT_H_ 
     20#define RPHP_POBJECT_H_ 
    2121 
    22 #include "rphp_hash.h" 
    2322#include <iostream> 
     23 
     24#include "pHash.h" 
    2425 
    2526namespace rphp { 
    …… 
    4344} 
    4445 
    45 #endif /* RPHP_OBJECT_H_ */ 
     46#endif /* RPHP_POBJECT_H_ */ 

  • trunk/rphp/runtime/include/pRuntime.h

    r572 r593  
    1717 * ***** END LICENSE BLOCK ***** */ 
    1818 
    19 #ifndef RPHP_RUNTIME_H_ 
    20 #define RPHP_RUNTIME_H_ 
     19#ifndef RPHP_PRUNTIME_H_ 
     20#define RPHP_PRUNTIME_H_ 
    2121 
    22 #include "rphp_types.h" 
     22#include "pTypes.h" 
    2323 
    24 #endif /* RPHP_RUNTIME_H_ */ 
     24#endif /* RPHP_PRUNTIME_H_ */ 

  • trunk/rphp/runtime/include/pTypes.h

    r592 r593  
    1717 * ***** END LICENSE BLOCK ***** */ 
    1818 
    19 #ifndef RPHP_TYPES_H_ 
    20 #define RPHP_TYPES_H_ 
     19#ifndef RPHP_PTYPES_H_ 
     20#define RPHP_PTYPES_H_ 
    2121 
    22 #include "boost/lexical_cast.hpp" 
     22#include <boost/lexical_cast.hpp> 
    2323 
    24 #include "rphp_pvar.h" 
    25 #include "rphp_hash.h" 
    26 #include "rphp_object.h" 
     24#include "pVar.h" 
     25#include "pHash.h" 
     26#include "pObject.h" 
    2727 
    2828namespace rphp { 
    …… 
    158158 
    159159 
    160 #endif /* RPHP_TYPES_H_ */ 
     160#endif /* RPHP_PTYPES_H_ */ 

  • trunk/rphp/runtime/pHash.cpp

    r592 r593  
    1717 * ***** END LICENSE BLOCK ***** */ 
    1818 
    19 #include "rphp_hash.h" 
    2019#include <iostream> 
     20#include "pHash.h" 
    2121 
    2222U_NAMESPACE_BEGIN 

  • trunk/rphp/runtime/pObject.cpp

    r592 r593  
    1717 * ***** END LICENSE BLOCK ***** */ 
    1818 
    19 #include "rphp_object.h" 
    2019#include <iostream> 
     20#include "pObject.h" 
    2121 
    2222namespace rphp { 

  • trunk/rphp/runtime/pTypes.cpp

    r592 r593  
    1717 * ***** END LICENSE BLOCK ***** */ 
    1818 
    19 #include "rphp_types.h" 
     19#include "pTypes.h" 
    2020 
    2121namespace rphp { 

  • trunk/rphp/runtime/test/CMakeLists.txt

    r588 r593  
    99# XXX fixme 
    1010link_directories (${CMAKE_SOURCE_DIR}/../build/) 
    11 include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/../) 
     11include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/../include/) 
    1212 
    1313# test apps 
    14 add_executable( rphp_runtime_suite main.cpp phashTestCase.cpp pvarTestCase.cpp ) 
    15 target_link_libraries( rphp_runtime_suite cppunit rphp_runtime ${ICU_LIBRARIES} ${ICU_IO_LIBRARIES}) 
     14add_executable( rphp-runtime-suite main.cpp phashTestCase.cpp pvarTestCase.cpp ) 
     15target_link_libraries( rphp-runtime-suite cppunit rphp-runtime ${ICU_LIBRARIES} ${ICU_IO_LIBRARIES}) 

  • trunk/rphp/runtime/test/phashTestCase.cpp

    r592 r593  
    33#include <iostream> 
    44 
    5 #include "rphp_runtime.h" 
     5#include "pRuntime.h" 
    66 
    77#include "phashTestCase.h" 

  • trunk/rphp/runtime/test/pvarTestCase.cpp

    r592 r593  
    99#include <iostream> 
    1010 
    11 #include "rphp_runtime.h" 
     11#include "pRuntime.h" 
    1212#include "pvarTestCase.h" 
    1313