Skip to content

Commit 4dd8c9f

Browse files
committed
again rename binary -> sqlplot-tools
1 parent 18bc7e3 commit 4dd8c9f

6 files changed

Lines changed: 15 additions & 15 deletions

File tree

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
3939
endif()
4040

4141
# options to build with various database libraries
42-
option(WITH_POSTGRESQL "Build SqlPlotTools with PostgreSQL interface" ON)
43-
option(WITH_MYSQL "Build SqlPlotTools with MySQL interface" ON)
42+
option(WITH_POSTGRESQL "Build sqlplot-tools with PostgreSQL interface" ON)
43+
option(WITH_MYSQL "Build sqlplot-tools with MySQL interface" ON)
4444

4545
# option to update all tests with new output
4646
option(UPDATE_TESTS "Update test output with program output" OFF)
@@ -53,7 +53,7 @@ set(TEST_DATABASE "Sqlite"
5353
CACHE STRING "Select the database system to run tests on.")
5454

5555
# allow user to specify other binary installation paths
56-
set(INSTALL_BIN_DIR "bin" CACHE PATH "Installation directory for sqlplottools")
56+
set(INSTALL_BIN_DIR "bin" CACHE PATH "Installation directory for sqlplot-tools")
5757

5858
# enable warnings
5959
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W -Wall")

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ cmake ..
5252
make
5353
```
5454

55-
The main program is **`sp-process`**, located in `src/`.
55+
The main program is **`sqlplot-tools`**, located in `src/`.
5656

5757
# Tutorial
5858

@@ -86,7 +86,7 @@ To see how SqlPlotTools imports data sets, we suggest you run
8686

8787
```
8888
touch test.db
89-
sp-process import-data -D sqlite:test.db ex1 examples/sorting-speed/stats.txt
89+
sqlplot-tools import-data -D sqlite:test.db ex1 examples/sorting-speed/stats.txt
9090
```
9191

9292
This will import RESULT rows from the included [stats.txt](examples/sorting-speed/stats.txt) file into the table ex1 in an SQLite3 database called `test.db`. The types of the different columns are automatically detected during import, thus there is no need to specify a `CREATE TABLE` directive. Without the `-D sqlite:test.db`, the table would be created in a temporary in-memory database, and thus discarded after the program ends. However, since we saved the database, we can manually select from the data. The imported table looks as follows:
@@ -146,14 +146,14 @@ x y algo
146146

147147
The SQL statement already suggests how the data rows are transformed by SqlPlotTools into plot lines. The parenthesised argument "algo" (in general "col1,col2,col3") is used to **group multiple rows** into a plot line. The plot line is automatically labelled using the values of the group columns.
148148

149-
To generate the plot data from the stats and update the Gnuplot file, simply run `sp-process` in the `examples/sorting-speed` directory, followed by `gnuplot`:
149+
To generate the plot data from the stats and update the Gnuplot file, simply run `sqlplot-tools` in the `examples/sorting-speed` directory, followed by `gnuplot`:
150150

151151
```
152-
sp-process speed.plot
152+
sqlplot-tools speed.plot
153153
gnuplot speed.plot
154154
```
155155

156-
The `sp-process` call will parse [speed.plot](examples/sorting-speed/speed.plot) for SQL directives, execute them, and modified the plot file. The lines after these directives are **replaced** with the corresponding results, and in the case of Gnuplot, and additional [speed-data.txt](examples/sorting-speed/speed-data.txt) file is generated, which contains the actual data points of the plot. Since the current tarball already contains `speed-data.txt` and `speed.pdf`, we suggest deleting these two files and recreating them with the command above.
156+
The `sqlplot-tools` call will parse [speed.plot](examples/sorting-speed/speed.plot) for SQL directives, execute them, and modified the plot file. The lines after these directives are **replaced** with the corresponding results, and in the case of Gnuplot, and additional [speed-data.txt](examples/sorting-speed/speed-data.txt) file is generated, which contains the actual data points of the plot. Since the current tarball already contains `speed-data.txt` and `speed.pdf`, we suggest deleting these two files and recreating them with the command above.
157157

158158
## Generating LaTeX Pgfplots and Tabulars using SQL Statements
159159

src/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
###############################################################################
22
# src/CMakeLists.txt
33
#
4-
# CMake file for sqlplottools utility set.
4+
# CMake file for sqlplot-tools utility set.
55
#
66
###############################################################################
77
# Copyright (C) 2013-2015 Timo Bingmann <tb@panthema.net>
@@ -30,7 +30,7 @@ if(MYSQL_FOUND)
3030
set(SQL_SOURCES ${SQL_SOURCES} mysql.cpp)
3131
endif()
3232

33-
add_executable(sqlplottools
33+
add_executable(sqlplot-tools
3434
main.cpp
3535
latex.cpp
3636
gnuplot.cpp
@@ -44,8 +44,8 @@ add_executable(sqlplottools
4444
reformat.cpp
4545
)
4646

47-
target_link_libraries(sqlplottools ${SQL_LIBRARIES} ${Boost_LIBRARIES})
47+
target_link_libraries(sqlplot-tools ${SQL_LIBRARIES} ${Boost_LIBRARIES})
4848

49-
install(TARGETS sqlplottools RUNTIME DESTINATION ${INSTALL_BIN_DIR})
49+
install(TARGETS sqlplot-tools RUNTIME DESTINATION ${INSTALL_BIN_DIR})
5050

5151
################################################################################

src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/******************************************************************************
2-
* src/sp-process.cpp
2+
* src/sqlplot-tools.cpp
33
*
44
* Process embedded SQL plot instructions in LaTeX or Gnuplot files.
55
*

tests/gnuplot/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ foreach(infile ${plot_files})
3131
get_filename_component(basename ${infile} NAME)
3232
# write test case
3333
add_test(NAME gnuplot_${basename}
34-
COMMAND ${CMAKE_BINARY_DIR}/src/sp-process ${TEST_OPTIONS} ${infile} -o ${outfile}
34+
COMMAND ${CMAKE_BINARY_DIR}/src/sqlplot-tools ${TEST_OPTIONS} ${infile} -o ${outfile}
3535
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
3636
)
3737
endforeach()

tests/latex/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ foreach(infile ${tex_files})
3131
get_filename_component(basename ${infile} NAME)
3232
# write test case
3333
add_test(NAME latex_${basename}
34-
COMMAND ${CMAKE_BINARY_DIR}/src/sp-process ${TEST_OPTIONS} ${infile} -o ${outfile}
34+
COMMAND ${CMAKE_BINARY_DIR}/src/sqlplot-tools ${TEST_OPTIONS} ${infile} -o ${outfile}
3535
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
3636
)
3737
endforeach()

0 commit comments

Comments
 (0)