Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[12983] trunk
|
From: <arj...@us...> - 2014-02-08 19:00:26
|
Revision: 12983
http://sourceforge.net/p/plplot/code/12983
Author: arjenmarkus
Date: 2014-02-08 19:00:24 +0000 (Sat, 08 Feb 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/bindings/tcl/CMakeLists.txt
trunk/bindings/tk/plserver.c
trunk/cmake/epa_build/cmake/CMakeLists.txt
trunk/cmake/epa_build/swig/CMakeLists.txt
Modified: trunk/bindings/tcl/CMakeLists.txt
===================================================================
--- trunk/bindings/tcl/CMakeLists.txt 2014-02-07 05:42:56 UTC (rev 12982)
+++ trunk/bindings/tcl/CMakeLists.txt 2014-02-08 19:00:24 UTC (rev 12983)
@@ -23,11 +23,11 @@
# Check consistency of plplot_parameters.h.
add_custom_target(
check_tcl_parameters
- COMMAND ${CMAKE_COMMAND} -E remove -f
+ COMMAND ${CMAKE_COMMAND} -E remove -f
${CMAKE_CURRENT_BINARY_DIR}/plplot_parameters.h_compare
COMMAND
- sed -f ${CMAKE_CURRENT_SOURCE_DIR}/global_defines.sed <
- ${CMAKE_SOURCE_DIR}/bindings/swig-support/plplotcapi.i >
+ sed -f ${CMAKE_CURRENT_SOURCE_DIR}/global_defines.sed <
+ ${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"
@@ -186,6 +186,7 @@
${TCL_LIBRARY}
)
+ message(STATUS "ENABLE_itcl: ${ENABLE_itcl}")
if(ENABLE_itcl)
include_directories(${ITCL_INCLUDE_PATH})
@@ -208,6 +209,7 @@
${ITCL_LIBRARY}
)
endif(ENABLE_itcl)
+ message(STATUS "Itcl libraries: ${plplottcltk_Main${LIB_TAG}_link_libraries}")
if(ENABLE_tkX)
set(plplottcltk${LIB_TAG}_LIB_SRCS
@@ -438,10 +440,10 @@
# _target suffix to avoid nameclash with filename plplot.tcl. This
# nameclash screwed up ../tk/configuration which had a non-generated file
# of the same name which was a dependency of a custom target.
- add_custom_target(plplot.tcl_target ALL
+ add_custom_target(plplot.tcl_target ALL
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot.tcl
)
- set_property(GLOBAL PROPERTY
+ set_property(GLOBAL PROPERTY
FILES_plplot.tcl_target ${CMAKE_CURRENT_BINARY_DIR}/plplot.tcl
)
@@ -455,7 +457,7 @@
add_custom_target(tclIndex_tcl ALL
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tclIndex
)
- set_property(GLOBAL PROPERTY
+ set_property(GLOBAL PROPERTY
FILES_tclIndex_tcl ${CMAKE_CURRENT_BINARY_DIR}/tclIndex
)
@@ -593,7 +595,7 @@
)
endif(USE_RPATH)
- install(TARGETS pltcl
+ install(TARGETS pltcl
EXPORT export_plplot
DESTINATION ${BIN_DIR}
)
Modified: trunk/bindings/tk/plserver.c
===================================================================
--- trunk/bindings/tk/plserver.c 2014-02-07 05:42:56 UTC (rev 12982)
+++ trunk/bindings/tk/plserver.c 2014-02-08 19:00:24 UTC (rev 12983)
@@ -115,25 +115,33 @@
// Save arglist to get around Tk_ParseArgv limitations
+ fprintf(stderr, "Before myargv\n");
+
myargv = (const char **) malloc( argc * sizeof ( char * ) );
for ( i = 0; i < argc; i++ )
{
myargv[i] = argv[i];
}
+ fprintf(stderr, "After myargv\n");
+
// Parse args
// Examine the result string to see if an error return is really an error
if ( Tk_ParseArgv( interp, (Tk_Window) NULL, &argc, argv,
argTable, TK_ARGV_NO_DEFAULTS ) != TCL_OK )
{
+ fprintf(stderr, "Error in Tk_ParseArgv\n");
fprintf( stderr, "\n(plserver) %s\n\n", Tcl_GetStringResult( interp ) );
fprintf( stderr, "\
The client_<xxx> and -child options should not be used except via the\n\
PLplot/Tk driver.\n\n(wish) " );
+ fprintf(stderr, "Before Tcl_SetResult\n");
Tcl_SetResult( interp, (char *) helpmsg, TCL_VOLATILE );
}
+ fprintf(stderr, "After Tk_ParseArgv\n");
+
// No longer need interpreter
#if TCL_MAJOR_VERSION < 7 || ( TCL_MAJOR_VERSION == 7 && TCL_MINOR_VERSION < 5 )
Modified: trunk/cmake/epa_build/cmake/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/cmake/CMakeLists.txt 2014-02-07 05:42:56 UTC (rev 12982)
+++ trunk/cmake/epa_build/cmake/CMakeLists.txt 2014-02-08 19:00:24 UTC (rev 12983)
@@ -1,76 +1,76 @@
-# cmake/CMakeLists.txt
-
-# Configure the build of cmake.
-
-# Copyright (C) 2013 Alan W. Irwin
-
-# This file is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-
-# This file 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
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with this file; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-# An external curl library (see --system-curl option below) is
-# required to build cmake because the cmake internal version of curl
-# is quite lame (no openssl capability, for example). Also, we
-# haven't yet implemented a curl epa_build configuration because that
-# is going to be somewhat difficult due to the large number of
-# dependencies. See
-# http://www.linuxfromscratch.org/blfs/view/svn/basicnet/curl.html for
-# a list of those dependencies. There is some hope because
-# some of those are optional so I may tackle the curl epa_build configuration
-# sooner rather than later.
-
-# For now we are okay on Linux because we can just use the system curl
-# library for the cmake build, but on Windows it is unlikely curl is
-# installed so we will be unable to build a powerful cmake (until a
-# curl epa_build configuration is available). Note, if the Windows
-# build of cmake fails, then either install curl (if that is possible)
-# or use the workaround of downloading a binary download from kitware
-# that apparently does use a powerful Windows version of curl.
-
-set(PACKAGE cmake)
-
-# List of dependencies (most of which are build tools) which should be
-# ignored.
-set(ignored_dependencies_LIST curl ${extra_ignored_dependencies_list})
-
-set(dependencies_LIST curl)
-
-# Do boilerplate tasks that must be done for each different project
-# that is configured as part of epa_build.
-epa_boilerplate(
- ignored_dependencies_LIST
- PACKAGE
- dependencies_LIST
- dependencies_targets
- EPA_PATH
- source_PATH
- )
-
-set(CFLAGS "$ENV{CFLAGS}")
-set(CXXFLAGS "$ENV{CXXFLAGS}")
-
-# Data that is related to downloads.
-set(DIR v2.8)
-set(VERSION 2.8.12.1)
-set(URL http://www.cmake.org/files/${DIR}/cmake-${VERSION}.tar.gz)
-set(DOWNLOAD_HASH_TYPE MD5)
-set(DOWNLOAD_HASH 9d38cd4e2c94c3cea97d0e2924814acc)
-
-ExternalProject_Add(
- build_${PACKAGE}
- URL ${URL}
- URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
- CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${SH_EXECUTABLE} ${EPA_BASE}/Source/build_${PACKAGE}/bootstrap --prefix=${EPA_CMAKE_INSTALL_PREFIX} --parallel=8 --verbose --system-curl --no-qt-gui
- BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND}
- INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND} install
- )
+# cmake/CMakeLists.txt
+
+# Configure the build of cmake.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This file 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
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+# An external curl library (see --system-curl option below) is
+# required to build cmake because the cmake internal version of curl
+# is quite lame (no openssl capability, for example). Also, we
+# haven't yet implemented a curl epa_build configuration because that
+# is going to be somewhat difficult due to the large number of
+# dependencies. See
+# http://www.linuxfromscratch.org/blfs/view/svn/basicnet/curl.html for
+# a list of those dependencies. There is some hope because
+# some of those are optional so I may tackle the curl epa_build configuration
+# sooner rather than later.
+
+# For now we are okay on Linux because we can just use the system curl
+# library for the cmake build, but on Windows it is unlikely curl is
+# installed so we will be unable to build a powerful cmake (until a
+# curl epa_build configuration is available). Note, if the Windows
+# build of cmake fails, then either install curl (if that is possible)
+# or use the workaround of downloading a binary download from kitware
+# that apparently does use a powerful Windows version of curl.
+
+set(PACKAGE cmake)
+
+# List of dependencies (most of which are build tools) which should be
+# ignored.
+set(ignored_dependencies_LIST curl ${extra_ignored_dependencies_list})
+
+set(dependencies_LIST curl)
+
+# Do boilerplate tasks that must be done for each different project
+# that is configured as part of epa_build.
+epa_boilerplate(
+ ignored_dependencies_LIST
+ PACKAGE
+ dependencies_LIST
+ dependencies_targets
+ EPA_PATH
+ source_PATH
+ )
+
+set(CFLAGS "$ENV{CFLAGS}")
+set(CXXFLAGS "$ENV{CXXFLAGS}")
+
+# Data that is related to downloads.
+set(DIR v2.8)
+set(VERSION 2.8.12.2)
+set(URL http://www.cmake.org/files/${DIR}/cmake-${VERSION}.tar.gz)
+set(DOWNLOAD_HASH_TYPE MD5)
+set(DOWNLOAD_HASH 17c6513483d23590cbce6957ec6d1e66)
+
+ExternalProject_Add(
+ build_${PACKAGE}
+ URL ${URL}
+ URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${SH_EXECUTABLE} ${EPA_BASE}/Source/build_${PACKAGE}/bootstrap --prefix=${EPA_CMAKE_INSTALL_PREFIX} --parallel=8 --verbose --system-curl --no-qt-gui
+ BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND}
+ INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND} install
+ )
Modified: trunk/cmake/epa_build/swig/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/swig/CMakeLists.txt 2014-02-07 05:42:56 UTC (rev 12982)
+++ trunk/cmake/epa_build/swig/CMakeLists.txt 2014-02-08 19:00:24 UTC (rev 12983)
@@ -1,85 +1,86 @@
-# swig/CMakeLists.txt
-
-# Configure the build of swig.
-
-# N.B. this file is generated so if you edit it you will lose all your
-# changes the next time it is generated (typically by running
-# either/both the update_added_packages.sh or update_pango_packages.sh
-# scripts). If those scripts do not provide good results, then
-# consider changing their source files (e.g., by editing the files
-# used in those scripts) or add a patch to be run by those scripts.
-
-# Copyright (C) 2013 Alan W. Irwin
-
-# This file is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-
-# This file 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
-# Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public
-# License along with this file; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-set(PACKAGE swig)
-
-# List of dependencies (most of which are build tools) which should be
-# ignored.
-set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
-
-set(dependencies_LIST libpcre)
-
-# Do boilerplate tasks that must be done for each different project
-# that is configured as part of epa_build.
-epa_boilerplate(
- ignored_dependencies_LIST
- PACKAGE
- dependencies_LIST
- dependencies_targets
- EPA_PATH
- source_PATH
- )
-
-if(MSYS_PLATFORM)
- set(CFLAGS "$ENV{CFLAGS}")
-else(MSYS_PLATFORM)
- set(CFLAGS "$ENV{CFLAGS}")
-endif(MSYS_PLATFORM)
-
-set(CXXFLAGS "$ENV{CXXFLAGS}")
-
-# Drop -fvisibility=hidden since that option does not work for a
-# number of software packages that are configured automatically using
-# this template.
-string(REGEX REPLACE "-fvisibility=hidden" "" CFLAGS "${CFLAGS}")
-string(REGEX REPLACE "-fvisibility=hidden" "" CXXFLAGS "${CXXFLAGS}")
-
-# Data that is related to downloads.
-set(URL http://downloads.sourceforge.net/swig/swig/swig-2.0.11/swig-2.0.11.tar.gz)
-set(DOWNLOAD_HASH_TYPE SHA256)
-set(DOWNLOAD_HASH 63780bf29f53937ad399a1f68bccb3730c90f65746868c4cdfc25cafcd0a424e)
-
-ExternalProject_Add(
- build_${PACKAGE}
- DEPENDS ${dependencies_targets}
- URL ${URL}
- URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
- PATCH_COMMAND ""
- CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" "LDFLAGS=-Wl,-rpath -Wl,${EPA_CMAKE_INSTALL_PREFIX}/lib" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --with-pcre-prefix=${EPA_CMAKE_INSTALL_PREFIX}
- BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}
- BUILD_IN_SOURCE OFF
- INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install
- )
-
-add_custom_command(
- OUTPUT
- ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-patch
- COMMAND ${CMAKE_COMMAND} -E echo
- "Provide swig support for octave-3.8.0"
- COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/octave-3.8.0.patch
- APPEND
- )
+# swig/CMakeLists.txt
+
+# Configure the build of swig.
+
+# N.B. this file is generated so if you edit it you will lose all your
+# changes the next time it is generated (typically by running
+# either/both the update_added_packages.sh or update_pango_packages.sh
+# scripts). If those scripts do not provide good results, then
+# consider changing their source files (e.g., by editing the files
+# used in those scripts) or add a patch to be run by those scripts.
+
+# Copyright (C) 2013 Alan W. Irwin
+
+# This file is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This file 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
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+set(PACKAGE swig)
+
+# List of dependencies (most of which are build tools) which should be
+# ignored.
+set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
+
+set(dependencies_LIST libpcre)
+
+# Do boilerplate tasks that must be done for each different project
+# that is configured as part of epa_build.
+epa_boilerplate(
+ ignored_dependencies_LIST
+ PACKAGE
+ dependencies_LIST
+ dependencies_targets
+ EPA_PATH
+ source_PATH
+ )
+
+if(MSYS_PLATFORM)
+ # Add two MSYS specific flags to avoid compile errors
+ set(CFLAGS "-D__NO_MINGW_LFS -U__STRICT_ANSI__ $ENV{CFLAGS}")
+else(MSYS_PLATFORM)
+ set(CFLAGS "$ENV{CFLAGS}")
+endif(MSYS_PLATFORM)
+
+set(CXXFLAGS "$ENV{CXXFLAGS}")
+
+# Drop -fvisibility=hidden since that option does not work for a
+# number of software packages that are configured automatically using
+# this template.
+string(REGEX REPLACE "-fvisibility=hidden" "" CFLAGS "${CFLAGS}")
+string(REGEX REPLACE "-fvisibility=hidden" "" CXXFLAGS "${CXXFLAGS}")
+
+# Data that is related to downloads.
+set(URL http://downloads.sourceforge.net/swig/swig/swig-2.0.11/swig-2.0.11.tar.gz)
+set(DOWNLOAD_HASH_TYPE SHA256)
+set(DOWNLOAD_HASH 63780bf29f53937ad399a1f68bccb3730c90f65746868c4cdfc25cafcd0a424e)
+
+ExternalProject_Add(
+ build_${PACKAGE}
+ DEPENDS ${dependencies_targets}
+ URL ${URL}
+ URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
+ PATCH_COMMAND ""
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" "LDFLAGS=-Wl,-rpath -Wl,${EPA_CMAKE_INSTALL_PREFIX}/lib" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --with-pcre-prefix=${EPA_CMAKE_INSTALL_PREFIX}
+ BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}
+ BUILD_IN_SOURCE OFF
+ INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install
+ )
+
+add_custom_command(
+ OUTPUT
+ ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-patch
+ COMMAND ${CMAKE_COMMAND} -E echo
+ "Provide swig support for octave-3.8.0"
+ COMMAND ${PATCH_EXECUTABLE} --directory=${EPA_BASE}/Source/build_${PACKAGE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/octave-3.8.0.patch
+ APPEND
+ )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
