Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[13016] trunk
|
From: <ai...@us...> - 2014-02-23 18:50:15
|
Revision: 13016
http://sourceforge.net/p/plplot/code/13016
Author: airwin
Date: 2014-02-23 18:50:11 +0000 (Sun, 23 Feb 2014)
Log Message:
-----------
Implement "check_all" target which depends on all the check targets.
Improve run-time messages for each of the check targets.
Modified Paths:
--------------
trunk/bindings/f95/CMakeLists.txt
trunk/bindings/ocaml/CMakeLists.txt
trunk/bindings/swig-support/CMakeLists.txt
trunk/bindings/tcl/CMakeLists.txt
trunk/cmake/modules/plplot.cmake
trunk/doc/docbook/src/CMakeLists.txt
Modified: trunk/bindings/f95/CMakeLists.txt
===================================================================
--- trunk/bindings/f95/CMakeLists.txt 2014-02-20 20:49:23 UTC (rev 13015)
+++ trunk/bindings/f95/CMakeLists.txt 2014-02-23 18:50:11 UTC (rev 13016)
@@ -112,6 +112,7 @@
# Check consistency of plplot_parameters.h.
add_custom_target(
check_f95_parameters
+ ${CMAKE_COMMAND} -E echo "Check that bindings/f95/plplot_parameters.h is consistent with the #defines in bindings/swig-support/plplotcapi.i"
COMMAND ${CMAKE_COMMAND} -E remove -f
${CMAKE_CURRENT_BINARY_DIR}/plplot_parameters.h_compare
COMMAND
@@ -119,12 +120,13 @@
${CMAKE_SOURCE_DIR}/bindings/swig-support/plplotcapi.i >
${CMAKE_CURRENT_BINARY_DIR}/plplot_parameters.h_compare
COMMAND
- ${CMAKE_COMMAND} -E echo "Check that plplot_parameters.h is consistent with the #defines in bindings/swig-support/plplotcapi.i"
COMMAND
cmp ${CMAKE_CURRENT_SOURCE_DIR}/plplot_parameters.h
${CMAKE_CURRENT_BINARY_DIR}/plplot_parameters.h_compare
)
+ add_dependencies(check_all check_f95_parameters)
+
set(plplotf95${LIB_TAG}_LIB_SRCS
strutil.f90
configurable.f90
Modified: trunk/bindings/ocaml/CMakeLists.txt
===================================================================
--- trunk/bindings/ocaml/CMakeLists.txt 2014-02-20 20:49:23 UTC (rev 13015)
+++ trunk/bindings/ocaml/CMakeLists.txt 2014-02-23 18:50:11 UTC (rev 13016)
@@ -57,16 +57,15 @@
if(GENERATE_PLPLOT_H_INC)
add_custom_target(
check_plplot_h.inc
- COMMAND
- ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_BINARY_DIR}/generated_plplot_h.inc
- COMMAND
- ${OCAML} ${CMAKE_CURRENT_SOURCE_DIR}/touchup.ml ${CMAKE_CURRENT_SOURCE_DIR}/plplot_h ${CMAKE_CURRENT_BINARY_DIR}/generated_plplot_h.inc
- COMMAND
- ${CMAKE_COMMAND} -E echo "Check that plplot_h.inc is consistent with touchup.ml and plplot_h"
- COMMAND
- cmp ${CMAKE_CURRENT_SOURCE_DIR}/plplot_h.inc ${CMAKE_CURRENT_BINARY_DIR}/generated_plplot_h.inc
+ COMMAND ${CMAKE_COMMAND} -E echo "Check that bindings/ocaml/plplot_h.inc is consistent with bindings/ocaml/touchup.ml and bindings/ocaml/plplot_h"
+ COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_BINARY_DIR}/generated_plplot_h.inc
+ COMMAND ${OCAML} ${CMAKE_CURRENT_SOURCE_DIR}/touchup.ml ${CMAKE_CURRENT_SOURCE_DIR}/plplot_h ${CMAKE_CURRENT_BINARY_DIR}/generated_plplot_h.inc
+ COMMAND cmp ${CMAKE_CURRENT_SOURCE_DIR}/plplot_h.inc ${CMAKE_CURRENT_BINARY_DIR}/generated_plplot_h.inc
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
+
+ add_dependencies(check_all check_plplot_h.inc)
+
endif(GENERATE_PLPLOT_H_INC)
#Detailed CMake logic to build ocaml bindings for PLplot.
Modified: trunk/bindings/swig-support/CMakeLists.txt
===================================================================
--- trunk/bindings/swig-support/CMakeLists.txt 2014-02-20 20:49:23 UTC (rev 13015)
+++ trunk/bindings/swig-support/CMakeLists.txt 2014-02-23 18:50:11 UTC (rev 13016)
@@ -2,7 +2,7 @@
###
### Process this file with cmake to produce Makefile
###
-# Copyright (C) 2010 Alan W. Irwin
+# Copyright (C) 2010-2014 Alan W. Irwin
#
# This file is part of PLplot.
#
@@ -24,6 +24,7 @@
if(PERL_XML_DOM AND PERL_XML_PARSER)
add_custom_target(
check_swig_documentation
+ COMMAND ${CMAKE_COMMAND} -E echo "Check that bindings/swig-support/swig_documentation.i is consistent with doc/docbook/src/api.xml"
COMMAND ${CMAKE_COMMAND} -E remove -f
${CMAKE_CURRENT_BINARY_DIR}/swig_documentation.i_compare
COMMAND ${PERL_EXECUTABLE}
@@ -31,12 +32,13 @@
${CMAKE_SOURCE_DIR}/doc/docbook/src/plplotdoc.xml.in
${CMAKE_SOURCE_DIR}/doc/docbook/src/api.xml
${CMAKE_CURRENT_BINARY_DIR}/swig_documentation.i_compare
- COMMAND ${CMAKE_COMMAND} -E echo "Check that swig_documentation.i is consistent with doc/docbook/src/api.xml"
COMMAND cmp
${CMAKE_CURRENT_SOURCE_DIR}/swig_documentation.i
${CMAKE_CURRENT_BINARY_DIR}/swig_documentation.i_compare
)
-
+
+ add_dependencies(check_all check_swig_documentation)
+
set(make_documentation_DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/${rep_doc}
)
@@ -50,10 +52,13 @@
# Add (Unix) custom target to check numerical #defines in plplotcapi.i.
add_custom_target(
check_plplotcapi_defines
+ COMMAND ${CMAKE_COMMAND} -E echo "Check that numerical #defines in bindings/swig-support/plplotcapi.i are consistent with the numerical #defines in include/plplot.h"
+ COMMAND ${CMAKE_COMMAND} -E echo "An error for this target implies the numerical #defines section of bindings/swig-support/plplotcapi.i needs updating following the directions in that file"
COMMAND ${CMAKE_COMMAND} -E remove -f
${CMAKE_CURRENT_BINARY_DIR}/generated_plplotcapi_defines
COMMAND grep -E "^ *#define +[^ ]+ +[()-+0-9x]+" ${CMAKE_SOURCE_DIR}/include/plplot.h | grep -v plotsh3d > ${CMAKE_CURRENT_BINARY_DIR}/generated_plplotcapi_defines
- COMMAND ${CMAKE_COMMAND} -E echo "Non-NULL diff results below (which will be accompanied by an error for this target) imply the numerical #defines section of bindings/swig-support/plplotcapi.i needs updating following the directions in that file"
- COMMAND grep -E "^ *#define +[^ ]+ +[()-+0-9x]+" ${CMAKE_CURRENT_SOURCE_DIR}/plplotcapi.i | diff -auw - ${CMAKE_CURRENT_BINARY_DIR}/generated_plplotcapi_defines
+ COMMAND grep -E "^ *#define +[^ ]+ +[()-+0-9x]+" ${CMAKE_CURRENT_SOURCE_DIR}/plplotcapi.i | diff -qw - ${CMAKE_CURRENT_BINARY_DIR}/generated_plplotcapi_defines
VERBATIM
-)
\ No newline at end of file
+)
+
+add_dependencies(check_all check_plplotcapi_defines)
Modified: trunk/bindings/tcl/CMakeLists.txt
===================================================================
--- trunk/bindings/tcl/CMakeLists.txt 2014-02-20 20:49:23 UTC (rev 13015)
+++ trunk/bindings/tcl/CMakeLists.txt 2014-02-23 18:50:11 UTC (rev 13016)
@@ -23,6 +23,7 @@
# Check consistency of plplot_parameters.h.
add_custom_target(
check_tcl_parameters
+ ${CMAKE_COMMAND} -E echo "Check that bindings/tcl/plplot_parameters.h is consistent with the #defines in bindings/swig-support/plplotcapi.i"
COMMAND ${CMAKE_COMMAND} -E remove -f
${CMAKE_CURRENT_BINARY_DIR}/plplot_parameters.h_compare
COMMAND
@@ -30,12 +31,13 @@
${CMAKE_SOURCE_DIR}/bindings/swig-support/plplotcapi.i >
${CMAKE_CURRENT_BINARY_DIR}/plplot_parameters.h_compare
COMMAND
- ${CMAKE_COMMAND} -E echo "Check that plplot_parameters.h is consistent with the #defines in bindings/swig-support/plplotcapi.i"
COMMAND
cmp ${CMAKE_CURRENT_SOURCE_DIR}/plplot_parameters.h
${CMAKE_CURRENT_BINARY_DIR}/plplot_parameters.h_compare
)
+ add_dependencies(check_all check_tcl_parameters)
+
# tclmatrix
set(tclmatrix${LIB_TAG}_LIB_SRCS
tclMatrix.c
Modified: trunk/cmake/modules/plplot.cmake
===================================================================
--- trunk/cmake/modules/plplot.cmake 2014-02-20 20:49:23 UTC (rev 13015)
+++ trunk/cmake/modules/plplot.cmake 2014-02-23 18:50:11 UTC (rev 13016)
@@ -21,6 +21,9 @@
option(ADD_SPECIAL_CONSISTENCY_CHECKING "Add extra source-tree consistency checking targets that require special tools" OFF)
+# target that depends on all check targets.
+add_custom_target(check_all)
+
# libraries are all shared by default
option(BUILD_SHARED_LIBS "Build shared libraries" ON)
Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt 2014-02-20 20:49:23 UTC (rev 13015)
+++ trunk/doc/docbook/src/CMakeLists.txt 2014-02-23 18:50:11 UTC (rev 13016)
@@ -36,8 +36,12 @@
find_program(API_XML_CONSISTENCY_CHECKER api.xml_consistency_checker)
if(API_XML_CONSISTENCY_CHECKER)
add_custom_target(check_api_xml_consistency
+ COMMAND ${CMAKE_COMMAND} -E echo "Check that doc/docbook/src/api.xml is consistent with include/plplot.h"
COMMAND ${API_XML_CONSISTENCY_CHECKER} -header=${CMAKE_SOURCE_DIR}/include/plplot.h -incdir=${CMAKE_BINARY_DIR}/include -apixml=${CMAKE_SOURCE_DIR}/doc/docbook/src/api.xml
)
+
+ add_dependencies(check_all check_api_xml_consistency)
+
else(API_XML_CONSISTENCY_CHECKER)
message(STATUS "WARNING: cannot find the api.xml_consistency_checker application so cannot check the consistency of api.xml with plplot.h")
endif(API_XML_CONSISTENCY_CHECKER)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
