From: <ai...@us...> - 2013-07-09 19:27:39
|
Revision: 12409 http://sourceforge.net/p/plplot/code/12409 Author: airwin Date: 2013-07-09 19:27:35 +0000 (Tue, 09 Jul 2013) Log Message: ----------- Convert from *.cmake form to *.in form for all files configured by CMake. From now on that means the *.cmake form is reserved for files that contain CMake logic. This change should remove the last historical traces of autotools from our project. Historically we could not use the *.in form for certain files configured by CMake because those files already existed at that time as autotools configurable files. But the autotools form of configurable *.in files were removed some time ago so that allows the chance to use that form of name now for all CMake-configurable files now. Tested by: Alan W. Irwin <ai...@us...> using scripts/comprehensive_test.sh --do_test_interactive no Modified Paths: -------------- trunk/CMakeLists.txt trunk/bindings/ada/CMakeLists.txt trunk/bindings/c++/CMakeLists.txt trunk/bindings/d/CMakeLists.txt trunk/bindings/f77/CMakeLists.txt trunk/bindings/f95/CMakeLists.txt trunk/bindings/gnome2/lib/CMakeLists.txt trunk/bindings/ocaml/CMakeLists.txt trunk/bindings/qt_gui/CMakeLists.txt trunk/bindings/tcl/CMakeLists.txt trunk/bindings/wxwidgets/CMakeLists.txt trunk/examples/f77/CMakeLists.txt trunk/examples/f95/CMakeLists.txt trunk/examples/python/CMakeLists.txt trunk/plplot_test/CMakeLists.txt trunk/src/CMakeLists.txt Added Paths: ----------- trunk/bindings/f77/configurable.f.in trunk/config.h.in trunk/examples/f77/plf77demos.inc.in trunk/examples/f95/plf95demos.inc.in trunk/examples/python/plplot_python_start.py.in trunk/pkgcfg/plplot-template.pc.in trunk/plplot_test/plplot-test.sh.in Removed Paths: ------------- trunk/bindings/f77/configurable.f.cmake trunk/config.h.cmake trunk/examples/f77/plf77demos.inc.cmake trunk/examples/f95/plf95demos.inc.cmake trunk/examples/python/plplot_python_start.py.cmake trunk/pkgcfg/plplot-template.pc.cmake trunk/plplot_test/plplot-test.sh.cmake Modified: trunk/CMakeLists.txt =================================================================== --- trunk/CMakeLists.txt 2013-07-09 16:28:26 UTC (rev 12408) +++ trunk/CMakeLists.txt 2013-07-09 19:27:35 UTC (rev 12409) @@ -105,7 +105,7 @@ ) configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake + ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h ) # Allow access to the generated config.h for this build. Modified: trunk/bindings/ada/CMakeLists.txt =================================================================== --- trunk/bindings/ada/CMakeLists.txt 2013-07-09 16:28:26 UTC (rev 12408) +++ trunk/bindings/ada/CMakeLists.txt 2013-07-09 19:27:35 UTC (rev 12409) @@ -159,7 +159,7 @@ ${CMAKE_BINARY_DIR}/pkgcfg/plplot${LIB_TAG}${PC_FILE_SUFFIX}.pc ) configure_file( - ${CMAKE_SOURCE_DIR}/pkgcfg/plplot-template.pc.cmake + ${CMAKE_SOURCE_DIR}/pkgcfg/plplot-template.pc.in ${PC_CONFIGURED_FILE} @ONLY ) Modified: trunk/bindings/c++/CMakeLists.txt =================================================================== --- trunk/bindings/c++/CMakeLists.txt 2013-07-09 16:28:26 UTC (rev 12408) +++ trunk/bindings/c++/CMakeLists.txt 2013-07-09 19:27:35 UTC (rev 12409) @@ -120,7 +120,7 @@ ${CMAKE_BINARY_DIR}/pkgcfg/plplot${LIB_TAG}${PC_FILE_SUFFIX}.pc ) configure_file( - ${CMAKE_SOURCE_DIR}/pkgcfg/plplot-template.pc.cmake + ${CMAKE_SOURCE_DIR}/pkgcfg/plplot-template.pc.in ${PC_CONFIGURED_FILE} @ONLY ) Modified: trunk/bindings/d/CMakeLists.txt =================================================================== --- trunk/bindings/d/CMakeLists.txt 2013-07-09 16:28:26 UTC (rev 12408) +++ trunk/bindings/d/CMakeLists.txt 2013-07-09 19:27:35 UTC (rev 12409) @@ -119,7 +119,7 @@ ${CMAKE_BINARY_DIR}/pkgcfg/plplot${LIB_TAG}${PC_FILE_SUFFIX}.pc ) configure_file( - ${CMAKE_SOURCE_DIR}/pkgcfg/plplot-template.pc.cmake + ${CMAKE_SOURCE_DIR}/pkgcfg/plplot-template.pc.in ${PC_CONFIGURED_FILE} @ONLY ) Modified: trunk/bindings/f77/CMakeLists.txt =================================================================== --- trunk/bindings/f77/CMakeLists.txt 2013-07-09 16:28:26 UTC (rev 12408) +++ trunk/bindings/f77/CMakeLists.txt 2013-07-09 19:27:35 UTC (rev 12409) @@ -97,7 +97,7 @@ endif(F77_CMD_LINE) configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/configurable.f.cmake + ${CMAKE_CURRENT_SOURCE_DIR}/configurable.f.in ${CMAKE_CURRENT_BINARY_DIR}/configurable.f ) @@ -268,7 +268,7 @@ ${CMAKE_BINARY_DIR}/pkgcfg/plplot${LIB_TAG}${PC_FILE_SUFFIX}.pc ) configure_file( - ${CMAKE_SOURCE_DIR}/pkgcfg/plplot-template.pc.cmake + ${CMAKE_SOURCE_DIR}/pkgcfg/plplot-template.pc.in ${PC_CONFIGURED_FILE} @ONLY ) Deleted: trunk/bindings/f77/configurable.f.cmake =================================================================== --- trunk/bindings/f77/configurable.f.cmake 2013-07-09 16:28:26 UTC (rev 12408) +++ trunk/bindings/f77/configurable.f.cmake 2013-07-09 19:27:35 UTC (rev 12409) @@ -1,50 +0,0 @@ -C $Id$ -C -C Copyright (C) 2004 Alan W. Irwin -C -C This file is part of PLplot. -C -C PLplot is free software; you can redistribute it and/or modify -C it under the terms of the GNU Library General Public License as -C published by the Free Software Foundation; either version 2 of the -C License, or (at your option) any later version. -C -C PLplot is distributed in the hope that it will be useful, -C but WITHOUT ANY WARRANTY; without even the implied warranty of -C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -C GNU Library General Public License for more details. -C -C You should have received a copy of the GNU Library General Public -C License along with PLplot; if not, write to the Free Software -C Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - subroutine plparseopts(mode) - implicit none - include 'sfstubs.h' - integer mode - integer maxargs, iargs, numargs, index, maxindex, iargc, islen - parameter(maxindex = maxlen/4) - parameter (maxargs=20) - character*(maxlen) arg - integer*4 iargsarr(maxindex, maxargs) -@HAVE_F77PARSE_CL_FALSE@ write(0,'(a)') 'plparseopts not implemented on this fortran'// -@HAVE_F77PARSE_CL_FALSE@ & ' platform because iargc or getarg are not available' -@HAVE_F77PARSE_CL_TRUE@ numargs = iargc() -@HAVE_F77PARSE_CL_TRUE@ if(numargs.lt.0) then -@HAVE_F77PARSE_CL_TRUE@C This actually happened on badly linked Cygwin platform. -@HAVE_F77PARSE_CL_TRUE@ write(0,'(a)') 'plparseopts: negative number of arguments' -@HAVE_F77PARSE_CL_TRUE@ return -@HAVE_F77PARSE_CL_TRUE@ endif -@HAVE_F77PARSE_CL_TRUE@ if(numargs+1.gt.maxargs) then -@HAVE_F77PARSE_CL_TRUE@ write(0,'(a)') 'plparseopts: too many arguments' -@HAVE_F77PARSE_CL_TRUE@ return -@HAVE_F77PARSE_CL_TRUE@ endif -@HAVE_F77PARSE_CL_TRUE@ do 10 iargs = 0, numargs -@HAVE_F77PARSE_CL_TRUE@ call getarg(iargs, arg) -@HAVE_F77PARSE_CL_TRUE@ call plstrf2c(arg(:islen(arg)), string1, maxlen) -@HAVE_F77PARSE_CL_TRUE@ do 5 index = 1, maxindex -@HAVE_F77PARSE_CL_TRUE@ iargsarr(index, iargs+1) = s1(index) -@HAVE_F77PARSE_CL_TRUE@ 5 continue -@HAVE_F77PARSE_CL_TRUE@ 10 continue -@HAVE_F77PARSE_CL_TRUE@ call plparseopts7(numargs+1, iargsarr, mode, maxindex*4) - end Copied: trunk/bindings/f77/configurable.f.in (from rev 12408, trunk/bindings/f77/configurable.f.cmake) =================================================================== --- trunk/bindings/f77/configurable.f.in (rev 0) +++ trunk/bindings/f77/configurable.f.in 2013-07-09 19:27:35 UTC (rev 12409) @@ -0,0 +1,50 @@ +C $Id$ +C +C Copyright (C) 2004 Alan W. Irwin +C +C This file is part of PLplot. +C +C PLplot is free software; you can redistribute it and/or modify +C it under the terms of the GNU Library General Public License as +C published by the Free Software Foundation; either version 2 of the +C License, or (at your option) any later version. +C +C PLplot is distributed in the hope that it will be useful, +C but WITHOUT ANY WARRANTY; without even the implied warranty of +C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +C GNU Library General Public License for more details. +C +C You should have received a copy of the GNU Library General Public +C License along with PLplot; if not, write to the Free Software +C Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + subroutine plparseopts(mode) + implicit none + include 'sfstubs.h' + integer mode + integer maxargs, iargs, numargs, index, maxindex, iargc, islen + parameter(maxindex = maxlen/4) + parameter (maxargs=20) + character*(maxlen) arg + integer*4 iargsarr(maxindex, maxargs) +@HAVE_F77PARSE_CL_FALSE@ write(0,'(a)') 'plparseopts not implemented on this fortran'// +@HAVE_F77PARSE_CL_FALSE@ & ' platform because iargc or getarg are not available' +@HAVE_F77PARSE_CL_TRUE@ numargs = iargc() +@HAVE_F77PARSE_CL_TRUE@ if(numargs.lt.0) then +@HAVE_F77PARSE_CL_TRUE@C This actually happened on badly linked Cygwin platform. +@HAVE_F77PARSE_CL_TRUE@ write(0,'(a)') 'plparseopts: negative number of arguments' +@HAVE_F77PARSE_CL_TRUE@ return +@HAVE_F77PARSE_CL_TRUE@ endif +@HAVE_F77PARSE_CL_TRUE@ if(numargs+1.gt.maxargs) then +@HAVE_F77PARSE_CL_TRUE@ write(0,'(a)') 'plparseopts: too many arguments' +@HAVE_F77PARSE_CL_TRUE@ return +@HAVE_F77PARSE_CL_TRUE@ endif +@HAVE_F77PARSE_CL_TRUE@ do 10 iargs = 0, numargs +@HAVE_F77PARSE_CL_TRUE@ call getarg(iargs, arg) +@HAVE_F77PARSE_CL_TRUE@ call plstrf2c(arg(:islen(arg)), string1, maxlen) +@HAVE_F77PARSE_CL_TRUE@ do 5 index = 1, maxindex +@HAVE_F77PARSE_CL_TRUE@ iargsarr(index, iargs+1) = s1(index) +@HAVE_F77PARSE_CL_TRUE@ 5 continue +@HAVE_F77PARSE_CL_TRUE@ 10 continue +@HAVE_F77PARSE_CL_TRUE@ call plparseopts7(numargs+1, iargsarr, mode, maxindex*4) + end Modified: trunk/bindings/f95/CMakeLists.txt =================================================================== --- trunk/bindings/f95/CMakeLists.txt 2013-07-09 16:28:26 UTC (rev 12408) +++ trunk/bindings/f95/CMakeLists.txt 2013-07-09 19:27:35 UTC (rev 12409) @@ -234,7 +234,7 @@ ${CMAKE_BINARY_DIR}/pkgcfg/plplot${LIB_TAG}${PC_FILE_SUFFIX}.pc ) configure_file( - ${CMAKE_SOURCE_DIR}/pkgcfg/plplot-template.pc.cmake + ${CMAKE_SOURCE_DIR}/pkgcfg/plplot-template.pc.in ${PC_CONFIGURED_FILE} @ONLY ) Modified: trunk/bindings/gnome2/lib/CMakeLists.txt =================================================================== --- trunk/bindings/gnome2/lib/CMakeLists.txt 2013-07-09 16:28:26 UTC (rev 12408) +++ trunk/bindings/gnome2/lib/CMakeLists.txt 2013-07-09 19:27:35 UTC (rev 12409) @@ -128,7 +128,7 @@ ${CMAKE_BINARY_DIR}/pkgcfg/plplot${LIB_TAG}${PC_FILE_SUFFIX}.pc ) configure_file( - ${CMAKE_SOURCE_DIR}/pkgcfg/plplot-template.pc.cmake + ${CMAKE_SOURCE_DIR}/pkgcfg/plplot-template.pc.in ${PC_CONFIGURED_FILE} @ONLY ) Modified: trunk/bindings/ocaml/CMakeLists.txt =================================================================== --- trunk/bindings/ocaml/CMakeLists.txt 2013-07-09 16:28:26 UTC (rev 12408) +++ trunk/bindings/ocaml/CMakeLists.txt 2013-07-09 19:27:35 UTC (rev 12409) @@ -336,7 +336,7 @@ ${CMAKE_BINARY_DIR}/pkgcfg/plplot${LIB_TAG}${PC_FILE_SUFFIX}.pc ) configure_file( - ${CMAKE_SOURCE_DIR}/pkgcfg/plplot-template.pc.cmake + ${CMAKE_SOURCE_DIR}/pkgcfg/plplot-template.pc.in ${PC_CONFIGURED_FILE} @ONLY ) Modified: trunk/bindings/qt_gui/CMakeLists.txt =================================================================== --- trunk/bindings/qt_gui/CMakeLists.txt 2013-07-09 16:28:26 UTC (rev 12408) +++ trunk/bindings/qt_gui/CMakeLists.txt 2013-07-09 19:27:35 UTC (rev 12409) @@ -148,7 +148,7 @@ ${CMAKE_BINARY_DIR}/pkgcfg/plplot${LIB_TAG}${PC_FILE_SUFFIX}.pc ) configure_file( - ${CMAKE_SOURCE_DIR}/pkgcfg/plplot-template.pc.cmake + ${CMAKE_SOURCE_DIR}/pkgcfg/plplot-template.pc.in ${PC_CONFIGURED_FILE} @ONLY ) Modified: trunk/bindings/tcl/CMakeLists.txt =================================================================== --- trunk/bindings/tcl/CMakeLists.txt 2013-07-09 16:28:26 UTC (rev 12408) +++ trunk/bindings/tcl/CMakeLists.txt 2013-07-09 19:27:35 UTC (rev 12409) @@ -401,7 +401,7 @@ ${CMAKE_BINARY_DIR}/pkgcfg/plplot${LIB_TAG}${PC_FILE_SUFFIX}.pc ) configure_file( - ${CMAKE_SOURCE_DIR}/pkgcfg/plplot-template.pc.cmake + ${CMAKE_SOURCE_DIR}/pkgcfg/plplot-template.pc.in ${PC_CONFIGURED_FILE} @ONLY ) Modified: trunk/bindings/wxwidgets/CMakeLists.txt =================================================================== --- trunk/bindings/wxwidgets/CMakeLists.txt 2013-07-09 16:28:26 UTC (rev 12408) +++ trunk/bindings/wxwidgets/CMakeLists.txt 2013-07-09 19:27:35 UTC (rev 12409) @@ -182,7 +182,7 @@ ${CMAKE_BINARY_DIR}/pkgcfg/plplot${LIB_TAG}${PC_FILE_SUFFIX}.pc ) configure_file( - ${CMAKE_SOURCE_DIR}/pkgcfg/plplot-template.pc.cmake + ${CMAKE_SOURCE_DIR}/pkgcfg/plplot-template.pc.in ${PC_CONFIGURED_FILE} @ONLY ) Deleted: trunk/config.h.cmake =================================================================== --- trunk/config.h.cmake 2013-07-09 16:28:26 UTC (rev 12408) +++ trunk/config.h.cmake 2013-07-09 19:27:35 UTC (rev 12409) @@ -1,303 +0,0 @@ -// Configured (by CMake) macros for PLplot that are required for the -// core build but _not_ required for the build of the installed -// examples (and presumably any user applications). Therefore, the -// configured config.h should not be installed. In contrast, -// include/plConfig.h.cmake (note, plConfig.h #includes config.h for -// the core build because HAVE_CONFIG_H is #defined in that case) -// contains configured macros that are required for the core build, -// installed examples build, and build of user applications. -// Therefore, in contrast to config.h, plConfig.h should be installed. -// -// Maintenance issue: in makes no sense to configure duplicate macros -// for both config.h and plConfig.h. Therefore, when adding a macro -// decide which file to put it in depending on whether the result is -// needed for the installed examples build or not. Furthermore, move -// configured macros from one file to the other as needed depending on -// that criterion, but do not copy them. -// -// - -// Location of executables -#define BIN_DIR "@BIN_DIR@" - -// Location of Build tree -#define BUILD_DIR "@BUILD_DIR@" - -// Location of package data files -#define DATA_DIR "@DATA_DIR@" - -// Location of dynamically loaded drivers -#define DRV_DIR "@DRV_DIR@" - -// Name of the default cmap0 palette to use -#define PL_DEFAULT_CMAP0_FILE "@DEFAULT_CMAP0_FILE@" - -// Name of the default cmap1 palette to use -#define PL_DEFAULT_CMAP1_FILE "@DEFAULT_CMAP1_FILE@" - -// Define if support for deprecated plplot functions should be compiled -#cmakedefine PL_DEPRECATED - -// Define if there is support for dynamically loaded drivers -#cmakedefine ENABLE_DYNDRIVERS - -// Define to 1 if you have the <cmath> header file. -#cmakedefine HAVE_CMATH 1 - -// Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. -// -#cmakedefine HAVE_DIRENT_H 1 - -// Define to 1 if you have the <dlfcn.h> header file. -#cmakedefine HAVE_DLFCN_H 1 - -// Define if [freetype] is available -#cmakedefine PL_HAVE_FREETYPE - -// Define if [shapelib] is available -#cmakedefine HAVE_SHAPELIB - -// Define if [agg] is available -#cmakedefine HAVE_AGG - -// Define to 1 if you have the <glib.h> header file. -#cmakedefine HAVE_GLIB_H 1 - -// Define to 1 if you have the <glib-object.h> header file. -#cmakedefine HAVE_GLIB_OBJECT_H 1 - -// Define to 1 if you have the <gtk/gtk.h> header file. -#cmakedefine HAVE_GTK_GTK_H 1 - -// Define to 1 if you have the <inttypes.h> header file. -#cmakedefine HAVE_INTTYPES_H 1 - -// Define if [incr], [Tcl] is available -#cmakedefine HAVE_ITCL - -// Define to 1 if you have the <itclDecls.h> header file. -#cmakedefine HAVE_ITCLDECLS_H 1 - -// Define if Tk is available -#cmakedefine ENABLE_tk - -// Define if [incr], [Tk] is available -#cmakedefine HAVE_ITK - -// Define to 1 if you have the <jni.h> header file. -#cmakedefine HAVE_JNI_H 1 - -// Define to 1 if you have the <libart_lgpl/libart.h> header file. -#cmakedefine HAVE_LIBART_LGPL_LIBART_H 1 - -// Define to 1 if you have the <libgnomecanvas/libgnomecanvas.h> header file. -// -#cmakedefine HAVE_LIBGNOMECANVAS_LIBGNOMECANVAS_H 1 - -// Define to 1 if you have the <libgnomeprint/gnome-print.h> header file. -#cmakedefine HAVE_LIBGNOMEPRINT_GNOME_PRINT_H 1 - -// Define if libunicode is available -#cmakedefine HAVE_LIBUNICODE - -// Define to 1 if you have the <math.h> header file. -#cmakedefine HAVE_MATH_H 1 - -// Define to 1 if you have the <memory.h> header file. -#cmakedefine HAVE_MEMORY_H 1 - -// Define to 1 if the function mkstemp is available. -#cmakedefine PL_HAVE_MKSTEMP 1 - -// Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. -#cmakedefine HAVE_NDIR_H 1 - -// Define if python numpy is available -#cmakedefine HAVE_NUMPY - -// Define if libpango is available -#cmakedefine HAVE_PANGO - -// Define if popen is available -#cmakedefine HAVE_POPEN - -// Define if _NSGetArgc is available -#cmakedefine HAVE_NSGETARGC - -// Define if pthreads is available -#cmakedefine PL_HAVE_PTHREAD - -// Define if Qhull is available -#cmakedefine PL_HAVE_QHULL - -// Define to 1 if you have the <stdlib.h> header file. -#cmakedefine HAVE_STDLIB_H 1 - -// Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. -// -#cmakedefine HAVE_SYS_DIR_H 1 - -// Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. -// -#cmakedefine HAVE_SYS_NDIR_H 1 - -// Define to 1 if you have the <sys/stat.h> header file. -#cmakedefine HAVE_SYS_STAT_H 1 - -// Define to 1 if you have the <sys/types.h> header file. -#cmakedefine HAVE_SYS_TYPES_H 1 - -// Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. -#cmakedefine HAVE_SYS_WAIT_H 1 - -// Define to 1 if you have the <termios.h> header file. -#cmakedefine HAVE_TERMIOS_H 1 - -// Define to 1 if you have the <crt_externs.h> header file. -#cmakedefine HAVE_CRT_EXTERNS_H 1 - -// Define to 1 if the function unlink is available -#cmakedefine PL_HAVE_UNLINK 1 - -// Define to 1 if you have the `vfork' function. -#cmakedefine HAVE_VFORK 1 - -// Define to 1 if you have the <vfork.h> header file. -#cmakedefine HAVE_VFORK_H 1 - -// Include sys/type.h if needed -#cmakedefine NEED_SYS_TYPE_H - -// Name of package -#define PACKAGE "@PACKAGE@" - -// Define if the win32 ltdl implementation should be used -#cmakedefine LTDL_WIN32 - -// Portable definition for PTHREAD_MUTEX_RECURSIVE -#define PLPLOT_MUTEX_RECURSIVE @PLPLOT_MUTEX_RECURSIVE@ - -// Directory containing fonts that are accessible from freetype -#define PL_FREETYPE_FONT_DIR "@PL_FREETYPE_FONT_DIR@" - -// MONO font accessible from freetype -#define PL_FREETYPE_MONO "@PL_FREETYPE_MONO@" - -// MONO_BOLD font accessible from freetype -#define PL_FREETYPE_MONO_BOLD "@PL_FREETYPE_MONO_BOLD@" - -// MONO_BOLD_ITALIC font accessible from freetype -#define PL_FREETYPE_MONO_BOLD_ITALIC "@PL_FREETYPE_MONO_BOLD_ITALIC@" - -// MONO_BOLD_OBLIQUE font accessible from freetype -#define PL_FREETYPE_MONO_BOLD_OBLIQUE "@PL_FREETYPE_MONO_BOLD_OBLIQUE@" - -// MONO_ITALIC font accessible from freetype -#define PL_FREETYPE_MONO_ITALIC "@PL_FREETYPE_MONO_ITALIC@" - -// MONO_OBLIQUE font accessible from freetype -#define PL_FREETYPE_MONO_OBLIQUE "@PL_FREETYPE_MONO_OBLIQUE@" - -// SANS font accessible from freetype -#define PL_FREETYPE_SANS "@PL_FREETYPE_SANS@" - -// SANS_BOLD font accessible from freetype -#define PL_FREETYPE_SANS_BOLD "@PL_FREETYPE_SANS_BOLD@" - -// SANS_BOLD_ITALIC font accessible from freetype -#define PL_FREETYPE_SANS_BOLD_ITALIC "@PL_FREETYPE_SANS_BOLD_ITALIC@" - -// SANS_BOLD_OBLIQUE font accessible from freetype -#define PL_FREETYPE_SANS_BOLD_OBLIQUE "@PL_FREETYPE_SANS_BOLD_OBLIQUE@" - -// SANS_ITALIC font accessible from freetype -#define PL_FREETYPE_SANS_ITALIC "@PL_FREETYPE_SANS_ITALIC@" - -// SANS_OBLIQUE font accessible from freetype -#define PL_FREETYPE_SANS_OBLIQUE "@PL_FREETYPE_SANS_OBLIQUE@" - -// SCRIPT font accessible from freetype -#define PL_FREETYPE_SCRIPT "@PL_FREETYPE_SCRIPT@" - -// SCRIPT_BOLD font accessible from freetype -#define PL_FREETYPE_SCRIPT_BOLD "@PL_FREETYPE_SCRIPT_BOLD@" - -// SCRIPT_BOLD_ITALIC font accessible from freetype -#define PL_FREETYPE_SCRIPT_BOLD_ITALIC "@PL_FREETYPE_SCRIPT_BOLD_ITALIC@" - -// SCRIPT_BOLD_OBLIQUE font accessible from freetype -#define PL_FREETYPE_SCRIPT_BOLD_OBLIQUE "@PL_FREETYPE_SCRIPT_BOLD_OBLIQUE@" - -// SCRIPT_ITALIC font accessible from freetype -#define PL_FREETYPE_SCRIPT_ITALIC "@PL_FREETYPE_SCRIPT_ITALIC@" - -// SCRIPT_OBLIQUE font accessible from freetype -#define PL_FREETYPE_SCRIPT_OBLIQUE "@PL_FREETYPE_SCRIPT_OBLIQUE@" - -// SERIF font accessible from freetype -#define PL_FREETYPE_SERIF "@PL_FREETYPE_SERIF@" - -// SERIF_BOLD font accessible from freetype -#define PL_FREETYPE_SERIF_BOLD "@PL_FREETYPE_SERIF_BOLD@" - -// SERIF_BOLD_ITALIC font accessible from freetype -#define PL_FREETYPE_SERIF_BOLD_ITALIC "@PL_FREETYPE_SERIF_BOLD_ITALIC@" - -// SERIF_BOLD_OBLIQUE font accessible from freetype -#define PL_FREETYPE_SERIF_BOLD_OBLIQUE "@PL_FREETYPE_SERIF_BOLD_OBLIQUE@" - -// SERIF_ITALIC font accessible from freetype -#define PL_FREETYPE_SERIF_ITALIC "@PL_FREETYPE_SERIF_ITALIC@" - -// SERIF_OBLIQUE font accessible from freetype -#define PL_FREETYPE_SERIF_OBLIQUE "@PL_FREETYPE_SERIF_OBLIQUE@" - -// Symbol font accessible from freetype -#define PL_FREETYPE_SYMBOL "@PL_FREETYPE_SYMBOL@" - -// SYMBOL_BOLD font accessible from freetype -#define PL_FREETYPE_SYMBOL_BOLD "@PL_FREETYPE_SYMBOL_BOLD@" - -// SYMBOL_BOLD_ITALIC font accessible from freetype -#define PL_FREETYPE_SYMBOL_BOLD_ITALIC "@PL_FREETYPE_SYMBOL_BOLD_ITALIC@" - -// SYMBOL_BOLD_OBLIQUE font accessible from freetype -#define PL_FREETYPE_SYMBOL_BOLD_OBLIQUE "@PL_FREETYPE_SYMBOL_BOLD_OBLIQUE@" - -// SYMBOL_ITALIC font accessible from freetype -#define PL_FREETYPE_SYMBOL_ITALIC "@PL_FREETYPE_SYMBOL_ITALIC@" - -// SYMBOL_OBLIQUE font accessible from freetype -#define PL_FREETYPE_SYMBOL_OBLIQUE "@PL_FREETYPE_SYMBOL_OBLIQUE@" - -// Define as the return type of signal handlers (`int' or `void'). -#define RETSIGTYPE @RETSIGTYPE@ - -// Location of Source tree -#define SOURCE_DIR "@SOURCE_DIR@" - -// Define to 1 if you have the ANSI C header files. -#cmakedefine STDC_HEADERS 1 - -// Location of Tcl stuff -#define TCL_DIR "@TCL_DIR@" - -// Version number of package -#define VERSION "@VERSION@" - -// Define if csa is desired -#cmakedefine WITH_CSA - -// Define if want to use general fill_intersection_polygon approach -// rather than the traditional code to fill the intersection of a polygon with -// the clipping limits. -#cmakedefine USE_FILL_INTERSECTION_POLYGON - -// Define to `char *' if <sys/types.h> does not define. -#cmakedefine caddr_t - -// Define to `int' if <sys/types.h> does not define. -#cmakedefine pid_t - -// Define as `fork' if `vfork' does not work. -#cmakedefine vfork Copied: trunk/config.h.in (from rev 12408, trunk/config.h.cmake) =================================================================== --- trunk/config.h.in (rev 0) +++ trunk/config.h.in 2013-07-09 19:27:35 UTC (rev 12409) @@ -0,0 +1,303 @@ +// Configured (by CMake) macros for PLplot that are required for the +// core build but _not_ required for the build of the installed +// examples (and presumably any user applications). Therefore, the +// configured config.h should not be installed. In contrast, +// include/plConfig.h.cmake (note, plConfig.h #includes config.h for +// the core build because HAVE_CONFIG_H is #defined in that case) +// contains configured macros that are required for the core build, +// installed examples build, and build of user applications. +// Therefore, in contrast to config.h, plConfig.h should be installed. +// +// Maintenance issue: in makes no sense to configure duplicate macros +// for both config.h and plConfig.h. Therefore, when adding a macro +// decide which file to put it in depending on whether the result is +// needed for the installed examples build or not. Furthermore, move +// configured macros from one file to the other as needed depending on +// that criterion, but do not copy them. +// +// + +// Location of executables +#define BIN_DIR "@BIN_DIR@" + +// Location of Build tree +#define BUILD_DIR "@BUILD_DIR@" + +// Location of package data files +#define DATA_DIR "@DATA_DIR@" + +// Location of dynamically loaded drivers +#define DRV_DIR "@DRV_DIR@" + +// Name of the default cmap0 palette to use +#define PL_DEFAULT_CMAP0_FILE "@DEFAULT_CMAP0_FILE@" + +// Name of the default cmap1 palette to use +#define PL_DEFAULT_CMAP1_FILE "@DEFAULT_CMAP1_FILE@" + +// Define if support for deprecated plplot functions should be compiled +#cmakedefine PL_DEPRECATED + +// Define if there is support for dynamically loaded drivers +#cmakedefine ENABLE_DYNDRIVERS + +// Define to 1 if you have the <cmath> header file. +#cmakedefine HAVE_CMATH 1 + +// Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. +// +#cmakedefine HAVE_DIRENT_H 1 + +// Define to 1 if you have the <dlfcn.h> header file. +#cmakedefine HAVE_DLFCN_H 1 + +// Define if [freetype] is available +#cmakedefine PL_HAVE_FREETYPE + +// Define if [shapelib] is available +#cmakedefine HAVE_SHAPELIB + +// Define if [agg] is available +#cmakedefine HAVE_AGG + +// Define to 1 if you have the <glib.h> header file. +#cmakedefine HAVE_GLIB_H 1 + +// Define to 1 if you have the <glib-object.h> header file. +#cmakedefine HAVE_GLIB_OBJECT_H 1 + +// Define to 1 if you have the <gtk/gtk.h> header file. +#cmakedefine HAVE_GTK_GTK_H 1 + +// Define to 1 if you have the <inttypes.h> header file. +#cmakedefine HAVE_INTTYPES_H 1 + +// Define if [incr], [Tcl] is available +#cmakedefine HAVE_ITCL + +// Define to 1 if you have the <itclDecls.h> header file. +#cmakedefine HAVE_ITCLDECLS_H 1 + +// Define if Tk is available +#cmakedefine ENABLE_tk + +// Define if [incr], [Tk] is available +#cmakedefine HAVE_ITK + +// Define to 1 if you have the <jni.h> header file. +#cmakedefine HAVE_JNI_H 1 + +// Define to 1 if you have the <libart_lgpl/libart.h> header file. +#cmakedefine HAVE_LIBART_LGPL_LIBART_H 1 + +// Define to 1 if you have the <libgnomecanvas/libgnomecanvas.h> header file. +// +#cmakedefine HAVE_LIBGNOMECANVAS_LIBGNOMECANVAS_H 1 + +// Define to 1 if you have the <libgnomeprint/gnome-print.h> header file. +#cmakedefine HAVE_LIBGNOMEPRINT_GNOME_PRINT_H 1 + +// Define if libunicode is available +#cmakedefine HAVE_LIBUNICODE + +// Define to 1 if you have the <math.h> header file. +#cmakedefine HAVE_MATH_H 1 + +// Define to 1 if you have the <memory.h> header file. +#cmakedefine HAVE_MEMORY_H 1 + +// Define to 1 if the function mkstemp is available. +#cmakedefine PL_HAVE_MKSTEMP 1 + +// Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. +#cmakedefine HAVE_NDIR_H 1 + +// Define if python numpy is available +#cmakedefine HAVE_NUMPY + +// Define if libpango is available +#cmakedefine HAVE_PANGO + +// Define if popen is available +#cmakedefine HAVE_POPEN + +// Define if _NSGetArgc is available +#cmakedefine HAVE_NSGETARGC + +// Define if pthreads is available +#cmakedefine PL_HAVE_PTHREAD + +// Define if Qhull is available +#cmakedefine PL_HAVE_QHULL + +// Define to 1 if you have the <stdlib.h> header file. +#cmakedefine HAVE_STDLIB_H 1 + +// Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. +// +#cmakedefine HAVE_SYS_DIR_H 1 + +// Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. +// +#cmakedefine HAVE_SYS_NDIR_H 1 + +// Define to 1 if you have the <sys/stat.h> header file. +#cmakedefine HAVE_SYS_STAT_H 1 + +// Define to 1 if you have the <sys/types.h> header file. +#cmakedefine HAVE_SYS_TYPES_H 1 + +// Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. +#cmakedefine HAVE_SYS_WAIT_H 1 + +// Define to 1 if you have the <termios.h> header file. +#cmakedefine HAVE_TERMIOS_H 1 + +// Define to 1 if you have the <crt_externs.h> header file. +#cmakedefine HAVE_CRT_EXTERNS_H 1 + +// Define to 1 if the function unlink is available +#cmakedefine PL_HAVE_UNLINK 1 + +// Define to 1 if you have the `vfork' function. +#cmakedefine HAVE_VFORK 1 + +// Define to 1 if you have the <vfork.h> header file. +#cmakedefine HAVE_VFORK_H 1 + +// Include sys/type.h if needed +#cmakedefine NEED_SYS_TYPE_H + +// Name of package +#define PACKAGE "@PACKAGE@" + +// Define if the win32 ltdl implementation should be used +#cmakedefine LTDL_WIN32 + +// Portable definition for PTHREAD_MUTEX_RECURSIVE +#define PLPLOT_MUTEX_RECURSIVE @PLPLOT_MUTEX_RECURSIVE@ + +// Directory containing fonts that are accessible from freetype +#define PL_FREETYPE_FONT_DIR "@PL_FREETYPE_FONT_DIR@" + +// MONO font accessible from freetype +#define PL_FREETYPE_MONO "@PL_FREETYPE_MONO@" + +// MONO_BOLD font accessible from freetype +#define PL_FREETYPE_MONO_BOLD "@PL_FREETYPE_MONO_BOLD@" + +// MONO_BOLD_ITALIC font accessible from freetype +#define PL_FREETYPE_MONO_BOLD_ITALIC "@PL_FREETYPE_MONO_BOLD_ITALIC@" + +// MONO_BOLD_OBLIQUE font accessible from freetype +#define PL_FREETYPE_MONO_BOLD_OBLIQUE "@PL_FREETYPE_MONO_BOLD_OBLIQUE@" + +// MONO_ITALIC font accessible from freetype +#define PL_FREETYPE_MONO_ITALIC "@PL_FREETYPE_MONO_ITALIC@" + +// MONO_OBLIQUE font accessible from freetype +#define PL_FREETYPE_MONO_OBLIQUE "@PL_FREETYPE_MONO_OBLIQUE@" + +// SANS font accessible from freetype +#define PL_FREETYPE_SANS "@PL_FREETYPE_SANS@" + +// SANS_BOLD font accessible from freetype +#define PL_FREETYPE_SANS_BOLD "@PL_FREETYPE_SANS_BOLD@" + +// SANS_BOLD_ITALIC font accessible from freetype +#define PL_FREETYPE_SANS_BOLD_ITALIC "@PL_FREETYPE_SANS_BOLD_ITALIC@" + +// SANS_BOLD_OBLIQUE font accessible from freetype +#define PL_FREETYPE_SANS_BOLD_OBLIQUE "@PL_FREETYPE_SANS_BOLD_OBLIQUE@" + +// SANS_ITALIC font accessible from freetype +#define PL_FREETYPE_SANS_ITALIC "@PL_FREETYPE_SANS_ITALIC@" + +// SANS_OBLIQUE font accessible from freetype +#define PL_FREETYPE_SANS_OBLIQUE "@PL_FREETYPE_SANS_OBLIQUE@" + +// SCRIPT font accessible from freetype +#define PL_FREETYPE_SCRIPT "@PL_FREETYPE_SCRIPT@" + +// SCRIPT_BOLD font accessible from freetype +#define PL_FREETYPE_SCRIPT_BOLD "@PL_FREETYPE_SCRIPT_BOLD@" + +// SCRIPT_BOLD_ITALIC font accessible from freetype +#define PL_FREETYPE_SCRIPT_BOLD_ITALIC "@PL_FREETYPE_SCRIPT_BOLD_ITALIC@" + +// SCRIPT_BOLD_OBLIQUE font accessible from freetype +#define PL_FREETYPE_SCRIPT_BOLD_OBLIQUE "@PL_FREETYPE_SCRIPT_BOLD_OBLIQUE@" + +// SCRIPT_ITALIC font accessible from freetype +#define PL_FREETYPE_SCRIPT_ITALIC "@PL_FREETYPE_SCRIPT_ITALIC@" + +// SCRIPT_OBLIQUE font accessible from freetype +#define PL_FREETYPE_SCRIPT_OBLIQUE "@PL_FREETYPE_SCRIPT_OBLIQUE@" + +// SERIF font accessible from freetype +#define PL_FREETYPE_SERIF "@PL_FREETYPE_SERIF@" + +// SERIF_BOLD font accessible from freetype +#define PL_FREETYPE_SERIF_BOLD "@PL_FREETYPE_SERIF_BOLD@" + +// SERIF_BOLD_ITALIC font accessible from freetype +#define PL_FREETYPE_SERIF_BOLD_ITALIC "@PL_FREETYPE_SERIF_BOLD_ITALIC@" + +// SERIF_BOLD_OBLIQUE font accessible from freetype +#define PL_FREETYPE_SERIF_BOLD_OBLIQUE "@PL_FREETYPE_SERIF_BOLD_OBLIQUE@" + +// SERIF_ITALIC font accessible from freetype +#define PL_FREETYPE_SERIF_ITALIC "@PL_FREETYPE_SERIF_ITALIC@" + +// SERIF_OBLIQUE font accessible from freetype +#define PL_FREETYPE_SERIF_OBLIQUE "@PL_FREETYPE_SERIF_OBLIQUE@" + +// Symbol font accessible from freetype +#define PL_FREETYPE_SYMBOL "@PL_FREETYPE_SYMBOL@" + +// SYMBOL_BOLD font accessible from freetype +#define PL_FREETYPE_SYMBOL_BOLD "@PL_FREETYPE_SYMBOL_BOLD@" + +// SYMBOL_BOLD_ITALIC font accessible from freetype +#define PL_FREETYPE_SYMBOL_BOLD_ITALIC "@PL_FREETYPE_SYMBOL_BOLD_ITALIC@" + +// SYMBOL_BOLD_OBLIQUE font accessible from freetype +#define PL_FREETYPE_SYMBOL_BOLD_OBLIQUE "@PL_FREETYPE_SYMBOL_BOLD_OBLIQUE@" + +// SYMBOL_ITALIC font accessible from freetype +#define PL_FREETYPE_SYMBOL_ITALIC "@PL_FREETYPE_SYMBOL_ITALIC@" + +// SYMBOL_OBLIQUE font accessible from freetype +#define PL_FREETYPE_SYMBOL_OBLIQUE "@PL_FREETYPE_SYMBOL_OBLIQUE@" + +// Define as the return type of signal handlers (`int' or `void'). +#define RETSIGTYPE @RETSIGTYPE@ + +// Location of Source tree +#define SOURCE_DIR "@SOURCE_DIR@" + +// Define to 1 if you have the ANSI C header files. +#cmakedefine STDC_HEADERS 1 + +// Location of Tcl stuff +#define TCL_DIR "@TCL_DIR@" + +// Version number of package +#define VERSION "@VERSION@" + +// Define if csa is desired +#cmakedefine WITH_CSA + +// Define if want to use general fill_intersection_polygon approach +// rather than the traditional code to fill the intersection of a polygon with +// the clipping limits. +#cmakedefine USE_FILL_INTERSECTION_POLYGON + +// Define to `char *' if <sys/types.h> does not define. +#cmakedefine caddr_t + +// Define to `int' if <sys/types.h> does not define. +#cmakedefine pid_t + +// Define as `fork' if `vfork' does not work. +#cmakedefine vfork Modified: trunk/examples/f77/CMakeLists.txt =================================================================== --- trunk/examples/f77/CMakeLists.txt 2013-07-09 16:28:26 UTC (rev 12408) +++ trunk/examples/f77/CMakeLists.txt 2013-07-09 19:27:35 UTC (rev 12409) @@ -97,7 +97,7 @@ set(HAVE_F77_ISNAN_TRUE C) endif(FORTRAN_HAVE_ISNAN) configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/plf77demos.inc.cmake + ${CMAKE_CURRENT_SOURCE_DIR}/plf77demos.inc.in ${CMAKE_CURRENT_BINARY_DIR}/plf77demos.inc ) Deleted: trunk/examples/f77/plf77demos.inc.cmake =================================================================== --- trunk/examples/f77/plf77demos.inc.cmake 2013-07-09 16:28:26 UTC (rev 12408) +++ trunk/examples/f77/plf77demos.inc.cmake 2013-07-09 19:27:35 UTC (rev 12409) @@ -1,12 +0,0 @@ - function myisnan(x) - - implicit none - logical myisnan - real*8 x - -@HAVE_F77_ISNAN_FALSE@ myisnan = (x.ne.x) -@HAVE_F77_ISNAN_TRUE@ myisnan = isnan(x) - - return - - end function Copied: trunk/examples/f77/plf77demos.inc.in (from rev 12408, trunk/examples/f77/plf77demos.inc.cmake) =================================================================== --- trunk/examples/f77/plf77demos.inc.in (rev 0) +++ trunk/examples/f77/plf77demos.inc.in 2013-07-09 19:27:35 UTC (rev 12409) @@ -0,0 +1,12 @@ + function myisnan(x) + + implicit none + logical myisnan + real*8 x + +@HAVE_F77_ISNAN_FALSE@ myisnan = (x.ne.x) +@HAVE_F77_ISNAN_TRUE@ myisnan = isnan(x) + + return + + end function Modified: trunk/examples/f95/CMakeLists.txt =================================================================== --- trunk/examples/f95/CMakeLists.txt 2013-07-09 16:28:26 UTC (rev 12408) +++ trunk/examples/f95/CMakeLists.txt 2013-07-09 19:27:35 UTC (rev 12409) @@ -98,7 +98,7 @@ set(HAVE_F77_ISNAN_TRUE !) endif(FORTRAN_HAVE_ISNAN) configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/plf95demos.inc.cmake + ${CMAKE_CURRENT_SOURCE_DIR}/plf95demos.inc.in ${CMAKE_CURRENT_BINARY_DIR}/plf95demos.inc ) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/plf95demos.inc Deleted: trunk/examples/f95/plf95demos.inc.cmake =================================================================== --- trunk/examples/f95/plf95demos.inc.cmake 2013-07-09 16:28:26 UTC (rev 12408) +++ trunk/examples/f95/plf95demos.inc.cmake 2013-07-09 19:27:35 UTC (rev 12409) @@ -1,13 +0,0 @@ - function myisnan(x) - - use plplot_flt - implicit none - logical :: myisnan - real (kind=plflt) :: x - -@HAVE_F77_ISNAN_FALSE@ myisnan = (x.ne.x) -@HAVE_F77_ISNAN_TRUE@ myisnan = isnan(x) - - return - - end function Copied: trunk/examples/f95/plf95demos.inc.in (from rev 12408, trunk/examples/f95/plf95demos.inc.cmake) =================================================================== --- trunk/examples/f95/plf95demos.inc.in (rev 0) +++ trunk/examples/f95/plf95demos.inc.in 2013-07-09 19:27:35 UTC (rev 12409) @@ -0,0 +1,13 @@ + function myisnan(x) + + use plplot_flt + implicit none + logical :: myisnan + real (kind=plflt) :: x + +@HAVE_F77_ISNAN_FALSE@ myisnan = (x.ne.x) +@HAVE_F77_ISNAN_TRUE@ myisnan = isnan(x) + + return + + end function Modified: trunk/examples/python/CMakeLists.txt =================================================================== --- trunk/examples/python/CMakeLists.txt 2013-07-09 16:28:26 UTC (rev 12408) +++ trunk/examples/python/CMakeLists.txt 2013-07-09 19:27:35 UTC (rev 12409) @@ -240,7 +240,7 @@ set(python_location5 ${CMAKE_BINARY_DIR}/bindings/qt_gui/pyqt4) set(python_location6 ${CMAKE_BINARY_DIR}/bindings/gnome2/python) configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/plplot_python_start.py.cmake + ${CMAKE_CURRENT_SOURCE_DIR}/plplot_python_start.py.in ${CMAKE_CURRENT_BINARY_DIR}/plplot_python_start.py @ONLY ) @@ -251,7 +251,7 @@ set(python_location4) set(python_location5) configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/plplot_python_start.py.cmake + ${CMAKE_CURRENT_SOURCE_DIR}/plplot_python_start.py.in ${CMAKE_CURRENT_BINARY_DIR}/plplot_python_start.py_install @ONLY ) Deleted: trunk/examples/python/plplot_python_start.py.cmake =================================================================== --- trunk/examples/python/plplot_python_start.py.cmake 2013-07-09 16:28:26 UTC (rev 12408) +++ trunk/examples/python/plplot_python_start.py.cmake 2013-07-09 19:27:35 UTC (rev 12409) @@ -1,11 +0,0 @@ -# Append to effective python path so that can find plplot modules -# depending on how python_location[12] are set. -# Note, by careful choice of python_location[12] for the build-tree -# case and the install tree case you can achieve -# a clear separation between build and install tree case. -import sys -sys.path.insert (0, "@python_location1@") -sys.path.insert (0, "@python_location2@") -sys.path.insert (0, "@python_location3@") -sys.path.insert (0, "@python_location4@") -sys.path.insert (0, "@python_location5@") Copied: trunk/examples/python/plplot_python_start.py.in (from rev 12408, trunk/examples/python/plplot_python_start.py.cmake) =================================================================== --- trunk/examples/python/plplot_python_start.py.in (rev 0) +++ trunk/examples/python/plplot_python_start.py.in 2013-07-09 19:27:35 UTC (rev 12409) @@ -0,0 +1,11 @@ +# Append to effective python path so that can find plplot modules +# depending on how python_location[12] are set. +# Note, by careful choice of python_location[12] for the build-tree +# case and the install tree case you can achieve +# a clear separation between build and install tree case. +import sys +sys.path.insert (0, "@python_location1@") +sys.path.insert (0, "@python_location2@") +sys.path.insert (0, "@python_location3@") +sys.path.insert (0, "@python_location4@") +sys.path.insert (0, "@python_location5@") Deleted: trunk/pkgcfg/plplot-template.pc.cmake =================================================================== --- trunk/pkgcfg/plplot-template.pc.cmake 2013-07-09 16:28:26 UTC (rev 12408) +++ trunk/pkgcfg/plplot-template.pc.cmake 2013-07-09 19:27:35 UTC (rev 12409) @@ -1,10 +0,0 @@ -libdir=@SHLIB_DIR@ -includedir=@INCLUDE_DIR@ -drvdir=@LIB_DIR@/plplot@VERSION@/drivers@LIB_TAG@ - -Name: PLplot @PC_SHORT_NAME@ -Description: Scientific plotting library (@PC_LONG_NAME@@PC_PRECISION@ precision) -@PC_REQUIRES_TAG@: @PC_REQUIRES@ -Version: @VERSION@ -Libs: -L${libdir} @PC_LINK_FLAGS@ -Cflags: -I${includedir} @PC_COMPILE_FLAGS@ Copied: trunk/pkgcfg/plplot-template.pc.in (from rev 12408, trunk/pkgcfg/plplot-template.pc.cmake) =================================================================== --- trunk/pkgcfg/plplot-template.pc.in (rev 0) +++ trunk/pkgcfg/plplot-template.pc.in 2013-07-09 19:27:35 UTC (rev 12409) @@ -0,0 +1,10 @@ +libdir=@SHLIB_DIR@ +includedir=@INCLUDE_DIR@ +drvdir=@LIB_DIR@/plplot@VERSION@/drivers@LIB_TAG@ + +Name: PLplot @PC_SHORT_NAME@ +Description: Scientific plotting library (@PC_LONG_NAME@@PC_PRECISION@ precision) +@PC_REQUIRES_TAG@: @PC_REQUIRES@ +Version: @VERSION@ +Libs: -L${libdir} @PC_LINK_FLAGS@ +Cflags: -I${includedir} @PC_COMPILE_FLAGS@ Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2013-07-09 16:28:26 UTC (rev 12408) +++ trunk/plplot_test/CMakeLists.txt 2013-07-09 19:27:35 UTC (rev 12409) @@ -37,7 +37,7 @@ #Build-tree configuration set(CONFIGURED_EXAMPLES_DIR EXAMPLES_DIR) configure_file( - plplot-test.sh.cmake + plplot-test.sh.in ${CMAKE_CURRENT_BINARY_DIR}/plplot-test.sh @ONLY ) @@ -45,7 +45,7 @@ #Install-tree configuration set(CONFIGURED_EXAMPLES_DIR SRC_EXAMPLES_DIR) configure_file( - plplot-test.sh.cmake + plplot-test.sh.in ${CMAKE_CURRENT_BINARY_DIR}/plplot-test.sh_install @ONLY ) Deleted: trunk/plplot_test/plplot-test.sh.cmake =================================================================== --- trunk/plplot_test/plplot-test.sh.cmake 2013-07-09 16:28:26 UTC (rev 12408) +++ trunk/plplot_test/plplot-test.sh.cmake 2013-07-09 19:27:35 UTC (rev 12409) @@ -1,409 +0,0 @@ -#!@SH_EXECUTABLE@ -# -*- mode: shell-script -*- -# $Id$ -# -# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Alan W. Irwin -# Copyright (C) 2004 Rafael Laboissiere -# -# This file is part of PLplot. -# -# PLplot is free software; you can redistribute it and/or modify -# it under the terms of the GNU Library General Public License as published -# by the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# PLplot is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Library General Public License for more details. -# -# You should have received a copy of the GNU Library General Public License -# along with PLplot; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -# test suite for executing all configured demos (either in plplot/tmp -# or else in the install area) capable of file output. Our ultimate aim -# is to compare the generated files with results generated on a system -# that is known to give good results. However, single-precision -# contamination (even when double is configured) and the consequent large -# roundoff error is currently hampering our cross-platform comparisons. -# So for now, this is only a test suite in the sense that it checks the -# files corresponding to our demo plots can all be generated. It is -# up to the user to display those files with the appropriate software -# (e.g., gv for postscript files and kview or a browser for png, gif, -# or jpeg files on Linux systems) to make sure they display properly. - -version=@VERSION@ - -EXAMPLES_DIR=${EXAMPLES_DIR:-.} -SRC_EXAMPLES_DIR=${SRC_EXAMPLES_DIR:-.} -OUTPUT_DIR=${OUTPUT_DIR:-.} -device=${DEVICE:-psc} -export EXAMPLES_DIR SRC_EXAMPLES_DIR OUTPUT_DIR device DEBUG_CMD - -usage() -{ -echo ' -Usage: plplot-test.sh [OPTIONS] - -Options: - [--device=DEVICE] (DEVICE = any cmake-enabled device. psc is the default) - [--front-end=FE] (FE = one of c, cxx, f77, f95 java, octave, python, tcl, pdl, ada, ocaml, lua or d) - If this option is not specified, then all front-ends will - be tested. More than one front-end may be given, like - this --front-end="c cxx" - [--examples-dir=/path/to/examples/dir] - Specify path to the examples directory. Defaults to "." - [--src-examples-dir=/path/to/src/examples/dir] - Specify path to the src examples directory. Defaults to "." - [--output-dir=/path/to/output/dir] - Specify location where the resulting files are stored. - Defaults to "." - [--interactive] Run subset of C examples for interactive devices only. - [--interactive_octave] Run interactive octave examples for interactive devices only. - [--verbose] Echo each PLplot example that is executed. - [--debug="debug command"] - Run examples with given debug command. - [--debug] Run examples with default debug command (valgrind). - [--version] - [--help] - -Environment variables: - DEVICE, FRONT_END, EXAMPLES_DIR, SRC_EXAMPLES_DIR, and OUTPUT_DIR can be - used to specify the devices, front-ends, the examples directory, the - source examples directory (used for the special case of build-tree checks - when that tree is separated from the source tree), and output directory. - These environment variables are overridden by the options --device, - --front-end, --examples-dir, --src-examples-dir, and --output-dir. -' - exit $1 -} - -# Figure out what script options were specified by the user. - -while test $# -gt 0; do - if [ "@HAVE_BASH@" = "ON" ] ; then - case "$1" in - -*=*) optarg=${1#*=} ;; - *) optarg= ;; - esac - else - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - fi - - case $1 in - --device=*) - device=$optarg - ;; - --interactive) - interactive=on - ;; - --interactive_octave) - interactive_octave=on - ;; - --verbose) - export verbose_test=on - ;; - --version) - echo $version - exit 0 - ;; - --front-end=*) - FRONT_END=$optarg - for i in $FRONT_END ; do - [ $i = "c" \ - -o $i = "cxx" \ - -o $i = "f77" \ - -o $i = "f95" \ - -o $i = "java" \ - -o $i = "octave" \ - -o $i = "python" \ - -o $i = "tcl" \ - -o $i = "pdl" \ - -o $i = "ada" \ - -o $i = "ocaml" \ - -o $i = "lua" \ - -o $i = "d" \ - ] \ - || usage 0 1>&2 - done - ;; - --examples-dir=*) - EXAMPLES_DIR=$optarg - ;; - --src-examples-dir=*) - SRC_EXAMPLES_DIR=$optarg - ;; - --output-dir=*) - OUTPUT_DIR=$optarg - ;; - --debug=*) - DEBUG_CMD=$optarg - ;; - --debug) - DEBUG_CMD="valgrind --leak-check=full --show-reachable=yes --log-file=valgrind.x%q{index}%q{lang}.%q{dsuffix}.log" - ;; - --help) - usage 0 1>&2 - ;; - *) - usage 1 1>&2 - ;; - esac - shift -done - -# This script is only designed to work when EXAMPLES_DIR is a directory -# with a subdirectory called "c". Check whether this conditions is true. - -if [ ! -d "$EXAMPLES_DIR"/c ] ; then -echo ' -This script is only designed to work when the EXAMPLES_DIR environment -variable (overridden by option --examples-dir) is a directory with a -subdirectory called "c". This condition has been violated. -' -exit 1 -fi - -# Find where the front-end scripts are by looking at the directory name of the -# current script. - -if [ "@WIN32@" = "1" ] ; then - scripts_dir=${0%/*} -else - scripts_dir=`echo "$0" | sed 's:/[^/][^/]*$::'` -fi - -if [ "$interactive" = "on" -o "$interactive_octave" = "on" ] ; then - # List of interactive devices for PLplot that _might_ be enabled. - PLD_aqt=@PLD_aqt@ - PLD_qtwidget=@PLD_qtwidget@ - PLD_gcw=@PLD_gcw@ - PLD_gnome=@PLD_gnome@ - PLD_ntk=@PLD_ntk@ - PLD_tk=@PLD_tk@ - PLD_wingcc=@PLD_wingcc@ - PLD_wincairo=@PLD_wincairo@ - PLD_wxwidgets=@PLD_wxwidgets@ - PLD_xcairo=@PLD_xcairo@ - PLD_xwin=@PLD_xwin@ - - eval pld_device='$'PLD_$device - if [ -z "$pld_device" ] ; then - echo ' -Never heard of an interactive device called '"$device"'. Either this -is not a legitimate interactive device for PLplot or else -plplot-test.sh.cmake needs some maintenance to include this -interactive device in the list of possible PLplot interactive devices. -' - exit 1 - fi - - if [ ! "$pld_device" = "ON" ] ; then - echo ' -PLD_'"$device"' is defined as '"$pld_device"'. It must be ON (i.e., enabled -by your cmake configuration and built properly) before you can use this -script with DEVICE='"$device"'. -' - exit 1 - fi - - status=0 - if [ "$interactive" = "on" ] ; then - export cdir="$EXAMPLES_DIR"/c - echo "Testing subset of C examples for device $device" - script="$scripts_dir"/test_c_interactive.sh - else - # This case must be "$interactive_octave" = "on" - export options= - export octave=@OCTAVE@ - export octavedir=\ -"$EXAMPLES_DIR"/../bindings/octave:\ -"$SRC_EXAMPLES_DIR"/../bindings/octave/PLplot:\ -"$SRC_EXAMPLES_DIR"/../bindings/octave/PLplot/support:\ -"$SRC_EXAMPLES_DIR"/../bindings/octave/misc:\ -"$SRC_EXAMPLES_DIR"/octave:\ -"@PLPLOT_OCTAVE_DIR@":\ -"@PLPLOT_OCTAVE_DIR@"/support:\ -"@OCTAVE_M_DIR@"/PLplot:\ -"@OCTAVE_OCT_DIR@": - echo "Testing interactive octave examples for device $device" - script="$scripts_dir"/test_octave_interactive.sh - fi - @SH_EXECUTABLE@ "$script" || status=1 - - exit $status -fi - -# These variables set by default assuming you are going to run this -# script from the installed demos directory $prefix/lib/plplot$version/examples. -cdir="$EXAMPLES_DIR"/c -cxxdir="$EXAMPLES_DIR"/c++ -f77dir="$EXAMPLES_DIR"/f77 -f95dir="$EXAMPLES_DIR"/f95 -pythondir="$@CONFIGURED_EXAMPLES_DIR@"/python -tcldir="$@CONFIGURED_EXAMPLES_DIR@"/tcl -perldir="$SRC_EXAMPLES_DIR"/perl -javadir="$EXAMPLES_DIR"/java -adadir="$EXAMPLES_DIR"/ada -ocamldir="$EXAMPLES_DIR"/ocaml -luadir="$@CONFIGURED_EXAMPLES_DIR@"/lua -ddir="$EXAMPLES_DIR"/d -octave=@OCTAVE@ -octavedir=\ -"$EXAMPLES_DIR"/../bindings/octave:\ -"$SRC_EXAMPLES_DIR"/../bindings/octave/PLplot:\ -"$SRC_EXAMPLES_DIR"/../bindings/octave/PLplot/support:\ -"$SRC_EXAMPLES_DIR"/../bindings/octave/misc:\ -"$SRC_EXAMPLES_DIR"/octave:\ -"@PLPLOT_OCTAVE_DIR@":\ -"@PLPLOT_OCTAVE_DIR@"/support:\ -"@OCTAVE_M_DIR@"/PLplot:\ -"@OCTAVE_OCT_DIR@": -export cdir cxxdir f77dir f95dir pythondir javadir octave octavedir tcldir perldir adadir ocamldir luadir ddir - -fe="" - -# List of non-interactive (i.e., file) devices for PLplot that -# _might_ be enabled. For completeness you may want to specify all devices -# here, but be sure to comment out the interactive ones since they are -# handled by the above --interactive logic. - -#interactive PLD_aqt=@PLD_aqt@ -PLD_cgm=@PLD_cgm@ -PLD_conex=@PLD_conex@ -PLD_dg300=@PLD_dg300@ -PLD_epsqt=@PLD_epsqt@ -PLD_pdfqt=@PLD_pdfqt@ -#interactive PLD_qtwidget=@PLD_qtwidget@ -PLD_bmpqt=@PLD_bmpqt@ -PLD_jpgqt=@PLD_jpgqt@ -PLD_pngqt=@PLD_pngqt@ -PLD_ppmqt=@PLD_ppmqt@ -PLD_tiffqt=@PLD_tiffqt@ -PLD_svgqt=@PLD_svgqt@ -#interactive PLD_gcw=@PLD_gcw@ -PLD_gif=@PLD_gif@ -#interactive PLD_gnome=@PLD_gnome@ -PLD_hp7470=@PLD_hp7470@ -PLD_hp7580=@PLD_hp7580@ -PLD_imp=@PLD_imp@ -PLD_jpeg=@PLD_jpeg@ -PLD_lj_hpgl=@PLD_lj_hpgl@ -PLD_ljii=@PLD_ljii@ -PLD_ljiip=@PLD_ljiip@ -#not a file device PLD_mem=@PLD_mem@ -#not a file device PLD_memcairo=@PLD_memcairo@ -PLD_mskermit=@PLD_mskermit@ -#interactive PLD_ntk=@PLD_ntk@ -PLD_null=@PLD_null@ -PLD_pbm=@PLD_pbm@ -PLD_pdf=@PLD_pdf@ -PLD_pdfcairo=@PLD_pdfcairo@ -PLD_plmeta=@PLD_plmeta@ -PLD_png=@PLD_png@ -PLD_pngcairo=@PLD_pngcairo@ -PLD_ps=@PLD_ps@ -# special case -PLD_psc=@PLD_ps@ -PLD_pscairo=@PLD_pscairo@ -PLD_epscairo=@PLD_epscairo@ -PLD_pstex=@PLD_pstex@ -PLD_psttf=@PLD_psttf@ -# special case -PLD_psttfc=@PLD_psttf@ -PLD_svg=@PLD_svg@ -PLD_svgcairo=@PLD_svgcairo@ -PLD_tek4010=@PLD_tek4010@ -PLD_tek4010f=@PLD_tek4010f@ -PLD_tek4107=@PLD_tek4107@ -PLD_tek4107f=@PLD_tek4107f@ -#interactive PLD_tk=@PLD_tk@ -#interactive PLD_tkwin=@PLD_tkwin@ -PLD_versaterm=@PLD_versaterm@ -PLD_vlt=@PLD_vlt@ -#interactive PLD_wincairo=@PLD_wincairo@ -#interactive PLD_wingcc=@PLD_wingcc@ -PLD_wxpng=@PLD_wxpng@ -#interactive PLD_wxwidgets=@PLD_wxwidgets@ -#interactive PLD_xcairo=@PLD_xcairo@ -PLD_xfig=@PLD_xfig@ -PLD_xterm=@PLD_xterm@ -#interactive PLD_xwin=@PLD_xwin@ - -eval pld_device='$'PLD_$device -if [ -z "$pld_device" ] ; then -echo ' -Never heard of a file device called '"$device"'. Either this is not a -legitimate file (i.e. non-interactive) device for PLplot or else -plplot-test.sh.cmake needs some maintenance to include this file device in -the list of possible PLplot file devices. -' -exit 1 -fi - -if [ ! "$pld_device" = "ON" ] ; then -echo ' -PLD_'"$device"' is defined as '"$pld_device"'. It must be ON (i.e., enabled -by your cmake configuration and built properly) before you can use this -script with DEVICE='"$device"'. -' -exit 1 -fi - -# Some devices require special options others do not. -case "$device" in - png|pngcairo|epscairo|jpeg|xfig|svg|svgcairo|bmpqt|jpgqt|pngqt|ppmqt|tiffqt|svgqt|epsqt|pdfqt) - options="-fam -fflen 2" - ;; - gif) - # gif standard is limited to 256 colours so cannot have aliasing turned - # on (which uses additional colours) for examples which already have - # a substantial number of colours (such as example 2 with its 116 colours). - options="-fam -fflen 2 -drvopt smooth=0" - ;; - *) - options= - ;; -esac -dsuffix=$device -export dsuffix options - -# Find out what front-ends have been configured -if [ -z "$FRONT_END" ] ; then - FRONT_END=c - test "@ENABLE_cxx@" = "ON" && FRONT_END="$FRONT_END cxx" - test "@ENABLE_f77@" = "ON" && FRONT_END="$FRONT_END f77" - test "@ENABLE_f95@" = "ON" && FRONT_END="$FRONT_END f95" - test "@ENABLE_java@" = "ON" && FRONT_END="$FRONT_END java" - test "@ENABLE_octave@" = "ON" && FRONT_END="$FRONT_END octave" - test "@ENABLE_python@" = "ON" && FRONT_END="$FRONT_END python" - test "@ENABLE_tcl@" = "ON" && FRONT_END="$FRONT_END tcl" - test "@ENABLE_pdl@" = "ON" && FRONT_END="$FRONT_END pdl" - test "@ENABLE_ada@" = "ON" && FRONT_END="$FRONT_END ada" - test "@ENABLE_ocaml@" = "ON" && FRONT_END="$FRONT_END ocaml" - test "@ENABLE_lua@" = "ON" && FRONT_END="$FRONT_END lua" - test "@ENABLE_d@" = "ON" && FRONT_END="$FRONT_END d" -fi - -# Call the front-end scripts -status=0 - -if [ "@WIN32@" = "1" ] ; then - critical_examples="14 17 29" - exesuffix=".exe" -else - critical_examples="14 17 29" - exesuffix= -fi -export critical_examples exesuffix -for i in $FRONT_END ; do - echo "Testing front-end $i" - script="$scripts_dir"/test_$i.sh - @SH_EXECUTABLE@ "$script" || status=1 -done - -exit $status Copied: trunk/plplot_test/plplot-test.sh.in (from rev 12408, trunk/plplot_test/plplot-test.sh.cmake) =================================================================== --- trunk/plplot_test/plplot-test.sh.in (rev 0) +++ trunk/plplot_test/plplot-test.sh.in 2013-07-09 19:27:35 UTC (rev 12409) @@ -0,0 +1,409 @@ +#!@SH_EXECUTABLE@ +# -*- mode: shell-script -*- +# $Id$ +# +# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Alan W. Irwin +# Copyright (C) 2004 Rafael Laboissiere +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU Library General Public License as published +# by the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +# test suite for executing all configured demos (either in plplot/tmp +# or else in the install area) capable of file output. Our ultimate aim +# is to compare the generated files with results generated on a system +# that is known to give good results. However, single-precision +# contamination (even when double is configured) and the consequent large +# roundoff error is currently hampering our cross-platform comparisons. +# So for now, this is only a test suite in the sense that it checks the +# files corresponding to our demo plots can all be generated. It is +# up to the user to display those files with the appropriate software +# (e.g., gv for postscript files and kview or a browser for png, gif, +# or jpeg files on Linux systems) to make sure they display properly. + +version=@VERSION@ + +EXAMPLES_DIR=${EXAMPLES_DIR:-.} +SRC_EXAMPLES_DIR=${SRC_EXAMPLES_DIR:-.} +OUTPUT_DIR=${OUTPUT_DIR:-.} +device=${DEVICE:-psc} +export EXAMPLES_DIR SRC_EXAMPLES_DIR OUTPUT_DIR device DEBUG_CMD + +usage() +{ +echo ' +Usage: plplot-test.sh [OPTIONS] + +Options: + [--device=DEVICE] (DEVICE = any cmake-enabled device. psc is the default) + [--front-end=FE] (FE = one of c, cxx, f77, f95 java, octave, python, tcl, pdl, ada, ocaml, lua or d) + If this option is not specified, then all front-ends will + be tested. More than one front-end may be given, like + this --front-end="c cxx" + [--examples-dir=/path/to/examples/dir] + Specify path to the examples directory. Defaults to "." + [--src-examples-dir=/path/to/src/examples/dir] + Specify path to the src examples directory. Defaults to "." + [--output-dir=/path/to/output/dir] + Specify location where the resulting files are stored. + Defaults to "." + [--interactive] Run subset of C examples for interactive devices only. + [--interactive_octave] Run interactive octave examples for interactive devices only. + [--verbose] Echo each PLplot example that is executed. + [--debug="debug command"] + Run examples with given debug command. + [--debug] Run examples with default debug command (valgrind). + [--version] + [--help] + +Environment variables: + DEVICE, FRONT_END, EXAMPLES_DIR, SRC_EXAMPLES_DIR, and OUTPUT_DIR can be + used to specify the devices, front-ends, the examples directory, the + source examples directory (used for the special case of build-tree checks + when that tree is separated from the source tree), and output directory. + These environment variables are overridden by the options --device, + --front-end, --examples-dir, --src-examples-dir, and --out... [truncated message content] |