Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[12677] trunk
|
From: <ai...@us...> - 2013-11-12 00:54:58
|
Revision: 12677
http://sourceforge.net/p/plplot/code/12677
Author: airwin
Date: 2013-11-12 00:54:54 +0000 (Tue, 12 Nov 2013)
Log Message:
-----------
VERSION ==> PLPLOT_VERSION (to make the code easier to understand and to
reduce the possibility of name clashes in the future).
PLPLOT_TCL_VERSION ==> PLPLOT_VERSION (since we want to identifiy the
PLplot tcl/tk bindings with PLPLOT_VERSION and not potentially some
other version string.
Propagate PLPLOT_ITCL_VERSION, PLPLOT_ITK_VERSION, and
PLPLOT_IWIDGETS_VERSION from CMake to the C code environment.
N.B. The first of these changes is quite intrusive so the tests below
are useful but they are far from a guarantee that there are no
lingering issues from this change. So stay alert for VERSION issues
when you use the PLplot svn trunk.
Tested by Alan W. Irwin <ai...@us...> on Linux using
the test_noninteractive targets for the build tree and the traditional
and CMake-based build systems for the installed examples tree.
Modified Paths:
--------------
trunk/CMakeLists.txt
trunk/abi-compliance-checker.xml.template.in
trunk/bindings/ocaml/META.in
trunk/bindings/ocaml/plcairo/META.in
trunk/bindings/tcl/pkgIndex.tcl.in
trunk/bindings/tcl/tclAPI.c
trunk/bindings/tk/Pltk_Init.c
trunk/bindings/tk/pkgIndex.tcl.in
trunk/bindings/tk-x-plat/Plplotter_Init.c
trunk/bindings/tk-x-plat/pkgIndex.tcl.in
trunk/cmake/modules/docbook.cmake
trunk/cmake/modules/instdirs.cmake
trunk/cmake/modules/plplot_version.cmake
trunk/config.h.in
trunk/doc/Doxyfile.in
trunk/drivers/ps.c
trunk/drivers/psttf.cc
trunk/pkgcfg/plplot-template.pc.in
trunk/plplot_test/plplot-test.sh.in
trunk/src/plargs.c
trunk/src/plcore.c
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2013-11-11 22:23:48 UTC (rev 12676)
+++ trunk/CMakeLists.txt 2013-11-12 00:54:54 UTC (rev 12677)
@@ -248,7 +248,7 @@
endif(WIN32_AND_NOT_CYGWIN)
set(
CPACK_SOURCE_PACKAGE_FILE_NAME
- "plplot-${VERSION}"
+ "plplot-${PLPLOT_VERSION}"
CACHE INTERNAL "tarball basename"
)
set(CPACK_SOURCE_GENERATOR TGZ)
Modified: trunk/abi-compliance-checker.xml.template.in
===================================================================
--- trunk/abi-compliance-checker.xml.template.in 2013-11-11 22:23:48 UTC (rev 12676)
+++ trunk/abi-compliance-checker.xml.template.in 2013-11-12 00:54:54 UTC (rev 12677)
@@ -1,4 +1,4 @@
-<version>${VERSION}</version>
+<version>${PLPLOT_VERSION}</version>
<headers>
${PREFIX}/include/plplot
</headers>
Modified: trunk/bindings/ocaml/META.in
===================================================================
--- trunk/bindings/ocaml/META.in 2013-11-11 22:23:48 UTC (rev 12676)
+++ trunk/bindings/ocaml/META.in 2013-11-12 00:54:54 UTC (rev 12677)
@@ -1,7 +1,7 @@
# findlib META file for ocaml-plplot
requires = ""
description = "PLplot library bindings"
-version = "@VERSION@"
+version = "@PLPLOT_VERSION@"
browse_interfaces = " Plplot "
linkopts = "-ccopt \"-L@SHLIB_DIR@\""
archive(byte) = "plplot.cma"
Modified: trunk/bindings/ocaml/plcairo/META.in
===================================================================
--- trunk/bindings/ocaml/plcairo/META.in 2013-11-11 22:23:48 UTC (rev 12676)
+++ trunk/bindings/ocaml/plcairo/META.in 2013-11-12 00:54:54 UTC (rev 12677)
@@ -2,7 +2,7 @@
requires = "plplot"
requires += "cairo"
description = "PLplot Cairo extras"
-version = "@VERSION@"
+version = "@PLPLOT_VERSION@"
browse_interfaces = " Plcairo "
archive(byte) = "plcairo.cma"
archive(native) = "plcairo.cmxa"
Modified: trunk/bindings/tcl/pkgIndex.tcl.in
===================================================================
--- trunk/bindings/tcl/pkgIndex.tcl.in 2013-11-11 22:23:48 UTC (rev 12676)
+++ trunk/bindings/tcl/pkgIndex.tcl.in 2013-11-12 00:54:54 UTC (rev 12677)
@@ -73,5 +73,5 @@
rename load_pkg_Pltcl {}
}
-package ifneeded Pltcl @PLPLOT_TCL_VERSION@ [list load_pkg_Pltcl $dir]
+package ifneeded Pltcl @PLPLOT_VERSION@ [list load_pkg_Pltcl $dir]
Modified: trunk/bindings/tcl/tclAPI.c
===================================================================
--- trunk/bindings/tcl/tclAPI.c 2013-11-11 22:23:48 UTC (rev 12676)
+++ trunk/bindings/tcl/tclAPI.c 2013-11-12 00:54:54 UTC (rev 12677)
@@ -398,10 +398,10 @@
int debug = plsc->debug;
const char *libDir = NULL;
static char initScript[] =
- "tcl_findLibrary plplot " VERSION " \"\" plplot.tcl PL_LIBRARY pllibrary";
+ "tcl_findLibrary plplot " PLPLOT_VERSION " \"\" plplot.tcl PL_LIBRARY pllibrary";
#ifdef PLPLOT_EXTENDED_SEARCH
static char initScriptExtended[] =
- "tcl_findLibrary plplot " VERSION "/tcl \"\" plplot.tcl PL_LIBRARY pllibrary";
+ "tcl_findLibrary plplot " PLPLOT_VERSION "/tcl \"\" plplot.tcl PL_LIBRARY pllibrary";
#endif
#ifdef USE_TCL_STUBS
@@ -441,7 +441,7 @@
#endif
#endif
- Tcl_SetVar( interp, "plversion", VERSION, TCL_GLOBAL_ONLY );
+ Tcl_SetVar( interp, "plversion", PLPLOT_VERSION, TCL_GLOBAL_ONLY );
// Begin search for init script
// Each search begins with a test of libDir, so rearrangement is easy.
@@ -606,7 +606,7 @@
// We really need this so the TEA based 'make install' can
// properly determine the package we have installed
- Tcl_PkgProvide( interp, "Pltcl", VERSION );
+ Tcl_PkgProvide( interp, "Pltcl", PLPLOT_VERSION );
return TCL_OK;
}
Modified: trunk/bindings/tk/Pltk_Init.c
===================================================================
--- trunk/bindings/tk/Pltk_Init.c 2013-11-11 22:23:48 UTC (rev 12676)
+++ trunk/bindings/tk/Pltk_Init.c 2013-11-12 00:54:54 UTC (rev 12677)
@@ -101,7 +101,7 @@
}
#endif
- Tcl_PkgProvide( interp, "Pltk", VERSION );
+ Tcl_PkgProvide( interp, "Pltk", PLPLOT_VERSION );
return TCL_OK;
}
Modified: trunk/bindings/tk/pkgIndex.tcl.in
===================================================================
--- trunk/bindings/tk/pkgIndex.tcl.in 2013-11-11 22:23:48 UTC (rev 12676)
+++ trunk/bindings/tk/pkgIndex.tcl.in 2013-11-12 00:54:54 UTC (rev 12677)
@@ -90,4 +90,4 @@
rename load_pkg_Pltk {}
}
-package ifneeded Pltk @PLPLOT_TCL_VERSION@ [list load_pkg_Pltk $dir]
+package ifneeded Pltk @PLPLOT_VERSION@ [list load_pkg_Pltk $dir]
Modified: trunk/bindings/tk-x-plat/Plplotter_Init.c
===================================================================
--- trunk/bindings/tk-x-plat/Plplotter_Init.c 2013-11-11 22:23:48 UTC (rev 12676)
+++ trunk/bindings/tk-x-plat/Plplotter_Init.c 2013-11-12 00:54:54 UTC (rev 12677)
@@ -90,7 +90,7 @@
Tcl_CreateCommand( interp, "plframe", (Tcl_CmdProc *) plPlotterCmd,
(ClientData) NULL, (Tcl_CmdDeleteProc *) NULL );
- Tcl_PkgProvide( interp, "Plplotter", VERSION );
+ Tcl_PkgProvide( interp, "Plplotter", PLPLOT_VERSION );
return TCL_OK;
}
Modified: trunk/bindings/tk-x-plat/pkgIndex.tcl.in
===================================================================
--- trunk/bindings/tk-x-plat/pkgIndex.tcl.in 2013-11-11 22:23:48 UTC (rev 12676)
+++ trunk/bindings/tk-x-plat/pkgIndex.tcl.in 2013-11-12 00:54:54 UTC (rev 12677)
@@ -90,5 +90,5 @@
rename load_pkg_Plplotter {}
}
-package ifneeded Plplotter @PLPLOT_TCL_VERSION@ [list load_pkg_Plplotter $dir]
+package ifneeded Plplotter @PLPLOT_VERSION@ [list load_pkg_Plplotter $dir]
Modified: trunk/cmake/modules/docbook.cmake
===================================================================
--- trunk/cmake/modules/docbook.cmake 2013-11-11 22:23:48 UTC (rev 12676)
+++ trunk/cmake/modules/docbook.cmake 2013-11-12 00:54:54 UTC (rev 12677)
@@ -333,11 +333,11 @@
# The "MANIFEST" variables needed in top-level CMakeLists.txt and
# in doc/docbook/src/CMakeLists.txt.
if(BUILD_DOC OR PREBUILT_DOC)
- set(BASE "${PACKAGE}-${VERSION}")
+ set(BASE "${PACKAGE}-${PLPLOT_VERSION}")
set(INFO_MANIFEST "INFO-MANIFEST")
- set(BASE_INFO "${PACKAGE}-info-${VERSION}")
+ set(BASE_INFO "${PACKAGE}-info-${PLPLOT_VERSION}")
set(MAN_MANIFEST "MAN-MANIFEST")
- set(BASE_MAN "${PACKAGE}-man-${VERSION}")
+ set(BASE_MAN "${PACKAGE}-man-${PLPLOT_VERSION}")
set(HTML_MANIFEST "HTML-MANIFEST")
- set(BASE_HTML "${PACKAGE}-html-${VERSION}")
+ set(BASE_HTML "${PACKAGE}-html-${PLPLOT_VERSION}")
endif(BUILD_DOC OR PREBUILT_DOC)
Modified: trunk/cmake/modules/instdirs.cmake
===================================================================
--- trunk/cmake/modules/instdirs.cmake 2013-11-11 22:23:48 UTC (rev 12676)
+++ trunk/cmake/modules/instdirs.cmake 2013-11-12 00:54:54 UTC (rev 12677)
@@ -75,7 +75,7 @@
# cached values above.
# Data.
-set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}${VERSION})
+set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}${PLPLOT_VERSION})
# Libraries.
set(LIB_DIR ${CMAKE_INSTALL_LIBDIR})
@@ -90,7 +90,7 @@
set(SHLIB_DIR ${CMAKE_INSTALL_LIBDIR})
# Tcl files.
-set(TCL_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}${VERSION}/tcl)
+set(TCL_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}${PLPLOT_VERSION}/tcl)
# Ada source files (*.adb, *.ads) (following recommendations in
# http://www.ada-france.org/debian/debian-ada-policy.html
@@ -101,7 +101,7 @@
set(ADA_LIB_DIR ${CMAKE_INSTALL_LIBDIR}/ada/adalib/plplotada${LIB_TAG})
# Drivers.
-set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}${VERSION}/drivers${LIB_TAG})
+set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}${PLPLOT_VERSION}/drivers${LIB_TAG})
# Documentation.
set(DOC_DIR ${CMAKE_INSTALL_DATADIR}/doc/${PACKAGE})
Modified: trunk/cmake/modules/plplot_version.cmake
===================================================================
--- trunk/cmake/modules/plplot_version.cmake 2013-11-11 22:23:48 UTC (rev 12676)
+++ trunk/cmake/modules/plplot_version.cmake 2013-11-12 00:54:54 UTC (rev 12677)
@@ -4,16 +4,9 @@
# Version data that need review and possible modification for each release.
-set(VERSION 5.9.10)
+# Overall PLplot version number.
+set(PLPLOT_VERSION 5.9.10)
-# According to man package, PLPLOT_TCL_VERSION (used in the various
-# pkgIndex.tcl scripts) should be strictly numbers alternating with
-# decimal points with the first number (the major number) signifying
-# incompatible changes in the scripts. To keep our life simple, let us
-# use the same as the VERSION above so long as it is strictly numerical.
-
-set(PLPLOT_TCL_VERSION ${VERSION})
-
# CPack version numbers for release tarball name.
set(CPACK_PACKAGE_VERSION_MAJOR 5)
set(CPACK_PACKAGE_VERSION_MINOR 9)
Modified: trunk/config.h.in
===================================================================
--- trunk/config.h.in 2013-11-11 22:23:48 UTC (rev 12676)
+++ trunk/config.h.in 2013-11-12 00:54:54 UTC (rev 12677)
@@ -276,12 +276,17 @@
// Define to 1 if you have the ANSI C header files.
#cmakedefine STDC_HEADERS 1
+// Overall PLplot version number
+#define PLPLOT_VERSION "@PLPLOT_VERSION@"
+
// Location of Tcl stuff
-#define TCL_DIR "@TCL_DIR@"
+#define TCL_DIR "@TCL_DIR@"
+// Consistent package versions for Itcl and friends found by PLplot
+// If PLplot could not find consistent values these are set to 0.0.0
+#define PLPLOT_ITCL_VERSION "@PLPLOT_ITCL_VERSION@"
+#define PLPLOT_ITK_VERSION "@PLPLOT_ITK_VERSION@"
+#define PLPLOT_IWIDGETS_VERSION "@PLPLOT_IWIDGETS_VERSION@"
-// Version number of package
-#define VERSION "@VERSION@"
-
// Define if csa is desired
#cmakedefine WITH_CSA
Modified: trunk/doc/Doxyfile.in
===================================================================
--- trunk/doc/Doxyfile.in 2013-11-11 22:23:48 UTC (rev 12676)
+++ trunk/doc/Doxyfile.in 2013-11-12 00:54:54 UTC (rev 12677)
@@ -32,7 +32,7 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = @VERSION@
+PROJECT_NUMBER = @PLPLOT_VERSION@
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer
Modified: trunk/drivers/ps.c
===================================================================
--- trunk/drivers/ps.c 2013-11-11 22:23:48 UTC (rev 12676)
+++ trunk/drivers/ps.c 2013-11-12 00:54:54 UTC (rev 12677)
@@ -252,7 +252,7 @@
fprintf( OF, "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n" );
fprintf( OF, "%%%%Title: PLplot Graph\n" );
- fprintf( OF, "%%%%Creator: PLplot Version %s\n", VERSION );
+ fprintf( OF, "%%%%Creator: PLplot Version %s\n", PLPLOT_VERSION );
fprintf( OF, "%%%%CreationDate: %s\n", ps_getdate() );
fprintf( OF, "%%%%Pages: (atend)\n" );
fprintf( OF, "%%%%EndComments\n\n" );
Modified: trunk/drivers/psttf.cc
===================================================================
--- trunk/drivers/psttf.cc 2013-11-11 22:23:48 UTC (rev 12676)
+++ trunk/drivers/psttf.cc 2013-11-12 00:54:54 UTC (rev 12677)
@@ -319,7 +319,7 @@
doc->osHeader() << "%%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
doc->osHeader() << "%%Title: PLplot Graph\n";
- doc->osHeader() << "%%Creator: PLplot Version " << VERSION << "\n";
+ doc->osHeader() << "%%Creator: PLplot Version " << PLPLOT_VERSION << "\n";
doc->osHeader() << "%%CreationDate: " << ps_getdate() << "\n";
doc->osHeader() << "%%Pages: (atend)\n";
doc->osHeader() << "%%EndComments\n\n";
Modified: trunk/pkgcfg/plplot-template.pc.in
===================================================================
--- trunk/pkgcfg/plplot-template.pc.in 2013-11-11 22:23:48 UTC (rev 12676)
+++ trunk/pkgcfg/plplot-template.pc.in 2013-11-12 00:54:54 UTC (rev 12677)
@@ -1,10 +1,10 @@
libdir=@SHLIB_DIR@
includedir=@INCLUDE_DIR@
-drvdir=@LIB_DIR@/plplot@VERSION@/drivers@LIB_TAG@
+drvdir=@LIB_DIR@/plplot@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@
+Version: @PLPLOT_VERSION@
Libs: -L${libdir} @PC_LINK_FLAGS@
Cflags: -I${includedir} @PC_COMPILE_FLAGS@
Modified: trunk/plplot_test/plplot-test.sh.in
===================================================================
--- trunk/plplot_test/plplot-test.sh.in 2013-11-11 22:23:48 UTC (rev 12676)
+++ trunk/plplot_test/plplot-test.sh.in 2013-11-12 00:54:54 UTC (rev 12677)
@@ -33,7 +33,7 @@
# (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@
+version=@PLPLOT_VERSION@
EXAMPLES_DIR=${EXAMPLES_DIR:-.}
SRC_EXAMPLES_DIR=${SRC_EXAMPLES_DIR:-.}
Modified: trunk/src/plargs.c
===================================================================
--- trunk/src/plargs.c 2013-11-11 22:23:48 UTC (rev 12676)
+++ trunk/src/plargs.c 2013-11-12 00:54:54 UTC (rev 12677)
@@ -1578,7 +1578,7 @@
opt_v( const char * PL_UNUSED( opt ), const char * PL_UNUSED( opt_arg ), void * PL_UNUSED( client_data ) )
{
if ( !mode_quiet )
- fprintf( stderr, "PLplot library version: %s\n", VERSION );
+ fprintf( stderr, "PLplot library version: %s\n", PLPLOT_VERSION );
return 2;
}
Modified: trunk/src/plcore.c
===================================================================
--- trunk/src/plcore.c 2013-11-11 22:23:48 UTC (rev 12676)
+++ trunk/src/plcore.c 2013-11-12 00:54:54 UTC (rev 12677)
@@ -3823,7 +3823,7 @@
void
c_plgver( char *p_ver )
{
- strcpy( p_ver, VERSION );
+ strcpy( p_ver, PLPLOT_VERSION );
}
// Set inferior X window
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
