Changeset 611

Show
Ignore:
Timestamp:
07/24/08 10:27:01 (4 months ago)
Author:
weyrick
Message:

plugin the pieces. everything should be built from the root CMakeLists.txt now. compiler/ builds an eval lib, runtime/ builds a runtime lib, and frontend/cli uses them

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/rphp/CMakeLists.txt

    r608 r611  
     1# root 
     2 
    13project (rphp) 
    24 
    3 cmake_minimum_required(VERSION 2.6) 
    4 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ) 
     5set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules ) 
     6MESSAGE( STATUS "PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR} ) 
     7MESSAGE( STATUS "CMAKE_MODULE_PATH: " ${CMAKE_MODULE_PATH} ) 
    58 
    6 FIND_PACKAGE(ICU REQUIRED) 
     9set(RPHP_RUNTIME_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/runtime/include) 
     10set(RPHP_COMPILER_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/compiler) 
     11 
     12FIND_PACKAGE(Boost REQUIRED) 
     13FIND_PACKAGE(ICU) 
    714 
    815add_subdirectory(tools) 
     16add_subdirectory(runtime) 
     17add_subdirectory(compiler) 
     18add_subdirectory(frontend/cli) 
    919 
    10 include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} tools/kdevelop-pg/include ${ICU_INCLUDE_DIRS}/unicode ${ICU_INCLUDE_DIRS}) 
    11  
    12 set(SRC_FILES 
    13   compiler/parser/rphp_default_visitor.cpp 
    14   compiler/parser/rphp_parser.cpp 
    15   compiler/parser/rphp_visitor.cpp 
    16   compiler/parser/phplexer.cpp 
    17   compiler/parser/main.cpp 
    18 ) 
    19  
    20 add_executable( rphp ${SRC_FILES} ) 
    21  
    22 target_link_libraries( rphp  ${ICU_LIBRARIES} ${ICU_I18_LIBRARIES} ) 

  • trunk/rphp/README

    r554 r611  
     1 
     2Roadsend PHP 

  • trunk/rphp/frontend/cli/main.cpp

    r608 r611  
    1 /* 
    2  * main.cpp 
    3  * 
    4  *  Created on: Jul 22, 2008 
    5  *      Author: thomasmoenicke 
    6  */ 
    71 
    8 #include "rphp_parser.h" 
    9 #include "phplexer.h" 
     2#include <iostream> 
     3#include "pDriver.h" 
    104 
    115int main( int argc, char* argv[] ) 
    126{ 
    13     const UnicodeString content( "print();" ); 
    147 
    15     rphp::parser parser; 
    16     rphp::Lexer lexer( &parser, content ); 
     8    rphp::pDriver driver; 
     9     
     10    std::cout << "Roadsend PHP" << std::endl; 
     11    driver.compile("fiddle.php"); 
     12 
    1713} 

  • trunk/rphp/runtime/CMakeLists.txt

    r598 r611  
    1 project (rphp) 
     1# runtime 
    22 
    3 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/../cmake/modules ) 
     3MESSAGE( STATUS "runtime check" ) 
    44 
    5 FIND_PACKAGE(Boost REQUIRED) 
    6 FIND_PACKAGE(ICU) 
    7  
    8 cmake_minimum_required(VERSION 2.6) 
    9  
    10 include_directories (${CMAKE_SOURCE_DIR}/include ${CMAKE_BINARY_DIR} ${Boost_INCLUDE_DIRS}) 
     5include_directories (${Boost_INCLUDE_DIRS} ${RPHP_RUNTIME_INCLUDE_DIR}) 
    116 
    127set(RUNTIME_SRC_FILES 

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

    r593 r611  
    1 project (rphp) 
    21 
    32set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/../../cmake/modules )