Commit 2e119e52 authored by Paul Asmuth's avatar Paul Asmuth
Browse files

plotfx -> fviz

parent b37304b1
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ cmake_install.cmake
*.so
*.dll
*.dylib
/plotfx
/fviz
/.ninja_deps
/.ninja_log
/*.ninja
+1 −1
Original line number Diff line number Diff line
Here is an inevitably incomplete list of contributers who have submitted
patches, reported bugs, added translations, helped answer newbie questions, and
generally made PlotFX better (ordered by time of first contribution)
generally made fviz better (ordered by time of first contribution)

- Paul Asmuth <paul@asmuth.com>
- Laura Schlimmer <lauraschlimmer@gmail.com>
+3 −3
Original line number Diff line number Diff line
PlotFX v0.2.0; unreleased
fviz v0.2.0; unreleased

  * Renamed the project from "FnordMetric" to "PlotFX", set version to "0.2.0"
  * Renamed the project from "FnordMetric" to "fviz", set version to "0.2.0"

  * Changed the license to 3-Clause BSD

@@ -10,7 +10,7 @@ PlotFX v0.2.0; unreleased

  * Added support for reading input data from CSV files

  * Added support for embedding PlotFX as a library
  * Added support for embedding fviz as a library

  * Added support for exporting images as bitmaps (PNG) and PDF files through
    libcairo
+20 −20
Original line number Diff line number Diff line
project(plotfx)
add_definitions("-DPLOTFX_VERSION='\"v0.2.0\"'")
project(fviz)
add_definitions("-Dfviz_VERSION='\"v0.2.0\"'")


# CMake Setup
@@ -27,26 +27,26 @@ find_package(PNG)
include_directories(${CAIRO_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS} ${HARFBUZZ_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS})


# Build: PlotFX Library
# Build: fviz Library
# -----------------------------------------------------------------------------
file(GLOB source_files "core/graphics/*.cc" "core/utils/**.cc" "core/sexpr*.cc" "core/plotfx.cc" "core/scale.cc" "core/environment.cc" "elements/text.cc" "core/element_factory.cc" "core/config_helpers.cc" "elements/chart/axis.cc" "core/format.cc" "core/layout.cc" "core/data_model.cc" "elements/chart/layout.cc" "elements/fill.cc")
list(REMOVE_ITEM source_files "core/plotfx_cli.cc")
add_library(plotfx STATIC ${source_files})
set_target_properties(plotfx PROPERTIES PUBLIC_HEADER "source/plotfx.h;source/plotfx_sdl.h")
set(PLOTFX_LDFLAGS plotfx ${CAIRO_LIBRARIES} ${FREETYPE_LIBRARIES} ${HARFBUZZ_LIBRARIES} ${HARFBUZZ_ICU_LIBRARIES} ${PNG_LIBRARIES} ${FONTCONFIG_LIBRARIES})
file(GLOB source_files "core/graphics/*.cc" "core/utils/**.cc" "core/sexpr*.cc" "core/fviz.cc" "core/scale.cc" "core/environment.cc" "elements/text.cc" "core/element_factory.cc" "core/config_helpers.cc" "elements/chart/axis.cc" "core/format.cc" "core/layout.cc" "core/data_model.cc" "elements/chart/layout.cc" "elements/fill.cc")
list(REMOVE_ITEM source_files "core/cli.cc")
add_library(fviz STATIC ${source_files})
set_target_properties(fviz PROPERTIES PUBLIC_HEADER "source/fviz.h;source/fviz_sdl.h")
set(fviz_LDFLAGS fviz ${CAIRO_LIBRARIES} ${FREETYPE_LIBRARIES} ${HARFBUZZ_LIBRARIES} ${HARFBUZZ_ICU_LIBRARIES} ${PNG_LIBRARIES} ${FONTCONFIG_LIBRARIES})


# Build: CLI
# -----------------------------------------------------------------------------
add_executable(plotfx-cli core/plotfx_cli.cc)
target_link_libraries(plotfx-cli ${PLOTFX_LDFLAGS})
set_target_properties(plotfx-cli PROPERTIES OUTPUT_NAME plotfx)
add_executable(fviz-cli core/cli.cc)
target_link_libraries(fviz-cli ${fviz_LDFLAGS})
set_target_properties(fviz-cli PROPERTIES OUTPUT_NAME fviz)


# Installation
# -----------------------------------------------------------------------------
install(TARGETS plotfx ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include/plotfx)
install(TARGETS plotfx-cli DESTINATION bin)
install(TARGETS fviz ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include/fviz)
install(TARGETS fviz-cli DESTINATION bin)


# Testing
@@ -57,39 +57,39 @@ foreach(unit_test_path ${unit_test_files})
  get_filename_component(unit_test_srcdir ${unit_test_path} DIRECTORY)

  add_executable(${unit_test_name} ${unit_test_path})
  target_link_libraries(${unit_test_name} ${PLOTFX_LDFLAGS})
  target_link_libraries(${unit_test_name} ${fviz_LDFLAGS})

  add_test(
      NAME ${unit_test_name}
      COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${unit_test_name})
endforeach()

file(GLOB spec_test_files "tests/spec/**/test_*.ptx")
file(GLOB spec_test_files "tests/spec/**/test_*.fvz")
foreach(spec_test_path ${spec_test_files})
  get_filename_component(spec_test_name ${spec_test_path} NAME_WE)
  get_filename_component(spec_test_srcdir ${spec_test_path} DIRECTORY)
  add_test(
      NAME ${spec_test_name}_svg
      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
      COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tests/spec/test_runner.sh ${CMAKE_CURRENT_BINARY_DIR}/plotfx ${spec_test_path} ${CMAKE_CURRENT_BINARY_DIR}/${spec_test_name}.svg ${spec_test_srcdir}/${spec_test_name}.svg)
      COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tests/spec/test_runner.sh ${CMAKE_CURRENT_BINARY_DIR}/fviz ${spec_test_path} ${CMAKE_CURRENT_BINARY_DIR}/${spec_test_name}.svg ${spec_test_srcdir}/${spec_test_name}.svg)
endforeach()

file(GLOB example_test_files "examples/**/*.ptx")
file(GLOB example_test_files "examples/**/*.fvz")
foreach(example_test_path ${example_test_files})
  get_filename_component(example_test_name ${example_test_path} NAME_WE)
  get_filename_component(example_test_srcdir ${example_test_path} DIRECTORY)
  add_test(
      NAME test_example_${example_test_name}_svg
      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
      COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tests/spec/test_runner.sh ${CMAKE_CURRENT_BINARY_DIR}/plotfx ${example_test_path} ${CMAKE_CURRENT_BINARY_DIR}/example_${example_test_name}.svg ${example_test_srcdir}/${example_test_name}.svg)
      COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tests/spec/test_runner.sh ${CMAKE_CURRENT_BINARY_DIR}/fviz ${example_test_path} ${CMAKE_CURRENT_BINARY_DIR}/example_${example_test_name}.svg ${example_test_srcdir}/${example_test_name}.svg)
endforeach()

file(GLOB doc_test_files "manual/figures/*.ptx")
file(GLOB doc_test_files "manual/figures/*.fvz")
foreach(doc_test_path ${doc_test_files})
  get_filename_component(doc_test_name ${doc_test_path} NAME_WE)
  get_filename_component(doc_test_srcdir ${doc_test_path} DIRECTORY)
  add_test(
      NAME test_doc_${doc_test_name}_svg
      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
      COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tests/spec/test_runner.sh ${CMAKE_CURRENT_BINARY_DIR}/plotfx ${doc_test_path} ${CMAKE_CURRENT_BINARY_DIR}/figure_${doc_test_name}.svg ${doc_test_srcdir}/${doc_test_name}.svg)
      COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tests/spec/test_runner.sh ${CMAKE_CURRENT_BINARY_DIR}/fviz ${doc_test_path} ${CMAKE_CURRENT_BINARY_DIR}/figure_${doc_test_name}.svg ${doc_test_srcdir}/${doc_test_name}.svg)
endforeach()
+1 −1
Original line number Diff line number Diff line
The PlotFX License (https://plotfx.org)
The fviz License (https://fviz.org)
Copyright (c) 2018, Paul Asmuth, Laura Schlimmer
All rights reserved.

Loading