Menu
▾
▴
plplot-cvs — For PLplot svn commit messages
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(33) |
Jun
|
Jul
(30) |
Aug
(2) |
Sep
|
Oct
(30) |
Nov
(136) |
Dec
(59) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(255) |
Feb
(169) |
Mar
(322) |
Apr
(185) |
May
(33) |
Jun
(89) |
Jul
(47) |
Aug
(59) |
Sep
(40) |
Oct
(31) |
Nov
(74) |
Dec
(84) |
| 2002 |
Jan
(163) |
Feb
(78) |
Mar
(23) |
Apr
(5) |
May
(22) |
Jun
(75) |
Jul
(143) |
Aug
(48) |
Sep
(111) |
Oct
(58) |
Nov
(124) |
Dec
(278) |
| 2003 |
Jan
(106) |
Feb
(276) |
Mar
(354) |
Apr
(97) |
May
(14) |
Jun
(3) |
Jul
(7) |
Aug
(21) |
Sep
(83) |
Oct
(110) |
Nov
(3) |
Dec
(119) |
| 2004 |
Jan
(318) |
Feb
(409) |
Mar
(68) |
Apr
(23) |
May
(105) |
Jun
(147) |
Jul
(69) |
Aug
(53) |
Sep
(23) |
Oct
(14) |
Nov
(15) |
Dec
(63) |
| 2005 |
Jan
(146) |
Feb
(69) |
Mar
(157) |
Apr
(127) |
May
(166) |
Jun
(8) |
Jul
(5) |
Aug
(3) |
Sep
(8) |
Oct
(17) |
Nov
(29) |
Dec
(34) |
| 2006 |
Jan
(3) |
Feb
(4) |
Mar
(1) |
Apr
(70) |
May
(241) |
Jun
(82) |
Jul
(344) |
Aug
(196) |
Sep
(87) |
Oct
(57) |
Nov
(121) |
Dec
(86) |
| 2007 |
Jan
(60) |
Feb
(67) |
Mar
(102) |
Apr
(28) |
May
(13) |
Jun
(29) |
Jul
(38) |
Aug
(56) |
Sep
(91) |
Oct
(89) |
Nov
(50) |
Dec
(68) |
| 2008 |
Jan
(87) |
Feb
(47) |
Mar
(100) |
Apr
(34) |
May
(65) |
Jun
(54) |
Jul
(98) |
Aug
(128) |
Sep
(109) |
Oct
(141) |
Nov
(40) |
Dec
(206) |
| 2009 |
Jan
(176) |
Feb
(226) |
Mar
(134) |
Apr
(84) |
May
(152) |
Jun
(85) |
Jul
(91) |
Aug
(153) |
Sep
(141) |
Oct
(59) |
Nov
(87) |
Dec
(75) |
| 2010 |
Jan
(58) |
Feb
(41) |
Mar
(51) |
Apr
(74) |
May
(81) |
Jun
(39) |
Jul
(30) |
Aug
(43) |
Sep
(76) |
Oct
(59) |
Nov
(62) |
Dec
(52) |
| 2011 |
Jan
(125) |
Feb
(41) |
Mar
(96) |
Apr
(53) |
May
(21) |
Jun
(23) |
Jul
(48) |
Aug
(71) |
Sep
(37) |
Oct
(81) |
Nov
(60) |
Dec
(32) |
| 2012 |
Jan
(51) |
Feb
(23) |
Mar
|
Apr
(8) |
May
(2) |
Jun
|
Jul
(8) |
Aug
(25) |
Sep
(4) |
Oct
(32) |
Nov
(17) |
Dec
(2) |
| 2013 |
Jan
(8) |
Feb
(2) |
Mar
(9) |
Apr
(9) |
May
(37) |
Jun
(48) |
Jul
(63) |
Aug
(42) |
Sep
(59) |
Oct
(83) |
Nov
(141) |
Dec
(133) |
| 2014 |
Jan
(57) |
Feb
(58) |
Mar
(58) |
Apr
(25) |
May
(14) |
Jun
(3) |
Jul
(6) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ai...@us...> - 2013-07-10 16:20:25
|
Revision: 12414
http://sourceforge.net/p/plplot/code/12414
Author: airwin
Date: 2013-07-10 16:20:21 +0000 (Wed, 10 Jul 2013)
Log Message:
-----------
Make treatment of the dll directory consistent with the rest of the
build-system logic. In other words, only use dll for the
WIN32_AND_NOT_CYGWIN case.
Modified Paths:
--------------
trunk/drivers/CMakeLists.txt
trunk/examples/lua/CMakeLists.txt
Modified: trunk/drivers/CMakeLists.txt
===================================================================
--- trunk/drivers/CMakeLists.txt 2013-07-10 15:58:05 UTC (rev 12413)
+++ trunk/drivers/CMakeLists.txt 2013-07-10 16:20:21 UTC (rev 12414)
@@ -50,12 +50,12 @@
# in windows we move test-drv-info to the dll directory
# otherwise we use the RPATH functionality
- if(WIN32_OR_CYGWIN)
+ if(WIN32_AND_NOT_CYGWIN)
set_target_properties(
test-drv-info
PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/dll
)
- else(WIN32_OR_CYGWIN)
+ else(WIN32_AND_NOT_CYGWIN)
set(test-drv-info_RPATH
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/src
@@ -71,7 +71,7 @@
INSTALL_RPATH "${test-drv-info_RPATH}"
BUILD_WITH_INSTALL_RPATH ON
)
- endif(WIN32_OR_CYGWIN)
+ endif(WIN32_AND_NOT_CYGWIN)
get_target_property(test-drv-info_LOCATION test-drv-info LOCATION)
set(test_dyndrivers_TDEPENDS test-drv-info)
Modified: trunk/examples/lua/CMakeLists.txt
===================================================================
--- trunk/examples/lua/CMakeLists.txt 2013-07-10 15:58:05 UTC (rev 12413)
+++ trunk/examples/lua/CMakeLists.txt 2013-07-10 16:20:21 UTC (rev 12414)
@@ -102,11 +102,11 @@
set_property(GLOBAL PROPERTY FILES_examples_lua ${command_DEPENDS})
endif(BUILD_TEST)
- if(WIN32_OR_CYGWIN)
+ if(WIN32_AND_NOT_CYGWIN)
set(lua_lib_location ${CMAKE_BINARY_DIR}/dll)
- else(WIN32_OR_CYGWIN)
+ else(WIN32_AND_NOT_CYGWIN)
set(lua_lib_location ${CMAKE_BINARY_DIR}/bindings/lua)
- endif(WIN32_OR_CYGWIN)
+ endif(WIN32_AND_NOT_CYGWIN)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/plplot_examples.lua.in
${CMAKE_CURRENT_BINARY_DIR}/plplot_examples.lua
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-07-10 15:58:12
|
Revision: 12413
http://sourceforge.net/p/plplot/code/12413
Author: airwin
Date: 2013-07-10 15:58:05 +0000 (Wed, 10 Jul 2013)
Log Message:
-----------
Replace WIN32 with an unambiguous name for that variable.
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2013-07-10 04:32:13 UTC (rev 12412)
+++ trunk/CMakeLists.txt 2013-07-10 15:58:05 UTC (rev 12413)
@@ -59,6 +59,8 @@
# Force CMake to _NOT_ define 'WIN32' on Cygwin
set(CMAKE_LEGACY_CYGWIN_WIN32 OFF)
+
+# Set unambiguous names for these variables as a reminder.
set(WIN32_AND_NOT_CYGWIN ${WIN32})
if(WIN32 OR CYGWIN)
set(WIN32_OR_CYGWIN ON)
@@ -133,9 +135,9 @@
# in windows all created dlls are gathered in the dll directory
# if you add this directory to your PATH all shared libraries are available
-if(BUILD_SHARED_LIBS AND WIN32)
+if(BUILD_SHARED_LIBS AND WIN32_AND_NOT_CYGWIN)
set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dll)
-endif(BUILD_SHARED_LIBS AND WIN32)
+endif(BUILD_SHARED_LIBS AND WIN32_AND_NOT_CYGWIN)
# Borland Compiler must compile in ANSII mode
if(BORLAND)
@@ -247,11 +249,11 @@
set(CPACK_PACKAGE_VENDOR "PLplot development team")
set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/README)
set(CPACK_SET_DESTDIR ON)
-if(WIN32)
+if(WIN32_AND_NOT_CYGWIN)
set(CPACK_GENERATOR ZIP)
-else(WIN32)
+else(WIN32_AND_NOT_CYGWIN)
set(CPACK_GENERATOR TGZ)
-endif(WIN32)
+endif(WIN32_AND_NOT_CYGWIN)
set(
CPACK_SOURCE_PACKAGE_FILE_NAME
"plplot-${VERSION}"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-07-10 04:32:15
|
Revision: 12412
http://sourceforge.net/p/plplot/code/12412
Author: airwin
Date: 2013-07-10 04:32:13 +0000 (Wed, 10 Jul 2013)
Log Message:
-----------
Propagate WIN32_AND_NOT_CYGWIN and WIN32_OR_CYGWIN to the installed
examples build system.
Modified Paths:
--------------
trunk/examples/plplot_configure.cmake_installed_examples.in
Modified: trunk/examples/plplot_configure.cmake_installed_examples.in
===================================================================
--- trunk/examples/plplot_configure.cmake_installed_examples.in 2013-07-09 21:32:02 UTC (rev 12411)
+++ trunk/examples/plplot_configure.cmake_installed_examples.in 2013-07-10 04:32:13 UTC (rev 12412)
@@ -230,4 +230,8 @@
set(CMP_EXECUTABLE @CMP_EXECUTABLE@)
# ocaml examples build needs this.
-set(USE_RPATH @USE_RPATH@)
\ No newline at end of file
+set(USE_RPATH @USE_RPATH@)
+
+# WIN32 and CYGWIN derived variables
+set(WIN32_AND_NOT_CYGWIN @WIN32_AND_NOT_CYGWIN@)
+set(WIN32_OR_CYGWIN @WIN32_OR_CYGWIN@)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-07-09 21:32:05
|
Revision: 12411
http://sourceforge.net/p/plplot/code/12411
Author: airwin
Date: 2013-07-09 21:32:02 +0000 (Tue, 09 Jul 2013)
Log Message:
-----------
Change all instances of WIN32 to WIN32_OR_CYGWIN to be consistent with
modern CMake which does not set WIN32 to be ON for the Cygwin
platform.
Untested since I have no access to a Cygwin platform. But the
build system now has a chance to work for that case so Cygwin
platform testing is now encouraged.
Modified Paths:
--------------
trunk/bindings/f77/CMakeLists.txt
trunk/bindings/f95/CMakeLists.txt
trunk/bindings/python/CMakeLists.txt
trunk/bindings/qt_gui/pyqt4/CMakeLists.txt
trunk/cmake/modules/FindGD.cmake
trunk/cmake/modules/cairo.cmake
trunk/cmake/modules/drivers.cmake
trunk/cmake/modules/fortran.cmake
trunk/cmake/modules/freetype.cmake
trunk/cmake/modules/pdf.cmake
trunk/cmake/modules/plplot.cmake
trunk/cmake/modules/wingcc.cmake
trunk/drivers/CMakeLists.txt
trunk/examples/lua/CMakeLists.txt
trunk/lib/qsastime/CMakeLists.txt
Modified: trunk/bindings/f77/CMakeLists.txt
===================================================================
--- trunk/bindings/f77/CMakeLists.txt 2013-07-09 21:02:31 UTC (rev 12410)
+++ trunk/bindings/f77/CMakeLists.txt 2013-07-09 21:32:02 UTC (rev 12411)
@@ -78,7 +78,7 @@
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/sfstubs.f
PROPERTIES GENERATED ON)
- if(WIN32)
+ if(WIN32_OR_CYGWIN)
# Set the flags for the C compiler. The C stubs need to have the
# correction case and calling convention for the Fortran compiler
IF(TARGET_FORTRAN MATCHES "IVF")
@@ -88,7 +88,7 @@
SET(DEFFILE "")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /DCVF")
ENDIF(TARGET_FORTRAN MATCHES "IVF")
- endif(WIN32)
+ endif(WIN32_OR_CYGWIN)
if(F77_CMD_LINE)
set(HAVE_F77PARSE_CL_FALSE C)
Modified: trunk/bindings/f95/CMakeLists.txt
===================================================================
--- trunk/bindings/f95/CMakeLists.txt 2013-07-09 21:02:31 UTC (rev 12410)
+++ trunk/bindings/f95/CMakeLists.txt 2013-07-09 21:32:02 UTC (rev 12411)
@@ -45,7 +45,7 @@
)
## Build C part of F95 bindings
- if(WIN32)
+ if(WIN32_OR_CYGWIN)
# Set the flags for the C compiler. The C stubs need to have the
# correct case and calling convention for the Fortran compiler
IF(TARGET_FORTRAN MATCHES "IVF")
@@ -55,7 +55,7 @@
SET(DEFFILE "")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /DCVF")
ENDIF(TARGET_FORTRAN MATCHES "IVF")
- endif(WIN32)
+ endif(WIN32_OR_CYGWIN)
set(plplotf95c${LIB_TAG}_LIB_SRCS
sc3d.c
Modified: trunk/bindings/python/CMakeLists.txt
===================================================================
--- trunk/bindings/python/CMakeLists.txt 2013-07-09 21:02:31 UTC (rev 12410)
+++ trunk/bindings/python/CMakeLists.txt 2013-07-09 21:32:02 UTC (rev 12411)
@@ -86,14 +86,14 @@
)
endif(USE_RPATH)
- if(WIN32)
+ if(WIN32_OR_CYGWIN)
set_target_properties(
_plplotcmodule
PROPERTIES
SUFFIX ".pyd"
OUTPUT_NAME "_plplotc"
)
- endif(WIN32)
+ endif(WIN32_OR_CYGWIN)
add_library(plplot_widgetmodule MODULE plplot_widgetmodule.c)
set_target_properties(plplot_widgetmodule PROPERTIES PREFIX "")
Modified: trunk/bindings/qt_gui/pyqt4/CMakeLists.txt
===================================================================
--- trunk/bindings/qt_gui/pyqt4/CMakeLists.txt 2013-07-09 21:02:31 UTC (rev 12410)
+++ trunk/bindings/qt_gui/pyqt4/CMakeLists.txt 2013-07-09 21:32:02 UTC (rev 12411)
@@ -69,16 +69,16 @@
${plplot_pyqt4_SRC}
)
- if(WIN32)
+ if(WIN32_OR_CYGWIN)
set_target_properties(
plplot_pyqt4
PROPERTIES
PREFIX ""
SUFFIX ".pyd"
)
- else(WIN32)
+ else(WIN32_OR_CYGWIN)
set_target_properties(plplot_pyqt4 PROPERTIES PREFIX "")
- endif(WIN32)
+ endif(WIN32_OR_CYGWIN)
target_link_libraries(
plplot_pyqt4
Modified: trunk/cmake/modules/FindGD.cmake
===================================================================
--- trunk/cmake/modules/FindGD.cmake 2013-07-09 21:02:31 UTC (rev 12410)
+++ trunk/cmake/modules/FindGD.cmake 2013-07-09 21:32:02 UTC (rev 12411)
@@ -16,7 +16,7 @@
if(WIN32_AND_NOT_CYGWIN)
set(GD_NAMES ${GD_NAMES} bgd)
-else(WIN32)
+else(WIN32_AND_NOT_CYGWIN)
set(GD_NAMES ${GD_NAMES} gd)
endif(WIN32_AND_NOT_CYGWIN)
Modified: trunk/cmake/modules/cairo.cmake
===================================================================
--- trunk/cmake/modules/cairo.cmake 2013-07-09 21:02:31 UTC (rev 12410)
+++ trunk/cmake/modules/cairo.cmake 2013-07-09 21:32:02 UTC (rev 12411)
@@ -179,9 +179,9 @@
set(extcairo_true "#")
endif(NOT PLD_extcairo)
-if(NOT WIN32)
+if(NOT WIN32_OR_CYGWIN)
message(STATUS
"Not a Windows platform so setting wincairo driver to OFF."
)
set(PLD_wincairo OFF CACHE BOOL "Enable wincairo device" FORCE)
-endif(NOT WIN32)
+endif(NOT WIN32_OR_CYGWIN)
Modified: trunk/cmake/modules/drivers.cmake
===================================================================
--- trunk/cmake/modules/drivers.cmake 2013-07-09 21:02:31 UTC (rev 12410)
+++ trunk/cmake/modules/drivers.cmake 2013-07-09 21:32:02 UTC (rev 12411)
@@ -43,12 +43,12 @@
set(ENABLE_DYNDRIVERS OFF CACHE BOOL
"Enable dynamic loading of device drivers" FORCE)
endif(ENABLE_DYNDRIVERS AND NOT BUILD_SHARED_LIBS)
-if(ENABLE_DYNDRIVERS AND WIN32)
+if(ENABLE_DYNDRIVERS AND WIN32_OR_CYGWIN)
if(NOT CYGWIN)
set(LTDL_WIN32 ON)
set(LTDL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include)
endif(NOT CYGWIN)
-endif(ENABLE_DYNDRIVERS AND WIN32)
+endif(ENABLE_DYNDRIVERS AND WIN32_OR_CYGWIN)
if(ENABLE_DYNDRIVERS AND NOT LTDL_WIN32)
find_package(LTDL)
if(LTDL_FOUND)
Modified: trunk/cmake/modules/fortran.cmake
===================================================================
--- trunk/cmake/modules/fortran.cmake 2013-07-09 21:02:31 UTC (rev 12410)
+++ trunk/cmake/modules/fortran.cmake 2013-07-09 21:32:02 UTC (rev 12411)
@@ -95,10 +95,10 @@
set(TARGET_FORTRAN "CVF" CACHE STRING "Target Fortran Compiler")
endif(CMAKE_Fortran_COMPILER MATCHES ".*/DF.*")
- if(CMAKE_Fortran_COMPILER MATCHES ".*/F90.*" AND WIN32)
+ if(CMAKE_Fortran_COMPILER MATCHES ".*/F90.*" AND WIN32_OR_CYGWIN)
# Compaq Visual Fortran - alternative name
message(STATUS "NOTICE: " "Found Compaq Visual Fortran")
set(TARGET_FORTRAN "CVF" CACHE STRING "Target Fortran Compiler")
- endif(CMAKE_Fortran_COMPILER MATCHES ".*/F90.*" AND WIN32)
+ endif(CMAKE_Fortran_COMPILER MATCHES ".*/F90.*" AND WIN32_OR_CYGWIN)
endif(ENABLE_f77 OR ENABLE_f95)
Modified: trunk/cmake/modules/freetype.cmake
===================================================================
--- trunk/cmake/modules/freetype.cmake 2013-07-09 21:02:31 UTC (rev 12410)
+++ trunk/cmake/modules/freetype.cmake 2013-07-09 21:32:02 UTC (rev 12411)
@@ -41,19 +41,19 @@
if (WITH_FREETYPE)
- if(WIN32)
+ if(WIN32_OR_CYGWIN)
set(
PL_FREETYPE_FONT_PATH
"c:/windows/fonts"
CACHE PATH "Path for TrueType fonts"
)
- else(WIN32)
+ else(WIN32_OR_CYGWIN)
set(
PL_FREETYPE_FONT_PATH
"/usr/share/fonts/truetype/freefont"
CACHE PATH "Path for TrueType fonts"
)
- endif(WIN32)
+ endif(WIN32_OR_CYGWIN)
# PLplot internally needs a trailing slash for this path.
set(PL_FREETYPE_FONT_DIR "${PL_FREETYPE_FONT_PATH}/")
@@ -92,11 +92,11 @@
foreach(FONT_ENTRY ${PL_FREETYPE_FONT_LIST})
string(REGEX REPLACE "^(.*):.*:.*$" "\\1" NAME ${FONT_ENTRY})
- if (WIN32)
+ if (WIN32_OR_CYGWIN)
string(REGEX REPLACE "^.*:.*:(.*)$" "\\1" FONT ${FONT_ENTRY})
- else (WIN32)
+ else (WIN32_OR_CYGWIN)
string(REGEX REPLACE "^.*:(.*):.*$" "\\1" FONT ${FONT_ENTRY})
- endif (WIN32)
+ endif (WIN32_OR_CYGWIN)
set(${NAME} ${FONT}
CACHE FILEPATH "Font file for ${NAME}"
)
Modified: trunk/cmake/modules/pdf.cmake
===================================================================
--- trunk/cmake/modules/pdf.cmake 2013-07-09 21:02:31 UTC (rev 12410)
+++ trunk/cmake/modules/pdf.cmake 2013-07-09 21:32:02 UTC (rev 12411)
@@ -32,13 +32,13 @@
find_package(hpdf)
if(hpdf_FOUND)
message(STATUS "Looking for haru pdf header and library - found")
- if(WIN32 AND NOT CMAKE_COMPILER_IS_GNUCC)
+ if(WIN32_OR_CYGWIN AND NOT CMAKE_COMPILER_IS_GNUCC)
set(pdf_COMPILE_FLAGS "-I${hpdf_INCLUDE_DIRS} -DHPDF_DLL")
- elseif(WIN32 AND CMAKE_COMPILER_IS_GNUCC)
+ elseif(WIN32_OR_CYGWIN AND CMAKE_COMPILER_IS_GNUCC)
set(pdf_COMPILE_FLAGS "-I${hpdf_INCLUDE_DIRS} -DHPDF_DLL_CDECL")
- else(WIN32 AND NOT CMAKE_COMPILER_IS_GNUCC)
+ else(WIN32_OR_CYGWIN AND NOT CMAKE_COMPILER_IS_GNUCC)
set(pdf_COMPILE_FLAGS "-I${hpdf_INCLUDE_DIRS}")
- endif(WIN32 AND NOT CMAKE_COMPILER_IS_GNUCC)
+ endif(WIN32_OR_CYGWIN AND NOT CMAKE_COMPILER_IS_GNUCC)
set(pdf_LINK_FLAGS "${hpdf_LIBRARIES}")
set(pdf_RPATH ${hpdf_LIBRARY_DIRS})
filter_rpath(pdf_RPATH)
Modified: trunk/cmake/modules/plplot.cmake
===================================================================
--- trunk/cmake/modules/plplot.cmake 2013-07-09 21:02:31 UTC (rev 12410)
+++ trunk/cmake/modules/plplot.cmake 2013-07-09 21:32:02 UTC (rev 12411)
@@ -42,11 +42,11 @@
# transitively linked by default by CMake and also by pkg-config (used
# to generate compile and link flags for the traditional build and
# test system of the installed examples).
- if(WIN32)
+ if(WIN32_OR_CYGWIN)
option(NON_TRANSITIVE "Option to use non-transitive linking" OFF)
- else(WIN32)
+ else(WIN32_OR_CYGWIN)
option(NON_TRANSITIVE "Option to use non-transitive linking" ON)
- endif(WIN32)
+ endif(WIN32_OR_CYGWIN)
else(BUILD_SHARED_LIBS)
set(NON_TRANSITIVE OFF CACHE BOOL "Option to use non-transitive linking" FORCE)
endif(BUILD_SHARED_LIBS)
@@ -85,10 +85,10 @@
# Note, must come before java since that depends on, e.g., LIB_DIR.
# =======================================================================
-# WIN32 covers CYGWIN as well (and possibly MINGW, but we will make sure).
-if(WIN32 OR MINGW)
+# WIN32_OR_CYGWIN covers CYGWIN as well (and possibly MINGW, but we will make sure).
+if(WIN32_OR_CYGWIN OR MINGW)
set(EXEEXT .exe)
-endif(WIN32 OR MINGW)
+endif(WIN32_OR_CYGWIN OR MINGW)
include(double)
include(instdirs)
@@ -143,10 +143,10 @@
# create a devpackage file
option(DEVPAK "Create DevPackage" NO)
-if(DEVPAK AND NOT WIN32)
+if(DEVPAK AND NOT WIN32_OR_CYGWIN)
message( STATUS "DevPackage only available for Win32. Set DEVPAK to OFF." )
set(DEVPAK OFF)
-endif(DEVPAK AND NOT WIN32)
+endif(DEVPAK AND NOT WIN32_OR_CYGWIN)
if(DEVPAK AND BUILD_TEST)
message( STATUS "Examples are not build for DevPackage. Set BUILD_TEST to OFF." )
set(BUILD_TEST OFF)
@@ -479,7 +479,7 @@
# compilers are enabled (C is already enabled for the whole project
# and C++ should be enabled above).
# =======================================================================
-if(WIN32 AND NOT MINGW)
+if(WIN32_OR_CYGWIN AND NOT MINGW)
# MinGW excluded because it does not enable a static runtime according
# to http://lists-archives.com/mingw-users/00126-mingw-msvc-md-mt-ml.html .
option(STATIC_RUNTIME "Set Windows non-MinGW compiler static runtime linkage if requested" OFF)
@@ -504,7 +504,7 @@
endif(${flag_var} MATCHES "/MD")
endforeach(flag_var ${flag_vars})
endif(STATIC_RUNTIME)
-endif(WIN32 AND NOT MINGW)
+endif(WIN32_OR_CYGWIN AND NOT MINGW)
# =======================================================================
# additional library support
@@ -512,12 +512,12 @@
include(freetype)
# On windows systems the math library is not separated so do not specify
# it unless you are on a non-windows system.
-if(NOT WIN32)
+if(NOT WIN32_OR_CYGWIN)
find_library(MATH_LIB NAMES m PATHS /usr/local/lib /usr/lib)
if(NOT MATH_LIB)
message(FATAL_ERROR "Cannot find required math library")
endif(NOT MATH_LIB)
-endif(NOT WIN32)
+endif(NOT WIN32_OR_CYGWIN)
# Must come after MATH_LIB is defined (or not).
include(csiro)
Modified: trunk/cmake/modules/wingcc.cmake
===================================================================
--- trunk/cmake/modules/wingcc.cmake 2013-07-09 21:02:31 UTC (rev 12410)
+++ trunk/cmake/modules/wingcc.cmake 2013-07-09 21:32:02 UTC (rev 12411)
@@ -28,9 +28,9 @@
# DRIVERS_LINK_FLAGS - list of LINK_FLAGS for all static devices.
# Windows-only device driver.
-if(PLD_wingcc AND NOT WIN32)
+if(PLD_wingcc AND NOT WIN32_OR_CYGWIN)
set(PLD_wingcc OFF CACHE BOOL "Enable wingcc device" FORCE)
-endif(PLD_wingcc AND NOT WIN32)
+endif(PLD_wingcc AND NOT WIN32_OR_CYGWIN)
if(PLD_wingcc)
message(STATUS "Looking for gdi32 header and library")
Modified: trunk/drivers/CMakeLists.txt
===================================================================
--- trunk/drivers/CMakeLists.txt 2013-07-09 21:02:31 UTC (rev 12410)
+++ trunk/drivers/CMakeLists.txt 2013-07-09 21:32:02 UTC (rev 12411)
@@ -50,12 +50,12 @@
# in windows we move test-drv-info to the dll directory
# otherwise we use the RPATH functionality
- if(WIN32)
+ if(WIN32_OR_CYGWIN)
set_target_properties(
test-drv-info
PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/dll
)
- else(WIN32)
+ else(WIN32_OR_CYGWIN)
set(test-drv-info_RPATH
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/src
@@ -71,7 +71,7 @@
INSTALL_RPATH "${test-drv-info_RPATH}"
BUILD_WITH_INSTALL_RPATH ON
)
- endif(WIN32)
+ endif(WIN32_OR_CYGWIN)
get_target_property(test-drv-info_LOCATION test-drv-info LOCATION)
set(test_dyndrivers_TDEPENDS test-drv-info)
@@ -149,14 +149,14 @@
# the prefix should always be nothing (rather than lib) and the suffix
# should be set in a platform-dependent manner in order for libltdl
# to find the dynamic device.
- if(WIN32)
+ if(WIN32_OR_CYGWIN)
# strace showed that .dll was a must for libltdl on Cygwin.
set(DYNAMIC_SUFFIX ".dll")
- else(WIN32)
+ else(WIN32_OR_CYGWIN)
# So far this works on all non-Cygwin systems, but only Linux and
# Mac OS X have been tested so far.
set(DYNAMIC_SUFFIX ".so")
- endif(WIN32)
+ endif(WIN32_OR_CYGWIN)
#message("${SOURCE_ROOT_NAME}_RPATH = ${${SOURCE_ROOT_NAME}_RPATH}")
if(USE_RPATH)
Modified: trunk/examples/lua/CMakeLists.txt
===================================================================
--- trunk/examples/lua/CMakeLists.txt 2013-07-09 21:02:31 UTC (rev 12410)
+++ trunk/examples/lua/CMakeLists.txt 2013-07-09 21:32:02 UTC (rev 12411)
@@ -102,11 +102,11 @@
set_property(GLOBAL PROPERTY FILES_examples_lua ${command_DEPENDS})
endif(BUILD_TEST)
- if(WIN32)
+ if(WIN32_OR_CYGWIN)
set(lua_lib_location ${CMAKE_BINARY_DIR}/dll)
- else(WIN32)
+ else(WIN32_OR_CYGWIN)
set(lua_lib_location ${CMAKE_BINARY_DIR}/bindings/lua)
- endif(WIN32)
+ endif(WIN32_OR_CYGWIN)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/plplot_examples.lua.in
${CMAKE_CURRENT_BINARY_DIR}/plplot_examples.lua
Modified: trunk/lib/qsastime/CMakeLists.txt
===================================================================
--- trunk/lib/qsastime/CMakeLists.txt 2013-07-09 21:02:31 UTC (rev 12410)
+++ trunk/lib/qsastime/CMakeLists.txt 2013-07-09 21:32:02 UTC (rev 12411)
@@ -138,9 +138,9 @@
# Don't bother with building qsastime_testlib on Windows because its
# C library is incapable of providing useful time routines to act
# as comparisons with qsastime library results.
- if(WIN32)
+ if(WIN32_OR_CYGWIN)
set(BUILD_QSASTIME_TESTLIB OFF CACHE BOOL "Build qsastime_testlib application which is used to test the qsastime library against the C library time routines" FORCE)
- endif(WIN32)
+ endif(WIN32_OR_CYGWIN)
# qsastime_extra.[ch] provides helper functions for qsastime_test that should
# not be part of the library.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-07-09 21:02:33
|
Revision: 12410
http://sourceforge.net/p/plplot/code/12410
Author: airwin
Date: 2013-07-09 21:02:31 +0000 (Tue, 09 Jul 2013)
Log Message:
-----------
Replace WIN32 AND NOT CYGWIN logic everywhere in CMake logic with the
variable WIN32_AND_NOT_CYGWIN.
Force our build system to use the modern usage which does not set
WIN32 on CYGWIN platforms. Because of this change,
WIN32_AND_NOT_CYGWIN is defined to be the same as ${WIN32}, but keep
the WIN32_AND_NOT_CYGWIN name of the variable just to be clear.
Note the Cygwin platform has no chance to work until a further change
to replace WIN32 everywhere with WIN32_OR_CYGWIN is completed. That
change should be coming soon.
Modified Paths:
--------------
trunk/CMakeLists.txt
trunk/bindings/ada/CMakeLists.txt
trunk/bindings/f77/CMakeLists.txt
trunk/bindings/f95/CMakeLists.txt
trunk/cmake/modules/FindGD.cmake
trunk/examples/python/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2013-07-09 19:27:35 UTC (rev 12409)
+++ trunk/CMakeLists.txt 2013-07-09 21:02:31 UTC (rev 12410)
@@ -57,6 +57,15 @@
cmake_minimum_required(VERSION 2.8.6 FATAL_ERROR)
endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+# Force CMake to _NOT_ define 'WIN32' on Cygwin
+set(CMAKE_LEGACY_CYGWIN_WIN32 OFF)
+set(WIN32_AND_NOT_CYGWIN ${WIN32})
+if(WIN32 OR CYGWIN)
+ set(WIN32_OR_CYGWIN ON)
+else(WIN32 OR CYGWIN)
+ set(WIN32_OR_CYGWIN OFF)
+endif(WIN32 OR CYGWIN)
+
#foreach(policy RANGE 0 9)
# cmake_policy(GET CMP000${policy} policy_result)
# message(STATUS "Policy CMP000${policy} is ${policy_result}")
Modified: trunk/bindings/ada/CMakeLists.txt
===================================================================
--- trunk/bindings/ada/CMakeLists.txt 2013-07-09 19:27:35 UTC (rev 12409)
+++ trunk/bindings/ada/CMakeLists.txt 2013-07-09 21:02:31 UTC (rev 12410)
@@ -70,7 +70,7 @@
# Work around an issue in our CMake Ada language
# support for MinGW/Windows. FIXME. This issue should be fixed
# at the Ada language support level and not worked around here.
- if(WIN32 AND NOT CYGWIN)
+ if(WIN32_AND_NOT_CYGWIN)
add_custom_command(
TARGET plplotada${LIB_TAG} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
@@ -78,7 +78,7 @@
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/dll
VERBATIM
)
- endif(WIN32 AND NOT CYGWIN)
+ endif(WIN32_AND_NOT_CYGWIN)
target_link_libraries(plplotada${LIB_TAG}
plplot${LIB_TAG} ${GNAT_LIB}
Modified: trunk/bindings/f77/CMakeLists.txt
===================================================================
--- trunk/bindings/f77/CMakeLists.txt 2013-07-09 19:27:35 UTC (rev 12409)
+++ trunk/bindings/f77/CMakeLists.txt 2013-07-09 21:02:31 UTC (rev 12410)
@@ -185,9 +185,9 @@
configurable.f
)
- if(WIN32 AND BUILD_SHARED_LIBS AND NOT CYGWIN AND NOT MINGW)
+ if(WIN32_AND_NOT_CYGWIN AND BUILD_SHARED_LIBS AND NOT MINGW)
SET(plplotf77${LIB_TAG}_LIB_SRCS ${plplotf77${LIB_TAG}_LIB_SRCS} plplotf77${DEFFILE}.def)
- endif(WIN32 AND BUILD_SHARED_LIBS AND NOT CYGWIN AND NOT MINGW)
+ endif(WIN32_AND_NOT_CYGWIN AND BUILD_SHARED_LIBS AND NOT MINGW)
add_library(plplotf77${LIB_TAG} ${plplotf77${LIB_TAG}_LIB_SRCS})
Modified: trunk/bindings/f95/CMakeLists.txt
===================================================================
--- trunk/bindings/f95/CMakeLists.txt 2013-07-09 19:27:35 UTC (rev 12409)
+++ trunk/bindings/f95/CMakeLists.txt 2013-07-09 21:02:31 UTC (rev 12410)
@@ -131,9 +131,9 @@
sfstubsf95.f90
)
- if(WIN32 AND BUILD_SHARED_LIBS AND NOT MINGW AND NOT CYGWIN)
+ if(WIN32_AND_NOT_CYGWIN AND BUILD_SHARED_LIBS AND NOT MINGW)
SET(plplotf95${LIB_TAG}_LIB_SRCS ${plplotf95${LIB_TAG}_LIB_SRCS} plplotf95${DEFFILE}.def)
- endif(WIN32 AND BUILD_SHARED_LIBS AND NOT MINGW AND NOT CYGWIN)
+ endif(WIN32_AND_NOT_CYGWIN AND BUILD_SHARED_LIBS AND NOT MINGW)
add_library(plplotf95${LIB_TAG} ${plplotf95${LIB_TAG}_LIB_SRCS})
Modified: trunk/cmake/modules/FindGD.cmake
===================================================================
--- trunk/cmake/modules/FindGD.cmake 2013-07-09 19:27:35 UTC (rev 12409)
+++ trunk/cmake/modules/FindGD.cmake 2013-07-09 21:02:31 UTC (rev 12410)
@@ -14,11 +14,11 @@
/usr/include
)
-if(WIN32 AND NOT CYGWIN)
+if(WIN32_AND_NOT_CYGWIN)
set(GD_NAMES ${GD_NAMES} bgd)
else(WIN32)
set(GD_NAMES ${GD_NAMES} gd)
-endif(WIN32 AND NOT CYGWIN)
+endif(WIN32_AND_NOT_CYGWIN)
find_library(GD_LIBRARY
NAMES ${GD_NAMES}
@@ -33,12 +33,12 @@
endif(GD_LIBRARY AND GD_INCLUDE_DIR)
if(GD_FOUND)
- if(WIN32 AND NOT CYGWIN)
+ if(WIN32_AND_NOT_CYGWIN)
set(GD_SUPPORTS_PNG ON)
set(GD_SUPPORTS_JPEG ON)
set(GD_SUPPORTS_GIF ON)
get_filename_component(GD_LIBRARY_DIR ${GD_LIBRARY} PATH)
- else(WIN32 AND NOT CYGWIN)
+ else(WIN32_AND_NOT_CYGWIN)
include(CheckLibraryExists)
get_filename_component(GD_LIB_PATH ${GD_LIBRARY} PATH)
get_filename_component(GD_LIB ${GD_LIBRARY} NAME)
@@ -110,7 +110,7 @@
set(GD_LIBRARY_DIR "${GD_LIBRARY_DIR}" "${GD_NEXTLIBDIR}")
endif(NOT GD_TMP_FOUND)
endforeach(GD_LIB ${GD_LIBRARIES})
- endif(WIN32 AND NOT CYGWIN)
+ endif(WIN32_AND_NOT_CYGWIN)
endif(GD_FOUND)
if(GD_FOUND)
Modified: trunk/examples/python/CMakeLists.txt
===================================================================
--- trunk/examples/python/CMakeLists.txt 2013-07-09 19:27:35 UTC (rev 12409)
+++ trunk/examples/python/CMakeLists.txt 2013-07-09 21:02:31 UTC (rev 12410)
@@ -232,11 +232,11 @@
set(python_location1 ${CMAKE_SOURCE_DIR}/bindings/python)
set(python_location2 ${CMAKE_BINARY_DIR}/bindings/python)
set(python_location3 ${CMAKE_BINARY_DIR}/examples/python)
- if(WIN32 AND NOT CYGWIN)
+ if(WIN32_AND_NOT_CYGWIN)
set(python_location4 ${CMAKE_BINARY_DIR}/dll)
- else(WIN32 AND NOT CYGWIN)
+ else(WIN32_AND_NOT_CYGWIN)
set(python_location3)
- endif(WIN32 AND NOT CYGWIN)
+ endif(WIN32_AND_NOT_CYGWIN)
set(python_location5 ${CMAKE_BINARY_DIR}/bindings/qt_gui/pyqt4)
set(python_location6 ${CMAKE_BINARY_DIR}/bindings/gnome2/python)
configure_file(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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] |
|
From: <ai...@us...> - 2013-07-09 16:28:30
|
Revision: 12408
http://sourceforge.net/p/plplot/code/12408
Author: airwin
Date: 2013-07-09 16:28:26 +0000 (Tue, 09 Jul 2013)
Log Message:
-----------
Move from *.cmake form to *.in form for configurable files.
Modified Paths:
--------------
trunk/include/CMakeLists.txt
Added Paths:
-----------
trunk/include/plConfig.h.in
trunk/include/plDevs.h.in
Removed Paths:
-------------
trunk/include/plConfig.h.cmake
trunk/include/plDevs.h.cmake
Modified: trunk/include/CMakeLists.txt
===================================================================
--- trunk/include/CMakeLists.txt 2013-07-09 06:03:41 UTC (rev 12407)
+++ trunk/include/CMakeLists.txt 2013-07-09 16:28:26 UTC (rev 12408)
@@ -20,12 +20,12 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/plConfig.h.cmake
+ ${CMAKE_CURRENT_SOURCE_DIR}/plConfig.h.in
${CMAKE_CURRENT_BINARY_DIR}/plConfig.h
)
configure_file(
- ${CMAKE_CURRENT_SOURCE_DIR}/plDevs.h.cmake
+ ${CMAKE_CURRENT_SOURCE_DIR}/plDevs.h.in
${CMAKE_CURRENT_BINARY_DIR}/plDevs.h
)
Deleted: trunk/include/plConfig.h.cmake
===================================================================
--- trunk/include/plConfig.h.cmake 2013-07-09 06:03:41 UTC (rev 12407)
+++ trunk/include/plConfig.h.cmake 2013-07-09 16:28:26 UTC (rev 12408)
@@ -1,109 +0,0 @@
-// -*-C-*-
-// $Id$
-//
-// Maurice LeBrun
-// IFS, University of Texas at Austin
-// 18-Jul-1994
-//
-// Copyright (C) 2004, 2006, 2007, 2008, 2009 Alan W. Irwin
-// Copyright (C) 2004 Rafael Laboissiere
-// Copyright (C) 2004 Joao Cardoso
-//
-// 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
-//
-//
-
-// Configured (by CMake) macros for PLplot that are required for the
-// core build and the build of the installed
-// examples (and presumably any user applications). Therefore, the
-// configured plConfig.h should be installed. In contrast,
-// config.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 only required for the core
-// build. Therefore, in contrast to plConfig.h, config.h should not
-// 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.
-//
-//
-
-#ifndef __PLCONFIG_H__
-#define __PLCONFIG_H__
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-// Define if you have c++ accessible stdint.h
-#cmakedefine PL_HAVE_CXX_STDINT_H
-
-// Define if snprintf is available
-#ifndef PL_HAVE_SNPRINTF
-#cmakedefine PL_HAVE_SNPRINTF
-#endif
-
-// Define if _snprintf is available
-#ifndef _PL_HAVE_SNPRINTF
-#cmakedefine _PL_HAVE_SNPRINTF
-#endif
-
-// Define if isfinite is available
-#cmakedefine PL_HAVE_ISFINITE
-
-// Define if finite is available
-#cmakedefine PL_HAVE_FINITE
-
-// Define if _finite is available
-#cmakedefine PL__HAVE_FINITE
-
-// Define if isinf is available
-#cmakedefine PL_HAVE_ISINF
-
-// Define if _isinf is available
-#cmakedefine PL__HAVE_ISINF
-
-// Define if isnan is available
-#cmakedefine PL_HAVE_ISNAN
-
-// Define if _isnan is available
-#cmakedefine PL__HAVE_ISNAN
-
-// Define to 1 if you have the <stdint.h> header file.
-#cmakedefine PL_HAVE_STDINT_H 1
-
-// Define to 1 if you have the <unistd.h> header file.
-#cmakedefine PL_HAVE_UNISTD_H 1
-
-// Define if usleep is available
-#cmakedefine PL_HAVE_USLEEP
-
-// Define if you want PLplot's float type to be double
-#cmakedefine PL_DOUBLE
-
-// Define if C++ compiler accepts using namespace
-#cmakedefine PL_USE_NAMESPACE
-
-// Define if isnan is present in <math.h> but not in <cmath>
-// - broken Mac OSX systems
-#cmakedefine PL_BROKEN_ISNAN_CXX
-
-#endif // __PLCONFIG_H__
Copied: trunk/include/plConfig.h.in (from rev 12396, trunk/include/plConfig.h.cmake)
===================================================================
--- trunk/include/plConfig.h.in (rev 0)
+++ trunk/include/plConfig.h.in 2013-07-09 16:28:26 UTC (rev 12408)
@@ -0,0 +1,109 @@
+// -*-C-*-
+// $Id$
+//
+// Maurice LeBrun
+// IFS, University of Texas at Austin
+// 18-Jul-1994
+//
+// Copyright (C) 2004, 2006, 2007, 2008, 2009 Alan W. Irwin
+// Copyright (C) 2004 Rafael Laboissiere
+// Copyright (C) 2004 Joao Cardoso
+//
+// 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
+//
+//
+
+// Configured (by CMake) macros for PLplot that are required for the
+// core build and the build of the installed
+// examples (and presumably any user applications). Therefore, the
+// configured plConfig.h should be installed. In contrast,
+// config.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 only required for the core
+// build. Therefore, in contrast to plConfig.h, config.h should not
+// 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.
+//
+//
+
+#ifndef __PLCONFIG_H__
+#define __PLCONFIG_H__
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+// Define if you have c++ accessible stdint.h
+#cmakedefine PL_HAVE_CXX_STDINT_H
+
+// Define if snprintf is available
+#ifndef PL_HAVE_SNPRINTF
+#cmakedefine PL_HAVE_SNPRINTF
+#endif
+
+// Define if _snprintf is available
+#ifndef _PL_HAVE_SNPRINTF
+#cmakedefine _PL_HAVE_SNPRINTF
+#endif
+
+// Define if isfinite is available
+#cmakedefine PL_HAVE_ISFINITE
+
+// Define if finite is available
+#cmakedefine PL_HAVE_FINITE
+
+// Define if _finite is available
+#cmakedefine PL__HAVE_FINITE
+
+// Define if isinf is available
+#cmakedefine PL_HAVE_ISINF
+
+// Define if _isinf is available
+#cmakedefine PL__HAVE_ISINF
+
+// Define if isnan is available
+#cmakedefine PL_HAVE_ISNAN
+
+// Define if _isnan is available
+#cmakedefine PL__HAVE_ISNAN
+
+// Define to 1 if you have the <stdint.h> header file.
+#cmakedefine PL_HAVE_STDINT_H 1
+
+// Define to 1 if you have the <unistd.h> header file.
+#cmakedefine PL_HAVE_UNISTD_H 1
+
+// Define if usleep is available
+#cmakedefine PL_HAVE_USLEEP
+
+// Define if you want PLplot's float type to be double
+#cmakedefine PL_DOUBLE
+
+// Define if C++ compiler accepts using namespace
+#cmakedefine PL_USE_NAMESPACE
+
+// Define if isnan is present in <math.h> but not in <cmath>
+// - broken Mac OSX systems
+#cmakedefine PL_BROKEN_ISNAN_CXX
+
+#endif // __PLCONFIG_H__
Deleted: trunk/include/plDevs.h.cmake
===================================================================
--- trunk/include/plDevs.h.cmake 2013-07-09 06:03:41 UTC (rev 12407)
+++ trunk/include/plDevs.h.cmake 2013-07-09 16:28:26 UTC (rev 12408)
@@ -1,102 +0,0 @@
-// -*-C-*-
-// $Id$
-//
-// Maurice LeBrun
-// IFS, University of Texas at Austin
-// 18-Jul-1994
-//
-// Contains macro definitions that determine what device drivers are
-// compiled into the PLplot library. On a Unix system, typically the
-// configure script builds plDevs.h from plDevs.h.in. Elsewhere, it's
-// best to hand-configure a plDevs.h file and keep it with the
-// system-specific files.
-//
-// Copyright (C) 2004 Andrew Roach
-// Copyright (C) 2005 Thomas J. Duck
-// Copyright (C) 2006 Andrew Ross
-// Copyright (C) 2006 Alan W. Irwin
-//
-// 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
-//
-//
-
-#ifndef __PLDEVS_H__
-#define __PLDEVS_H__
-
-#cmakedefine PDL_aqt
-#cmakedefine PLD_plmeta
-#cmakedefine PLD_null
-#cmakedefine PLD_xterm
-#cmakedefine PLD_tek4010
-#cmakedefine PLD_tek4010f
-#cmakedefine PLD_tek4107
-#cmakedefine PLD_tek4107f
-#cmakedefine PLD_mskermit
-#cmakedefine PLD_vlt
-#cmakedefine PLD_versaterm
-#cmakedefine PLD_conex
-#cmakedefine PLD_linuxvga
-#cmakedefine PLD_dg300
-#cmakedefine PLD_png
-#cmakedefine PLD_jpeg
-#cmakedefine PLD_gif
-#cmakedefine PLD_cgm
-#cmakedefine PLD_ps
-#cmakedefine PLD_xfig
-#cmakedefine PLD_ljiip
-#cmakedefine PLD_ljii
-#cmakedefine PLD_lj_hpgl
-#cmakedefine PLD_hp7470
-#cmakedefine PLD_hp7580
-#cmakedefine PLD_imp
-#cmakedefine PLD_xwin
-#cmakedefine PLD_tk
-#cmakedefine PLD_pbm
-#cmakedefine PLD_gcw
-#cmakedefine PLD_gnome
-#cmakedefine PLD_pstex
-#cmakedefine PLD_psttf
-#cmakedefine PLD_ntk
-#cmakedefine PLD_tkwin
-#cmakedefine PLD_mem
-#cmakedefine PLD_wingcc
-#cmakedefine PLD_wxwidgets
-#cmakedefine PLD_wxpng
-#cmakedefine PLD_svg
-#cmakedefine PLD_pdf
-#cmakedefine PLD_xcairo
-#cmakedefine PLD_pdfcairo
-#cmakedefine PLD_pscairo
-#cmakedefine PLD_epscairo
-#cmakedefine PLD_svgcairo
-#cmakedefine PLD_pngcairo
-#cmakedefine PLD_memcairo
-#cmakedefine PLD_extcairo
-#cmakedefine PLD_wincairo
-#cmakedefine PLD_bmpqt
-#cmakedefine PLD_jpgqt
-#cmakedefine PLD_pngqt
-#cmakedefine PLD_ppmqt
-#cmakedefine PLD_tiffqt
-#cmakedefine PLD_svgqt
-#cmakedefine PLD_epsqt
-#cmakedefine PLD_pdfqt
-#cmakedefine PLD_qtwidget
-#cmakedefine PLD_extqt
-#cmakedefine PLD_memqt
-
-#endif // __PLDEVS_H__
Copied: trunk/include/plDevs.h.in (from rev 12396, trunk/include/plDevs.h.cmake)
===================================================================
--- trunk/include/plDevs.h.in (rev 0)
+++ trunk/include/plDevs.h.in 2013-07-09 16:28:26 UTC (rev 12408)
@@ -0,0 +1,102 @@
+// -*-C-*-
+// $Id$
+//
+// Maurice LeBrun
+// IFS, University of Texas at Austin
+// 18-Jul-1994
+//
+// Contains macro definitions that determine what device drivers are
+// compiled into the PLplot library. On a Unix system, typically the
+// configure script builds plDevs.h from plDevs.h.in. Elsewhere, it's
+// best to hand-configure a plDevs.h file and keep it with the
+// system-specific files.
+//
+// Copyright (C) 2004 Andrew Roach
+// Copyright (C) 2005 Thomas J. Duck
+// Copyright (C) 2006 Andrew Ross
+// Copyright (C) 2006 Alan W. Irwin
+//
+// 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
+//
+//
+
+#ifndef __PLDEVS_H__
+#define __PLDEVS_H__
+
+#cmakedefine PDL_aqt
+#cmakedefine PLD_plmeta
+#cmakedefine PLD_null
+#cmakedefine PLD_xterm
+#cmakedefine PLD_tek4010
+#cmakedefine PLD_tek4010f
+#cmakedefine PLD_tek4107
+#cmakedefine PLD_tek4107f
+#cmakedefine PLD_mskermit
+#cmakedefine PLD_vlt
+#cmakedefine PLD_versaterm
+#cmakedefine PLD_conex
+#cmakedefine PLD_linuxvga
+#cmakedefine PLD_dg300
+#cmakedefine PLD_png
+#cmakedefine PLD_jpeg
+#cmakedefine PLD_gif
+#cmakedefine PLD_cgm
+#cmakedefine PLD_ps
+#cmakedefine PLD_xfig
+#cmakedefine PLD_ljiip
+#cmakedefine PLD_ljii
+#cmakedefine PLD_lj_hpgl
+#cmakedefine PLD_hp7470
+#cmakedefine PLD_hp7580
+#cmakedefine PLD_imp
+#cmakedefine PLD_xwin
+#cmakedefine PLD_tk
+#cmakedefine PLD_pbm
+#cmakedefine PLD_gcw
+#cmakedefine PLD_gnome
+#cmakedefine PLD_pstex
+#cmakedefine PLD_psttf
+#cmakedefine PLD_ntk
+#cmakedefine PLD_tkwin
+#cmakedefine PLD_mem
+#cmakedefine PLD_wingcc
+#cmakedefine PLD_wxwidgets
+#cmakedefine PLD_wxpng
+#cmakedefine PLD_svg
+#cmakedefine PLD_pdf
+#cmakedefine PLD_xcairo
+#cmakedefine PLD_pdfcairo
+#cmakedefine PLD_pscairo
+#cmakedefine PLD_epscairo
+#cmakedefine PLD_svgcairo
+#cmakedefine PLD_pngcairo
+#cmakedefine PLD_memcairo
+#cmakedefine PLD_extcairo
+#cmakedefine PLD_wincairo
+#cmakedefine PLD_bmpqt
+#cmakedefine PLD_jpgqt
+#cmakedefine PLD_pngqt
+#cmakedefine PLD_ppmqt
+#cmakedefine PLD_tiffqt
+#cmakedefine PLD_svgqt
+#cmakedefine PLD_epsqt
+#cmakedefine PLD_pdfqt
+#cmakedefine PLD_qtwidget
+#cmakedefine PLD_extqt
+#cmakedefine PLD_memqt
+
+#endif // __PLDEVS_H__
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-07-09 06:03:43
|
Revision: 12407
http://sourceforge.net/p/plplot/code/12407
Author: airwin
Date: 2013-07-09 06:03:41 +0000 (Tue, 09 Jul 2013)
Log Message:
-----------
Initial commit of script to parse jhbuild xml file produced by
gtk_xml_recursive_process.py (which combines included chain of jhbuild
xml files into one file).
Currently the principal function of the script, parse_jhbuild only
has the logic tested where if_dependencies is True (i.e., where dependencies
are being recursively followed), and that test on real jhbuild data showed
a circular dependency which lead to infinite depths in the recursion.
So some method of detecting circular dependencies and erroring out
must be implemented, and the logic for the alternative straight
printout of values without following the dependencies must be extended
a bit as well.
Added Paths:
-----------
trunk/cmake/build_projects/gtk_transform.py
Added: trunk/cmake/build_projects/gtk_transform.py
===================================================================
--- trunk/cmake/build_projects/gtk_transform.py (rev 0)
+++ trunk/cmake/build_projects/gtk_transform.py 2013-07-09 06:03:41 UTC (rev 12407)
@@ -0,0 +1,156 @@
+#!/usr/bin/env python
+
+# Read gtk jhbuild xml module that has been produced by
+# gtk_xml_recursive_process.py from stdin and transform it into data
+# required for build_projects using the ElementTree XML API.
+
+# 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
+
+import sys
+import xml.etree.ElementTree as ET
+
+def parse_jhbuild(root, id, if_dependencies):
+ # find all necessary data to build. If xml is in slightly non-standard
+ # form or if there is any other trouble, then immediately return
+ # with no output to stdout.
+ print("id = %s" % id)
+ package = root.findall(".//*[@id='%s']" % id)
+ if len(package) < 1:
+ # Cannot find this package. Do nothing.
+ return None
+ elif len(package) > 1:
+ raise RuntimeError, "non-unique id found for %s" % id
+ # From here on drop the reference to the first (and only) element
+ # of package for convenience.
+ package = package[0]
+
+ # From now only handle two build types and only a subset of
+ # attributes for both, and only look for
+ # branch and dependencies elements (of various kinds) below
+ # packages.
+ config_type = package.tag
+ if config_type == "autotools":
+ config_arguments = package.get("autogenargs")
+ elif config_type == "cmake":
+ config_arguments = package.get("cmakeargs")
+ else:
+ return None
+
+ # Parse branch element of package
+ branch = package.findall("branch[@hash]")
+ if len(branch) < 1:
+ # Cannot find branch so do nothing.
+ return None
+ elif len(branch) > 1:
+ raise RuntimeError, "non-unique branch element found with hash attribute for %s" % id
+
+ # From here on drop the reference to the first (and only) element
+ # of branch for convenience.
+ branch = branch[0]
+
+ download_hash = branch.get("hash")
+ if len(download_hash) == 0:
+ return None
+ index = download_hash.index(":")
+ download_hash_type = download_hash[0:index].upper()
+ download_hash = download_hash[index+1:]
+
+ download_repo = branch.get("repo")
+ if len(download_repo) == 0:
+ return None
+
+ download_module = branch.get("module")
+ if len(download_module) == 0:
+ return None
+
+ # Parse various kinds of jhbuild dependencies.
+ # Note from
+ # http://stackoverflow.com/questions/9974957/what-is-the-after-element-used-for-in-jhbuild
+ # "dependencies are hard dependencies. Packages that are
+ # required to build a module. suggests are soft
+ # dependencies. Packages might use them if they are installed
+ # (detected at build time) but if they are not present, they
+ # do not present a problem. These dependencies will be built,
+ # but they can be ignored without problems by using the
+ # argument --ignore-suggests. For instance, evolution can be
+ # built with or without nss support. after are not strict
+ # dependencies, but they are needed at runtime to get some
+ # features. For instance, metacity is needed by mutter to have
+ # key binding settings in mutter."
+
+ # Create overall_dependencies dictionary and populate it as needed.
+ overall_dependencies={}
+ # Create dependencies dictionary and populate it as needed.
+ dependencies={}
+ # Add a dependency for pkg-config if there is a subelement named that.
+ if package.find("pkg-config") != None:
+ dependencies["pkg-config"] = None
+ overall_dependencies["pkg-config"] = None
+ for dep_element in package.findall("dependencies/dep"):
+ dependencies[dep_element.get("package")] = None
+ overall_dependencies[dep_element.get("package")] = None
+
+ # Create suggests dictionary and populate it as needed.
+ suggests={}
+ for dep_element in package.findall("suggests/dep"):
+ suggests[dep_element.get("package")] = None
+ overall_dependencies[dep_element.get("package")] = None
+ # Repeat for suggest target name (a mistake for one package
+ # with id=gdm).
+ for dep_element in package.findall("suggest/dep"):
+ suggests[dep_element.get("package")] = None
+ overall_dependencies[dep_element.get("package")] = None
+
+ # Create after dictionary and populate it as needed.
+ after={}
+ for dep_element in package.findall("after/dep"):
+ after[dep_element.get("package")] = None
+ overall_dependencies[dep_element.get("package")] = None
+
+ if not if_dependencies:
+ pass
+ else:
+ dependencies_list = overall_dependencies.keys()
+ bad_dependencies = {}
+ for dep in dependencies_list:
+ extra = parse_jhbuild(root, dep, True)
+ if extra == None:
+ bad_dependencies[dep] = None
+ del overall_dependencies[dep]
+ else:
+ overall_dependencies.update(extra[0])
+ bad_dependencies.update(extra[1])
+
+ return (overall_dependencies, bad_dependencies)
+
+tree = ET.parse(sys.stdin)
+root = tree.getroot()
+
+# Create repository dictionary. Note, there is sometimes more than
+# one definition. Eyeballing the file, it appears those definitions
+# are completely redundant so it is fine to take the last definition
+# (which we do here).
+repository_dict={}
+for repository in root.findall("repository"):
+ repository_dict[repository.get("name")] = repository.get("href")
+
+dependency_dictionary = parse_jhbuild(root, "pango", True)
+if not dependency_dictionary == None:
+ print("good dependencies =")
+ print(dependency_dictionary[0].keys())
+ print("bad dependencies =")
+ print(dependency_dictionary[1].keys())
Property changes on: trunk/cmake/build_projects/gtk_transform.py
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-07-07 20:03:05
|
Revision: 12406
http://sourceforge.net/p/plplot/code/12406
Author: airwin
Date: 2013-07-07 20:03:03 +0000 (Sun, 07 Jul 2013)
Log Message:
-----------
The overview is the stdout from this script will be used as input for
another python script (still being designed) to transform the single
complete xml file into build_projects configuration files.
This should be the final version of this script for gtk-3.4.1, but it
is likely changes will have to be made for other versions of gtk
modules (when we move to those) since some exact syntax assumptions
are made that are correct for 3.4.1 jhbuild module files, but might
not be correct for other versions.
Tested by: Alan W. Irwin <ai...@us...> by running
./gtk_xml_recursive_process.py /home/software/pango_stack/jhbuild/modulesets/3.4.1/gnome-apps-3.4.1.modules
This command followed all the includes. That is, all *.modules files
in that directory were included in the output to stdout as measured by
some spot checking and "wc -l" line count results that jibed with the
total line count for *.modules files in that directory (if you account
for three dropped include lines and two head lines and one tail line
that are dropped from the included files).
Modified Paths:
--------------
trunk/cmake/build_projects/gtk_xml_recursive_process.py
Modified: trunk/cmake/build_projects/gtk_xml_recursive_process.py
===================================================================
--- trunk/cmake/build_projects/gtk_xml_recursive_process.py 2013-07-07 18:00:07 UTC (rev 12405)
+++ trunk/cmake/build_projects/gtk_xml_recursive_process.py 2013-07-07 20:03:03 UTC (rev 12406)
@@ -3,6 +3,12 @@
# Recursively read gtk jhbuild xml module files following include
# elements to produce the equivalent single xml file.
+# N.B. This logic assumes exact syntax that is in gtk 3.4.1 version of
+# module files including blank characters, and there is no guarantee
+# for different gtk that that syntax will be immutable. So it is likely
+# this file will need maintenance for other versions of gtk. See EXACT
+# comments below where changes might have to be made.
+
# Copyright (C) 2013 Alan W. Irwin
# This file is free software; you can redistribute it and/or
@@ -26,10 +32,33 @@
fileobject = open(fullpath)
line = fileobject.readline()
while line:
- sys.stdout.write(line)
+ if if_included:
+ # ignore certain lines if the file is included
+ # EXACT
+ if line.find('<?xml version="1.0" ?>') >= 0:
+ line = fileobject.readline()
+ continue
+ # EXACT
+ if line.find('<moduleset>') >= 0:
+ line = fileobject.readline()
+ continue
+ # EXACT
+ if line.find('</moduleset>') >= 0:
+ line = fileobject.readline()
+ continue
+ # EXACT
+ index = line.find('<include href="')
+ if index >=0:
+ start = line.index('"')
+ stop = line.rindex('"')
+ included_filename = line[start+1: stop]
+ recursive_process(path, included_filename, True)
+ else:
+ sys.stdout.write(line)
line = fileobject.readline()
fileobject.close()
+#sys.setrecursionlimit(10)
fullpath = sys.argv[1]
index = fullpath.rfind("/")
if index >=0 and len(fullpath) > index + 1:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-07-07 18:00:12
|
Revision: 12405
http://sourceforge.net/p/plplot/code/12405
Author: airwin
Date: 2013-07-07 18:00:07 +0000 (Sun, 07 Jul 2013)
Log Message:
-----------
Initial commit of python script to follow includes in gtk jhbuild
xml module files to generate an equivalent single module file.
At this stage, the script does not follow includes so simply copies
the file specified as an argument to the script to stdout.
Tested by: Alan W. Irwin <ai...@us...> using
./gtk_xml_recursive_process.py README |diff - README
Added Paths:
-----------
trunk/cmake/build_projects/gtk_xml_recursive_process.py
Added: trunk/cmake/build_projects/gtk_xml_recursive_process.py
===================================================================
--- trunk/cmake/build_projects/gtk_xml_recursive_process.py (rev 0)
+++ trunk/cmake/build_projects/gtk_xml_recursive_process.py 2013-07-07 18:00:07 UTC (rev 12405)
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+
+# Recursively read gtk jhbuild xml module files following include
+# elements to produce the equivalent single xml file.
+
+# 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
+
+import sys
+
+def recursive_process(path, filename, if_included):
+ fullpath = path + "/" + filename
+ fileobject = open(fullpath)
+ line = fileobject.readline()
+ while line:
+ sys.stdout.write(line)
+ line = fileobject.readline()
+ fileobject.close()
+
+fullpath = sys.argv[1]
+index = fullpath.rfind("/")
+if index >=0 and len(fullpath) > index + 1:
+ path = fullpath[:index]
+ filename = fullpath[index+1:]
+elif index < 0 and len(fullpath) >= 1:
+ path = "."
+ filename = fullpath
+else:
+ print("%s is invalid fullpath name of a file" % fullpath)
+ sys.exit()
+
+recursive_process(path, filename, False)
Property changes on: trunk/cmake/build_projects/gtk_xml_recursive_process.py
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arj...@us...> - 2013-07-07 12:59:54
|
Revision: 12404
http://sourceforge.net/p/plplot/code/12404
Author: arjenmarkus
Date: 2013-07-07 12:59:52 +0000 (Sun, 07 Jul 2013)
Log Message:
-----------
Use the SetClassLongPtr() function in stead of SetClassLong() to make the code
useable for both 32-bits and 64-bits versions.
Modified Paths:
--------------
trunk/drivers/wingcc.c
Modified: trunk/drivers/wingcc.c
===================================================================
--- trunk/drivers/wingcc.c 2013-07-02 00:04:52 UTC (rev 12403)
+++ trunk/drivers/wingcc.c 2013-07-07 12:59:52 UTC (rev 12404)
@@ -199,14 +199,14 @@
SetClassLong( dev->hwnd, GCL_HCURSOR, (long) dev->cursor ); \
SetCursor( dev->cursor ); } while ( 0 )
-#define NormalCursor() do { \
- dev->cursor = LoadCursor( NULL, IDC_ARROW ); \
- SetClassLong( dev->hwnd, GCL_HCURSOR, (long) dev->cursor ); \
+#define NormalCursor() do { \
+ dev->cursor = LoadCursor( NULL, IDC_ARROW ); \
+ SetClassLongPtr( dev->hwnd, GCL_HCURSOR, (LONG_PTR) dev->cursor ); \
SetCursor( dev->cursor ); } while ( 0 )
-#define BusyCursor() do { \
- dev->cursor = LoadCursor( NULL, IDC_WAIT ); \
- SetClassLong( dev->hwnd, GCL_HCURSOR, (long) dev->cursor ); \
+#define BusyCursor() do { \
+ dev->cursor = LoadCursor( NULL, IDC_WAIT ); \
+ SetClassLongPtr( dev->hwnd, GCL_HCURSOR, (LONG_PTR) dev->cursor ); \
SetCursor( dev->cursor ); } while ( 0 )
#define PopupPrint 0x08A1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-07-02 00:04:58
|
Revision: 12403
http://sourceforge.net/p/plplot/code/12403
Author: airwin
Date: 2013-07-02 00:04:52 +0000 (Tue, 02 Jul 2013)
Log Message:
-----------
Implement a BUILD_THE_BUILDTOOLS option.
When this variable is set to ON with -DBUILD_THE_BUILDTOOLS=ON, this
puts build_projects in a special mode to build and install only a
small list of buildtools. Only cmake is on that list of buildtools
for now that are built with this option. cmake is built with the
bootstrap method to cut the dependence on the binary version of cmake
that is used to configure build_projects in the
-DBUILD_THE_BUILDTOOLS=ON case.
The idea is once the buildtools list of packages is built with this
special option, then you can put those buildtools on the PATH and use
them from then on in normal builds of build_packages to reduce the
reliance on downloaded binaries for all results.
Tested by: Alan W. Irwin <ai...@us...> using the
build_all target for the "Unix Makefiles" generator on Linux and the
"MSYS Makefiles" generator on (the Wine version of) Windows. Note
these were just successful build tests, and the resulting
cmake-2.8.11.1 binary in each case has not been tested (yet) by using
it for builds of other software. But all subsequent tests will be
using these bootstrapped versions.
Modified Paths:
--------------
trunk/cmake/build_projects/CMakeLists.txt
trunk/cmake/build_projects/README
Added Paths:
-----------
trunk/cmake/build_projects/cmake/
trunk/cmake/build_projects/cmake/bp.cmake
Modified: trunk/cmake/build_projects/CMakeLists.txt
===================================================================
--- trunk/cmake/build_projects/CMakeLists.txt 2013-07-01 20:14:47 UTC (rev 12402)
+++ trunk/cmake/build_projects/CMakeLists.txt 2013-07-02 00:04:52 UTC (rev 12403)
@@ -201,18 +201,40 @@
# on those individual build targets
set(build_target_LIST)
-# List of all configurations. Order doesn't matter because multiple
-# attempts to include the same configuration (via dependencies) are ignored.
-set(build_configuration_LIST
- libagg
- libharu
- libqhull
- ndiff
- plplot
- shapelib
- wxwidgets
-)
+option(BUILD_THE_BUILDTOOLS "Build the buildtools (such as cmake) used for the rest of the builds" OFF)
+if(BUILD_THE_BUILDTOOLS)
+ set(executables_LIST
+ sh
+ )
+ foreach(executable ${executables_LIST})
+ string(TOUPPER ${executable} EXECUTABLE)
+ find_program(${EXECUTABLE}_EXECUTABLE ${executable})
+ if(NOT ${EXECUTABLE}_EXECUTABLE)
+ if(MSYS_PLATFORM)
+ message(STATUS "${executable} missing from your MSYS platform. If sh is missing, use a generator other than 'MinGW Makefiles'. If something else is missing use mingw-get to install it.")
+ endif(MSYS_PLATFORM)
+ message(FATAL_ERROR "${executable} must be on your PATH in order for build_projects to work correctly")
+ endif(NOT ${EXECUTABLE}_EXECUTABLE)
+ endforeach(executable ${executables_LIST})
+
+ set(build_configuration_LIST
+ cmake
+ )
+else(BUILD_THE_BUILDTOOLS)
+ # List of all configurations. Order doesn't matter because multiple
+ # attempts to include the same configuration (via dependencies) are ignored.
+ set(build_configuration_LIST
+ libagg
+ libharu
+ libqhull
+ ndiff
+ plplot
+ shapelib
+ wxwidgets
+ )
+endif(BUILD_THE_BUILDTOOLS)
+
foreach(build_configuration ${build_configuration_LIST})
include(${build_configuration}/bp.cmake)
endforeach(build_configuration ${build_configuration_LIST})
Modified: trunk/cmake/build_projects/README
===================================================================
--- trunk/cmake/build_projects/README 2013-07-01 20:14:47 UTC (rev 12402)
+++ trunk/cmake/build_projects/README 2013-07-02 00:04:52 UTC (rev 12403)
@@ -54,7 +54,9 @@
http://www.cmake.org/files. I am currently using
v2.8/cmake-2.8.10.2-win32-x86.zip. Unpack this using the unzip
command you just installed. Put the resulting
-cmake-2.8.10.2-win32-x86/bin on your PATH.
+cmake-2.8.10.2-win32-x86/bin on your PATH. This downloadable binary
+(which poses a security concern like all downloadable binaries)
+is only used once.
7. If you are going to try the "NMake Makefiles JOM" generator, download
the latest jom_VERSION.zip from http://releases.qt-project.org/jom, unpack
@@ -66,15 +68,57 @@
correction in a following post in that thread.
===============================================================================
-Build instructions:
+Build instructions for the buildtools (such as cmake):
-1. Adjust the local path to the PLplot source tree in plplot/bp.cmake
-(this will only necessary until build_projects is updated to configure
+Note that when cmake is built this way it is configured by the
+bootstrap script (which demands sh is on the PATH) rather than cmake
+itself so the downloaded binary version of cmake used to configure the
+build_tools build is not actually used to build cmake which provides a
+slight increase in security for the paranoid. And you should be
+paranoid about security (i.e., you should build your own
+version of CMake from source, in my opinion rather than relying
+on a downloaded binary) since crackers are always
+trying it on.
+
+Note the special paths below which have a _buildtools suffix, and also
+note the special option -DBUILD_THE_BUILDTOOLS=ON which configures
+builds of _only_ the build tools such as cmake that are used for the
+other software projects.
+
+Linux "Unix Makefiles"
+
+wine@raven> mkdir -p /home/wine/newstart/build_script/build_dir-linux_buildtools
+wine@raven> cd /home/wine/newstart/build_script/build_dir-linux_buildtools
+wine@raven> rm -rf /home/wine/newstart/build_script/build_dir-linux_buildtools/*
+wine@raven> cmake -G"Unix Makefiles" -DCMAKE_INSTALL_PREFIX:PATH=/home/wine/newstart/build_script/install-linux_buildtools -DBUILD_THE_BUILDTOOLS=ON ~software/plplot_svn/HEAD/plplot_allura/cmake/build_projects >& cmake.out
+wine@raven> make VERBOSE=1 build_all >& build_all.out
+
+Windows "MSYS Makefiles" (This is a special case that requires sh.exe to
+be on the PATH so the "MinGW Makefiles" generator cannot be used.
+
+bash.exe-3.1$ mkdir -p /z/home/wine/newstart/build_script/build_dir-git_buildtools
+bash.exe-3.1$ cd /z/home/wine/newstart/build_script/build_dir-git_buildtools
+bash.exe-3.1$ rm -rf /z/home/wine/newstart/build_script/build_dir-git_buildtools/*
+bash.exe-3.1$ cmake -G"MSYS Makefiles" -DCMAKE_INSTALL_PREFIX:PATH=/z/home/wine/newstart/build_script/install-git_buildtools -DBUILD_THE_BUILDTOOLS=ON /z/home/software/plplot_svn/HEAD/plplot_allura/cmake/build_projects >& cmake.out
+bash.exe-3.1$ mingw32-make.exe VERBOSE=1 build_all >& build_all.out
+
+Build instructions for everything else which is not a build tool but
+which uses those (such as cmake) which have been built above:
+
+1. Put the bin directory contained in the install tree created above
+at the top of the PATH. In my case this directory is either
+/home/wine/newstart/build_script/install-linux_buildtools/bin (Linux)
+or /z/home/wine/newstart/build_script/install-git_buildtool/bin
+(Windows). This step insures you will be using the buildtools you
+built yourself from source from now on rather than some downloaded binary.
+
+2. Adjust the local path to the PLplot source tree in plplot/bp.cmake
+(this will only be necessary until build_projects is updated to configure
a build of an svn client that works on Windows). The alternative is
to download and test a released version of PLplot, but I prefer the
-trunk version.
+svn trunk version because that is much more up to date.
-2. Examples of configuring a build and test of PLplot and some of its
+3. Examples of configuring a build and test of PLplot and some of its
soft dependencies on several different systems with various generators
and build tools. Adjust these for your own paths, and note the first
three commands in each group are to insure you start with a clean
Added: trunk/cmake/build_projects/cmake/bp.cmake
===================================================================
--- trunk/cmake/build_projects/cmake/bp.cmake (rev 0)
+++ trunk/cmake/build_projects/cmake/bp.cmake 2013-07-02 00:04:52 UTC (rev 12403)
@@ -0,0 +1,64 @@
+# cmake/bp.cmake
+# This file should be included directly or indirectly from a top-level
+# CMakeLists.txt file to 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
+
+# The top-level CMakeLists.txt file that includes this file should
+# have run "include(ExternalProject)" and set EP_BASE variable (and
+# corresponding directory property) as well as various BP variables
+# used below that configure how the External_Project functions
+# operate.
+
+set(BP_PACKAGE cmake)
+
+# Protect against configuring a build twice in one CMake call
+if(${BP_PACKAGE}_configured)
+ return()
+endif(${BP_PACKAGE}_configured)
+set(${BP_PACKAGE}_configured ON)
+
+# Data that is related to downloads.
+set(BP_CMAKE_DIR v2.8)
+set(BP_CMAKE_VERSION 2.8.11.1)
+set(${BP_PACKAGE}_URL http://www.cmake.org/files/${BP_CMAKE_DIR}/cmake-${BP_CMAKE_VERSION}.tar.gz)
+set(${BP_PACKAGE}_URL_MD5 df5324a3b203373a9e0a04b924281a43)
+
+# Data that is related to the PATH that must be used.
+if(MSYS_PLATFORM)
+ set(BP_PATH_NODLL "${BP_PATH}")
+ set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}")
+ determine_msys_path(BP_PATH "${BP_PATH}")
+ determine_msys_path(${BP_PACKAGE}_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
+else(MSYS_PLATFORM)
+ set(${BP_PACKAGE}_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
+endif(MSYS_PLATFORM)
+#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+
+ExternalProject_Add(
+ build_${BP_PACKAGE}
+ URL ${${BP_PACKAGE}_URL}
+ URL_MD5 ${${BP_PACKAGE}_URL_MD5}
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} CFLAGS=-O3 CXXFLAGS=-O3 ${SH_EXECUTABLE} ${EP_BASE}/Source/build_${BP_PACKAGE}/bootstrap --prefix=${${BP_PACKAGE}_INSTALL_PREFIX} --parallel=8
+ BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND}
+ INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} install
+ )
+
+list(APPEND build_target_LIST build_${BP_PACKAGE})
+# Restore BP_PATH to original state.
+set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-07-01 20:14:50
|
Revision: 12402
http://sourceforge.net/p/plplot/code/12402
Author: airwin
Date: 2013-07-01 20:14:47 +0000 (Mon, 01 Jul 2013)
Log Message:
-----------
Document how to use the build_projects project to build software on
Linux and Windows platforms. The Linux instructions should also
work on Mac OS X, but that platform hasn't been tested yet.
Added Paths:
-----------
trunk/cmake/build_projects/README
Added: trunk/cmake/build_projects/README
===================================================================
--- trunk/cmake/build_projects/README (rev 0)
+++ trunk/cmake/build_projects/README 2013-07-01 20:14:47 UTC (rev 12402)
@@ -0,0 +1,135 @@
+The build_projects project should work out of the box for
+Linux or Mac OS X systems with a full development tool-chain installed.
+
+But the situation is different on Windows where you have to download
+and install specific toolchain software before you start.
+
+===============================================================================
+Installing the Required Windows Toolchain:
+
+N.B. There is a good possibility that build_projects will work with the
+Microsoft proprietary toolchain, and I would be happy to accept
+patches to make that so (including a patch for this file), but my only
+experience is with free software so until I receive such patches, the
+instructions below refer only to free software toolchains.
+
+1. Install latest MinGW/MSYS using the automatic installer
+
+Use the latest automatic installer (currently
+mingw-get-inst-20120426.exe which can be obtained from
+http://sourceforge.net/projects/mingw/files/Installer/mingw-get-inst/mingw-get-inst-20120426/).
+Specify obtaining the latest updates, all relevant compilers,
+(everythiing except objc) and also specify the MSYS development
+software. This should install, for example, version 4.7.2 of gcc,
+g++, Ada, and gfortran.
+
+2. Downgrade one component of MSYS.
+N.B. This must be done from the cmd environment since
+if you run this from bash.exe, that executable's use of MSYS
+libraries will screw up the downgrade.
+
+MinGW-4.7.2\bin\mingw-get.exe upgrade msys-core-bin=1.0.17-1
+
+This downgrade is necessary and quite important, see
+http://sourceforge.net/p/mingw/bugs/1950. Otherwise, you
+will get an infinite hang from any attempt to do parallel
+builds (which build_projects automatically uses for many
+of its builds) using the MSYS make.exe command.
+
+3. Install additional needed MSYS software that is not installed by
+the automatic installer.
+
+mingw-get.exe --recursive install msys-unzip
+
+4. Copy the MinGW-4.7.2/msys/1.0/bin directory to
+MinGW-4.7.2/msys/1.0/bin_without_sh and remove sh.exe from that latter
+PATH (This works around a CMake issue with the "MinGW Makefiles" generator.)
+
+5. Put both MinGW-4.7.2/bin and either MinGW-4.7.2/msys/1.0/bin (for
+any Windows CMake generator you are going to use other than "MinGW
+Makefiles) or MinGW-4.7.2/msys/1.0/bin_without_sh (for the case of
+"MinGW Makefiles" on your PATH.
+
+6. Download a recent cmake.exe version from
+http://www.cmake.org/files. I am currently using
+v2.8/cmake-2.8.10.2-win32-x86.zip. Unpack this using the unzip
+command you just installed. Put the resulting
+cmake-2.8.10.2-win32-x86/bin on your PATH.
+
+7. If you are going to try the "NMake Makefiles JOM" generator, download
+the latest jom_VERSION.zip from http://releases.qt-project.org/jom, unpack
+it with unzip.exe just just installed and put jom.exe on your PATH.
+
+8. If you are going to try the "Ninja" generator, then follow the
+build instructions for that tool at
+http://www.cmake.org/pipermail/cmake/2013-June/055038.html + one
+correction in a following post in that thread.
+===============================================================================
+
+Build instructions:
+
+1. Adjust the local path to the PLplot source tree in plplot/bp.cmake
+(this will only necessary until build_projects is updated to configure
+a build of an svn client that works on Windows). The alternative is
+to download and test a released version of PLplot, but I prefer the
+trunk version.
+
+2. Examples of configuring a build and test of PLplot and some of its
+soft dependencies on several different systems with various generators
+and build tools. Adjust these for your own paths, and note the first
+three commands in each group are to insure you start with a clean
+build directory
+
+Linux "Unix Makefiles"
+
+wine@raven> mkdir -p /home/wine/newstart/build_script/build_dir-linux
+wine@raven> cd /home/wine/newstart/build_script/build_dir-linux
+wine@raven> rm -rf /home/wine/newstart/build_script/build_dir-linux/*
+wine@raven> cmake -G"Unix Makefiles" -DCMAKE_INSTALL_PREFIX:PATH=/home/wine/newstart/build_script/install-linux ~software/plplot_svn/HEAD/plplot_allura/cmake/build_projects >& cmake.out
+wine@raven> make VERBOSE=1 build_plplot >& build_plplot.out
+
+Windows "MinGW Makefiles"
+
+bash.exe-3.1$ mkdir -p /z/home/wine/newstart/build_script/build_dir-git_mingw
+bash.exe-3.1$ cd /z/home/wine/newstart/build_script/build_dir-git_mingw
+bash.exe-3.1$ rm -rf /z/home/wine/newstart/build_script/build_dir-git_mingw/*
+bash.exe-3.1$ cmake -G"MinGW Makefiles" -DCMAKE_INSTALL_PREFIX:PATH=/z/home/wine/newstart/build_script/install-git_mingw /z/home/software/plplot_svn/HEAD/plplot_allura/cmake/build_projects >& cmake.out
+bash.exe-3.1$ mingw32-make.exe VERBOSE=1 build_plplot >& build_plplot.out
+
+Other combinations that have been successfully tested in part by building
+all the C and C++ PLplot dependencies with the "build_all" target.
+
+Note, the "build_all" target does not include PLplot itself yet
+(which has additional languages needs such as Fortran, and Ada which
+are known to not work for "Ninja" and which might not work for "NMake Makefiles JOM" ). Also note, we assume something similar to the first three commands
+given above has been used to start with a clean build tree.
+
+On Linux:
+
+# "Ninja" generator
+irwin@raven> cmake -G"Ninja" -DCMAKE_INSTALL_PREFIX:PATH=/home/wine/newstart/build_script/install-linux_ninja ~software/plplot_svn/HEAD/plplot_allura/cmake/build_projects >& cmake.out
+irwin@raven> ninja -v build_all >& build_all.out
+
+On Windows:
+
+# "MSYS Makefiles" generator
+# This one should work for the build_plplot target as well, but I
+# haven't tested it yet.
+bash.exe-3.1$ cmake -G"MSYS Makefiles" -DCMAKE_INSTALL_PREFIX:PATH=/z/home/wine/newstart/build_script/install-git /z/home/software/plplot_svn/HEAD/plplot_allura/cmake/build_projects >& cmake.out
+bash.exe-3.1$ make.exe VERBOSE=1 build_all >& build_all.out
+
+# "Ninja" generator
+bash.exe-3.1$ cmake -G"Ninja" -DCMAKE_INSTALL_PREFIX:PATH=/z/home/wine/newstart/build_script/install-git_ninja /z/home/software/plplot_svn/HEAD/pl
+plot_allura/cmake/build_projects >& cmake.out
+bash.exe-3.1$ ninja -v build_all >& build_all.out
+
+# "NMake Makefiles JOM" generator
+# This CMake generator currently has some issues with using the MinGW suite
+# of compilers by default that must be worked around by being specific about
+# what compilers you want.
+bash.exe-3.1$ cmake -G"NMake Makefiles JOM" -DCMAKE_C_COMPILER:FILEPATH=/z/home/wine/newstart/MinGW-4.7.2/bin/gcc.exe -DCMAKE_CXX_COMPILER:FILEPATH=/z/home/wine/newstart/MinGW-4.7.2/bin/g++.exe -DCMAKE_RC_COMPILER:FILEPATH=/z/home/wine/newstart/MinGW-4.7.2/bin/windres.exe -DCMAKE_INSTALL_PREFIX:PATH=/z/home/wine/newstart/build_script/install-git_jom /z/home/software/plplot_svn/HEAD/plplot_allura/cmake/build_projects >& cmake.out
+bash.exe-3.1$ jom build_all >& build_all.out
+
+N.B. All of the above have been run without issues on a Wine platform
+(wine-git close to wine-1.6-rc1) and therefore should also work for
+the Microsoft version of Windows.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-07-01 04:22:38
|
Revision: 12401
http://sourceforge.net/p/plplot/code/12401
Author: airwin
Date: 2013-07-01 04:22:35 +0000 (Mon, 01 Jul 2013)
Log Message:
-----------
libharu #include file location changed from directory where hpdf.h was
found to the directory where hpdf/hpdf.h was found.
Modified Paths:
--------------
trunk/cmake/modules/Findhpdf.cmake
trunk/drivers/pdf.c
Modified: trunk/cmake/modules/Findhpdf.cmake
===================================================================
--- trunk/cmake/modules/Findhpdf.cmake 2013-07-01 04:20:44 UTC (rev 12400)
+++ trunk/cmake/modules/Findhpdf.cmake 2013-07-01 04:22:35 UTC (rev 12401)
@@ -8,7 +8,7 @@
# hpdf_LIBRARY_DIRS, the directory where libhpdf (either shared or static)
# is found.
-find_path(hpdf_INCLUDE_DIR hpdf.h /usr/local/include /usr/include)
+find_path(hpdf_INCLUDE_DIR hpdf/hpdf.h /usr/local/include /usr/include)
if(hpdf_INCLUDE_DIR)
find_library(hpdf_LIBRARY
Modified: trunk/drivers/pdf.c
===================================================================
--- trunk/drivers/pdf.c 2013-07-01 04:20:44 UTC (rev 12400)
+++ trunk/drivers/pdf.c 2013-07-01 04:22:35 UTC (rev 12401)
@@ -38,7 +38,7 @@
#include <math.h>
#include <setjmp.h>
-#include "hpdf.h"
+#include "hpdf/hpdf.h"
// PLplot header files
#define DEBUG
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-07-01 04:20:47
|
Revision: 12400
http://sourceforge.net/p/plplot/code/12400
Author: airwin
Date: 2013-07-01 04:20:44 +0000 (Mon, 01 Jul 2013)
Log Message:
-----------
Make CMake logic consistent with improved visibility logic for libharu.
Modified Paths:
--------------
trunk/cmake/modules/pdf.cmake
Modified: trunk/cmake/modules/pdf.cmake
===================================================================
--- trunk/cmake/modules/pdf.cmake 2013-07-01 04:15:56 UTC (rev 12399)
+++ trunk/cmake/modules/pdf.cmake 2013-07-01 04:20:44 UTC (rev 12400)
@@ -32,11 +32,13 @@
find_package(hpdf)
if(hpdf_FOUND)
message(STATUS "Looking for haru pdf header and library - found")
- if(WIN32)
+ if(WIN32 AND NOT CMAKE_COMPILER_IS_GNUCC)
set(pdf_COMPILE_FLAGS "-I${hpdf_INCLUDE_DIRS} -DHPDF_DLL")
- else(WIN32)
+ elseif(WIN32 AND CMAKE_COMPILER_IS_GNUCC)
+ set(pdf_COMPILE_FLAGS "-I${hpdf_INCLUDE_DIRS} -DHPDF_DLL_CDECL")
+ else(WIN32 AND NOT CMAKE_COMPILER_IS_GNUCC)
set(pdf_COMPILE_FLAGS "-I${hpdf_INCLUDE_DIRS}")
- endif(WIN32)
+ endif(WIN32 AND NOT CMAKE_COMPILER_IS_GNUCC)
set(pdf_LINK_FLAGS "${hpdf_LIBRARIES}")
set(pdf_RPATH ${hpdf_LIBRARY_DIRS})
filter_rpath(pdf_RPATH)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-07-01 04:15:58
|
Revision: 12399
http://sourceforge.net/p/plplot/code/12399
Author: airwin
Date: 2013-07-01 04:15:56 +0000 (Mon, 01 Jul 2013)
Log Message:
-----------
Implement plplot build.
Modified Paths:
--------------
trunk/cmake/build_projects/CMakeLists.txt
trunk/cmake/build_projects/plplot/bp.cmake
Modified: trunk/cmake/build_projects/CMakeLists.txt
===================================================================
--- trunk/cmake/build_projects/CMakeLists.txt 2013-07-01 04:14:16 UTC (rev 12398)
+++ trunk/cmake/build_projects/CMakeLists.txt 2013-07-01 04:15:56 UTC (rev 12399)
@@ -208,9 +208,9 @@
libharu
libqhull
ndiff
-# plplot
+ plplot
shapelib
-# wxwidgets
+ wxwidgets
)
foreach(build_configuration ${build_configuration_LIST})
Modified: trunk/cmake/build_projects/plplot/bp.cmake
===================================================================
--- trunk/cmake/build_projects/plplot/bp.cmake 2013-07-01 04:14:16 UTC (rev 12398)
+++ trunk/cmake/build_projects/plplot/bp.cmake 2013-07-01 04:15:56 UTC (rev 12399)
@@ -25,29 +25,91 @@
# operate.
# Configure build of PLplot dependencies.
-set(BP_PACKAGE plplot)
+# N.B. early stanzas of this logic before the includes
+# cannot set or use the BP_PACKAGE variable since the includes
+# reset that.
# Protect against configuring a build twice in one CMake call
-if(${BP_PACKAGE}_configured)
+if(plplot_configured)
return()
-endif(${BP_PACKAGE}_configured)
-set(${BP_PACKAGE}_configured ON)
+endif(plplot_configured)
+set(plplot_configured ON)
-include(shapelib/bp.cmake)
-include(libqhull/bp.cmake)
-include(libharu/bp.cmake)
-include(libagg/bp.cmake)
+set(plplot_dependencies_LIST
+ libagg
+ libharu
+ libqhull
+ shapelib
+# TEMPORARY
+# For debugging speed ignore wxwidgets soft dependency of PLplot for
+# now.
+# wxwidgets
+)
-# Build PLplot itself.
-# (Not implemented yet, but create empty custom target with correct
-# target dependencies as if that target were actually a PLplot build).
-add_custom_target(build_plplot)
-add_dependencies(build_plplot
- build_shapelib
- build_libqhull
- build_libharu
- build_libagg
+foreach(build_configuration ${plplot_dependencies_LIST})
+ include(${build_configuration}/bp.cmake)
+endforeach(build_configuration ${plplot_dependences_LIST})
+
+# This can be safely done only after above includes.
+set(BP_PACKAGE plplot)
+
+set(${BP_PACKAGE}_dependencies_targets)
+foreach(build_configuration ${${BP_PACKAGE}_dependencies_LIST})
+ list(APPEND ${BP_PACKAGE}_dependencies_targets build_${build_configuration})
+endforeach(build_configuration ${${BP_PACKAGE}_dependences_LIST})
+message(STATUS "${BP_PACKAGE}_dependencies_targets = ${${BP_PACKAGE}_dependencies_targets}")
+
+# Note could retrieve the latest release, but that is pretty dated.
+# So ideally, would use a subversion client to get the trunk version,
+# but that means (on Windows) you must build a subversion client.
+# That build (of the apache version of subversion) should be
+# straightforward assuming wget (available both for Unix and MSYS) is
+# installed. So I think ultimately a build of a subversion client
+# will be configured and available for all platforms. But for now
+# just use a local directory where the trunk version of PLplot has
+# been recently updated.
+# TEMPORARY
+set(PLPLOT_LOCAL_SOURCE_DIR /home/software/${BP_PACKAGE}_svn/HEAD/${BP_PACKAGE}_allura)
+file(TO_NATIVE_PATH ${PLPLOT_LOCAL_SOURCE_DIR} PLPLOT_LOCAL_SOURCE_DIR)
+
+# Data that is related to the PATH that must be used.
+if(MSYS_PLATFORM)
+ set(BP_PATH_NODLL "${BP_PATH}")
+ set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}/dll;${BP_PATH_NODLL}")
+ message(STATUS "Original BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+ determine_msys_path(BP_PATH "${BP_PATH}")
+ # TEMPORARY (already in the _required_ native form for the cmake -E
+ # copy_directory command below except for the drive letter which is
+ # z: for this local result.)
+ set(PLPLOT_LOCAL_SOURCE_DIR z:${PLPLOT_LOCAL_SOURCE_DIR})
+endif(MSYS_PLATFORM)
+message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+
+# Build PLplot itself. The pdf device is turned on since the haru library
+# is built with a fix to avoid segfaults for example 24.
+ExternalProject_Add(
+ build_${BP_PACKAGE}
+ DEPENDS "${${BP_PACKAGE}_dependencies_targets}"
+ #TEMPORARY
+ DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${PLPLOT_LOCAL_SOURCE_DIR} ${EP_BASE}/Source/build_${BP_PACKAGE}
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_CMAKE_COMMAND} -DBUILD_TEST=ON -DPLD_pdf=ON ${EP_BASE}/Source/build_${BP_PACKAGE}
+ BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND}
+ INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} install
+ TEST_BEFORE_INSTALL OFF
+ TEST_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} test_noninteractive
+ STEP_TARGETS configure build install test
)
+# Add custom commands to the current test step.
+add_custom_command(
+ OUTPUT
+ ${EP_BASE}/Stamp/build_${BP_PACKAGE}/build_${BP_PACKAGE}-test
+ COMMAND echo made_it_to_extra_test
+ COMMENT "Test installed examples from ${BP_PACKAGE}"
+ APPEND
+ )
-
+list(APPEND build_target_LIST build_${BP_PACKAGE})
+# Restore BP_PATH to original state.
+set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
+#message(STATUS "${BP_PACKAGE} restored original BP_PATH = ${BP_PATH}")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-07-01 04:14:20
|
Revision: 12398
http://sourceforge.net/p/plplot/code/12398
Author: airwin
Date: 2013-07-01 04:14:16 +0000 (Mon, 01 Jul 2013)
Log Message:
-----------
Make libharu and its demos build properly for MinGW compiler.
The visibility macros and corresponding CMake logic were completely
reorganized and rationalized and another fix (HPDF_FontDef and
HPDF_U3D typedefs implemented) done to make build work with MinGW
compiler.
Tested by: Alan W. Irwin <ai...@us...> using
the build_libharu target for both "Unix Makefiles" on Linux and
"MinGW Makefiles" on Wine version of Windows.
Modified Paths:
--------------
trunk/cmake/build_projects/libharu/CMakeLists.txt
trunk/cmake/build_projects/libharu/demo/CMakeLists.txt
trunk/cmake/build_projects/libharu/include/hpdf.h
trunk/cmake/build_projects/libharu/src/CMakeLists.txt
Modified: trunk/cmake/build_projects/libharu/CMakeLists.txt
===================================================================
--- trunk/cmake/build_projects/libharu/CMakeLists.txt 2013-07-01 03:59:28 UTC (rev 12397)
+++ trunk/cmake/build_projects/libharu/CMakeLists.txt 2013-07-01 04:14:16 UTC (rev 12398)
@@ -82,23 +82,6 @@
option(USE_RPATH "Use -rpath when linking libraries, executables" ON)
endif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-# Set macros to define visibility for various Windows platforms.
-# (gcc visibility support happens by default if none of these
-# are defined).
-# N.B. something slightly different must be done for the demo
-# visibility, but at this stage this CMake-based build system ignores
-# building the demos so don't worry about this issue for now.
-
-if(WIN32)
- if(CYGWIN)
- # Special Cygwin visibility support.
- add_definitions(-DHPDF_DLL_MAKE_CDECL)
- else(CYGWIN)
- # proprietary and Mingw compilers for Windows without Cygwin.
- add_definitions(-DHPDF_DLL_MAKE)
- endif(CYGWIN)
-endif(WIN32)
-
# Description of libharu for cpack.
set(LIBHARU_DESCRIPTION "libHaru is a free, cross platform, open source library for generating PDF files.")
set(LIBHARU_PACKAGE_NAME "libHaru-${LIBHARU_VERSION}-${COMPILER_LABEL}")
Modified: trunk/cmake/build_projects/libharu/demo/CMakeLists.txt
===================================================================
--- trunk/cmake/build_projects/libharu/demo/CMakeLists.txt 2013-07-01 03:59:28 UTC (rev 12397)
+++ trunk/cmake/build_projects/libharu/demo/CMakeLists.txt 2013-07-01 04:14:16 UTC (rev 12398)
@@ -66,6 +66,11 @@
# link the examples to the shared library otherwise to the static
if(LIBHARU_SHARED)
set(_LIBHARU_LIB hpdf)
+ if(CYGWIN OR MINGW)
+ add_definitions(-DHPDF_DLL_CDECL)
+ elseif(WIN32)
+ add_definitions(-DHPDF_DLL)
+ endif(CYGWIN OR MINGW)
else(LIBHARU_SHARED)
set(_LIBHARU_LIB hpdf_static)
endif(LIBHARU_SHARED)
Modified: trunk/cmake/build_projects/libharu/include/hpdf.h
===================================================================
--- trunk/cmake/build_projects/libharu/include/hpdf.h 2013-07-01 03:59:28 UTC (rev 12397)
+++ trunk/cmake/build_projects/libharu/include/hpdf.h 2013-07-01 04:14:16 UTC (rev 12398)
@@ -20,37 +20,33 @@
#include "hpdf_config.h"
#include "hpdf_version.h"
-#ifdef HPDF_DLL_MAKE
-# define HPDF_EXPORT(A) __declspec(dllexport) A __stdcall
+#if defined ( hpdf_EXPORTS )
+ #if defined ( HPDF_DLL_MAKE )
+ #define HPDF_EXPORT(A) __declspec(dllexport) A __stdcall
+ #elif defined ( HPDF_DLL_MAKE_CDECL )
+ #define HPDF_EXPORT(A) __declspec(dllexport) A
+ #elif defined ( __GNUC__ ) && __GNUC__ > 3
+ // Follow ideas in http://gcc.gnu.org/wiki/Visibility for GCC version 4.x
+ #define HPDF_EXPORT(A) __attribute__ ((visibility("default"))) A
+ #elif defined ( HPDF_SHARED_MAKE )
+ #define HPDF_EXPORT(A) extern A
+ #else
+ #define HPDF_EXPORT(A) extern A
+ #endif
#else
-# ifdef HPDF_DLL_MAKE_CDECL
-# define HPDF_EXPORT(A) __declspec(dllexport) A
-# else
-# ifdef HPDF_SHARED_MAKE
-# define HPDF_EXPORT(A) extern A
-# elif defined ( __GNUC__ ) && __GNUC__ > 3
-/* Follow ideas in http://gcc.gnu.org/wiki/Visibility for GCC version 4.x */
-# define HPDF_EXPORT(A) __attribute__ ((visibility("default"))) A
-# endif
-# endif /* HPDF_DLL_MAKE_CDECL */
-#endif /* HPDF_DLL_MAKE */
+ #if defined ( HPDF_DLL)
+ #define HPDF_SHARED
+ #define HPDF_EXPORT(A) __declspec(dllimport) A __stdcall
+ #elif defined ( HPDF_DLL_CDECL )
+ #define HPDF_SHARED
+ #define HPDF_EXPORT(A) __declspec(dllimport) A
+ #else
+ #define HPDF_EXPORT(A) extern A
+ #endif
+#endif
-#ifdef HPDF_DLL
-# define HPDF_SHARED
-# define HPDF_EXPORT(A) __declspec(dllimport) A __stdcall
-#else
-# ifdef HPDF_DLL_CDECL
-# define HPDF_SHARED
-# define HPDF_EXPORT(A) __declspec(dllimport) A
-# endif /* HPDF_DLL_CDECL */
-#endif /* HPDF_DLL */
-
#ifdef HPDF_SHARED
-#ifndef HPDF_EXPORT
-#define HPDF_EXPORT(A) extern A
-#endif /* HPDF_EXPORT */
-
#include "hpdf_consts.h"
#include "hpdf_types.h"
@@ -67,13 +63,11 @@
typedef HPDF_HANDLE HPDF_XObject;
typedef HPDF_HANDLE HPDF_Annotation;
typedef HPDF_HANDLE HPDF_ExtGState;
+typedef HPDF_HANDLE HPDF_FontDef;
+typedef HPDF_HANDLE HPDF_U3D;
#else
-#ifndef HPDF_EXPORT
-#define HPDF_EXPORT(A) A
-#endif /* HPDF_EXPORT */
-
#include "hpdf_consts.h"
#include "hpdf_doc.h"
Modified: trunk/cmake/build_projects/libharu/src/CMakeLists.txt
===================================================================
--- trunk/cmake/build_projects/libharu/src/CMakeLists.txt 2013-07-01 03:59:28 UTC (rev 12397)
+++ trunk/cmake/build_projects/libharu/src/CMakeLists.txt 2013-07-01 04:14:16 UTC (rev 12398)
@@ -86,6 +86,16 @@
)
endif(POST_2.1.0)
+# Set macros to define visibility for various Windows platforms.
+# (gcc visibility support happens by default if none of these
+# are defined).
+
+if(CYGWIN OR MINGW)
+ add_definitions(-DHPDF_DLL_MAKE_CDECL)
+elseif(WIN32)
+ add_definitions(-DHPDF_DLL_MAKE)
+endif(CYGWIN OR MINGW)
+
# =======================================================================
# create static and shared haru library
# =======================================================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-07-01 03:59:31
|
Revision: 12397
http://sourceforge.net/p/plplot/code/12397
Author: airwin
Date: 2013-07-01 03:59:28 +0000 (Mon, 01 Jul 2013)
Log Message:
-----------
Execute custom_test_script and command_script with ${SH_EXECUTABLE} so
that "MinGW Makefiles" can run these scripts without issues.
Modified Paths:
--------------
trunk/examples/CMakeLists.txt
Modified: trunk/examples/CMakeLists.txt
===================================================================
--- trunk/examples/CMakeLists.txt 2013-06-28 20:46:53 UTC (rev 12396)
+++ trunk/examples/CMakeLists.txt 2013-07-01 03:59:28 UTC (rev 12397)
@@ -421,19 +421,21 @@
)
if(CORE_BUILD)
- set(custom_test_command ${CMAKE_BINARY_DIR}/plplot_test/plplot-test.sh)
+ set(custom_test_script ${CMAKE_BINARY_DIR}/plplot_test/plplot-test.sh)
set(custom_env EXAMPLES_DIR=${CMAKE_BINARY_DIR}/examples SRC_EXAMPLES_DIR=${CMAKE_SOURCE_DIR}/examples)
set(java_custom_env ${custom_env} PLPLOT_JAVA_WRAP_DIR=${CMAKE_BINARY_DIR}/bindings/java/ PLPLOT_CLASSPATH=${CMAKE_BINARY_DIR}/examples/java/plplot.jar)
- set(compare_command ${CMAKE_BINARY_DIR}/plplot_test/test_diff.sh)
+ set(compare_script ${CMAKE_BINARY_DIR}/plplot_test/test_diff.sh)
else(CORE_BUILD)
- set(custom_test_command ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test.sh)
+ set(custom_test_script ${CMAKE_CURRENT_SOURCE_DIR}/plplot-test.sh)
set(custom_env SRC_EXAMPLES_DIR=${CMAKE_CURRENT_SOURCE_DIR})
set(java_custom_env ${custom_env})
- set(compare_command ${CMAKE_CURRENT_SOURCE_DIR}/test_diff.sh)
+ set(compare_script ${CMAKE_CURRENT_SOURCE_DIR}/test_diff.sh)
endif(CORE_BUILD)
+ set(custom_test_command ${SH_EXECUTABLE} ${custom_test_script})
+ set(compare_command ${SH_EXECUTABLE} ${compare_script})
if(PLD_psc)
- set(compare_file_depends ${custom_test_command})
+ set(compare_file_depends ${custom_test_script})
if(ENABLE_DYNDRIVERS)
# The ps shared object implements both the psc (and ps) devices.
get_property(FILE_DEPENDS_ps GLOBAL PROPERTY FILE_DEPENDS_ps_dyndriver)
@@ -532,7 +534,7 @@
# ENABLE_c is always ON by construction, but test it anyway for
# consistency sake.
if(ENABLE_c)
- set(device_depends ${custom_test_command})
+ set(device_depends ${custom_test_script})
# See explanation above about what to do with files_examples_c and
# targets_examples_c.
if(files_examples_c)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-06-28 20:46:59
|
Revision: 12396
http://sourceforge.net/p/plplot/code/12396
Author: airwin
Date: 2013-06-28 20:46:53 +0000 (Fri, 28 Jun 2013)
Log Message:
-----------
Drop the find_library part of the previous commit. That turned out to
be required only because of a system installation screwup I had which
has since been fixed.
But retain the whitespace changes of the previous commit.
Modified Paths:
--------------
trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake
Modified: trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake
===================================================================
--- trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake 2013-06-28 20:21:53 UTC (rev 12395)
+++ trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake 2013-06-28 20:46:53 UTC (rev 12396)
@@ -87,15 +87,9 @@
#CMAKE_FLAGS "-DLINK_LIBRARIES=gphobos"
OUTPUT_VARIABLE OUTPUT)
ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- find_library(PHOBOS_LIBRARY gphobos2)
- if(PHOBOS_LIBRARY)
- TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- CMAKE_FLAGS "-DLINK_LIBRARIES=${PHOBOS_LIBRARY}"
- OUTPUT_VARIABLE OUTPUT)
- else(PHOBOS_LIBRARY)
- message(STATUS "Failed to find Phobos library")
- set(CMAKE_D_PHOBOS_WORKS OFF)
- endif(PHOBOS_LIBRARY)
+ TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
+ CMAKE_FLAGS "-DLINK_LIBRARIES=gphobos2"
+ OUTPUT_VARIABLE OUTPUT)
ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
ELSE(CMAKE_COMPILER_IS_GDC)
IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-06-28 20:21:58
|
Revision: 12395
http://sourceforge.net/p/plplot/code/12395
Author: airwin
Date: 2013-06-28 20:21:53 +0000 (Fri, 28 Jun 2013)
Log Message:
-----------
Use find_library to help find gphobos2 library.
Also take care of whitespace issues.
Modified Paths:
--------------
trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake
Modified: trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake
===================================================================
--- trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake 2013-06-28 09:59:51 UTC (rev 12394)
+++ trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake 2013-06-28 20:21:53 UTC (rev 12395)
@@ -25,17 +25,17 @@
"{return args.sizeof-1;}\n")
STRING(REGEX MATCH "dmd" DMDTEST "${CMAKE_D_COMPILER}")
IF(DMDTEST STREQUAL "dmd")
- IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- TRY_COMPILE(CMAKE_D_COMPILER_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- OUTPUT_VARIABLE OUTPUT)
- ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- TRY_COMPILE(CMAKE_D_COMPILER_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libphobos2.a"
- OUTPUT_VARIABLE OUTPUT)
- ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ TRY_COMPILE(CMAKE_D_COMPILER_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
+ OUTPUT_VARIABLE OUTPUT)
+ ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ TRY_COMPILE(CMAKE_D_COMPILER_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
+ CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libphobos2.a"
+ OUTPUT_VARIABLE OUTPUT)
+ ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
ELSE(DMDTEST STREQUAL "dmd")
- TRY_COMPILE(CMAKE_D_COMPILER_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- OUTPUT_VARIABLE OUTPUT)
+ TRY_COMPILE(CMAKE_D_COMPILER_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
+ OUTPUT_VARIABLE OUTPUT)
ENDIF(DMDTEST STREQUAL "dmd")
SET(C_TEST_WAS_RUN 1)
ENDIF(NOT CMAKE_D_COMPILER_WORKS)
@@ -67,11 +67,11 @@
# FIXME. This is PLplot-specific location. Other projects will use
# a different location.
IF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in)
- CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in
- ${CMAKE_PLATFORM_INFO_DIR}/CMakeDCompiler.cmake IMMEDIATE)
+ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in
+ ${CMAKE_PLATFORM_INFO_DIR}/CMakeDCompiler.cmake IMMEDIATE)
ELSE(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in)
- CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeDCompiler.cmake.in
- ${CMAKE_PLATFORM_INFO_DIR}/CMakeDCompiler.cmake IMMEDIATE)
+ CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeDCompiler.cmake.in
+ ${CMAKE_PLATFORM_INFO_DIR}/CMakeDCompiler.cmake IMMEDIATE)
ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in)
ENDIF(NOT CMAKE_D_COMPILER_WORKS)
@@ -82,25 +82,31 @@
"int main(char[][] args)\n"
"{ writefln(\"%s\", args[0]); return args.sizeof-1;}\n")
IF(CMAKE_COMPILER_IS_GDC)
- IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- #CMAKE_FLAGS "-DLINK_LIBRARIES=gphobos"
- OUTPUT_VARIABLE OUTPUT)
- ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- CMAKE_FLAGS "-DLINK_LIBRARIES=gphobos2"
- OUTPUT_VARIABLE OUTPUT)
- ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
+ #CMAKE_FLAGS "-DLINK_LIBRARIES=gphobos"
+ OUTPUT_VARIABLE OUTPUT)
+ ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ find_library(PHOBOS_LIBRARY gphobos2)
+ if(PHOBOS_LIBRARY)
+ TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
+ CMAKE_FLAGS "-DLINK_LIBRARIES=${PHOBOS_LIBRARY}"
+ OUTPUT_VARIABLE OUTPUT)
+ else(PHOBOS_LIBRARY)
+ message(STATUS "Failed to find Phobos library")
+ set(CMAKE_D_PHOBOS_WORKS OFF)
+ endif(PHOBOS_LIBRARY)
+ ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
ELSE(CMAKE_COMPILER_IS_GDC)
- IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- OUTPUT_VARIABLE OUTPUT)
- ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libphobos.a"
- COMPILE_DEFINITIONS "-I${D_PATH}/include -I${D_PATH}/import"
- OUTPUT_VARIABLE OUTPUT)
- ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
+ OUTPUT_VARIABLE OUTPUT)
+ ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
+ CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libphobos.a"
+ COMPILE_DEFINITIONS "-I${D_PATH}/include -I${D_PATH}/import"
+ OUTPUT_VARIABLE OUTPUT)
+ ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
ENDIF(CMAKE_COMPILER_IS_GDC)
SET(C_TEST_WAS_RUN 1)
ENDIF(NOT CMAKE_D_PHOBOS_WORKS)
@@ -128,19 +134,19 @@
"int main(char[][] args)\n"
"{Stdout.newline();return args.sizeof-1;}\n")
IF(CMAKE_COMPILER_IS_GDC)
- TRY_COMPILE(CMAKE_D_TANGO_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- CMAKE_FLAGS "-DLINK_LIBRARIES=gtango"
- OUTPUT_VARIABLE OUTPUT)
+ TRY_COMPILE(CMAKE_D_TANGO_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
+ CMAKE_FLAGS "-DLINK_LIBRARIES=gtango"
+ OUTPUT_VARIABLE OUTPUT)
ELSE(CMAKE_COMPILER_IS_GDC)
- IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- TRY_COMPILE(CMAKE_D_TANGO_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- OUTPUT_VARIABLE OUTPUT)
- ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- TRY_COMPILE(CMAKE_D_TANGO_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libtango.a;${D_PATH}/lib/libphobos.a"
- COMPILE_DEFINITIONS "-I${D_PATH}/include -I${D_PATH}/import"
- OUTPUT_VARIABLE OUTPUT)
- ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ TRY_COMPILE(CMAKE_D_TANGO_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
+ OUTPUT_VARIABLE OUTPUT)
+ ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ TRY_COMPILE(CMAKE_D_TANGO_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
+ CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libtango.a;${D_PATH}/lib/libphobos.a"
+ COMPILE_DEFINITIONS "-I${D_PATH}/include -I${D_PATH}/import"
+ OUTPUT_VARIABLE OUTPUT)
+ ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
ENDIF(CMAKE_COMPILER_IS_GDC)
SET(C_TEST_WAS_RUN 1)
ENDIF(NOT CMAKE_D_TANGO_WORKS)
@@ -163,15 +169,15 @@
# if both tango and phobos are selected try to choose which one is available
IF(CMAKE_D_USE_TANGO AND CMAKE_D_USE_PHOBOS)
- MESSAGE(FATAL_ERROR "Tango AND Phobos selected, please choose one or the other!")
+ MESSAGE(FATAL_ERROR "Tango AND Phobos selected, please choose one or the other!")
ENDIF(CMAKE_D_USE_TANGO AND CMAKE_D_USE_PHOBOS)
# ensure the user has the appropriate std lib available
IF(CMAKE_D_USE_TANGO AND NOT CMAKE_D_TANGO_WORKS)
- MESSAGE(FATAL_ERROR "Tango is required for this project, but it is not available!")
+ MESSAGE(FATAL_ERROR "Tango is required for this project, but it is not available!")
ENDIF(CMAKE_D_USE_TANGO AND NOT CMAKE_D_TANGO_WORKS)
IF(CMAKE_D_USE_PHOBOS AND NOT CMAKE_D_PHOBOS_WORKS)
- MESSAGE(FATAL_ERROR "Phobos is required for this project, but it is not available!")
+ MESSAGE(FATAL_ERROR "Phobos is required for this project, but it is not available!")
ENDIF(CMAKE_D_USE_PHOBOS AND NOT CMAKE_D_PHOBOS_WORKS)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arj...@us...> - 2013-06-28 09:59:56
|
Revision: 12394
http://sourceforge.net/p/plplot/code/12394
Author: arjenmarkus
Date: 2013-06-28 09:59:51 +0000 (Fri, 28 Jun 2013)
Log Message:
-----------
Treat Cygwin in the same way as Windows wrt the generation of the DLLs, that is, put them in the subdirectory "dll", so that the path needs to be extended by that directory only.
The previous method (relying on rpath) does not seem to work for Cygwin.
Note: this does not solve the problem that under Cygwin a path "c:/tcl/include" is returned, even while these header files are available under "/usr/include". Therefore the build is not completely smooth yet.
Modified Paths:
--------------
trunk/CMakeLists.txt
trunk/cmake/build_projects/shapelib/CMakeLists.txt
trunk/drivers/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2013-06-27 19:49:07 UTC (rev 12393)
+++ trunk/CMakeLists.txt 2013-06-28 09:59:51 UTC (rev 12394)
@@ -34,7 +34,7 @@
# the PLplot core C library and core C examples. All other compilers
# required by our bindings are optional in that if no working compiler
# of the kind needed is available, the associated bindings and
-# examples are disabled.
+# examples are disabled.
project(plplot C)
message(STATUS "CMake version = ${CMAKE_VERSION}")
@@ -124,9 +124,9 @@
# in windows all created dlls are gathered in the dll directory
# if you add this directory to your PATH all shared libraries are available
-if(BUILD_SHARED_LIBS AND WIN32 AND NOT CYGWIN)
+if(BUILD_SHARED_LIBS AND WIN32)
set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dll)
-endif(BUILD_SHARED_LIBS AND WIN32 AND NOT CYGWIN)
+endif(BUILD_SHARED_LIBS AND WIN32)
# Borland Compiler must compile in ANSII mode
if(BORLAND)
Modified: trunk/cmake/build_projects/shapelib/CMakeLists.txt
===================================================================
--- trunk/cmake/build_projects/shapelib/CMakeLists.txt 2013-06-27 19:49:07 UTC (rev 12393)
+++ trunk/cmake/build_projects/shapelib/CMakeLists.txt 2013-06-28 09:59:51 UTC (rev 12394)
@@ -38,9 +38,9 @@
# In windows all created dlls are gathered in the dll directory
# if you add this directory to your PATH all shared libraries are available
-if(BUILD_SHARED_LIBS AND WIN32 AND NOT CYGWIN)
+if(BUILD_SHARED_LIBS AND WIN32)
set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dll)
-endif(BUILD_SHARED_LIBS AND WIN32 AND NOT CYGWIN)
+endif(BUILD_SHARED_LIBS AND WIN32)
set(PACKAGE shp)
Modified: trunk/drivers/CMakeLists.txt
===================================================================
--- trunk/drivers/CMakeLists.txt 2013-06-27 19:49:07 UTC (rev 12393)
+++ trunk/drivers/CMakeLists.txt 2013-06-28 09:59:51 UTC (rev 12394)
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
install(
- FILES README.drivers README.wxwidgets
+ FILES README.drivers README.wxwidgets
DESTINATION ${DOC_DIR}
)
@@ -41,7 +41,7 @@
test-drv-info.c
PROPERTIES COMPILE_FLAGS "-I${LTDL_INCLUDE_DIR} -DUSINGDLL"
)
-
+
add_executable(test-drv-info test-drv-info.c)
target_link_libraries(test-drv-info
plplot${LIB_TAG}
@@ -50,12 +50,12 @@
# in windows we move test-drv-info to the dll directory
# otherwise we use the RPATH functionality
- if(WIN32 AND NOT CYGWIN)
+ if(WIN32)
set_target_properties(
test-drv-info
PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/dll
)
- else(WIN32 AND NOT CYGWIN)
+ else(WIN32)
set(test-drv-info_RPATH
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}/src
@@ -64,19 +64,19 @@
${CMAKE_BINARY_DIR}/lib/qsastime
${libplplot${LIB_TAG}_RPATH}
)
-
+
set_target_properties(
test-drv-info
PROPERTIES
INSTALL_RPATH "${test-drv-info_RPATH}"
BUILD_WITH_INSTALL_RPATH ON
)
- endif(WIN32 AND NOT CYGWIN)
+ endif(WIN32)
get_target_property(test-drv-info_LOCATION test-drv-info LOCATION)
set(test_dyndrivers_TDEPENDS test-drv-info)
endif(TEST_DYNDRIVERS AND NOT CMAKE_CROSSCOMPILING)
-
+
foreach(SOURCE_ROOT_NAME ${DRIVERS_LIST})
#message("${SOURCE_ROOT_NAME}_SOURCE = ${${SOURCE_ROOT_NAME}_SOURCE}")
if(${SOURCE_ROOT_NAME}_COMPILE_FLAGS)
@@ -100,7 +100,7 @@
# for non-standard locations with the -L and -l forms.
#message("${SOURCE_ROOT_NAME}_LINK_FLAGS = ${${SOURCE_ROOT_NAME}_LINK_FLAGS}")
# ${SOURCE_ROOT_NAME}_TARGETS is a list of PLplot CMake targets that the
- # device driver depends on.
+ # device driver depends on.
#message("${SOURCE_ROOT_NAME}_TARGETS = ${${SOURCE_ROOT_NAME}_TARGETS}")
if(SOURCE_ROOT_NAME STREQUAL "qt" AND NOT ENABLE_qt)
@@ -135,7 +135,7 @@
endif(SOURCE_ROOT_NAME STREQUAL "qt" AND NOT ENABLE_qt)
# ${SOURCE_ROOT_NAME}_RPATH originally set in cmake/modules files for
- # each driver in ${DRIVERS_LIST}. This is only used for the
+ # each driver in ${DRIVERS_LIST}. This is only used for the
# install-tree rpath since cmake handles the build-tree rpath
# automatically (so long as full pathnames to libraries are used).
# Order is important here because of /usr/lib concerns.
@@ -157,7 +157,7 @@
# Mac OS X have been tested so far.
set(DYNAMIC_SUFFIX ".so")
endif(WIN32)
-
+
#message("${SOURCE_ROOT_NAME}_RPATH = ${${SOURCE_ROOT_NAME}_RPATH}")
if(USE_RPATH)
set_target_properties(
@@ -180,7 +180,7 @@
if(TEST_DYNDRIVERS AND NOT CMAKE_CROSSCOMPILING)
get_target_property(
${SOURCE_ROOT_NAME}_LOCATION
- ${SOURCE_ROOT_NAME}
+ ${SOURCE_ROOT_NAME}
LOCATION
)
add_custom_command(
@@ -200,7 +200,7 @@
DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/test_dyndrivers_dir/${SOURCE_ROOT_NAME}.driver_info
)
- set_property(GLOBAL
+ set_property(GLOBAL
PROPERTY FILE_DEPENDS_${SOURCE_ROOT_NAME}_dyndriver
${CMAKE_CURRENT_BINARY_DIR}/test_dyndrivers_dir/${SOURCE_ROOT_NAME}.driver_info
)
@@ -210,13 +210,13 @@
)
list(APPEND test_dyndrivers_TDEPENDS test_${SOURCE_ROOT_NAME}_dyndriver)
endif(TEST_DYNDRIVERS AND NOT CMAKE_CROSSCOMPILING)
-
- install(TARGETS ${SOURCE_ROOT_NAME}
+
+ install(TARGETS ${SOURCE_ROOT_NAME}
EXPORT export_plplot
DESTINATION ${DRV_DIR}
)
install(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ROOT_NAME}.driver_info
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ROOT_NAME}.driver_info
DESTINATION ${DRV_DIR}
)
endforeach(SOURCE_ROOT_NAME ${DRIVERS_LIST})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2013-06-27 19:49:10
|
Revision: 12393
http://sourceforge.net/p/plplot/code/12393
Author: andrewross
Date: 2013-06-27 19:49:07 +0000 (Thu, 27 Jun 2013)
Log Message:
-----------
Update D language bindings to D2. Fix some issues with the PLINT -> PLFLT line width changes.
Note: This breaks D1 language support and is only tested with gdc. I've re-enabled the D bindings to ensure this gets testing, but it will likely need further cmake work for other compilers / non-Linux platforms.
Modified Paths:
--------------
trunk/bindings/d/plplot.d
trunk/cmake/modules/d.cmake
trunk/cmake/modules/language_support/cmake/CMakeDInformation.cmake
trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake
trunk/cmake/modules/language_support/cmake/Platform/Linux-gdc.cmake
trunk/examples/d/x02d.d
trunk/examples/d/x04d.d
trunk/examples/d/x06d.d
trunk/examples/d/x07d.d
trunk/examples/d/x08d.d
trunk/examples/d/x11d.d
trunk/examples/d/x13d.d
trunk/examples/d/x15d.d
trunk/examples/d/x20d.d
trunk/examples/d/x21d.d
trunk/examples/d/x23d.d
trunk/examples/d/x24d.d
trunk/examples/d/x25d.d
trunk/examples/d/x26d.d
trunk/examples/d/x33d.d
Modified: trunk/bindings/d/plplot.d
===================================================================
--- trunk/bindings/d/plplot.d 2013-06-27 19:47:10 UTC (rev 12392)
+++ trunk/bindings/d/plplot.d 2013-06-27 19:49:07 UTC (rev 12393)
@@ -2,6 +2,10 @@
module plplot;
private import std.string;
+private import std.array;
+private import std.algorithm;
+private import std.stdio;
+private import std.conv;
// improved D interface
@@ -53,16 +57,16 @@
{
char*[] c_args = new char*[args.length];
foreach ( size_t i, char[] arg; args )
- c_args[i] = toStringz( arg );
- int argc = c_args.length;
+ c_args[i] = cast(char *) toStringz( arg );
+ int argc = cast(int) c_args.length;
return c_plparseopts( &argc, cast(char**) c_args, mode );
}
// simple arrow plotter.
void plvect( PLFLT[][] u, PLFLT[][] v, PLFLT scale, pltr_func pltr = null, PLPointer pltr_data = null )
{
- PLINT nx = u.length;
- PLINT ny = u[0].length;
+ PLINT nx = cast(PLINT) u.length;
+ PLINT ny = cast(PLINT) u[0].length;
assert( nx == v.length, "plvect(): Arrays must be of same length!" );
assert( ny == v[0].length, "plvect(): Arrays must be of same length!" );
@@ -71,26 +75,26 @@
void plvect( PLFLT[][] u, PLFLT[][] v, PLFLT scale, ref PLcGrid cgrid )
{
- PLINT nx = u.length;
- PLINT ny = u[0].length;
+ PLINT nx = cast(PLINT) u.length;
+ PLINT ny = cast(PLINT) u[0].length;
assert( nx == v.length, "plvect(): Arrays must be of same length!" );
assert( ny == v[0].length, "plvect(): Arrays must be of same length!" );
c_PLcGrid c;
c.xg = cgrid.xg.ptr;
- c.nx = cgrid.xg.length;
+ c.nx = cast(PLINT) cgrid.xg.length;
c.yg = cgrid.yg.ptr;
- c.ny = cgrid.yg.length;
+ c.ny = cast(PLINT) cgrid.yg.length;
c.zg = cgrid.zg.ptr;
- c.nz = cgrid.zg.length;
+ c.nz = cast(PLINT) cgrid.zg.length;
c_plvect( convert_array( u ), convert_array( v ), nx, ny, scale, &pltr1, &c );
}
void plvect( PLFLT[][] u, PLFLT[][] v, PLFLT scale, ref PLcGrid2 cgrid2 )
{
- PLINT nx = u.length;
- PLINT ny = u[0].length;
+ PLINT nx = cast(PLINT) u.length;
+ PLINT ny = cast(PLINT) u[0].length;
assert( nx == v.length, "plvect(): Arrays must be of same length!" );
assert( ny == v[0].length, "plvect(): Arrays must be of same length!" );
@@ -98,17 +102,17 @@
c2.xg = convert_array( cgrid2.xg );
c2.yg = convert_array( cgrid2.yg );
c2.zg = convert_array( cgrid2.zg );
- c2.nx = cgrid2.xg.length;
- c2.ny = cgrid2.xg[0].length;
+ c2.nx = cast(PLINT) cgrid2.xg.length;
+ c2.ny = cast(PLINT) cgrid2.xg[0].length;
if ( cgrid2.yg )
{
- assert( c2.nx == cgrid2.yg.length, "plcont(): Arrays must be of same length!" );
- assert( c2.ny == cgrid2.yg[0].length, "plcont(): Arrays must be of same length!" );
+ assert( c2.nx == cgrid2.yg.length, "plvect(): Arrays must be of same length!" );
+ assert( c2.ny == cgrid2.yg[0].length, "plvect(): Arrays must be of same length!" );
}
if ( cgrid2.zg )
{
- assert( c2.nx == cgrid2.zg.length, "plcont(): Arrays must be of same length!" );
- assert( c2.ny == cgrid2.zg[0].length, "plcont(): Arrays must be of same length!" );
+ assert( c2.nx == cgrid2.zg.length, "plvect(): Arrays must be of same length!" );
+ assert( c2.ny == cgrid2.zg[0].length, "plvect(): Arrays must be of same length!" );
}
c_plvect( convert_array( u ), convert_array( v ), nx, ny, scale, &pltr2, &c2 );
@@ -116,7 +120,7 @@
void plsvect( PLFLT[] arrowx, PLFLT[] arrowy, PLBOOL fill )
{
- PLINT npts = arrowx.length;
+ PLINT npts = cast(PLINT) arrowx.length;
assert( npts == arrowy.length, "plsvect(): Arrays must be of same length!" );
c_plsvect( arrowx.ptr, arrowy.ptr, npts, fill );
}
@@ -132,7 +136,7 @@
// Plot a histogram using x to store data values and y to store frequencies
void plbin( PLFLT[] x, PLFLT[] y, PLINT opt )
{
- PLINT nbin = x.length;
+ PLINT nbin = cast(PLINT) x.length;
assert( nbin == y.length, "plbin(): Arrays must be of same length!" );
c_plbin( nbin, x.ptr, y.ptr, opt );
}
@@ -159,43 +163,43 @@
void plcont( PLFLT[][] f, PLINT kx, PLINT lx, PLINT ky, PLINT ly, PLFLT[] clevel,
pltr_func pltr, PLPointer pltr_data = null )
{
- PLINT nx = f.length;
- PLINT ny = f[0].length;
+ PLINT nx = cast(PLINT) f.length;
+ PLINT ny = cast(PLINT) f[0].length;
- c_plcont( convert_array( f ), nx, ny, kx, lx, ky, ly, clevel.ptr, clevel.length,
+ c_plcont( convert_array( f ), nx, ny, kx, lx, ky, ly, clevel.ptr, cast(PLINT) clevel.length,
pltr, pltr_data );
}
void plcont( PLFLT[][] f, PLINT kx, PLINT lx, PLINT ky, PLINT ly, PLFLT[] clevel,
ref PLcGrid cgrid )
{
- PLINT nx = f.length;
- PLINT ny = f[0].length;
+ PLINT nx = cast(PLINT) f.length;
+ PLINT ny = cast(PLINT) f[0].length;
c_PLcGrid c;
c.xg = cgrid.xg.ptr;
- c.nx = cgrid.xg.length;
+ c.nx = cast(PLINT) cgrid.xg.length;
c.yg = cgrid.yg.ptr;
- c.ny = cgrid.yg.length;
+ c.ny = cast(PLINT) cgrid.yg.length;
c.zg = cgrid.zg.ptr;
- c.nz = cgrid.zg.length;
+ c.nz = cast(PLINT) cgrid.zg.length;
- c_plcont( convert_array( f ), nx, ny, kx, lx, ky, ly, clevel.ptr, clevel.length,
+ c_plcont( convert_array( f ), nx, ny, kx, lx, ky, ly, clevel.ptr, cast(PLINT) clevel.length,
&pltr1, &c );
}
void plcont( PLFLT[][] f, PLINT kx, PLINT lx, PLINT ky, PLINT ly, PLFLT[] clevel,
ref PLcGrid2 cgrid2 )
{
- PLINT nx = f.length;
- PLINT ny = f[0].length;
+ PLINT nx = cast(PLINT) f.length;
+ PLINT ny = cast(PLINT) f[0].length;
c_PLcGrid2 c2;
c2.xg = convert_array( cgrid2.xg );
c2.yg = convert_array( cgrid2.yg );
c2.zg = convert_array( cgrid2.zg );
- c2.nx = cgrid2.xg.length;
- c2.ny = cgrid2.xg[0].length;
+ c2.nx = cast(PLINT) cgrid2.xg.length;
+ c2.ny = cast(PLINT) cgrid2.xg[0].length;
if ( cgrid2.yg )
{
assert( c2.nx == cgrid2.yg.length, "plcont(): Arrays must be of same length!" );
@@ -207,7 +211,7 @@
assert( c2.ny == cgrid2.zg[0].length, "plcont(): Arrays must be of same length!" );
}
- c_plcont( convert_array( f ), nx, ny, kx, lx, ky, ly, clevel.ptr, clevel.length,
+ c_plcont( convert_array( f ), nx, ny, kx, lx, ky, ly, clevel.ptr, cast(PLINT) clevel.length,
&pltr2, &c2 );
}
@@ -220,7 +224,7 @@
// Plot horizontal error bars (xmin(i),y(i)) to (xmax(i),y(i))
void plerrx( PLFLT[] xmin, PLFLT[] xmax, PLFLT[] y )
{
- PLINT n = y.length;
+ PLINT n = cast(PLINT) y.length;
assert( n == xmin.length, "plerrx(): Arrays must be of same length!" );
assert( n == xmax.length, "plerrx(): Arrays must be of same length!" );
c_plerrx( n, xmin.ptr, xmax.ptr, y.ptr );
@@ -229,7 +233,7 @@
// Plot vertical error bars (x,ymin(i)) to (x(i),ymax(i))
void plerry( PLFLT[] x, PLFLT[] ymin, PLFLT[] ymax )
{
- PLINT n = x.length;
+ PLINT n = cast(PLINT) x.length;
assert( n == ymin.length, "plerry(): Arrays must be of same length!" );
assert( n == ymax.length, "plerry(): Arrays must be of same length!" );
c_plerry( n, x.ptr, ymin.ptr, ymax.ptr );
@@ -238,7 +242,7 @@
// Pattern fills the polygon bounded by the input points.
void plfill( PLFLT[] x, PLFLT[] y )
{
- PLINT n = x.length;
+ PLINT n = cast(PLINT) x.length;
assert( n == y.length, "plfill(): Arrays must be of same length!" );
c_plfill( n, x.ptr, y.ptr );
}
@@ -246,7 +250,7 @@
// Pattern fills the 3d polygon bounded by the input points.
void plfill3( PLFLT[] x, PLFLT[] y, PLFLT[] z )
{
- PLINT n = x.length;
+ PLINT n = cast(PLINT) x.length;
assert( n == y.length, "plfill3(): Arrays must be of same length!" );
assert( n == z.length, "plfill3(): Arrays must be of same length!" );
c_plfill3( n, x.ptr, y.ptr, z.ptr );
@@ -255,23 +259,23 @@
// Get the current device (keyword) name
void plgdev( out string p_dev )
{
- p_dev.length = 1024;
- c_plgdev( p_dev.ptr );
- p_dev = toString( p_dev.ptr );
+ char cdev[1024];
+ c_plgdev( cdev.ptr );
+ p_dev = to!string( cdev.ptr );
}
// Get the (current) output file name. Must be preallocated to >80 bytes
void plgfnam( out string fnam )
{
- fnam.length = 1024;
- c_plgfnam( fnam.ptr );
- fnam = toString( fnam.ptr );
+ char cfnam[1024];
+ c_plgfnam( cfnam.ptr );
+ fnam = to!string( cfnam.ptr );
}
// Draw gradient in polygon.
void plgradient( PLFLT[] x, PLFLT[] y, PLFLT angle )
{
- PLINT n = x.length;
+ PLINT n = cast(PLINT) x.length;
assert( n == y.length, "plgradient(): Arrays must be of same length!" );
c_plgradient( n, x.ptr, y.ptr, angle );
}
@@ -279,12 +283,12 @@
// grid irregularly sampled data
void plgriddata( PLFLT[] x, PLFLT[] y, PLFLT[] z, PLFLT[] xg, PLFLT[] yg, PLFLT[][] zg, PLINT type, PLFLT data )
{
- PLINT npts = x.length;
+ PLINT npts = cast(PLINT) x.length;
assert( npts == y.length, "plgriddata(): Arrays must be of same length!" );
assert( npts == z.length, "plgriddata(): Arrays must be of same length!" );
- PLINT nxg = xg.length;
- PLINT nyg = yg.length;
+ PLINT nxg = cast(PLINT) xg.length;
+ PLINT nyg = cast(PLINT) yg.length;
assert( nxg == zg.length, "plgriddata(): Arrays must be of same length!" );
assert( nyg == zg[0].length, "plgriddata(): Arrays must be of same length!" );
@@ -294,15 +298,15 @@
// Get the current library version number
void plgver( out string p_ver )
{
- p_ver.length = 1024;
- c_plgver( p_ver.ptr );
- p_ver = toString( p_ver.ptr );
+ char cver[1024];
+ c_plgver( cver.ptr );
+ p_ver = to!string( cver.ptr );
}
// Draws a histogram of n values of a variable in array data[0..n-1]
void plhist( PLFLT[] data, PLFLT datmin, PLFLT datmax, PLINT nbin, PLINT opt )
{
- c_plhist( data.length, data.ptr, datmin, datmax, nbin, opt );
+ c_plhist( cast(PLINT) data.length, data.ptr, datmin, datmax, nbin, opt );
}
// Simple routine for labelling graphs.
@@ -321,21 +325,15 @@
PLFLT text_justification,
PLINT[] text_colors, string[] text,
PLINT[] box_colors, PLINT[] box_patterns,
- PLFLT[] box_scales, PLINT[] box_line_widths,
+ PLFLT[] box_scales, PLFLT[] box_line_widths,
PLINT[] line_colors, PLINT[] line_styles,
- PLINT[] line_widths,
+ PLFLT[] line_widths,
PLINT[] symbol_colors, PLFLT[] symbol_scales,
PLINT[] symbol_numbers, string[] symbols )
{
- PLINT nlegend = opt_array.length;
- char*[] textz, symbolsz;
- textz.length = nlegend;
- symbolsz.length = nlegend;
- for ( int i = 0; i < nlegend; i++ )
- {
- textz[i] = toStringz( text[i] );
- symbolsz[i] = toStringz( symbols[i] );
- }
+ PLINT nlegend = cast(PLINT) opt_array.length;
+ immutable( char ) * *textz = array( map!toStringz( text ) ).ptr;
+ immutable( char ) * *symbolsz = array( map!toStringz( symbols ) ).ptr;
assert( nlegend == text_colors.length, "pllegend(): Arrays must be of same length!" );
assert( nlegend == text.length, "pllegend(): Arrays must be of same length!" );
assert( nlegend == box_colors.length, "pllegend(): Arrays must be of same length!" );
@@ -356,19 +354,19 @@
nlegend, opt_array.ptr,
text_offset, text_scale, text_spacing,
text_justification,
- text_colors.ptr, textz.ptr,
+ text_colors.ptr, textz,
box_colors.ptr, box_patterns.ptr,
box_scales.ptr, box_line_widths.ptr,
line_colors.ptr, line_styles.ptr,
line_widths.ptr,
symbol_colors.ptr, symbol_scales.ptr,
- symbol_numbers.ptr, symbolsz.ptr );
+ symbol_numbers.ptr, symbolsz );
}
// Draws line segments connecting a series of points.
void plline( PLFLT[] x, PLFLT[] y )
{
- PLINT n = x.length;
+ PLINT n = cast(PLINT) x.length;
assert( n == y.length, "plline(): Arrays must be of same length!" );
c_plline( n, x.ptr, y.ptr );
}
@@ -376,7 +374,7 @@
// Draws a line in 3 space.
void plline3( PLFLT[] x, PLFLT[] y, PLFLT[] z )
{
- PLINT n = x.length;
+ PLINT n = cast(PLINT) x.length;
assert( n == y.length, "plline3(): Arrays must be of same length!" );
assert( n == z.length, "plline3(): Arrays must be of same length!" );
c_plline3( n, x.ptr, y.ptr, z.ptr );
@@ -392,8 +390,8 @@
// Plots a mesh representation of the function z[x][y].
void plmesh( PLFLT[] x, PLFLT[] y, PLFLT[][] z, PLINT opt )
{
- PLINT nx = z.length;
- PLINT ny = z[0].length;
+ PLINT nx = cast(PLINT) z.length;
+ PLINT ny = cast(PLINT) z[0].length;
assert( nx == x.length, "plmesh(): Arrays must be of same length!" );
assert( ny == y.length, "plmesh(): Arrays must be of same length!" );
@@ -404,13 +402,13 @@
// Plots a mesh representation of the function z[x][y] with contour
void plmeshc( PLFLT[] x, PLFLT[] y, PLFLT[][] z, PLINT opt, PLFLT[] clevel )
{
- PLINT nx = z.length;
- PLINT ny = z[0].length;
+ PLINT nx = cast(PLINT) z.length;
+ PLINT ny = cast(PLINT) z[0].length;
assert( nx == x.length, "plmeshc(): Arrays must be of same length!" );
assert( ny == y.length, "plmeshc(): Arrays must be of same length!" );
- c_plmeshc( x.ptr, y.ptr, convert_array( z ), nx, ny, opt, clevel.ptr, clevel.length );
+ c_plmeshc( x.ptr, y.ptr, convert_array( z ), nx, ny, opt, clevel.ptr, cast(PLINT) clevel.length );
}
// Prints out "text" at specified position relative to viewport
@@ -428,8 +426,8 @@
// Plots a 3-d representation of the function z[x][y].
void plot3d( PLFLT[] x, PLFLT[] y, PLFLT[][] z, PLINT opt, PLBOOL side )
{
- PLINT nx = z.length;
- PLINT ny = z[0].length;
+ PLINT nx = cast(PLINT) z.length;
+ PLINT ny = cast(PLINT) z[0].length;
assert( nx == x.length, "plot3d(): Arrays must be of same length!" );
assert( ny == y.length, "plot3d(): Arrays must be of same length!" );
@@ -440,13 +438,13 @@
// Plots a 3-d representation of the function z[x][y] with contour.
void plot3dc( PLFLT[] x, PLFLT[] y, PLFLT[][] z, PLINT opt, PLFLT[] clevel )
{
- PLINT nx = z.length;
- PLINT ny = z[0].length;
+ PLINT nx = cast(PLINT) z.length;
+ PLINT ny = cast(PLINT) z[0].length;
assert( nx == x.length, "plot3dc(): Arrays must be of same length!" );
assert( ny == y.length, "plot3dc(): Arrays must be of same length!" );
- c_plot3dc( x.ptr, y.ptr, convert_array( z ), nx, ny, opt, clevel.ptr, clevel.length );
+ c_plot3dc( x.ptr, y.ptr, convert_array( z ), nx, ny, opt, clevel.ptr, cast(PLINT) clevel.length );
}
// Plots a 3-d representation of the function z[x][y] with contour and
@@ -454,20 +452,20 @@
void plot3dcl( PLFLT[] x, PLFLT[] y, PLFLT[][] z, PLINT opt, PLFLT[] clevel,
PLINT ixstart, PLINT ixn, PLINT[] indexymin, PLINT[] indexymax )
{
- PLINT nx = z.length;
- PLINT ny = z[0].length;
+ PLINT nx = cast(PLINT) z.length;
+ PLINT ny = cast(PLINT) z[0].length;
assert( nx == x.length, "plot3dcl(): Arrays must be of same length!" );
assert( ny == y.length, "plot3dcl(): Arrays must be of same length!" );
- c_plot3dcl( x.ptr, y.ptr, convert_array( z ), nx, ny, opt, clevel.ptr, clevel.length,
+ c_plot3dcl( x.ptr, y.ptr, convert_array( z ), nx, ny, opt, clevel.ptr, cast(PLINT) clevel.length,
ixstart, ixn, indexymin.ptr, indexymax.ptr );
}
// Set fill pattern directly.
void plpat( PLINT[] inc, PLINT[] del )
{
- PLINT nlin = inc.length;
+ PLINT nlin = cast(PLINT) inc.length;
assert( nlin == del.length, "plpat(): Arrays must be of same length!" );
c_plpat( nlin, inc.ptr, del.ptr );
}
@@ -475,7 +473,7 @@
// Plots array y against x for n points using ASCII code "code".
void plpoin( PLFLT[] x, PLFLT[] y, PLINT code )
{
- PLINT n = x.length;
+ PLINT n = cast(PLINT) x.length;
assert( n == y.length, "plpoin(): Arrays must be of same length!" );
c_plpoin( n, x.ptr, y.ptr, code );
}
@@ -483,7 +481,7 @@
// Draws a series of points in 3 space.
void plpoin3( PLFLT[] x, PLFLT[] y, PLFLT[] z, PLINT code )
{
- PLINT n = x.length;
+ PLINT n = cast(PLINT) x.length;
assert( n == y.length, "plpoin3(): Arrays must be of same length!" );
assert( n == z.length, "plpoin3(): Arrays must be of same length!" );
c_plpoin3( n, x.ptr, y.ptr, z.ptr, code );
@@ -492,7 +490,7 @@
// Plots array y against x for n points using (UTF-8) text string
void plstring( PLFLT[] x, PLFLT[] y, string text )
{
- PLINT n = x.length;
+ PLINT n = cast(PLINT) x.length;
assert( n == y.length, "plstring(): Arrays must be of same length!" );
c_plstring( n, x.ptr, y.ptr, toStringz( text ) );
}
@@ -500,7 +498,7 @@
// Draws a series of points (described by [UTF8] text string) in 3 space.
void plstring3( PLFLT[] x, PLFLT[] y, PLFLT[] z, string text )
{
- PLINT n = x.length;
+ PLINT n = cast(PLINT) x.length;
assert( n == y.length, "plstring3(): Arrays must be of same length!" );
assert( n == z.length, "plstring3(): Arrays must be of same length!" );
c_plstring3( n, x.ptr, y.ptr, z.ptr, toStringz( text ) );
@@ -509,7 +507,7 @@
// Draws a polygon in 3 space.
void plpoly3( PLFLT[] x, PLFLT[] y, PLFLT[] z, PLBOOL[] draw, PLBOOL ifcc )
{
- PLINT n = x.length;
+ PLINT n = cast(PLINT) x.length;
assert( n == y.length, "plpoly3(): Arrays must be of same length!" );
assert( n == z.length, "plpoly3(): Arrays must be of same length!" );
assert( n - 1 == draw.length, "plpoly3(): Array draw must be of same length then other arrays minus 1!" );
@@ -544,7 +542,7 @@
// Set color map 0 colors by 8 bit RGB values
void plscmap0( PLINT[] r, PLINT[] g, PLINT[] b )
{
- PLINT ncol0 = r.length;
+ PLINT ncol0 = cast(PLINT) r.length;
assert( ncol0 == g.length, "plscmap0(): Arrays must be of same length!" );
assert( ncol0 == b.length, "plscmap0(): Arrays must be of same length!" );
c_plscmap0( r.ptr, g.ptr, b.ptr, ncol0 );
@@ -553,7 +551,7 @@
// Set color map 0 colors by 8 bit RGB values and alpha values
void plscmap0a( PLINT[] r, PLINT[] g, PLINT[] b, PLFLT[] a )
{
- PLINT ncol0 = r.length;
+ PLINT ncol0 = cast(PLINT) r.length;
assert( ncol0 == g.length, "plscmap0a(): Arrays must be of same length!" );
assert( ncol0 == b.length, "plscmap0a(): Arrays must be of same length!" );
assert( ncol0 == a.length, "plscmap0a(): Arrays must be of same length!" );
@@ -563,7 +561,7 @@
// Set color map 1 colors by 8 bit RGB values
void plscmap1( PLINT[] r, PLINT[] g, PLINT[] b )
{
- PLINT ncol1 = r.length;
+ PLINT ncol1 = cast(PLINT) r.length;
assert( ncol1 == g.length, "plscmap1(): Arrays must be of same length!" );
assert( ncol1 == b.length, "plscmap1(): Arrays must be of same length!" );
c_plscmap1( r.ptr, g.ptr, b.ptr, ncol1 );
@@ -572,7 +570,7 @@
// Set color map 1 colors by 8 bit RGB and alpha values
void plscmap1a( PLINT[] r, PLINT[] g, PLINT[] b, PLFLT[] a )
{
- PLINT ncol1 = r.length;
+ PLINT ncol1 = cast(PLINT) r.length;
assert( ncol1 == g.length, "plscmap1a(): Arrays must be of same length!" );
assert( ncol1 == b.length, "plscmap1a(): Arrays must be of same length!" );
assert( ncol1 == a.length, "plscmap1a(): Arrays must be of same length!" );
@@ -584,7 +582,7 @@
void plscmap1l( PLBOOL itype, PLFLT[] intensity, PLFLT[] coord1,
PLFLT[] coord2, PLFLT[] coord3, PLBOOL[] alt_hue_path = null )
{
- PLINT npts = intensity.length;
+ PLINT npts = cast(PLINT) intensity.length;
assert( npts == coord1.length, "plscmap1l(): Arrays must be of same length!" );
assert( npts == coord2.length, "plscmap1l(): Arrays must be of same length!" );
assert( npts == coord3.length, "plscmap1l(): Arrays must be of same length!" );
@@ -604,7 +602,7 @@
void plscmap1la( PLBOOL itype, PLFLT[] intensity, PLFLT[] coord1,
PLFLT[] coord2, PLFLT[] coord3, PLFLT[] a, PLBOOL[] alt_hue_path = null )
{
- PLINT npts = intensity.length;
+ PLINT npts = cast(PLINT) intensity.length;
assert( npts == coord1.length, "plscmap1la(): Arrays must be of same length!" );
assert( npts == coord2.length, "plscmap1la(): Arrays must be of same length!" );
assert( npts == coord3.length, "plscmap1la(): Arrays must be of same length!" );
@@ -633,12 +631,12 @@
// Shade region.
void plshade( PLFLT[][] a, def_func defined, PLFLT left, PLFLT right,
PLFLT bottom, PLFLT top, PLFLT shade_min, PLFLT shade_max, PLINT sh_cmap,
- PLFLT sh_color, PLINT sh_width, PLINT min_color, PLINT min_width, PLINT max_color,
- PLINT max_width, PLBOOL rectangular,
+ PLFLT sh_color, PLFLT sh_width, PLINT min_color, PLFLT min_width, PLINT max_color,
+ PLFLT max_width, PLBOOL rectangular,
pltr_func pltr = null, PLPointer pltr_data = null )
{
- PLINT nx = a.length;
- PLINT ny = a[0].length;
+ PLINT nx = cast(PLINT) a.length;
+ PLINT ny = cast(PLINT) a[0].length;
c_plshade( convert_array( a ), nx, ny, defined, left, right, bottom, top, shade_min, shade_max, sh_cmap,
sh_color, sh_width, min_color, min_width, max_color, max_width, &c_plfill,
@@ -646,48 +644,48 @@
}
void plshades( PLFLT[][] a, def_func defined, PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax,
- PLFLT[] clevel, PLINT fill_width, PLINT cont_color, PLINT cont_width,
+ PLFLT[] clevel, PLFLT fill_width, PLINT cont_color, PLFLT cont_width,
PLBOOL rectangular, pltr_func pltr = null, PLPointer pltr_data = null )
{
- PLINT nx = a.length;
- PLINT ny = a[0].length;
+ PLINT nx = cast(PLINT) a.length;
+ PLINT ny = cast(PLINT) a[0].length;
- c_plshades( convert_array( a ), nx, ny, defined, xmin, xmax, ymin, ymax, clevel.ptr, clevel.length,
+ c_plshades( convert_array( a ), nx, ny, defined, xmin, xmax, ymin, ymax, clevel.ptr, cast(PLINT) clevel.length,
fill_width, cont_color, cont_width, &c_plfill, rectangular, pltr, pltr_data );
}
void plshades( PLFLT[][] a, def_func defined, PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax,
- PLFLT[] clevel, PLINT fill_width, PLINT cont_color, PLINT cont_width,
+ PLFLT[] clevel, PLFLT fill_width, PLINT cont_color, PLFLT cont_width,
PLBOOL rectangular, ref PLcGrid cgrid )
{
- PLINT nx = a.length;
- PLINT ny = a[0].length;
+ PLINT nx = cast(PLINT) a.length;
+ PLINT ny = cast(PLINT) a[0].length;
c_PLcGrid c;
c.xg = cgrid.xg.ptr;
- c.nx = cgrid.xg.length;
+ c.nx = cast(PLINT) cgrid.xg.length;
c.yg = cgrid.yg.ptr;
- c.ny = cgrid.yg.length;
+ c.ny = cast(PLINT) cgrid.yg.length;
c.zg = cgrid.zg.ptr;
- c.nz = cgrid.zg.length;
+ c.nz = cast(PLINT) cgrid.zg.length;
- c_plshades( convert_array( a ), nx, ny, defined, xmin, xmax, ymin, ymax, clevel.ptr, clevel.length,
+ c_plshades( convert_array( a ), nx, ny, defined, xmin, xmax, ymin, ymax, clevel.ptr, cast(PLINT) clevel.length,
fill_width, cont_color, cont_width, &c_plfill, rectangular, &pltr1, &c );
}
void plshades( PLFLT[][] a, def_func defined, PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax,
- PLFLT[] clevel, PLINT fill_width, PLINT cont_color, PLINT cont_width,
+ PLFLT[] clevel, PLFLT fill_width, PLINT cont_color, PLFLT cont_width,
PLBOOL rectangular, ref PLcGrid2 cgrid2 )
{
- PLINT nx = a.length;
- PLINT ny = a[0].length;
+ PLINT nx = cast(PLINT) a.length;
+ PLINT ny = cast(PLINT) a[0].length;
c_PLcGrid2 c2;
c2.xg = convert_array( cgrid2.xg );
c2.yg = convert_array( cgrid2.yg );
c2.zg = convert_array( cgrid2.zg );
- c2.nx = cgrid2.xg.length;
- c2.ny = cgrid2.xg[0].length;
+ c2.nx = cast(PLINT) cgrid2.xg.length;
+ c2.ny = cast(PLINT) cgrid2.xg[0].length;
if ( cgrid2.yg )
{
assert( c2.nx == cgrid2.yg.length, "plcont(): Arrays must be of same length!" );
@@ -699,7 +697,7 @@
assert( c2.ny == cgrid2.zg[0].length, "plcont(): Arrays must be of same length!" );
}
- c_plshades( convert_array( a ), nx, ny, defined, xmin, xmax, ymin, ymax, clevel.ptr, clevel.length,
+ c_plshades( convert_array( a ), nx, ny, defined, xmin, xmax, ymin, ymax, clevel.ptr, cast(PLINT) clevel.length,
fill_width, cont_color, cont_width, &c_plfill, rectangular, &pltr2, &c2 );
}
@@ -719,14 +717,14 @@
assert( 4 == styline.length, "plstripc(): Arrays must be of length 4!" );
assert( 4 == legline.length, "plstripc(): Arrays must be of length 4!" );
- char*[4] leglinez;
- for ( int i = 0; i < 4; i++ )
- {
- leglinez[i] = toStringz( legline[i] );
- }
+ immutable( char ) * *leglinez = array( map!toStringz( legline ) ).ptr;
+ //for ( int i = 0; i < 4; i++ )
+ //{
+ // leglinez[i] = toStringz( legline[i] );
+ //}
c_plstripc( id, toStringz( xspec ), toStringz( yspec ), xmin, xmax, xjump, ymin, ymax,
- xlpos, ylpos, y_ascl, acc, colbox, collab, colline.ptr, styline.ptr, leglinez.ptr,
+ xlpos, ylpos, y_ascl, acc, colbox, collab, colline.ptr, styline.ptr, leglinez,
toStringz( labx ), toStringz( laby ), toStringz( labtop ) );
}
@@ -735,8 +733,8 @@
PLFLT zmin, PLFLT zmax, PLFLT valuemin, PLFLT valuemax,
pltr_func pltr = null, PLPointer pltr_data = null )
{
- PLINT nx = idata.length;
- PLINT ny = idata[0].length;
+ PLINT nx = cast(PLINT) idata.length;
+ PLINT ny = cast(PLINT) idata[0].length;
c_plimagefr( convert_array( idata ), nx, ny, xmin, xmax, ymin, ymax, zmin, zmax,
valuemin, valuemax, pltr, pltr_data );
@@ -746,16 +744,16 @@
void plimagefr( PLFLT[][] idata, PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax,
PLFLT zmin, PLFLT zmax, PLFLT valuemin, PLFLT valuemax, PLcGrid cgrid )
{
- PLINT nx = idata.length;
- PLINT ny = idata[0].length;
+ PLINT nx = cast(PLINT) idata.length;
+ PLINT ny = cast(PLINT) idata[0].length;
c_PLcGrid c;
c.xg = cgrid.xg.ptr;
- c.nx = cgrid.xg.length;
+ c.nx = cast(PLINT) cgrid.xg.length;
c.yg = cgrid.yg.ptr;
- c.ny = cgrid.yg.length;
+ c.ny = cast(PLINT) cgrid.yg.length;
c.zg = cgrid.zg.ptr;
- c.nz = cgrid.zg.length;
+ c.nz = cast(PLINT) cgrid.zg.length;
c_plimagefr( convert_array( idata ), nx, ny, xmin, xmax, ymin, ymax, zmin, zmax,
valuemin, valuemax, &pltr1, &c );
@@ -765,15 +763,15 @@
void plimagefr( PLFLT[][] idata, PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax,
PLFLT zmin, PLFLT zmax, PLFLT valuemin, PLFLT valuemax, PLcGrid2 cgrid2 )
{
- PLINT nx = idata.length;
- PLINT ny = idata[0].length;
+ PLINT nx = cast(PLINT) idata.length;
+ PLINT ny = cast(PLINT) idata[0].length;
c_PLcGrid2 c2;
c2.xg = convert_array( cgrid2.xg );
c2.yg = convert_array( cgrid2.yg );
c2.zg = convert_array( cgrid2.zg );
- c2.nx = cgrid2.xg.length;
- c2.ny = cgrid2.xg[0].length;
+ c2.nx = cast(PLINT) cgrid2.xg.length;
+ c2.ny = cast(PLINT) cgrid2.xg[0].length;
if ( cgrid2.yg )
{
assert( c2.nx == cgrid2.yg.length, "plcont(): Arrays must be of same length!" );
@@ -794,8 +792,8 @@
void plimage( PLFLT[][] idata, PLFLT xmin, PLFLT xmax, PLFLT ymin, PLFLT ymax,
PLFLT zmin, PLFLT zmax, PLFLT Dxmin, PLFLT Dxmax, PLFLT Dymin, PLFLT Dymax )
{
- PLINT nx = idata.length;
- PLINT ny = idata[0].length;
+ PLINT nx = cast(PLINT) idata.length;
+ PLINT ny = cast(PLINT) idata[0].length;
c_plimage( convert_array( idata ), nx, ny, xmin, xmax, ymin, ymax, zmin, zmax, Dxmin, Dxmax,
Dymin, Dymax );
@@ -804,7 +802,7 @@
// Set up a new line style
void plstyl( PLINT[] mark, PLINT[] space )
{
- PLINT nms = mark.length;
+ PLINT nms = cast(PLINT) mark.length;
assert( nms == space.length, "plstyl(): Arrays must be of same length!" );
c_plstyl( nms, mark.ptr, space.ptr );
}
@@ -812,13 +810,13 @@
// Plots the 3d surface representation of the function z[x][y].
void plsurf3d( PLFLT[] x, PLFLT[] y, PLFLT[][] z, PLINT opt, PLFLT[] clevel = null )
{
- PLINT nx = z.length;
- PLINT ny = z[0].length;
+ PLINT nx = cast(PLINT) z.length;
+ PLINT ny = cast(PLINT) z[0].length;
assert( nx == x.length, "plsurf3d(): Arrays must be of same length!" );
assert( ny == y.length, "plsurf3d(): Arrays must be of same length!" );
if ( clevel )
- c_plsurf3d( x.ptr, y.ptr, convert_array( z ), nx, ny, opt, clevel.ptr, clevel.length );
+ c_plsurf3d( x.ptr, y.ptr, convert_array( z ), nx, ny, opt, clevel.ptr, cast(PLINT) clevel.length );
else
c_plsurf3d( x.ptr, y.ptr, convert_array( z ), nx, ny, opt, null, 0 );
}
@@ -828,19 +826,19 @@
void plsurf3dl( PLFLT[] x, PLFLT[] y, PLFLT[][] z, PLINT opt, PLFLT[] clevel,
PLINT ixstart, PLINT ixn, PLINT[] indexymin, PLINT[] indexymax )
{
- PLINT nx = z.length;
- PLINT ny = z[0].length;
+ PLINT nx = cast(PLINT) z.length;
+ PLINT ny = cast(PLINT) z[0].length;
assert( nx == x.length, "plsurf3d(): Arrays must be of same length!" );
assert( ny == y.length, "plsurf3d(): Arrays must be of same length!" );
- c_plsurf3dl( x.ptr, y.ptr, convert_array( z ), nx, ny, opt, clevel.ptr, clevel.length,
+ c_plsurf3dl( x.ptr, y.ptr, convert_array( z ), nx, ny, opt, clevel.ptr, cast(PLINT) clevel.length,
ixstart, ixn, indexymin.ptr, indexymax.ptr );
}
// Plots array y against x for n points using Hershey symbol "code"
void plsym( PLFLT[] x, PLFLT[] y, PLINT code )
{
- PLINT n = x.length;
+ PLINT n = cast(PLINT) x.length;
assert( n == y.length, "plsym(): Arrays must be of same length!" );
c_plsym( n, x.ptr, y.ptr, code );
}
@@ -941,7 +939,7 @@
// Find the maximum and minimum of a 2d matrix allocated with plAllc2dGrid().
void plMinMax2dGrid( PLFLT[][] f, out PLFLT fmax, out PLFLT fmin )
{
- plMinMax2dGrid( convert_array( f ), f.length, f[0].length, &fmax, &fmin );
+ plMinMax2dGrid( convert_array( f ), cast(PLINT) f.length, cast(PLINT) f[0].length, &fmax, &fmin );
}
// Wait for graphics input event and translate to world coordinates
@@ -1081,13 +1079,13 @@
struct _N1
{
- char *opt;
+ string opt;
int function( char *, char *, void * ) handler;
- void *client_data;
- void *var;
- int mode;
- char *syntax;
- char *desc;
+ void *client_data;
+ void *var;
+ int mode;
+ string syntax;
+ string desc;
}
alias _N1 PLOptionTable;
@@ -1515,8 +1513,8 @@
// This functions similarly to plbox() except that the origin of the axes
// is placed at the user-specified point (x0, y0).
-void c_plaxes( PLFLT x0, PLFLT y0, char *xopt, PLFLT xtick, PLINT nxsub,
- char *yopt, PLFLT ytick, PLINT nysub );
+void c_plaxes( PLFLT x0, PLFLT y0, const char *xopt, PLFLT xtick, PLINT nxsub,
+ const char *yopt, PLFLT ytick, PLINT nysub );
// Flags for plbin() - opt argument
const PL_BIN_DEFAULT = 0;
@@ -1531,11 +1529,11 @@
void c_plbop();
// This draws a box around the current viewport.
-void c_plbox( char *xopt, PLFLT xtick, PLINT nxsub, char *yopt, PLFLT ytick, PLINT nysub );
+void c_plbox( const char *xopt, PLFLT xtick, PLINT nxsub, const char *yopt, PLFLT ytick, PLINT nysub );
// This is the 3-d analogue of plbox().
-void c_plbox3( char *xopt, char *xlabel, PLFLT xtick, PLINT nsubx, char *yopt,
- char *ylabel, PLFLT ytick, PLINT nsuby, char *zopt, char *zlabel,
+void c_plbox3( const char *xopt, const char *xlabel, PLFLT xtick, PLINT nsubx, const char *yopt,
+ const char *ylabel, PLFLT ytick, PLINT nsuby, const char *zopt, const char *zlabel,
PLFLT ztick, PLINT nsubz );
// Calculate broken-down time from continuous time for current stream.
@@ -1752,7 +1750,7 @@
void c_pljoin( PLFLT x1, PLFLT y1, PLFLT x2, PLFLT y2 );
// Simple routine for labelling graphs.
-void c_pllab( char *xlabel, char *ylabel, char *tlabel );
+void c_pllab( const char *xlabel, const char *ylabel, const char *tlabel );
// Flags used for position argument of both pllegend and plcolorbar
const PL_POSITION_LEFT = 1;
@@ -1794,13 +1792,13 @@
PLINT nlegend, PLINT *opt_array,
PLFLT text_offset, PLFLT text_scale, PLFLT text_spacing,
PLFLT text_justification,
- PLINT *text_colors, char **text,
+ PLINT *text_colors, const char **text,
PLINT *box_colors, PLINT *box_patterns,
- PLFLT *box_scales, PLINT *box_line_widths,
+ PLFLT *box_scales, PLFLT *box_line_widths,
PLINT *line_colors, PLINT *line_styles,
- PLINT *line_widths,
+ PLFLT *line_widths,
PLINT *symbol_colors, PLFLT *symbol_scales,
- PLINT *symbol_numbers, char **symbols );
+ PLINT *symbol_numbers, const char **symbols );
// Sets position of the light source
void c_pllightsource( PLFLT x, PLFLT y, PLFLT z );
@@ -1815,7 +1813,7 @@
void c_pllsty( PLINT lin );
// plot continental outline in world coordinates
-void c_plmap( void function( PLINT, PLFLT *, PLFLT* ) mapform, char *type, PLFLT minlong,
+void c_plmap( void function( PLINT, PLFLT *, PLFLT* ) mapform, const char *type, PLFLT minlong,
PLFLT maxlong, PLFLT minlat, PLFLT maxlat );
// Plot the latitudes and longitudes on the background.
@@ -1833,10 +1831,10 @@
void c_plmkstrm( PLINT *p_strm );
// Prints out "text" at specified position relative to viewport
-void c_plmtex( char *side, PLFLT disp, PLFLT pos, PLFLT just, char *text );
+void c_plmtex( const char *side, PLFLT disp, PLFLT pos, PLFLT just, const char *text );
// Prints out "text" at specified position relative to viewport (3D)
-void c_plmtex3( char *side, PLFLT disp, PLFLT pos, PLFLT just, char *text );
+void c_plmtex3( const char *side, PLFLT disp, PLFLT pos, PLFLT just, const char *text );
// Plots a 3-d representation of the function z[x][y].
void c_plot3d( PLFLT *x, PLFLT *y, PLFLT **z, PLINT nx, PLINT ny, PLINT opt, PLBOOL side );
@@ -1891,10 +1889,10 @@
void c_plpoly3( PLINT n, PLFLT *x, PLFLT *y, PLFLT *z, PLBOOL *draw, PLBOOL ifcc );
// Plots array y against x for n points using (UTF-8) text string
-void c_plstring( PLINT n, PLFLT *x, PLFLT *y, char *text );
+void c_plstring( PLINT n, PLFLT *x, PLFLT *y, const char *text );
// Draws a series of points (described by [UTF8] text string) in 3 space.
-void c_plstring3( PLINT n, PLFLT *x, PLFLT *y, PLFLT *z, char * text );
+void c_plstring3( PLINT n, PLFLT *x, PLFLT *y, PLFLT *z, const char * text );
// Set the floating point precision (in number of places) in numeric labels.
void c_plprec( PLINT setp, PLINT prec );
@@ -1903,10 +1901,10 @@
void c_plpsty( PLINT patt );
// Prints out "text" at world cooordinate (x,y).
-void c_plptex( PLFLT x, PLFLT y, PLFLT dx, PLFLT dy, PLFLT just, char *text );
+void c_plptex( PLFLT x, PLFLT y, PLFLT dx, PLFLT dy, PLFLT just, const char *text );
// Prints out "text" at world cooordinate (x,y,z).
-void c_plptex3( PLFLT wx, PLFLT wy, PLFLT wz, PLFLT dx, PLFLT dy, PLFLT dz, PLFLT sx, PLFLT sy, PLFLT sz, PLFLT just, char *text );
+void c_plptex3( PLFLT wx, PLFLT wy, PLFLT wz, PLFLT dx, PLFLT dy, PLFLT dz, PLFLT sx, PLFLT sy, PLFLT sz, PLFLT just, const char *text );
// Random number generator based on Mersenne Twister.
// Obtain real random number in range [0,1].
@@ -1978,7 +1976,7 @@
void c_plscompression( PLINT compression );
// Set the device (keyword) name
-void c_plsdev( char *devname );
+void c_plsdev( const char *devname );
// Set window into device space using margin, aspect ratio, and
// justification
@@ -2015,7 +2013,7 @@
void c_plsfci( PLUNICODE fci );
// Set the output file name.
-void c_plsfnam( char *fnam );
+void c_plsfnam( const char *fnam );
// Set the current font family, style and weight
@@ -2024,17 +2022,17 @@
// Shade region.
void c_plshade( PLFLT **a, PLINT nx, PLINT ny, PLINT function( PLFLT, PLFLT ) defined, PLFLT left,
PLFLT right, PLFLT bottom, PLFLT top, PLFLT shade_min, PLFLT shade_max, PLINT sh_cmap,
- PLFLT sh_color, PLINT sh_width, PLINT min_color, PLINT min_width, PLINT max_color,
- PLINT max_width, void function( PLINT, PLFLT *, PLFLT* ) fill, PLBOOL rectangular,
+ PLFLT sh_color, PLFLT sh_width, PLINT min_color, PLFLT min_width, PLINT max_color,
+ PLFLT max_width, void function( PLINT, PLFLT *, PLFLT* ) fill, PLBOOL rectangular,
void function( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ) pltr, PLPointer pltr_data );
void c_plshades( PLFLT **a, PLINT nx, PLINT ny, PLINT function( PLFLT, PLFLT ) defined, PLFLT xmin,
- PLFLT xmax, PLFLT ymin, PLFLT ymax, PLFLT *clevel, PLINT nlevel, PLINT fill_width,
- PLINT cont_color, PLINT cont_width, void function( PLINT, PLFLT *, PLFLT* ) fill,
+ PLFLT xmax, PLFLT ymin, PLFLT ymax, PLFLT *clevel, PLINT nlevel, PLFLT fill_width,
+ PLINT cont_color, PLFLT cont_width, void function( PLINT, PLFLT *, PLFLT* ) fill,
PLBOOL rectangular, void function( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ) pltr,
PLPointer pltr_data );
-void plfshade( PLFLT function( PLINT, PLINT, PLPointer ) f2eval, PLPointer f2eval_data, PLFLT function( PLINT, PLINT, PLPointer ) c2eval, PLPointer c2eval_data, PLINT nx, PLINT ny, PLFLT left, PLFLT right, PLFLT bottom, PLFLT top, PLFLT shade_min, PLFLT shade_max, PLINT sh_cmap, PLFLT sh_color, PLINT sh_width, PLINT min_color, PLINT min_width, PLINT max_color, PLINT max_width, void function( PLINT, PLFLT *, PLFLT * ) fill, PLBOOL rectangular, void function( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ) pltr, PLPointer pltr_data );
+void plfshade( PLFLT function( PLINT, PLINT, PLPointer ) f2eval, PLPointer f2eval_data, PLFLT function( PLINT, PLINT, PLPointer ) c2eval, PLPointer c2eval_data, PLINT nx, PLINT ny, PLFLT left, PLFLT right, PLFLT bottom, PLFLT top, PLFLT shade_min, PLFLT shade_max, PLINT sh_cmap, PLFLT sh_color, PLFLT sh_width, PLINT min_color, PLFLT min_width, PLINT max_color, PLFLT max_width, void function( PLINT, PLFLT *, PLFLT * ) fill, PLBOOL rectangular, void function( PLFLT, PLFLT, PLFLT *, PLFLT *, PLPointer ) pltr, PLPointer pltr_data );
// Set up lengths of major tick marks.
@@ -2056,10 +2054,10 @@
void c_plspage( PLFLT xp, PLFLT yp, PLINT xleng, PLINT yleng, PLINT xoff, PLINT yoff );
// Set the colors for color table 0 from a cmap0 file
-void c_plspal0( char* filename );
+void c_plspal0( const char* filename );
// Set the colors for color table 1 from a cmap1 file
-void c_plspal1( char *filename, PLBOOL interpolate );
+void c_plspal1( const char *filename, PLBOOL interpolate );
// Set the pause (on end-of-page) status
void c_plspause( PLBOOL pause );
@@ -2080,7 +2078,7 @@
void c_plstar( PLINT nx, PLINT ny );
// Initialize PLplot, passing the device name and windows/page settings.
-void c_plstart( char *devname, PLINT nx, PLINT ny );
+void c_plstart( const char *devname, PLINT nx, PLINT ny );
// Set the coordinate transform
void c_plstransform( ct_func coordinate_transform = null, PLPointer coordinate_transform_data = null );
@@ -2089,7 +2087,7 @@
void c_plstripa( PLINT id, PLINT pen, PLFLT x, PLFLT y );
// Create 1d stripchart
-void c_plstripc( PLINT *id, char *xspec, char *yspec, PLFLT xmin, PLFLT xmax, PLFLT xjump, PLFLT ymin, PLFLT ymax, PLFLT xlpos, PLFLT ylpos, PLBOOL y_ascl, PLBOOL acc, PLINT colbox, PLINT collab, PLINT *colline, PLINT *styline, char **legline, char *labx, char *laby, char *labtop );
+void c_plstripc( PLINT *id, const char *xspec, const char *yspec, PLFLT xmin, PLFLT xmax, PLFLT xjump, PLFLT ymin, PLFLT ymax, PLFLT xlpos, PLFLT ylpos, PLBOOL y_ascl, PLBOOL acc, PLINT colbox, PLINT collab, PLINT *colline, PLINT *styline, const char **legline, const char *labx, const char *laby, const char *labtop );
// Deletes and releases memory used by a stripchart.
void c_plstripd( PLINT id );
@@ -2140,7 +2138,7 @@
void c_pltext();
// Set the format for date / time labels
-void c_pltimefmt( char *fmt );
+void c_pltimefmt( const char *fmt );
// Sets the edges of the viewport with the given aspect ratio, leaving
// room for labels.
@@ -2206,15 +2204,15 @@
// Set the variables to be used for storing error info
-void plsError( PLINT *errcode, char *errmsg );
+void plsError( PLINT *errcode, const char *errmsg );
// Sets an optional user exit handler.
-void plsexit( int function( char * ) handler );
+void plsexit( int function( const char * ) handler );
// Sets an optional user abort handler.
-void plsabort( void function( char * ) handler );
+void plsabort( void function( const char * ) handler );
// Transformation routines
@@ -2265,21 +2263,21 @@
// Merge user option table into internal info structure.
-int plMergeOpts( PLOptionTable *options, char *name, char **notes );
+int plMergeOpts( PLOptionTable *options, const char *name, const char **notes );
// Set the strings used in usage and syntax messages.
-void plSetUsage( char *program_string, char *usage_string );
+void plSetUsage( const char *program_string, const char *usage_string );
// Process input strings, treating them as an option and argument pair.
// The first is for the external API, the second the work routine declared
// here for backward compatibilty.
-int c_plsetopt( char *opt, char *optarg );
+int c_plsetopt( const char *opt, const char *optarg );
-int plSetOpt( char *opt, char *optarg );
+int plSetOpt( const char *opt, const char *optarg );
// Process options list using current options info.
-int c_plparseopts( int *p_argc, char **argv, PLINT mode );
+int c_plparseopts( int *p_argc, const char **argv, PLINT mode );
// Print usage & syntax message.
@@ -2301,20 +2299,20 @@
// Looks for the specified executable file according to usual search path.
-char * plFindCommand( char *fn );
+char * plFindCommand( const char *fn );
// Gets search name for file by concatenating the dir, subdir, and file
// name, allocating memory as needed.
-void plGetName( char *dir, char *subdir, char *filename, char **filespec );
+void plGetName( const char *dir, const char *subdir, const char *filename, char **filespec );
// Prompts human to input an integer in response to given message.
-PLINT plGetInt( char *s );
+PLINT plGetInt( const char *s );
// Prompts human to input a float in response to given message.
-PLFLT plGetFlt( char *s );
+PLFLT plGetFlt( const char *s );
// Nice way to allocate space for a vectored 2d grid
Modified: trunk/cmake/modules/d.cmake
===================================================================
--- trunk/cmake/modules/d.cmake 2013-06-27 19:47:10 UTC (rev 12392)
+++ trunk/cmake/modules/d.cmake 2013-06-27 19:49:07 UTC (rev 12393)
@@ -25,7 +25,7 @@
if(DEFAULT_NO_BINDINGS)
option(ENABLE_d "Enable D bindings" OFF)
else(DEFAULT_NO_BINDINGS)
- option(ENABLE_d "Enable D bindings" OFF)
+ option(ENABLE_d "Enable D bindings" ON)
endif(DEFAULT_NO_BINDINGS)
if(ENABLE_d AND NOT PLPLOT_D_COMPILER_WORKS)
Modified: trunk/cmake/modules/language_support/cmake/CMakeDInformation.cmake
===================================================================
--- trunk/cmake/modules/language_support/cmake/CMakeDInformation.cmake 2013-06-27 19:47:10 UTC (rev 12392)
+++ trunk/cmake/modules/language_support/cmake/CMakeDInformation.cmake 2013-06-27 19:49:07 UTC (rev 12393)
@@ -215,7 +215,7 @@
IF(CMAKE_D_USE_PHOBOS)
IF(CMAKE_COMPILER_IS_GDC)
SET(DSTDLIB_TYPE "-fversion=Phobos")
- SET(DSTDLIB_FLAGS "-lgphobos")
+ SET(DSTDLIB_FLAGS "-lgphobos2")
ELSE(CMAKE_COMPILER_IS_GDC)
SET(DSTDLIB_TYPE "-version=Phobos")
SET(DSTDLIB_FLAGS "-L${D_PATH}/lib -lphobos")
Modified: trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake
===================================================================
--- trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake 2013-06-27 19:47:10 UTC (rev 12392)
+++ trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake 2013-06-27 19:49:07 UTC (rev 12393)
@@ -30,7 +30,7 @@
OUTPUT_VARIABLE OUTPUT)
ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
TRY_COMPILE(CMAKE_D_COMPILER_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libphobos.a"
+ CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libphobos2.a"
OUTPUT_VARIABLE OUTPUT)
ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
ELSE(DMDTEST STREQUAL "dmd")
@@ -88,7 +88,7 @@
OUTPUT_VARIABLE OUTPUT)
ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- CMAKE_FLAGS "-DLINK_LIBRARIES=gphobos"
+ CMAKE_FLAGS "-DLINK_LIBRARIES=gphobos2"
OUTPUT_VARIABLE OUTPUT)
ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
ELSE(CMAKE_COMPILER_IS_GDC)
Modified: trunk/cmake/modules/language_support/cmake/Platform/Linux-gdc.cmake
===================================================================
--- trunk/cmake/modules/language_support/cmake/Platform/Linux-gdc.cmake 2013-06-27 19:47:10 UTC (rev 12392)
+++ trunk/cmake/modules/language_support/cmake/Platform/Linux-gdc.cmake 2013-06-27 19:49:07 UTC (rev 12393)
@@ -25,7 +25,7 @@
ENDFOREACH(item)
ENDIF(CMAKE_D_BUILD_DOCS)
-SET (CMAKE_D_FLAGS_INIT "-fversion=Posix ${DSTDLIB_FLAGS}")
+SET (CMAKE_D_FLAGS_INIT "${DSTDLIB_FLAGS}")
SET (CMAKE_D_FLAGS_DEBUG_INIT "-g ${DDOC_FLAGS}")
SET (CMAKE_D_FLAGS_MINSIZEREL_INIT "-Os ${DDOC_FLAGS}")
SET (CMAKE_D_FLAGS_RELEASE_INIT "-O3 -fomit-frame-pointer -fweb -frelease -finline-functions ${DDOC_FLAGS}")
Modified: trunk/examples/d/x02d.d
===================================================================
--- trunk/examples/d/x02d.d 2013-06-27 19:47:10 UTC (rev 12392)
+++ trunk/examples/d/x02d.d 2013-06-27 19:49:07 UTC (rev 12393)
@@ -4,6 +4,7 @@
//
import std.string;
+import std.conv;
import plplot;
@@ -133,7 +134,7 @@
vmax = vmax - 0.1;
}
plwidth( 1 );
- plptex( 0.5, 0.5, 1.0, 0.0, 0.5, std.string.toString( i ) );
+ plptex( 0.5, 0.5, 1.0, 0.0, 0.5, to!string( i ) );
}
}
}
Modified: trunk/examples/d/x04d.d
===================================================================
--- trunk/examples/d/x04d.d 2013-06-27 19:47:10 UTC (rev 12392)
+++ trunk/examples/d/x04d.d 2013-06-27 19:49:07 UTC (rev 12393)
@@ -46,10 +46,10 @@
PLINT[] box_colors;
PLINT[] box_patterns;
PLFLT[] box_scales;
- PLINT[] box_line_widths;
+ PLFLT[] box_line_widths;
PLINT[] line_colors;
PLINT[] line_styles;
- PLINT[] line_widths;
+ PLFLT[] line_widths;
PLINT[] symbol_numbers, symbol_colors;
PLFLT[] symbol_scales;
PLFLT legend_width, legend_height;
@@ -80,6 +80,8 @@
case 1:
plbox( "bcfghlnst", 0.0, 0, "bcghnstv", 0.0, 0 );
break;
+ default:
+ break;
}
// Plot ampl vs freq
@@ -136,7 +138,7 @@
text[0] = "Amplitude";
line_colors[0] = 2;
line_styles[0] = 1;
- line_widths[0] = 1;
+ line_widths[0] = 1.;
// Note from the above opt_array the first symbol (and box) indices
// do not have to be specified
@@ -147,7 +149,7 @@
text[1] = "Phase shift";
line_colors[1] = 3;
line_styles[1] = 1;
- line_widths[1] = 1;
+ line_widths[1] = 1.;
symbol_colors[1] = 3;
symbol_scales[1] = 1.;
symbol_numbers[1] = 4;
Modified: trunk/examples/d/x06d.d
===================================================================
--- trunk/examples/d/x06d.d 2013-06-27 19:47:10 UTC (rev 12392)
+++ trunk/examples/d/x06d.d 2013-06-27 19:49:07 UTC (rev 12393)
@@ -62,7 +62,7 @@
// Display the symbols (plpoin expects that x and y
// are arrays so pass pointers)
if ( k < 128 )
- plpoin( x, y, k );
+ plpoin( x, y, cast(PLINT) k );
k = k + 1;
}
}
Modified: trunk/examples/d/x07d.d
===================================================================
--- trunk/examples/d/x07d.d 2013-06-27 19:47:10 UTC (rev 12392)
+++ trunk/examples/d/x07d.d 2013-06-27 19:49:07 UTC (rev 12393)
@@ -62,7 +62,7 @@
y[0] = 0.95 - 0.1 * i;
// Display the symbols
- plsym( x, y, base[l] + k );
+ plsym( x, y, cast(PLINT) ( base[l] + k ) );
k = k + 1;
}
}
Modified: trunk/examples/d/x08d.d
===================================================================
--- trunk/examples/d/x08d.d 2013-06-27 19:47:10 UTC (rev 12392)
+++ trunk/examples/d/x08d.d 2013-06-27 19:49:07 UTC (rev 12393)
@@ -29,29 +29,8 @@
import std.math;
import std.c.stdlib;
-int sombrero;
+int sombrero = 0;
-PLOptionTable[] options = [
- {
- "sombrero", // Turns on use of Sombrero function
- null,
- null,
- &sombrero,
- PL_OPT_BOOL,
- "-sombrero",
- "Use the \"sombrero\" function."
- },
- {
- null, // option
- null, // handler
- null, // client data
- null, // address of variable to set
- 0, // mode flag
- null, // short syntax
- null
- } // long syntax
-];
-
//--------------------------------------------------------------------------
// cmap1_init1
//
@@ -104,8 +83,8 @@
PLFLT[] alt = [ 60.0, 20.0 ];
PLFLT[] az = [ 30.0, 60.0 ];
- char[] title[] = [ "#frPLplot Example 8 - Alt=60, Az=30",
- "#frPLplot Example 8 - Alt=20, Az=60" ];
+ string title[] = [ "#frPLplot Example 8 - Alt=60, Az=30",
+ "#frPLplot Example 8 - Alt=20, Az=60" ];
// Parse and process command line arguments
plparseopts( args, PL_PARSE_FULL );
Modified: trunk/examples/d/x11d.d
===================================================================
--- trunk/examples/d/x11d.d 2013-06-27 19:47:10 UTC (rev 12392)
+++ trunk/examples/d/x11d.d 2013-06-27 19:49:07 UTC (rev 12393)
@@ -60,8 +60,8 @@
PLFLT[] alt = [ 33.0, 17.0 ];
PLFLT[] az = [ 24.0, 115.0 ];
- char[] title[] = [ "#frPLplot Example 11 - Alt=33, Az=24, Opt=3",
- "#frPLplot Example 11 - Alt=17, Az=115, Opt=3" ];
+ string title[] = [ "#frPLplot Example 11 - Alt=33, Az=24, Opt=3",
+ "#frPLplot Example 11 - Alt=17, Az=115, Opt=3" ];
PLFLT xx, yy;
@@ -143,6 +143,8 @@
// magnitude colored wireframe plot with base contour
plmeshc( x, y, z, opt[k] | MAG_COLOR | BASE_CONT, clevel );
break;
+ default:
+ break;
}
plcol0( 3 );
Modified: trunk/examples/d/x13d.d
===================================================================
--- trunk/examples/d/x13d.d 2013-06-27 19:47:10 UTC (rev 12392)
+++ trunk/examples/d/x13d.d 2013-06-27 19:49:07 UTC (rev 12393)
@@ -65,7 +65,7 @@
y[j++] = 5.0 + 3.0 * sin( ( 2.0 * PI / 500. ) * theta );
}
- plcol0( i + 1 );
+ plcol0( cast(PLINT) ( i + 1 ) );
plpsty( ( i + 3 ) % 8 + 1 );
plfill( x, y );
plcol0( 1 );
Modified: trunk/examples/d/x15d.d
===================================================================
--- trunk/examples/d/x15d.d 2013-06-27 19:47:10 UTC (rev 12392)
+++ trunk/examples/d/x15d.d 2013-06-27 19:49:07 UTC (rev 12393)
@@ -120,12 +120,12 @@
PLFLT shade_min = zmin + ( zmax - zmin ) * 0.4;
PLFLT shade_max = zmin + ( zmax - zmin ) * 0.6;
PLFLT sh_color = 7;
- PLINT sh_width = 2;
+ PLFLT sh_width = 2.;
PLINT sh_cmap = 0;
PLINT min_color = 9;
PLINT max_color = 2;
- PLINT min_width = 2;
- PLINT max_width = 2;
+ PLFLT min_width = 2.;
+ PLFLT max_width = 2.;
plpsty( 8 );
plshade( z, null, -1., 1., -1., 1.,
@@ -239,4 +239,4 @@
}
}
}
-}
\ No newline at end of file
+}
Modified: trunk/examples/d/x20d.d
===================================================================
--- trunk/examples/d/x20d.d 2013-06-27 19:47:10 UTC (rev 12392)
+++ trunk/examples/d/x20d.d 2013-06-27 19:49:07 UTC (rev 12393)
@@ -6,7 +6,6 @@
import std.math;
import std.stdio;
-import std.stream;
import plplot;
@@ -83,7 +82,6 @@
z[XDIM - 1][i] = 1.0; // botton
pllab( "...around a blue square.", " ", "A red border should appear..." );
-
plimage( z, 1.0, XDIM, 1.0, YDIM, 0., 0., 1.0, XDIM, 1.0, YDIM );
}
@@ -131,7 +129,7 @@
{
if ( read_img( "../lena.pgm", img_f, width, height, num_col ) )
{
- fwritefln( stderr, "No such file" );
+ stderr.writeln( "No such file" );
plend();
return 1;
}
@@ -141,7 +139,7 @@
gray_cmap( num_col );
// display Lena
- plenv( 1.0, width, 1.0, height, 1, -1 );
+ plenv( 1.0, cast(PLFLT) width, 1.0, cast(PLFLT) height, 1, -1 );
if ( !nointeractive )
pllab( "Set and drag Button 1 to (re)set selection, Button 2 to finish.", " ", "Lena..." );
@@ -211,31 +209,34 @@
// read image from file in binary ppm format
int read_img( string fname, out PLFLT[][] img_f, out int width, out int height, out int num_col )
{
- ubyte[] img;
+ ubyte[] img;
- BufferedFile input = new BufferedFile;
+ if ( !std.file.exists( fname ) )
+ return 1;
+
+ File input;
try {
- input.open( fname, FileMode.In );
+ input.open( fname );
string ver;
- input.readf( "%s", &ver );
+ ver = input.readln();
- if ( ver != "P5" ) // I only understand this!
+ if ( ver != "P5\n" ) // I only understand this!
return 1;
char dummy;
- char[] result;
- input.read( dummy );
+ string result;
+ input.readf( "%c", &dummy );
while ( dummy == '#' )
{
- result = input.readLine();
+ result = input.readln();
if ( result.length == 0 )
- result = input.readLine(); // workaround: for some reason the first call returns empty string
- input.read( dummy );
+ result = input.readln(); // workaround: for some reason the first call returns empty string
+ input.readf( "%c", &dummy );
}
- input.seek( -1, SeekPos.Current );
+ input.seek( -1, SEEK_CUR );
- if ( input.readf( "%d %d %d", &width, &height, &num_col ) != 9 ) // width, height num colors
+ if ( input.readf( "%d %d %d\n", &width, &height, &num_col ) != 3 ) // width, height num colors
return 1;
img = new ubyte[width * height];
@@ -244,9 +245,10 @@
for ( int i = 0; i < width; i++ )
img_f[i] = new PLFLT[height];
- if ( input.read( img ) != width * height )
+ if ( input.rawRead( img ).length != ( width * height ) )
return 1;
} catch ( Exception except ) {
+ stderr.writeln( "Caught exception reading " ~ fname );
return 1;
} finally {
input.close();
Modified: trunk/examples/d/x21d.d
===================================================================
--- trunk/examples/d/x21d.d 2013-06-27 19:47:10 UTC (rev 12392)
+++ trunk/examples/d/x21d.d 2013-06-27 19:49:07 UTC (rev 12393)
@@ -217,8 +217,8 @@
void create_grid( PLFLT[] x, PLFLT[] y )
{
- int px = x.length;
- int py = y.length;
+ int px = cast(int) x.length;
+ int py = cast(int) y.length;
for ( int i = 0; i < px; i++ )
x[i] = xm + ( xM - xm ) * i / ( px - 1.0 );
@@ -230,7 +230,7 @@
void create_data( PLFLT[] x, PLFLT[] y, PLFLT[] z )
{
- int pts = x.length;
+ int pts = cast(int) x.length;
assert( pts == y.length, "create_data(): Arrays must be of same length" );
assert( pts == z.length, "create_data(): Arrays must be of same length" );
Modified: trunk/examples/d/x23d.d
===================================================================
--- trunk/examples/d/x23d.d 2013-06-27 19:47:10 UTC (rev 12392)
+++ trunk/examples/d/x23d.d 2013-06-27 19:49:07 UTC (rev 12393)
@@ -35,7 +35,7 @@
// Displays Greek letters and mathematically interesting Unicode ranges
//
-static char[][] Greek = [
+static string[] Greek = [
"#gA", "#gB", "#gG", "#gD", "#gE", "#gZ", "#gY", "#gH", "#gI", "#gK", "#gL", "#gM",
"#gN", "#gC", "#gO", "#gP", "#gR", "#gS", "#gT", "#gU", "#gF", "#gX", "#gQ", "#gW",
"#ga", "#gb", "#gg", "#gd", "#ge", "#gz", "#gy", "#gh", "#gi", "#gk", "#gl", "#gm",
@@ -79,7 +79,7 @@
0x2666
];
-static char[][] title = [
+static string[] title = [
"#<0x10>PLplot Example 23 - Greek Letters",
"#<0x10>PLplot Example 23 - Type 1 Symbol Font Glyphs by Unicode (a)",
"#<0x10>PLplot Example 23 - Type 1 Symbol Font Glyphs by Unicode (b)",
@@ -200,19 +200,19 @@
0x80000124
];
-static const char[][] family = [
+static const string[] family = [
"sans-serif",
"serif",
"monospace",
"script",
"symbol"
];
-static const char[][] style = [
+static const string[] style = [
"upright",
"italic",
"oblique"
];
-static const char[][] weight = [
+static const string[] weight = [
"medium",
"bold"
];
Modified: trunk/examples/d/x24d.d
===================================================================
--- trunk/examples/d/x24d.d 2013-06-27 19:47:10 UTC (rev 12392)
+++ trunk/examples/d/x24d.d 2013-06-27 19:49:07 UTC (rev 12393)
@@ -78,7 +78,7 @@
// Taken from http://www.columbia.edu/~fdc/pace/
-static char[][] peace = [
+static string[] peace = [
// Mandarin
"#<0x00>和平",
// Hindi
Modified: trunk/examples/d/x25d.d
===================================================================
--- trunk/examples/d/x25d.d 2013-06-27 19:47:10 UTC (rev 12392)
+++ trunk/examples/d/x25d.d 2013-06-27 19:49:07 UTC (rev 12393)
@@ -73,6 +73,8 @@
x0[] = [ 100.0, 100.0, 80.0, 0.0, -80.0, -100.0, -100.0, 80.0, -100.0, -100.0 ];
y0[] = [ -100.0, 100.0, 100.0, 80.0, 100.0, 100.0, 80.0, 0.0, -80.0, -100.0 ];
break;
+ default:
+ brea...
[truncated message content] |
|
From: <and...@us...> - 2013-06-27 19:47:13
|
Revision: 12392
http://sourceforge.net/p/plplot/code/12392
Author: andrewross
Date: 2013-06-27 19:47:10 +0000 (Thu, 27 Jun 2013)
Log Message:
-----------
Style recent changes.
Modified Paths:
--------------
trunk/drivers/wingcc.c
Modified: trunk/drivers/wingcc.c
===================================================================
--- trunk/drivers/wingcc.c 2013-06-27 08:02:46 UTC (rev 12391)
+++ trunk/drivers/wingcc.c 2013-06-27 19:47:10 UTC (rev 12392)
@@ -27,11 +27,11 @@
#include <string.h>
#include <windows.h>
-#if !defined( __CYGWIN__ )
+#if !defined ( __CYGWIN__ )
#include <tchar.h>
#else
#include <winnt.h>
-#define _T(a) __TEXT(a)
+#define _T( a ) __TEXT( a )
#endif
#ifdef _WIN64
#define GWL_USERDATA GWLP_USERDATA
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2013-06-27 08:02:51
|
Revision: 12391
http://sourceforge.net/p/plplot/code/12391
Author: andrewross
Date: 2013-06-27 08:02:46 +0000 (Thu, 27 Jun 2013)
Log Message:
-----------
Backport fix for java pltr2 crash to Debian packages.
Modified Paths:
--------------
trunk/debian/changelog
trunk/debian/patches/series
Added Paths:
-----------
trunk/debian/patches/java-pltr2-fix.diff
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2013-06-27 06:50:34 UTC (rev 12390)
+++ trunk/debian/changelog 2013-06-27 08:02:46 UTC (rev 12391)
@@ -1,12 +1,14 @@
-plplot (5.9.9-7ubuntu2) UNRELEASED; urgency=low
+plplot (5.9.9-7) UNRELEASED; urgency=low
* debian/patches/fix-cmake-ada-support.diff: Update ada support from
upstream to ensure plplot builds with latest Ada compiler in unstable.
* debian/rules: Update python library path.
* debian/patches/fix-cmake-d-support.diff: Add patch from upstream to
fix D language support.
+ * debian/patches/java-pltr2-fix.diff: Add patch from upstream to fix
+ crash in java examples using pltr2 (closes: #713309).
- -- Andrew Ross <and...@us...> Wed, 26 Jun 2013 22:29:59 +0100
+ -- Andrew Ross <and...@us...> Thu, 27 Jun 2013 08:44:20 +0100
plplot (5.9.9-6) unstable; urgency=low
Added: trunk/debian/patches/java-pltr2-fix.diff
===================================================================
--- trunk/debian/patches/java-pltr2-fix.diff (rev 0)
+++ trunk/debian/patches/java-pltr2-fix.diff 2013-06-27 08:02:46 UTC (rev 12391)
@@ -0,0 +1,80 @@
+Description: Fix for crash in pltr2 with java bindings
+Author: Andrew Ross <and...@us...>
+Origin: upstream
+
+Index: plplot-5.9.9/bindings/java/plplotjavac.i
+===================================================================
+--- plplot-5.9.9.orig/bindings/java/plplotjavac.i 2011-10-13 01:43:01.000000000 +0100
++++ plplot-5.9.9/bindings/java/plplotjavac.i 2013-06-27 08:42:33.360546465 +0100
+@@ -330,6 +330,7 @@
+ static PLINT Xlen = 0, Ylen = 0;
+ static PLFLT **xg;
+ static PLFLT **yg;
++ static PLcGrid2 *cgrid;
+ %}
+
+ // The following typemaps take care of marshaling values into and out of PLplot functions. The
+@@ -1536,7 +1537,6 @@
+ int nx = ( *jenv )->GetArrayLength( jenv, $input );
+ int ny = -1;
+ int i, j;
+- PLcGrid2 cgrid;
+ ai = (jobject *) malloc( nx * sizeof ( jobject ) );
+ adat = (jPLFLT **) malloc( nx * sizeof ( jPLFLT * ) );
+
+@@ -1580,16 +1580,18 @@
+
+ free( adat );
+ free( ai );
+- cgrid.xg = xg;
+- cgrid.yg = yg;
+- cgrid.nx = nx;
+- cgrid.ny = ny;
+- $1 = &cgrid;
++ cgrid = (PLcGrid2 *) malloc( sizeof ( PLcGrid2 ) );
++ cgrid->xg = xg;
++ cgrid->yg = yg;
++ cgrid->nx = nx;
++ cgrid->ny = ny;
++ $1 = cgrid;
+ }
+
+ %typemap( freearg ) PLPointer OBJECT_DATA {
+ free( yg[0] );
+ free( yg );
++ free( cgrid );
+ }
+ %typemap( jni ) PLPointer OBJECT_DATA "jobjectArray"
+ %typemap( jtype ) PLPointer OBJECT_DATA jPLFLTbracket2
+@@ -1679,7 +1681,6 @@
+ int nx = ( *jenv )->GetArrayLength( jenv, $input );
+ int ny = -1;
+ int i, j;
+- PLcGrid2 cgrid;
+ ai = (jobject *) malloc( nx * sizeof ( jobject ) );
+ adat = (jPLFLT **) malloc( nx * sizeof ( jPLFLT * ) );
+
+@@ -1723,16 +1724,18 @@
+
+ free( adat );
+ free( ai );
+- cgrid.xg = xg;
+- cgrid.yg = yg;
+- cgrid.nx = nx;
+- cgrid.ny = ny;
+- $1 = &cgrid;
++ cgrid = (PLcGrid2 *) malloc( sizeof ( PLcGrid2 ) );
++ cgrid->xg = xg;
++ cgrid->yg = yg;
++ cgrid->nx = nx;
++ cgrid->ny = ny;
++ $1 = cgrid;
+ }
+
+ %typemap( freearg ) PLPointer OBJECT_DATA_img {
+ free( yg[0] );
+ free( yg );
++ free( cgrid );
+ }
+ %typemap( jni ) PLPointer OBJECT_DATA_img "jobjectArray"
+ %typemap( jtype ) PLPointer OBJECT_DATA_img jPLFLTbracket2
Property changes on: trunk/debian/patches/java-pltr2-fix.diff
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2013-06-27 06:50:34 UTC (rev 12390)
+++ trunk/debian/patches/series 2013-06-27 08:02:46 UTC (rev 12391)
@@ -8,3 +8,4 @@
fix-cmake-ada-support.diff
fix-lua-includes.diff
fix-cmake-d-support.diff
+java-pltr2-fix.diff
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arj...@us...> - 2013-06-27 06:50:39
|
Revision: 12390
http://sourceforge.net/p/plplot/code/12390
Author: arjenmarkus
Date: 2013-06-27 06:50:34 +0000 (Thu, 27 Jun 2013)
Log Message:
-----------
Use an alternative header file for tchar.h, as that is not available in the
current version of Cygwin. This requires also defining the macro _T().
Modified Paths:
--------------
trunk/drivers/wingcc.c
Modified: trunk/drivers/wingcc.c
===================================================================
--- trunk/drivers/wingcc.c 2013-06-26 21:34:49 UTC (rev 12389)
+++ trunk/drivers/wingcc.c 2013-06-27 06:50:34 UTC (rev 12390)
@@ -27,7 +27,12 @@
#include <string.h>
#include <windows.h>
+#if !defined( __CYGWIN__ )
#include <tchar.h>
+#else
+#include <winnt.h>
+#define _T(a) __TEXT(a)
+#endif
#ifdef _WIN64
#define GWL_USERDATA GWLP_USERDATA
#define GCL_HCURSOR GCLP_HCURSOR
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
