Commit ba370c0f authored by Paul Asmuth's avatar Paul Asmuth
Browse files

src/{fnordmetric, libfnord}

parent eb0eec17

3rdparty/libfnord/fnord-webcomponents/examples/BUILD

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
package "fnord/webui/examples"



executable "webchat" {

  src = [

    "webchat.cc"

  ]

  link = [

    ":webchat_assets",

    "fnord/webui:base",

    "libx0/http:server",

    "//:pthread"

  ]

}



asset_bundle "webchat_assets" {

  src = [

    "webchat.css",

    "webchat_layout.tpl",

    "webchat_chatwindow.tpl"

  ]

  link = [

    "3rdparty/jquery.js",

    "3rdparty/bootstrap.css"

  ]

}

cmake/CMakeLists.txt

+60 −60
Original line number Diff line number Diff line
@@ -14,15 +14,15 @@ project(fnordmetric) 
option(ENABLE_TESTS "Build unit tests [default: off]" OFF)



include_directories(${PROJECT_BINARY_DIR})

include_directories(../3rdparty/libfnord)

include_directories(../src)

include_directories(../src/libfnord)



add_subdirectory(../3rdparty/libfnord/fnord-base "${CMAKE_CURRENT_BINARY_DIR}/libfnord-base")

add_subdirectory(../3rdparty/libfnord/fnord-chart "${CMAKE_CURRENT_BINARY_DIR}/libfnord-chart")

add_subdirectory(../3rdparty/libfnord/fnord-http "${CMAKE_CURRENT_BINARY_DIR}/libfnord-http")

add_subdirectory(../3rdparty/libfnord/fnord-json "${CMAKE_CURRENT_BINARY_DIR}/libfnord-json")

add_subdirectory(../3rdparty/libfnord/fnord-metricdb "${CMAKE_CURRENT_BINARY_DIR}/libfnord-metricdb")

add_subdirectory(../3rdparty/libfnord/fnord-sstable "${CMAKE_CURRENT_BINARY_DIR}/libfnord-sstable")

add_subdirectory(../src/libfnord/fnord-base "${CMAKE_CURRENT_BINARY_DIR}/libfnord-base")

add_subdirectory(../src/libfnord/fnord-chart "${CMAKE_CURRENT_BINARY_DIR}/libfnord-chart")

add_subdirectory(../src/libfnord/fnord-http "${CMAKE_CURRENT_BINARY_DIR}/libfnord-http")

add_subdirectory(../src/libfnord/fnord-json "${CMAKE_CURRENT_BINARY_DIR}/libfnord-json")

add_subdirectory(../src/libfnord/fnord-metricdb "${CMAKE_CURRENT_BINARY_DIR}/libfnord-metricdb")

add_subdirectory(../src/libfnord/fnord-sstable "${CMAKE_CURRENT_BINARY_DIR}/libfnord-sstable")



find_package(Threads)
@@ -39,58 +39,58 @@ set(FNORDMETRIC_SOURCES 
    $<TARGET_OBJECTS:fnord-json>

    $<TARGET_OBJECTS:fnord-metricdb>

    $<TARGET_OBJECTS:fnord-sstable>

    ../3rdparty/libfnord/fnord-webcomponents/bundle.cc

    ../3rdparty/libfnord/fnord-webcomponents/httpmount.cc

    ../src/adminui.cc

    ../src/environment.cc

    ../src/chartsql/areachartbuilder.cc

    ../src/chartsql/barchartbuilder.cc

    ../src/chartsql/domainconfig.cc

    ../src/chartsql/drawstatement.cc

    ../src/chartsql/linechartbuilder.cc

    ../src/chartsql/pointchartbuilder.cc

    ../src/chartsql/queryendpoint.cc

    ../src/chartsql/query.cc

    ../src/chartsql/queryservice.cc

    ../src/chartsql/seriesadapter.cc

    ../src/sql/backends/csv/csvbackend.cc

    ../src/sql/backends/csv/csvinputstream.cc

    ../src/sql/backends/csv/csvtableref.cc

    ../src/sql/backends/mysql/mysqlbackend.cc

    ../src/sql/backends/mysql/mysqlconnection.cc

    ../src/sql/backends/mysql/mysqltableref.cc

    ../src/sql/backends/metricservice/metrictableref.cc

    ../src/sql/backends/metricservice/metrictablerepository.cc

    ../src/sql/expressions/aggregate.cc

    ../src/sql/expressions/boolean.cc

    ../src/sql/expressions/datetime.cc

    ../src/sql/expressions/math.cc

    ../src/sql/parser/astnode.cc

    ../src/sql/parser/astutil.cc

    ../src/sql/parser/parser.cc

    ../src/sql/parser/token.cc

    ../src/sql/parser/tokenize.cc

    ../src/sql/runtime/compile.cc

    ../src/sql/runtime/defaultruntime.cc

    ../src/sql/runtime/execute.cc

    ../src/sql/runtime/groupovertimewindow.cc

    ../src/sql/runtime/orderby.cc

    ../src/sql/runtime/importstatement.cc

    ../src/sql/runtime/queryplan.cc

    ../src/sql/runtime/queryplanbuilder.cc

    ../src/sql/runtime/queryplannode.cc

    ../src/sql/runtime/runtime.cc

    ../src/sql/runtime/symboltable.cc

    ../src/sql/runtime/tablerepository.cc

    ../src/sql/runtime/tablescan.cc

    ../src/sql/svalue.cc)



#add_executable(fnordmetric-cli ${FNORDMETRIC_SOURCES} ../src/cli.cc)

    ../src/libfnord/fnord-webcomponents/bundle.cc

    ../src/libfnord/fnord-webcomponents/httpmount.cc

    ../src/fnordmetric/adminui.cc

    ../src/fnordmetric/environment.cc

    ../src/fnordmetric/chartsql/areachartbuilder.cc

    ../src/fnordmetric/chartsql/barchartbuilder.cc

    ../src/fnordmetric/chartsql/domainconfig.cc

    ../src/fnordmetric/chartsql/drawstatement.cc

    ../src/fnordmetric/chartsql/linechartbuilder.cc

    ../src/fnordmetric/chartsql/pointchartbuilder.cc

    ../src/fnordmetric/chartsql/queryendpoint.cc

    ../src/fnordmetric/chartsql/query.cc

    ../src/fnordmetric/chartsql/queryservice.cc

    ../src/fnordmetric/chartsql/seriesadapter.cc

    ../src/fnordmetric/sql/backends/csv/csvbackend.cc

    ../src/fnordmetric/sql/backends/csv/csvinputstream.cc

    ../src/fnordmetric/sql/backends/csv/csvtableref.cc

    ../src/fnordmetric/sql/backends/mysql/mysqlbackend.cc

    ../src/fnordmetric/sql/backends/mysql/mysqlconnection.cc

    ../src/fnordmetric/sql/backends/mysql/mysqltableref.cc

    ../src/fnordmetric/sql/backends/metricservice/metrictableref.cc

    ../src/fnordmetric/sql/backends/metricservice/metrictablerepository.cc

    ../src/fnordmetric/sql/expressions/aggregate.cc

    ../src/fnordmetric/sql/expressions/boolean.cc

    ../src/fnordmetric/sql/expressions/datetime.cc

    ../src/fnordmetric/sql/expressions/math.cc

    ../src/fnordmetric/sql/parser/astnode.cc

    ../src/fnordmetric/sql/parser/astutil.cc

    ../src/fnordmetric/sql/parser/parser.cc

    ../src/fnordmetric/sql/parser/token.cc

    ../src/fnordmetric/sql/parser/tokenize.cc

    ../src/fnordmetric/sql/runtime/compile.cc

    ../src/fnordmetric/sql/runtime/defaultruntime.cc

    ../src/fnordmetric/sql/runtime/execute.cc

    ../src/fnordmetric/sql/runtime/groupovertimewindow.cc

    ../src/fnordmetric/sql/runtime/orderby.cc

    ../src/fnordmetric/sql/runtime/importstatement.cc

    ../src/fnordmetric/sql/runtime/queryplan.cc

    ../src/fnordmetric/sql/runtime/queryplanbuilder.cc

    ../src/fnordmetric/sql/runtime/queryplannode.cc

    ../src/fnordmetric/sql/runtime/runtime.cc

    ../src/fnordmetric/sql/runtime/symboltable.cc

    ../src/fnordmetric/sql/runtime/tablerepository.cc

    ../src/fnordmetric/sql/runtime/tablescan.cc

    ../src/fnordmetric/sql/svalue.cc)



#add_executable(fnordmetric-cli ${FNORDMETRIC_SOURCES} ../src/fnordmetric/cli.cc)

#target_link_libraries(fnordmetric-cli m)

#target_link_libraries(fnordmetric-cli ${CMAKE_THREAD_LIBS_INIT})

#install(TARGETS fnordmetric-cli DESTINATION bin)



add_executable(fnordmetric-server ${FNORDMETRIC_SOURCES} ../src/fnordmetric-server.cc)

add_executable(fnordmetric-server ${FNORDMETRIC_SOURCES} ../src/fnordmetric/fnordmetric-server.cc)

target_link_libraries(fnordmetric-server m)

target_link_libraries(fnordmetric-server ${CMAKE_THREAD_LIBS_INIT})

install(TARGETS fnordmetric-server DESTINATION bin)
@@ -110,22 +110,22 @@ if(ENABLE_TESTS) 
  add_library(fnord SHARED ${FNORDMETRIC_SOURCES})

  target_link_libraries(fnord m)



  add_executable(tests/test-sql ../src/sql/sql_test.cc)

  add_executable(tests/test-sql ../src/fnordmetric/sql/sql_test.cc)

  target_link_libraries(tests/test-sql fnord)



  add_executable(tests/test-csv-backend

      stage/src/fnordmetric/sql/backends/csv/csvbackend_test.cc)

      stage/src/fnordmetric/fnordmetric/sql/backends/csv/csvbackend_test.cc)

  target_link_libraries(tests/test-csv-backend fnord)



  add_executable(tests/test-sql-extensions

      stage/src/fnordmetric/sql_extensions/sql_extensions_test.cc)

      stage/src/fnordmetric/fnordmetric/sql_extensions/sql_extensions_test.cc)

  target_link_libraries(tests/test-sql-extensions fnord)



  add_executable(tests/test-query

      stage/src/fnordmetric/query/query_test.cc)

      stage/src/fnordmetric/fnordmetric/query/query_test.cc)

  target_link_libraries(tests/test-query fnord)



  add_executable(tests/test-disk-backend

      stage/src/fnordmetric/metricdb/backends/disk/diskbackend_test.cc)

      stage/src/fnordmetric/fnordmetric/metricdb/backends/disk/diskbackend_test.cc)

  target_link_libraries(tests/test-disk-backend fnord)

endif()

src/adminui.cc→src/fnordmetric/adminui.cc

+2 −2
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ 
 * copy of the GNU General Public License along with this program. If not, see

 * <http://www.gnu.org/licenses/>.

 */

#include <environment.h>

#include <adminui.h>

#include <fnord-base/uri.h>

#include <fnordmetric/environment.h>

#include <fnordmetric/adminui.h>



namespace fnordmetric {

src/adminui.h→src/fnordmetric/adminui.h

+0 −0

File moved.

View file

src/chartsql/areachartbuilder.cc→src/fnordmetric/chartsql/areachartbuilder.cc

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ 
 * copy of the GNU General Public License along with this program. If not, see

 * <http://www.gnu.org/licenses/>.

 */

#include <chartsql/areachartbuilder.h>

#include <chartsql/drawstatement.h>

#include <fnordmetric/chartsql/areachartbuilder.h>

#include <fnordmetric/chartsql/drawstatement.h>

#include <fnord-chart/areachart.h>



namespace fnordmetric {

CRA Git | Maintained and supported by SUSTech CRA and CCSE