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-10-21 01:11:38
|
Revision: 12614
http://sourceforge.net/p/plplot/code/12614
Author: airwin
Date: 2013-10-21 01:11:34 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
Fix recently introduced CFLAGS processing logic for case when CFLAGS is not defined as an
environment variable or is empty.
Modified Paths:
--------------
trunk/cmake/build_projects/shapelib/bp.cmake
Modified: trunk/cmake/build_projects/shapelib/bp.cmake
===================================================================
--- trunk/cmake/build_projects/shapelib/bp.cmake 2013-10-21 01:04:03 UTC (rev 12613)
+++ trunk/cmake/build_projects/shapelib/bp.cmake 2013-10-21 01:11:34 UTC (rev 12614)
@@ -49,7 +49,7 @@
set(${BP_PACKAGE}_CFLAGS $ENV{CFLAGS})
# Eliminate this option which is not allowed for shapelib
-string(REGEX REPLACE "-fvisibility=hidden" "" ${BP_PACKAGE}_CFLAGS ${${BP_PACKAGE}_CFLAGS})
+string(REGEX REPLACE "-fvisibility=hidden" "" ${BP_PACKAGE}_CFLAGS "${${BP_PACKAGE}_CFLAGS}")
ExternalProject_Add(
build_${BP_PACKAGE}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-10-21 01:04:08
|
Revision: 12613
http://sourceforge.net/p/plplot/code/12613
Author: airwin
Date: 2013-10-21 01:04:03 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
For Python typemap for char *legline[4] get rid of uninitialized
variable for the fail return path.
Modified Paths:
--------------
trunk/bindings/python/plplotcmodule.i
Modified: trunk/bindings/python/plplotcmodule.i
===================================================================
--- trunk/bindings/python/plplotcmodule.i 2013-10-20 04:41:07 UTC (rev 12612)
+++ trunk/bindings/python/plplotcmodule.i 2013-10-21 01:04:03 UTC (rev 12613)
@@ -1456,7 +1456,8 @@
// this typemap takes a sequence of strings and converts them for plstripc
// also checks that previous Arrays were of length 4
//
-%typemap( in ) const char *legline[4] {
+%typemap( in ) const char *legline[4] ( char** tmp = NULL )
+{
int i;
if ( !PySequence_Check( $input ) || PySequence_Size( $input ) != 4 )
{
@@ -1468,19 +1469,21 @@
PyErr_SetString( PyExc_ValueError, "colline and styline args must be length 4." );
return NULL;
}
- $1 = malloc( sizeof ( char* ) * 4 );
+ tmp = (char **) malloc( sizeof ( char* ) * 4 );
+ if ( tmp == NULL ) return NULL;
+ $1 = tmp;
for ( i = 0; i < 4; i++ )
{
$1[i] = PyString_AsString( PySequence_Fast_GET_ITEM( $input, i ) );
if ( $1[i] == NULL )
{
- free( $1 );
+ free( tmp );
return NULL;
}
}
}
%typemap( freearg ) const char *legline[4] {
- free( $1 );
+ free( tmp$argnum );
}
// End of all code associated with special call-back functions.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-10-20 04:41:09
|
Revision: 12612
http://sourceforge.net/p/plplot/code/12612
Author: airwin
Date: 2013-10-20 04:41:07 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
For the ps, psttf, and hpgl device drivers change all macros concerning pen width to floating point so that
no casts are implicitly made when comparing to plsc->width.
Of course, these device drivers all write integer pen widths to the
file so make the appropriate casts concerning that.
ToDo (some day for somebody else). Investigate whether the
PostScript standard allows floating values for the pen width,
and if so, do not do the cast and instead write out to the floating
point value of the width to the file.
Modified Paths:
--------------
trunk/drivers/hpgl.c
trunk/drivers/psttf.cc
trunk/include/ps.h
Modified: trunk/drivers/hpgl.c
===================================================================
--- trunk/drivers/hpgl.c 2013-10-20 04:33:13 UTC (rev 12611)
+++ trunk/drivers/hpgl.c 2013-10-20 04:41:07 UTC (rev 12612)
@@ -78,9 +78,9 @@
#define LJIII_YMAX 7700
#define OF pls->OutFile
-#define MIN_WIDTH 1 // Minimum pen width
-#define MAX_WIDTH 10 // Maximum pen width
-#define DEF_WIDTH 1 // Default pen width
+#define MIN_WIDTH 1. // Minimum pen width
+#define MAX_WIDTH 10. // Maximum pen width
+#define DEF_WIDTH 1. // Default pen width
static void hpgl_dispatch_init_helper( PLDispatchTable *pdt,
char *menustr, char *devnam,
@@ -349,9 +349,9 @@
{
case PLSTATE_WIDTH:
case PLSTATE_COLOR0: {
- int width =
+ int width = (int) (
( pls->width < MIN_WIDTH ) ? DEF_WIDTH :
- ( pls->width > MAX_WIDTH ) ? MAX_WIDTH : pls->width;
+ ( pls->width > MAX_WIDTH ) ? MAX_WIDTH : pls->width );
if ( pls->icol0 < 1 || pls->icol0 > 8 )
fputs( "\nInvalid pen selection.", stderr );
Modified: trunk/drivers/psttf.cc
===================================================================
--- trunk/drivers/psttf.cc 2013-10-20 04:33:13 UTC (rev 12611)
+++ trunk/drivers/psttf.cc 2013-10-20 04:41:07 UTC (rev 12612)
@@ -670,9 +670,9 @@
switch ( op )
{
case PLSTATE_WIDTH: {
- int width =
+ int width = (int) (
( pls->width < MIN_WIDTH ) ? DEF_WIDTH :
- ( pls->width > MAX_WIDTH ) ? MAX_WIDTH : pls->width;
+ ( pls->width > MAX_WIDTH ) ? MAX_WIDTH : pls->width );
doc->osBody() << " S\n" << width << " W";
Modified: trunk/include/ps.h
===================================================================
--- trunk/include/ps.h 2013-10-20 04:33:13 UTC (rev 12611)
+++ trunk/include/ps.h 2013-10-20 04:41:07 UTC (rev 12612)
@@ -22,9 +22,9 @@
#define PSX XPSSIZE - 1
#define PSY YPSSIZE - 1
#define OF pls->OutFile
-#define MIN_WIDTH 1 // Minimum pen width
-#define MAX_WIDTH 30 // Maximum pen width
-#define DEF_WIDTH 3 // Default pen width
+#define MIN_WIDTH 1. // Minimum pen width
+#define MAX_WIDTH 30. // Maximum pen width
+#define DEF_WIDTH 3. // Default pen width
// These are for covering the page with the background color
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-10-20 04:33:17
|
Revision: 12611
http://sourceforge.net/p/plplot/code/12611
Author: airwin
Date: 2013-10-20 04:33:13 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
Fix bindings/python/plplotcmodule.i so that all -Wuninitialized (with
no optimization) warnings for the C code generated by swig are
removed. The trick was to initialize the appropriate variables to
NULL, and then use Py_CLEAR (which is a no-op if there is a NULL
argument) rather than the old-fashioned and error-prone Py_DECREF and
Py_XDECREF (see http://docs.python.org/2/c-api/refcounting.html) to
adjust the reference count properly in both the normal return path and
in the return path that cleans up after an error.
ToDo. I have since discovered that -O3 -Wuninitialized finds more
uninitialized issues than the -O0 case. I plan to fix those warnings
in a later commit.
Modified Paths:
--------------
trunk/bindings/python/plplotcmodule.i
Modified: trunk/bindings/python/plplotcmodule.i
===================================================================
--- trunk/bindings/python/plplotcmodule.i 2013-10-20 00:47:03 UTC (rev 12610)
+++ trunk/bindings/python/plplotcmodule.i 2013-10-20 04:33:13 UTC (rev 12611)
@@ -138,7 +138,7 @@
#endif
// With preceding count
-%typemap( in ) ( PLINT n, const PLINT * Array ) ( PyArrayObject * tmp )
+%typemap( in ) ( PLINT n, const PLINT * Array ) ( PyArrayObject * tmp = NULL )
{
tmp = (PyArrayObject *) myIntArray_ContiguousFromObject( $input, NPY_PLINT, 1, 1 );
if ( tmp == NULL )
@@ -148,11 +148,11 @@
}
%typemap( freearg ) ( PLINT n, const PLINT * Array )
{
- Py_DECREF( tmp$argnum );
+ Py_CLEAR( tmp$argnum );
}
// Trailing count and check consistency with previous
-%typemap( in ) ( const PLINT * ArrayCk, PLINT n ) ( PyArrayObject * tmp )
+%typemap( in ) ( const PLINT * ArrayCk, PLINT n ) ( PyArrayObject * tmp = NULL )
{
tmp = (PyArrayObject *) myIntArray_ContiguousFromObject( $input, NPY_PLINT, 1, 1 );
if ( tmp == NULL )
@@ -167,11 +167,11 @@
}
%typemap( freearg ) ( const PLINT * ArrayCk, PLINT n )
{
- Py_DECREF( tmp$argnum );
+ Py_CLEAR( tmp$argnum );
}
// No count but check consistency with previous
-%typemap( in ) const PLINT * ArrayCk( PyArrayObject * tmp )
+%typemap( in ) const PLINT * ArrayCk( PyArrayObject * tmp = NULL )
{
tmp = (PyArrayObject *) myIntArray_ContiguousFromObject( $input, NPY_PLINT, 1, 1 );
if ( tmp == NULL )
@@ -183,10 +183,10 @@
}
$1 = (PLINT *) PyArray_DATA( tmp );
}
-%typemap( freearg ) const PLINT * ArrayCk { Py_DECREF( tmp$argnum );}
+%typemap( freearg ) const PLINT * ArrayCk { Py_CLEAR( tmp$argnum );}
// No count but check consistency with previous or NULL
-%typemap( in ) const PLINT * ArrayCkNull( PyArrayObject * tmp )
+%typemap( in ) const PLINT * ArrayCkNull( PyArrayObject * tmp = NULL )
{
tmp = (PyArrayObject *) myIntArray_ContiguousFromObject( $input, NPY_PLINT, 1, 1 );
if ( tmp == NULL )
@@ -198,10 +198,10 @@
}
$1 = (PLINT *) PyArray_DATA( tmp );
}
-%typemap( freearg ) const PLINT * ArrayCkNull { Py_DECREF( tmp$argnum );}
+%typemap( freearg ) const PLINT * ArrayCkNull { Py_CLEAR( tmp$argnum );}
// Weird case to allow argument to be one shorter than others
-%typemap( in ) const PLINT * ArrayCkMinus1( PyArrayObject * tmp )
+%typemap( in ) const PLINT * ArrayCkMinus1( PyArrayObject * tmp = NULL )
{
tmp = (PyArrayObject *) myIntArray_ContiguousFromObject( $input, NPY_PLINT, 1, 1 );
if ( tmp == NULL )
@@ -213,9 +213,9 @@
}
$1 = (PLINT *) PyArray_DATA( tmp );
}
-%typemap( freearg ) const PLINT * ArrayCkMinus1 { Py_DECREF( tmp$argnum );}
+%typemap( freearg ) const PLINT * ArrayCkMinus1 { Py_CLEAR( tmp$argnum );}
-%typemap( in ) const PLINT * ArrayCkMinus1Null( PyArrayObject * tmp )
+%typemap( in ) const PLINT * ArrayCkMinus1Null( PyArrayObject * tmp = NULL )
{
tmp = (PyArrayObject *) myIntArray_ContiguousFromObject( $input, NPY_PLINT, 1, 1 );
if ( tmp == NULL )
@@ -227,10 +227,10 @@
}
$1 = (PLINT *) PyArray_DATA( tmp );
}
-%typemap( freearg ) const PLINT * ArrayCkMinus1Null { Py_DECREF( tmp$argnum );}
+%typemap( freearg ) const PLINT * ArrayCkMinus1Null { Py_CLEAR( tmp$argnum );}
// No length but remember size to check others
-%typemap( in ) const PLINT * Array( PyArrayObject * tmp )
+%typemap( in ) const PLINT * Array( PyArrayObject * tmp = NULL )
{
tmp = (PyArrayObject *) myIntArray_ContiguousFromObject( $input, NPY_PLINT, 1, 1 );
if ( tmp == NULL )
@@ -238,10 +238,10 @@
Alen = PyArray_DIMS( tmp )[0];
$1 = (PLINT *) PyArray_DATA( tmp );
}
-%typemap( freearg ) const PLINT * Array { Py_DECREF( tmp$argnum );}
+%typemap( freearg ) const PLINT * Array { Py_CLEAR( tmp$argnum );}
// set X and Y length for later consistency checking
-%typemap( in ) const PLINT * ArrayN( PyArrayObject * tmp )
+%typemap( in ) const PLINT * ArrayN( PyArrayObject * tmp = NULL )
{
int i;
tmp = (PyArrayObject *) myIntArray_ContiguousFromObject( $input, NPY_PLINT, 1, 1 );
@@ -259,7 +259,7 @@
if ( $1[i] > Ylen )
Ylen = $1[i];
}
-%typemap( freearg ) const PLINT * ArrayN { Py_DECREF( tmp$argnum );}
+%typemap( freearg ) const PLINT * ArrayN { Py_CLEAR( tmp$argnum );}
//--------------------------------------------------------------------------
// PLFLT Arrays
@@ -293,7 +293,7 @@
#endif
// with preceding count
-%typemap( in ) ( PLINT n, const PLFLT * Array ) ( PyArrayObject * tmp )
+%typemap( in ) ( PLINT n, const PLFLT * Array ) ( PyArrayObject * tmp = NULL )
{
tmp = (PyArrayObject *) myArray_ContiguousFromObject( $input, NPY_PLFLT, 1, 1 );
if ( tmp == NULL )
@@ -303,11 +303,11 @@
}
%typemap( freearg ) ( PLINT n, const PLFLT * Array )
{
- Py_DECREF( tmp$argnum );
+ Py_CLEAR( tmp$argnum );
}
// trailing count and check consistency with previous
-%typemap( in ) ( const PLFLT * ArrayCk, PLINT n ) ( PyArrayObject * tmp )
+%typemap( in ) ( const PLFLT * ArrayCk, PLINT n ) ( PyArrayObject * tmp = NULL )
{
tmp = (PyArrayObject *) myArray_ContiguousFromObject( $input, NPY_PLFLT, 1, 1 );
if ( tmp == NULL )
@@ -322,11 +322,11 @@
}
%typemap( freearg ) ( const PLFLT * ArrayCk, PLINT n )
{
- Py_DECREF( tmp$argnum );
+ Py_CLEAR( tmp$argnum );
}
// no count, but check consistency with previous
-%typemap( in ) const PLFLT * ArrayCk( PyArrayObject * tmp )
+%typemap( in ) const PLFLT * ArrayCk( PyArrayObject * tmp = NULL )
{
tmp = (PyArrayObject *) myArray_ContiguousFromObject( $input, NPY_PLFLT, 1, 1 );
if ( tmp == NULL )
@@ -338,10 +338,10 @@
}
$1 = (PLFLT *) PyArray_DATA( tmp );
}
-%typemap( freearg ) const PLFLT * ArrayCk { Py_DECREF( tmp$argnum );}
+%typemap( freearg ) const PLFLT * ArrayCk { Py_CLEAR( tmp$argnum );}
// no count, but check consistency with previous, or NULL
-%typemap( in ) const PLFLT * ArrayCkNull( PyArrayObject * tmp )
+%typemap( in ) const PLFLT * ArrayCkNull( PyArrayObject * tmp = NULL )
{
tmp = (PyArrayObject *) myArray_ContiguousFromObject( $input, NPY_PLFLT, 1, 1 );
if ( tmp == NULL )
@@ -353,10 +353,10 @@
}
$1 = (PLFLT *) PyArray_DATA( tmp );
}
-%typemap( freearg ) const PLFLT * ArrayCkNull { Py_DECREF( tmp$argnum );}
+%typemap( freearg ) const PLFLT * ArrayCkNull { Py_CLEAR( tmp$argnum );}
// check consistency with X dimension of previous
-%typemap( in ) const PLFLT * ArrayCkX( PyArrayObject * tmp )
+%typemap( in ) const PLFLT * ArrayCkX( PyArrayObject * tmp = NULL )
{
tmp = (PyArrayObject *) myArray_ContiguousFromObject( $input, NPY_PLFLT, 1, 1 );
if ( tmp == NULL )
@@ -368,10 +368,10 @@
}
$1 = (PLFLT *) PyArray_DATA( tmp );
}
-%typemap( freearg ) const PLFLT * ArrayCkX { Py_DECREF( tmp$argnum );}
+%typemap( freearg ) const PLFLT * ArrayCkX { Py_CLEAR( tmp$argnum );}
// check consistency with Y dimension of previous
-%typemap( in ) const PLFLT * ArrayCkY( PyArrayObject * tmp )
+%typemap( in ) const PLFLT * ArrayCkY( PyArrayObject * tmp = NULL )
{
tmp = (PyArrayObject *) myArray_ContiguousFromObject( $input, NPY_PLFLT, 1, 1 );
if ( tmp == NULL )
@@ -383,10 +383,10 @@
}
$1 = (PLFLT *) PyArray_DATA( tmp );
}
-%typemap( freearg ) const PLFLT * ArrayCkY { Py_DECREF( tmp$argnum );}
+%typemap( freearg ) const PLFLT * ArrayCkY { Py_CLEAR( tmp$argnum );}
// set X length for later consistency checking, with trailing count
-%typemap( in ) ( const PLFLT * ArrayX, PLINT nx ) ( PyArrayObject * tmp )
+%typemap( in ) ( const PLFLT * ArrayX, PLINT nx ) ( PyArrayObject * tmp = NULL )
{
tmp = (PyArrayObject *) myArray_ContiguousFromObject( $input, NPY_PLFLT, 1, 1 );
if ( tmp == NULL )
@@ -397,11 +397,11 @@
}
%typemap( freearg ) ( const PLFLT * ArrayX, PLINT nx )
{
- Py_DECREF( tmp$argnum );
+ Py_CLEAR( tmp$argnum );
}
// set X length for later consistency checking
-%typemap( in ) const PLFLT * ArrayX( PyArrayObject * tmp )
+%typemap( in ) const PLFLT * ArrayX( PyArrayObject * tmp = NULL )
{
tmp = (PyArrayObject *) myArray_ContiguousFromObject( $input, NPY_PLFLT, 1, 1 );
if ( tmp == NULL )
@@ -409,10 +409,10 @@
Xlen = PyArray_DIMS( tmp )[0];
$1 = (PLFLT *) PyArray_DATA( tmp );
}
-%typemap( freearg ) const PLFLT * ArrayX { Py_DECREF( tmp$argnum );}
+%typemap( freearg ) const PLFLT * ArrayX { Py_CLEAR( tmp$argnum );}
// Set Y length for later consistency checking, with trailing count
-%typemap( in ) ( const PLFLT * ArrayY, PLINT ny ) ( PyArrayObject * tmp )
+%typemap( in ) ( const PLFLT * ArrayY, PLINT ny ) ( PyArrayObject * tmp = NULL )
{
tmp = (PyArrayObject *) myArray_ContiguousFromObject( $input, NPY_PLFLT, 1, 1 );
if ( tmp == NULL )
@@ -423,11 +423,11 @@
}
%typemap( freearg ) ( const PLFLT * ArrayY, PLINT ny )
{
- Py_DECREF( tmp$argnum );
+ Py_CLEAR( tmp$argnum );
}
// set Y length for later consistency checking
-%typemap( in ) const PLFLT * ArrayY( PyArrayObject * tmp )
+%typemap( in ) const PLFLT * ArrayY( PyArrayObject * tmp = NULL )
{
tmp = (PyArrayObject *) myArray_ContiguousFromObject( $input, NPY_PLFLT, 1, 1 );
if ( tmp == NULL )
@@ -435,11 +435,11 @@
Ylen = PyArray_DIMS( tmp )[0];
$1 = (PLFLT *) PyArray_DATA( tmp );
}
-%typemap( freearg ) const PLFLT * ArrayY { Py_DECREF( tmp$argnum );}
+%typemap( freearg ) const PLFLT * ArrayY { Py_CLEAR( tmp$argnum );}
// with trailing count
-%typemap( in ) ( const PLFLT * Array, PLINT n ) ( PyArrayObject * tmp )
+%typemap( in ) ( const PLFLT * Array, PLINT n ) ( PyArrayObject * tmp = NULL )
{
tmp = (PyArrayObject *) myArray_ContiguousFromObject( $input, NPY_PLFLT, 1, 1 );
if ( tmp == NULL )
@@ -449,11 +449,11 @@
}
%typemap( freearg ) ( const PLFLT * Array, PLINT n )
{
- Py_DECREF( tmp$argnum );
+ Py_CLEAR( tmp$argnum );
}
// with no count
-%typemap( in ) const PLFLT * Array( PyArrayObject * tmp )
+%typemap( in ) const PLFLT * Array( PyArrayObject * tmp = NULL )
{
tmp = (PyArrayObject *) myArray_ContiguousFromObject( $input, NPY_PLFLT, 1, 1 );
if ( tmp == NULL )
@@ -461,10 +461,10 @@
Alen = PyArray_DIMS( tmp )[0];
$1 = (PLFLT *) PyArray_DATA( tmp );
}
-%typemap( freearg ) const PLFLT * Array { Py_DECREF( tmp$argnum );}
+%typemap( freearg ) const PLFLT * Array { Py_CLEAR( tmp$argnum );}
// 2D array with trailing dimensions, check consistency with previous
-%typemap( in ) ( const PLFLT * *MatrixCk, PLINT nx, PLINT ny ) ( PyArrayObject * tmp )
+%typemap( in ) ( const PLFLT * *MatrixCk, PLINT nx, PLINT ny ) ( PyArrayObject * tmp = NULL )
{
int i, size;
tmp = (PyArrayObject *) myArray_ContiguousFromObject( $input, NPY_PLFLT, 2, 2 );
@@ -484,12 +484,12 @@
}
%typemap( freearg ) ( const PLFLT * *MatrixCk, PLINT nx, PLINT ny )
{
- Py_DECREF( tmp$argnum );
+ Py_CLEAR( tmp$argnum );
free( $1 );
}
// 2D array with trailing dimensions, set the X, Y size for later checking
-%typemap( in ) ( const PLFLT * *Matrix, PLINT nx, PLINT ny ) ( PyArrayObject * tmp )
+%typemap( in ) ( const PLFLT * *Matrix, PLINT nx, PLINT ny ) ( PyArrayObject * tmp = NULL )
{
int i, size;
tmp = (PyArrayObject *) myArray_ContiguousFromObject( $input, NPY_PLFLT, 2, 2 );
@@ -504,12 +504,12 @@
}
%typemap( freearg ) ( const PLFLT * *Matrix, PLINT nx, PLINT ny )
{
- Py_DECREF( tmp$argnum );
+ Py_CLEAR( tmp$argnum );
free( $1 );
}
// 2D array with no dimensions, set the X, Y size for later checking
-%typemap( in ) const PLFLT * *Matrix( PyArrayObject * tmp )
+%typemap( in ) const PLFLT * *Matrix( PyArrayObject * tmp = NULL )
{
int i, size;
tmp = (PyArrayObject *) myArray_ContiguousFromObject( $input, NPY_PLFLT, 2, 2 );
@@ -523,12 +523,12 @@
$1[i] = ( (PLFLT *) PyArray_DATA( tmp ) + i * size );
}
%typemap( freearg ) const PLFLT * *Matrix {
- Py_DECREF( tmp$argnum );
+ Py_CLEAR( tmp$argnum );
free( $1 );
}
// for plshade1, note the difference in the type for the first arg
-%typemap( in ) ( const PLFLT * Matrix, PLINT nx, PLINT ny ) ( PyArrayObject * tmp )
+%typemap( in ) ( const PLFLT * Matrix, PLINT nx, PLINT ny ) ( PyArrayObject * tmp = NULL )
{
tmp = (PyArrayObject *) myArray_ContiguousFromObject( $input, NPY_PLFLT, 2, 2 );
if ( tmp == NULL )
@@ -539,11 +539,11 @@
}
%typemap( freearg ) ( const PLFLT * Matrix, PLINT nx, PLINT ny )
{
- Py_DECREF( tmp$argnum );
+ Py_CLEAR( tmp$argnum );
}
// 2D array, check for consistency
-%typemap( in ) const PLFLT * *MatrixCk( PyArrayObject * tmp )
+%typemap( in ) const PLFLT * *MatrixCk( PyArrayObject * tmp = NULL )
{
int i, size;
tmp = (PyArrayObject *) myArray_ContiguousFromObject( $input, NPY_PLFLT, 2, 2 );
@@ -560,13 +560,13 @@
$1[i] = ( (PLFLT *) PyArray_DATA( tmp ) + i * size );
}
%typemap( freearg ) const PLFLT * *MatrixCk {
- Py_DECREF( tmp$argnum );
+ Py_CLEAR( tmp$argnum );
free( $1 );
}
// 2D array, check for consistency and modify in place version (no longer used
// in favor of correct output version in the combined typemap below).
-%typemap( in ) PLFLT * *OutMatrixCk( PyArrayObject * tmp )
+%typemap( in ) PLFLT * *OutMatrixCk( PyArrayObject * tmp = NULL )
{
int i, size;
tmp = (PyArrayObject *) myArray_ContiguousFromObject( $input, NPY_PLFLT, 2, 2 );
@@ -583,14 +583,14 @@
$1[i] = ( (PLFLT *) PyArray_DATA( tmp ) + i * size );
}
%typemap( freearg ) PLFLT * *OutMatrixCk {
- Py_DECREF( tmp$argnum );
+ Py_CLEAR( tmp$argnum );
free( $1 );
}
// Combined typemap useful for specialized case of plgriddata.
// Set Y length for consistency checking, with trailing count
// combined with 2D output array, check for consistency
-%typemap( in ) ( const PLFLT * ArrayY, PLINT ny, PLFLT * *OutMatrixCk ) ( PyArrayObject * tmp, PyObject * array = NULL )
+%typemap( in ) ( const PLFLT * ArrayY, PLINT ny, PLFLT * *OutMatrixCk ) ( PyArrayObject * tmp = NULL, PyObject * array = NULL )
{
int i, size;
npy_intp dims[2];
@@ -614,7 +614,7 @@
}
%typemap( freearg ) ( const PLFLT * ArrayY, PLINT ny, PLFLT * *OutMatrixCk )
{
- Py_DECREF( tmp$argnum );
+ Py_CLEAR( tmp$argnum );
free( $3 );
}
%typemap( argout ) ( const PLFLT * ArrayY, PLINT ny, PLFLT * *OutMatrixCk )
@@ -626,7 +626,7 @@
// special for pllegend / plcolorbar, char ** ArrayCk
//***************************
// no count, but check consistency with previous. Always allow NULL strings.
-%typemap( in ) const char **ArrayCk( PyArrayObject * tmp )
+%typemap( in ) const char **ArrayCk( PyArrayObject * tmp = NULL )
{
int i;
tmp = (PyArrayObject *) PyArray_ContiguousFromObject( $input, NPY_STRING, 1, 1 );
@@ -648,10 +648,10 @@
}
}
}
-%typemap( freearg ) const char **ArrayCk { Py_DECREF( tmp$argnum ); free( $1 );}
+%typemap( freearg ) const char **ArrayCk { Py_CLEAR( tmp$argnum ); free( $1 );}
// With count. Always allow NULL strings.
-%typemap( in ) ( PLINT n, const char **Array ) ( PyArrayObject * tmp )
+%typemap( in ) ( PLINT n, const char **Array ) ( PyArrayObject * tmp = NULL )
{
int i;
tmp = (PyArrayObject *) PyArray_ContiguousFromObject( $input, NPY_STRING, 1, 1 );
@@ -672,7 +672,7 @@
}
%typemap( freearg ) ( PLINT n, const char **Array )
{
- Py_DECREF( tmp$argnum ); free( $2 );
+ Py_CLEAR( tmp$argnum ); free( $2 );
}
//**************************
@@ -762,8 +762,8 @@
void cleanup_PLcGrid1( void )
{
// fprintf(stderr, "cleanup PLcGrid1\n");
- Py_DECREF( pltr_xg );
- Py_DECREF( pltr_yg );
+ Py_CLEAR( pltr_xg );
+ Py_CLEAR( pltr_yg );
}
PLcGrid2* marshal_PLcGrid2( PyObject* input, int isimg )
@@ -823,8 +823,8 @@
// fprintf(stderr, "cleanup PLcGrid2\n");
free( tmpGrid2.xg );
free( tmpGrid2.yg );
- Py_DECREF( pltr_xg );
- Py_DECREF( pltr_yg );
+ Py_CLEAR( pltr_xg );
+ Py_CLEAR( pltr_yg );
}
%}
@@ -953,7 +953,7 @@
// call the python function
result = PyEval_CallObject( python_pltr, arglist );
// release the argument list
- Py_XDECREF( arglist );
+ Py_CLEAR( arglist );
// check and unpack the result
if ( result == NULL )
{
@@ -975,11 +975,11 @@
PLFLT* t = (PLFLT *) PyArray_DATA( tmp );
*tx = t[0];
*ty = t[1];
- Py_XDECREF( tmp );
+ Py_CLEAR( tmp );
}
}
// release the result
- Py_XDECREF( result );
+ Py_CLEAR( result );
// release the global interpreter lock
MY_UNBLOCK_THREADS
}
@@ -1002,7 +1002,7 @@
// call the python function
result = PyEval_CallObject( python_f2eval, arglist );
// release the argument list
- Py_DECREF( arglist );
+ Py_CLEAR( arglist );
// check and unpack the result
if ( !PyFloat_Check( result ) )
{
@@ -1015,7 +1015,7 @@
fresult = (PLFLT) PyFloat_AsDouble( result );
}
// release the result
- Py_XDECREF( result );
+ Py_CLEAR( result );
// release the global interpreter lock
MY_UNBLOCK_THREADS
}
@@ -1047,7 +1047,7 @@
// call the python function
result = PyEval_CallObject( python_label, arglist );
// release the argument list
- //Py_DECREF(arglist);
+ //Py_CLEAR(arglist);
// check and unpack the result
if ( result == NULL )
{
@@ -1066,7 +1066,7 @@
strncpy( string, pystring, len );
}
// release the result
- Py_XDECREF( result );
+ Py_CLEAR( result );
// release the global interpreter lock
MY_UNBLOCK_THREADS
}
@@ -1096,10 +1096,10 @@
// call the python function
result = PyEval_CallObject( python_ct, arglist );
// release the argument list
- Py_DECREF( arglist );
- Py_DECREF( px );
- Py_DECREF( py );
- Py_DECREF( pdata );
+ Py_CLEAR( arglist );
+ Py_CLEAR( px );
+ Py_CLEAR( py );
+ Py_CLEAR( pdata );
// check and unpack the result
if ( result == NULL )
{
@@ -1107,7 +1107,7 @@
PyErr_SetString( PyExc_RuntimeError, "coordinate transform callback must take 5 arguments." );
}
// release the result
- Py_XDECREF( result );
+ Py_CLEAR( result );
// release the global interpreter lock
MY_UNBLOCK_THREADS
}
@@ -1137,9 +1137,9 @@
// call the python function
result = PyEval_CallObject( python_mapform, arglist );
// release the argument list
- Py_DECREF( arglist );
- Py_DECREF( px );
- Py_DECREF( py );
+ Py_CLEAR( arglist );
+ Py_CLEAR( px );
+ Py_CLEAR( py );
// check and unpack the result
if ( result == NULL )
{
@@ -1147,7 +1147,7 @@
PyErr_SetString( PyExc_RuntimeError, "mapform callback must take 3 arguments." );
}
// release the result
- Py_XDECREF( result );
+ Py_CLEAR( result );
// release the global interpreter lock
MY_UNBLOCK_THREADS
}
@@ -1185,7 +1185,7 @@
pltr_type = CB_Python;
Py_XINCREF( input );
}
- Py_DECREF( rep );
+ Py_CLEAR( rep );
}
else
{
@@ -1198,7 +1198,7 @@
void cleanup_pltr( void )
{
- Py_XDECREF( python_pltr );
+ Py_CLEAR( python_pltr );
python_pltr = 0;
}
@@ -1213,7 +1213,7 @@
void cleanup_ct( void )
{
- Py_XDECREF( python_ct );
+ Py_CLEAR( python_ct );
python_ct = 0;
}
@@ -1228,7 +1228,7 @@
void cleanup_mapform( void )
{
- Py_XDECREF( python_mapform );
+ Py_CLEAR( python_mapform );
python_mapform = 0;
}
@@ -1270,7 +1270,7 @@
cleanup_PLcGrid2();
break;
case CB_Python:
- Py_XDECREF( python_pltr );
+ Py_CLEAR( python_pltr );
break;
default:
fprintf( stderr, "pltr_type is invalid\n" );
@@ -1417,7 +1417,7 @@
}
}
%typemap( freearg ) f2eval_func f2eval {
- Py_XDECREF( python_f2eval );
+ Py_CLEAR( python_f2eval );
python_f2eval = 0;
}
// marshall the label function pointer argument
@@ -1425,7 +1425,7 @@
// Release reference to previous function if applicable
if ( python_label )
{
- Py_XDECREF( python_label );
+ Py_CLEAR( python_label );
python_label = 0;
}
// it must be a callable or None
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-10-20 00:47:06
|
Revision: 12610
http://sourceforge.net/p/plplot/code/12610
Author: airwin
Date: 2013-10-20 00:47:03 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
Eliminate -fvisibility=hidden option from CFLAGS for shapelib if the
user specifies it as an overall environment variable to be honored by
build_projects build. The reason this workaround is required is
shapelib currently has no visibility support for Linux.
Modified Paths:
--------------
trunk/cmake/build_projects/shapelib/bp.cmake
Modified: trunk/cmake/build_projects/shapelib/bp.cmake
===================================================================
--- trunk/cmake/build_projects/shapelib/bp.cmake 2013-10-20 00:14:09 UTC (rev 12609)
+++ trunk/cmake/build_projects/shapelib/bp.cmake 2013-10-20 00:47:03 UTC (rev 12610)
@@ -47,11 +47,15 @@
endif(MSYS_PLATFORM)
#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+set(${BP_PACKAGE}_CFLAGS $ENV{CFLAGS})
+# Eliminate this option which is not allowed for shapelib
+string(REGEX REPLACE "-fvisibility=hidden" "" ${BP_PACKAGE}_CFLAGS ${${BP_PACKAGE}_CFLAGS})
+
ExternalProject_Add(
build_${BP_PACKAGE}
URL ${${BP_PACKAGE}_URL}
URL_MD5 ${${BP_PACKAGE}_URL_MD5}
- CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_CMAKE_COMMAND} -DEG_DATA:PATH=${EP_BASE}/Source/build_${BP_PACKAGE}/eg_data ${EP_BASE}/Source/build_${BP_PACKAGE}
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} CFLAGS=${${BP_PACKAGE}_CFLAGS} ${BP_CMAKE_COMMAND} -DEG_DATA:PATH=${EP_BASE}/Source/build_${BP_PACKAGE}/eg_data ${EP_BASE}/Source/build_${BP_PACKAGE}
BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND}
TEST_BEFORE_INSTALL ON
TEST_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_CTEST_COMMAND}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-10-20 00:14:12
|
Revision: 12609
http://sourceforge.net/p/plplot/code/12609
Author: airwin
Date: 2013-10-20 00:14:09 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
Style previous commit.
Modified Paths:
--------------
trunk/drivers/cairo.c
trunk/examples/d/x33d.d
Modified: trunk/drivers/cairo.c
===================================================================
--- trunk/drivers/cairo.c 2013-10-19 18:05:40 UTC (rev 12608)
+++ trunk/drivers/cairo.c 2013-10-20 00:14:09 UTC (rev 12609)
@@ -750,12 +750,12 @@
strncat( aStream->pangoMarkupString, "</span>", MAX_MARKUP_LEN - 1 - strlen( aStream->pangoMarkupString ) );
aStream->level++;
}
- else
- {
+ else
+ {
strncat( aStream->pangoMarkupString, "<span underline=\"single\">", MAX_MARKUP_LEN - 1 - strlen( aStream->pangoMarkupString ) );
aStream->level++;
- }
- aStream->uline = !aStream->uline;
+ }
+ aStream->uline = !aStream->uline;
break;
case PLTEXT_BACKCHAR:
case PLTEXT_OVERLINE:
@@ -989,7 +989,7 @@
// http://developer.gnome.org/doc/API/2.0/pango/PangoMarkupFormat.html
//--------------------------------------------------------------------------
-char *ucs4_to_pango_markup_format( PLUNICODE *ucs4, int ucs4Len, float fontSize)
+char *ucs4_to_pango_markup_format( PLUNICODE *ucs4, int ucs4Len, float fontSize )
{
char plplotEsc;
int i;
Modified: trunk/examples/d/x33d.d
===================================================================
--- trunk/examples/d/x33d.d 2013-10-19 18:05:40 UTC (rev 12608)
+++ trunk/examples/d/x33d.d 2013-10-20 00:14:09 UTC (rev 12609)
@@ -65,8 +65,8 @@
// plcolorbar options
// Colorbar type options
-const int COLORBAR_KINDS = 4;
-static PLINT colorbar_option_kinds[COLORBAR_KINDS] = [
+const int COLORBAR_KINDS = 4;
+static PLINT colorbar_option_kinds[COLORBAR_KINDS] = [
PL_COLORBAR_SHADE,
PL_COLORBAR_SHADE | PL_COLORBAR_SHADE_LABEL,
PL_COLORBAR_IMAGE,
@@ -80,8 +80,8 @@
];
// Which side of the page are we positioned relative to?
-const int COLORBAR_POSITIONS = 4;
-static PLINT colorbar_position_options[COLORBAR_POSITIONS] = [
+const int COLORBAR_POSITIONS = 4;
+static PLINT colorbar_position_options[COLORBAR_POSITIONS] = [
PL_POSITION_LEFT,
PL_POSITION_RIGHT,
PL_POSITION_TOP,
@@ -95,8 +95,8 @@
];
// Colorbar label positioning options
-const int COLORBAR_LABELS = 4;
-static PLINT colorbar_label_options[COLORBAR_LABELS] = [
+const int COLORBAR_LABELS = 4;
+static PLINT colorbar_label_options[COLORBAR_LABELS] = [
PL_COLORBAR_LABEL_LEFT,
PL_COLORBAR_LABEL_RIGHT,
PL_COLORBAR_LABEL_TOP,
@@ -110,8 +110,8 @@
];
// Colorbar cap options
-const int COLORBAR_CAPS = 4;
-static PLINT colorbar_cap_options[COLORBAR_CAPS] = [
+const int COLORBAR_CAPS = 4;
+static PLINT colorbar_cap_options[COLORBAR_CAPS] = [
PL_COLORBAR_CAP_NONE,
PL_COLORBAR_CAP_LOW,
PL_COLORBAR_CAP_HIGH,
@@ -124,31 +124,31 @@
"Low and high caps"
];
-static int colorbar = 1; // By default do not plot plcolorbar pages
+static int colorbar = 1; // By default do not plot plcolorbar pages
// for now while we are working out the API.
void
plcolorbar_example_page( int kind_i, int label_i, int cap_i, PLINT cont_color, PLFLT cont_width, PLINT n_values, PLFLT [] values )
{
// Parameters for the colorbars on this page
- PLINT position_i, position, opt;
- PLFLT x, y, x_length, y_length;
- PLFLT ticks[1] = [ 0.0 ];
- PLINT sub_ticks[1] = [ 0 ];
- PLFLT low_cap_color, high_cap_color;
- PLINT vertical, ifn;
- PLINT n_axes = 1;
- string[] axis_opts;
- PLINT n_labels = 1;
- PLINT label_opts[1] = [ 0 ];
- string[] label;
- string title;
- PLFLT colorbar_width, colorbar_height;
- PLINT n_values_array[1];
- PLFLT[][] values_array;
+ PLINT position_i, position, opt;
+ PLFLT x, y, x_length, y_length;
+ PLFLT ticks[1] = [ 0.0 ];
+ PLINT sub_ticks[1] = [ 0 ];
+ PLFLT low_cap_color, high_cap_color;
+ PLINT vertical, ifn;
+ PLINT n_axes = 1;
+ string[] axis_opts;
+ PLINT n_labels = 1;
+ PLINT label_opts[1] = [ 0 ];
+ string[] label;
+ string title;
+ PLFLT colorbar_width, colorbar_height;
+ PLINT n_values_array[1];
+ PLFLT[][] values_array;
- axis_opts.length = 1;
- label.length = 1;
- values_array = new PLFLT[][1];
+ axis_opts.length = 1;
+ label.length = 1;
+ values_array = new PLFLT[][1];
n_values_array[0] = n_values;
values_array[0] = values;
@@ -283,26 +283,26 @@
int main( char[][] args )
{
- int i, k;
- PLINT opt;
- PLINT nlegend, nturn;
- PLINT opt_array[MAX_NLEGEND];
- PLINT text_colors[MAX_NLEGEND];
- PLINT box_colors[MAX_NLEGEND];
- PLINT box_patterns[MAX_NLEGEND];
- PLFLT box_scales[MAX_NLEGEND];
- PLFLT box_line_widths[MAX_NLEGEND];
- PLINT line_colors[MAX_NLEGEND];
- PLINT line_styles[MAX_NLEGEND];
- PLFLT line_widths[MAX_NLEGEND];
- PLINT symbol_numbers[MAX_NLEGEND];
- PLINT symbol_colors[MAX_NLEGEND];
- PLFLT symbol_scales[MAX_NLEGEND];
- string text[MAX_NLEGEND];
- string symbols[MAX_NLEGEND];
- PLFLT legend_width, legend_height, x, y, xstart, ystart;
- PLFLT max_height, text_scale;
- PLINT position, opt_base, nrow, ncolumn;
+ int i, k;
+ PLINT opt;
+ PLINT nlegend, nturn;
+ PLINT opt_array[MAX_NLEGEND];
+ PLINT text_colors[MAX_NLEGEND];
+ PLINT box_colors[MAX_NLEGEND];
+ PLINT box_patterns[MAX_NLEGEND];
+ PLFLT box_scales[MAX_NLEGEND];
+ PLFLT box_line_widths[MAX_NLEGEND];
+ PLINT line_colors[MAX_NLEGEND];
+ PLINT line_styles[MAX_NLEGEND];
+ PLFLT line_widths[MAX_NLEGEND];
+ PLINT symbol_numbers[MAX_NLEGEND];
+ PLINT symbol_colors[MAX_NLEGEND];
+ PLFLT symbol_scales[MAX_NLEGEND];
+ string text[MAX_NLEGEND];
+ string symbols[MAX_NLEGEND];
+ PLFLT legend_width, legend_height, x, y, xstart, ystart;
+ PLFLT max_height, text_scale;
+ PLINT position, opt_base, nrow, ncolumn;
// Parse and process command line arguments
plparseopts( args, PL_PARSE_FULL );
@@ -336,9 +336,9 @@
for ( k = 0; k < 16; k++ )
{
- position = position_options[k];
- opt = opt_base;
- text[0] = format( "%2.2d", k );
+ position = position_options[k];
+ opt = opt_base;
+ text[0] = format( "%2.2d", k );
text_colors[0] = 1 + ( k % 8 );
line_colors[0] = 1 + ( k % 8 );
symbol_colors[0] = 1 + ( k % 8 );
@@ -375,10 +375,10 @@
symbol_scales[k] = 1.;
symbol_numbers[k] = 2;
symbols[k] = "*";
- text[k] = format( "%2.2d", k );
- text_colors[k] = 1 + ( k % 8 );
- line_colors[k] = 1 + ( k % 8 );
- symbol_colors[k] = 1 + ( k % 8 );
+ text[k] = format( "%2.2d", k );
+ text_colors[k] = 1 + ( k % 8 );
+ line_colors[k] = 1 + ( k % 8 );
+ symbol_colors[k] = 1 + ( k % 8 );
}
// Use monotype fonts so that all legends are the same size.
@@ -515,16 +515,16 @@
symbol_scales[k] = 1.;
symbol_numbers[k] = 2;
symbols[k] = "*";
- text[k] = format( "%2.2d", k );
- text_colors[k] = 1 + ( k % 8 );
- line_colors[k] = 1 + ( k % 8 );
- symbol_colors[k] = 1 + ( k % 8 );
+ text[k] = format( "%2.2d", k );
+ text_colors[k] = 1 + ( k % 8 );
+ line_colors[k] = 1 + ( k % 8 );
+ symbol_colors[k] = 1 + ( k % 8 );
}
// Use monotype fonts so that all legends are the same size.
plsfont( PL_FCI_MONO, -1, -1 );
plscol0a( 15, 32, 32, 32, 0.70 );
- nrow = cast(int)fmin( 3, nlegend );
+ nrow = cast(int) fmin( 3, nlegend );
ncolumn = 0;
pllegend( &legend_width, &legend_height, opt, position, x, y,
@@ -533,7 +533,7 @@
1., text_colors[0..nlegend], text[0..nlegend],
null, null, null, null,
line_colors[0..nlegend], line_styles[0..nlegend], line_widths[0..nlegend],
- symbol_colors[0..nlegend], symbol_scales[0..nlegend], symbol_numbers[0..nlegend], symbols[0..nlegend] );
+ symbol_colors[0..nlegend], symbol_scales[0..nlegend], symbol_numbers[0..nlegend], symbols[0..nlegend] );
if ( i == nturn )
{
@@ -570,35 +570,35 @@
opt_base = PL_LEGEND_BACKGROUND | PL_LEGEND_BOUNDING_BOX | PL_LEGEND_TEXT_LEFT;
// Set up None, Box, Line, Symbol, and Line & Symbol legend entries.
- opt_array[0] = PL_LEGEND_NONE;
- text[0] = format( "%s", "None" );
+ opt_array[0] = PL_LEGEND_NONE;
+ text[0] = format( "%s", "None" );
text_colors[0] = 1;
- opt_array[1] = PL_LEGEND_COLOR_BOX;
- text[1] = format( "%s", "Box" );
+ opt_array[1] = PL_LEGEND_COLOR_BOX;
+ text[1] = format( "%s", "Box" );
text_colors[1] = 2;
box_colors[1] = 2;
box_patterns[1] = 0;
box_scales[1] = 0.8;
box_line_widths[1] = 1.;
- opt_array[2] = PL_LEGEND_LINE;
- text[2] = format( "%s", "Line" );
+ opt_array[2] = PL_LEGEND_LINE;
+ text[2] = format( "%s", "Line" );
text_colors[2] = 3;
line_colors[2] = 3;
line_styles[2] = 1;
line_widths[2] = 1.;
- opt_array[3] = PL_LEGEND_SYMBOL;
- text[3] = format( "%s", "Symbol" );
+ opt_array[3] = PL_LEGEND_SYMBOL;
+ text[3] = format( "%s", "Symbol" );
text_colors[3] = 4;
symbol_colors[3] = 4;
symbol_scales[3] = text_scale;
symbol_numbers[3] = 4;
symbols[3] = special_symbols[2];
- opt_array[4] = PL_LEGEND_SYMBOL | PL_LEGEND_LINE;
- text[4] = format( "%s", "L & S" );
+ opt_array[4] = PL_LEGEND_SYMBOL | PL_LEGEND_LINE;
+ text[4] = format( "%s", "L & S" );
text_colors[4] = 5;
line_colors[4] = 5;
line_styles[4] = 1;
@@ -623,8 +623,8 @@
// Set up symbol legend entries with various symbols.
for ( i = 0; i < nlegend; i++ )
{
- opt_array[i] = PL_LEGEND_SYMBOL;
- text[i] = format( "%s%s", "Symbol ", special_symbols[i] );
+ opt_array[i] = PL_LEGEND_SYMBOL;
+ text[i] = format( "%s%s", "Symbol ", special_symbols[i] );
text_colors[i] = i + 1;
symbol_colors[i] = i + 1;
symbol_scales[i] = text_scale;
@@ -648,8 +648,8 @@
// Set up symbol legend entries with various numbers of symbols.
for ( i = 0; i < nlegend; i++ )
{
- opt_array[i] = PL_LEGEND_SYMBOL;
- text[i] = format( "%s %d", "Symbol Number", i + 2 );
+ opt_array[i] = PL_LEGEND_SYMBOL;
+ text[i] = format( "%s %d", "Symbol Number", i + 2 );
text_colors[i] = i + 1;
symbol_colors[i] = i + 1;
symbol_scales[i] = text_scale;
@@ -673,8 +673,8 @@
// Set up box legend entries with various colours.
for ( i = 0; i < nlegend; i++ )
{
- opt_array[i] = PL_LEGEND_COLOR_BOX;
- text[i] = format( "%s %d", "Box Color", i + 1 );
+ opt_array[i] = PL_LEGEND_COLOR_BOX;
+ text[i] = format( "%s %d", "Box Color", i + 1 );
text_colors[i] = i + 1;
box_colors[i] = i + 1;
box_patterns[i] = 0;
@@ -701,8 +701,8 @@
// Set up box legend entries with various patterns.
for ( i = 0; i < nlegend; i++ )
{
- opt_array[i] = PL_LEGEND_COLOR_BOX;
- text[i] = format( "%s %d", "Box Pattern", i );
+ opt_array[i] = PL_LEGEND_COLOR_BOX;
+ text[i] = format( "%s %d", "Box Pattern", i );
text_colors[i] = 2;
box_colors[i] = 2;
box_patterns[i] = i;
@@ -726,8 +726,8 @@
// Set up box legend entries with various box pattern line widths.
for ( i = 0; i < nlegend; i++ )
{
- opt_array[i] = PL_LEGEND_COLOR_BOX;
- text[i] = format( "%s %d", "Box Line Width", i + 1 );
+ opt_array[i] = PL_LEGEND_COLOR_BOX;
+ text[i] = format( "%s %d", "Box Line Width", i + 1 );
text_colors[i] = 2;
box_colors[i] = 2;
box_patterns[i] = 3;
@@ -751,8 +751,8 @@
// Set up line legend entries with various colours.
for ( i = 0; i < nlegend; i++ )
{
- opt_array[i] = PL_LEGEND_LINE;
- text[i] = format( "%s %d", "Line Color", i + 1 );
+ opt_array[i] = PL_LEGEND_LINE;
+ text[i] = format( "%s %d", "Line Color", i + 1 );
text_colors[i] = i + 1;
line_colors[i] = i + 1;
line_styles[i] = 1;
@@ -778,8 +778,8 @@
// Set up line legend entries with various styles.
for ( i = 0; i < nlegend; i++ )
{
- opt_array[i] = PL_LEGEND_LINE;
- text[i] = format( "%s %d", "Line Style", i + 1 );
+ opt_array[i] = PL_LEGEND_LINE;
+ text[i] = format( "%s %d", "Line Style", i + 1 );
text_colors[i] = 2;
line_colors[i] = 2;
line_styles[i] = i + 1;
@@ -802,8 +802,8 @@
// Set up line legend entries with various widths.
for ( i = 0; i < nlegend; i++ )
{
- opt_array[i] = PL_LEGEND_LINE;
- text[i] = format( "%s %d", "Line Width", i + 1 );
+ opt_array[i] = PL_LEGEND_LINE;
+ text[i] = format( "%s %d", "Line Width", i + 1 );
text_colors[i] = 2;
line_colors[i] = 2;
line_styles[i] = 1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arj...@us...> - 2013-10-19 18:05:44
|
Revision: 12608
http://sourceforge.net/p/plplot/code/12608
Author: arjenmarkus
Date: 2013-10-19 18:05:40 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
Moved two declarations of "cls" to the top of the function, as defining them in the middle of the executable code is a C++-like extension not accepted by MSVC/C++.
Also changed a comparison against NULL to an assignment of NULL.
Modified Paths:
--------------
trunk/bindings/java/plplotjavac.i
Modified: trunk/bindings/java/plplotjavac.i
===================================================================
--- trunk/bindings/java/plplotjavac.i 2013-10-19 17:10:54 UTC (rev 12607)
+++ trunk/bindings/java/plplotjavac.i 2013-10-19 18:05:40 UTC (rev 12608)
@@ -441,7 +441,7 @@
}
else
{
- $1 == NULL;
+ $1 = NULL;
}
}
%typemap( freearg ) const PLINT * ArrayCkNull {
@@ -1368,6 +1368,7 @@
jdouble jvalue;
JNIEnv *cbenv;
jmethodID labelID = 0;
+ jclass cls;
jaxis = (jint) axis;
jvalue = (jdouble) value;
@@ -1399,7 +1400,7 @@
fprintf( stderr, "Error - callback undefined\n" );
return;
}
- jclass cls = ( *cbenv )->GetObjectClass( cbenv, labelClass );
+ cls = ( *cbenv )->GetObjectClass( cbenv, labelClass );
if ( cls == 0 )
{
fprintf( stderr, "Error getting callback class\n" );
@@ -1468,6 +1469,7 @@
jobject jdata;
JNIEnv *cbenv;
jmethodID ctID = 0;
+ jclass cls;
jx = (jdouble) x;
jy = (jdouble) y;
@@ -1495,7 +1497,7 @@
fprintf( stderr, "Error - callback undefined\n" );
return;
}
- jclass cls = ( *cbenv )->GetObjectClass( cbenv, ctClass );
+ cls = ( *cbenv )->GetObjectClass( cbenv, ctClass );
if ( cls == 0 )
{
fprintf( stderr, "Error getting callback class\n" );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arj...@us...> - 2013-10-19 17:10:59
|
Revision: 12607
http://sourceforge.net/p/plplot/code/12607
Author: arjenmarkus
Date: 2013-10-19 17:10:54 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
Adjust the casts and sizes for calls to PyArray_DATA, as MSVC/C++ does not allow pointer arithmetic on (void *) pointers. By casting the result of PyArray_DATA to the proper data type the statements become acceptable and it is also no longer needed to multiply the stride with the size of the data type in bytes.
Modified Paths:
--------------
trunk/bindings/python/plplotcmodule.i
Modified: trunk/bindings/python/plplotcmodule.i
===================================================================
--- trunk/bindings/python/plplotcmodule.i 2013-10-19 03:27:48 UTC (rev 12606)
+++ trunk/bindings/python/plplotcmodule.i 2013-10-19 17:10:54 UTC (rev 12607)
@@ -477,10 +477,10 @@
}
$2 = PyArray_DIMS( tmp )[0];
$3 = PyArray_DIMS( tmp )[1];
- size = sizeof ( PLFLT ) * $3;
+ size = $3;
$1 = (PLFLT **) malloc( sizeof ( PLFLT* ) * $2 );
for ( i = 0; i < $2; i++ )
- $1[i] = (PLFLT *) ( PyArray_DATA( tmp ) + i * size );
+ $1[i] = ( (PLFLT *) PyArray_DATA( tmp ) + i * size );
}
%typemap( freearg ) ( const PLFLT * *MatrixCk, PLINT nx, PLINT ny )
{
@@ -497,10 +497,10 @@
return NULL;
Xlen = $2 = PyArray_DIMS( tmp )[0];
Ylen = $3 = PyArray_DIMS( tmp )[1];
- size = sizeof ( PLFLT ) * $3;
+ size = $3;
$1 = (PLFLT **) malloc( sizeof ( PLFLT* ) * $2 );
for ( i = 0; i < $2; i++ )
- $1[i] = (PLFLT *) ( PyArray_DATA( tmp ) + i * size );
+ $1[i] = ( (PLFLT *) PyArray_DATA( tmp ) + i * size );
}
%typemap( freearg ) ( const PLFLT * *Matrix, PLINT nx, PLINT ny )
{
@@ -517,10 +517,10 @@
return NULL;
Xlen = PyArray_DIMS( tmp )[0];
Ylen = PyArray_DIMS( tmp )[1];
- size = sizeof ( PLFLT ) * Ylen;
+ size = Ylen;
$1 = (PLFLT **) malloc( sizeof ( PLFLT* ) * Xlen );
for ( i = 0; i < Xlen; i++ )
- $1[i] = (PLFLT *) ( PyArray_DATA( tmp ) + i * size );
+ $1[i] = ( (PLFLT *) PyArray_DATA( tmp ) + i * size );
}
%typemap( freearg ) const PLFLT * *Matrix {
Py_DECREF( tmp$argnum );
@@ -554,10 +554,10 @@
PyErr_SetString( PyExc_ValueError, "Vectors must match matrix." );
return NULL;
}
- size = sizeof ( PLFLT ) * Ylen;
+ size = Ylen;
$1 = (PLFLT **) malloc( sizeof ( PLFLT* ) * Xlen );
for ( i = 0; i < Xlen; i++ )
- $1[i] = (PLFLT *) ( PyArray_DATA( tmp ) + i * size );
+ $1[i] = ( (PLFLT *) PyArray_DATA( tmp ) + i * size );
}
%typemap( freearg ) const PLFLT * *MatrixCk {
Py_DECREF( tmp$argnum );
@@ -577,10 +577,10 @@
PyErr_SetString( PyExc_ValueError, "Vectors must match matrix." );
return NULL;
}
- size = sizeof ( PLFLT ) * Ylen;
+ size = Ylen;
$1 = (PLFLT **) malloc( sizeof ( PLFLT* ) * Xlen );
for ( i = 0; i < Xlen; i++ )
- $1[i] = (PLFLT *) ( PyArray_DATA( tmp ) + i * size );
+ $1[i] = ( (PLFLT *) PyArray_DATA( tmp ) + i * size );
}
%typemap( freearg ) PLFLT * *OutMatrixCk {
Py_DECREF( tmp$argnum );
@@ -607,10 +607,10 @@
array = PyArray_SimpleNew( 2, dims, NPY_FLOAT64 );
if ( !array )
return NULL;
- size = (int) ( sizeof ( double ) * Ylen );
+ size = Ylen;
$3 = (double **) malloc( sizeof ( double * ) * Xlen );
for ( i = 0; i < Xlen; i++ )
- $3[i] = (double *) ( PyArray_DATA( (PyArrayObject *) array ) + i * size );
+ $3[i] = ( (double *) PyArray_DATA( (PyArrayObject *) array ) + i * size );
}
%typemap( freearg ) ( const PLFLT * ArrayY, PLINT ny, PLFLT * *OutMatrixCk )
{
@@ -640,7 +640,7 @@
$1 = (char **) malloc( sizeof ( char* ) * Alen );
for ( i = 0; i < Alen; i++ )
{
- $1[i] = PyArray_DATA( tmp ) + i * PyArray_STRIDES( tmp )[0];
+ $1[i] = (char *) PyArray_DATA( tmp ) + i * PyArray_STRIDES( tmp )[0];
if ( $1[i] == NULL )
{
free( $1 );
@@ -662,7 +662,7 @@
$2 = (char **) malloc( sizeof ( char* ) * Alen );
for ( i = 0; i < Alen; i++ )
{
- $2[i] = PyArray_DATA( tmp ) + i * PyArray_STRIDES( tmp )[0];
+ $2[i] = (char *) PyArray_DATA( tmp ) + i * PyArray_STRIDES( tmp )[0];
if ( $2[i] == NULL )
{
free( $2 );
@@ -808,13 +808,13 @@
return NULL;
}
}
- size = sizeof ( PLFLT ) * tmpGrid2.ny;
+ size = tmpGrid2.ny;
tmpGrid2.xg = (PLFLT **) malloc( sizeof ( PLFLT* ) * tmpGrid2.nx );
for ( i = 0; i < tmpGrid2.nx; i++ )
- tmpGrid2.xg[i] = (PLFLT *) ( PyArray_DATA( pltr_xg ) + i * size );
+ tmpGrid2.xg[i] = ( (PLFLT *) PyArray_DATA( pltr_xg ) + i * size );
tmpGrid2.yg = (PLFLT **) malloc( sizeof ( PLFLT* ) * tmpGrid2.nx );
for ( i = 0; i < tmpGrid2.nx; i++ )
- tmpGrid2.yg[i] = (PLFLT *) ( PyArray_DATA( pltr_yg ) + i * size );
+ tmpGrid2.yg[i] = ( (PLFLT *) PyArray_DATA( pltr_yg ) + i * size );
return &tmpGrid2;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-10-19 03:27:53
|
Revision: 12606
http://sourceforge.net/p/plplot/code/12606
Author: airwin
Date: 2013-10-19 03:27:48 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
Replace PyArray_FLOAT type (which is not part of the clean numpy-1.7
API) with appropriate NPY_* style types.
This fixed the numpy-1.7.1 compile errors caused by
#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
In two cases (both when calling a single-precision version of PLplot from python)
the PyArray_FLOAT replacement is by NPY_FLOAT32. That replacement
seemed appropriate but has not been tested.
In the two other cases (when PL_HAVE_PTHREAD is not #defined)
PyArray_FLOAT was replaced by NPY_PLFLT since I am pretty sure that
whether that macro is #defined or not should have nothing to do with
precision. This case (involving mapform) was tested on the
MinGW/MYSYS/Wine platform, and the results for example 19 were
substantially improved from major differences to just a few small
rounding troubles. So this change was definitely a bug fix
for the mapform case.
The remaining changes were to use a specific floating-point
precision types in all cases for clarity.
Modified Paths:
--------------
trunk/bindings/python/plplotcmodule.i
Modified: trunk/bindings/python/plplotcmodule.i
===================================================================
--- trunk/bindings/python/plplotcmodule.i 2013-10-19 02:51:19 UTC (rev 12605)
+++ trunk/bindings/python/plplotcmodule.i 2013-10-19 03:27:48 UTC (rev 12606)
@@ -53,9 +53,9 @@
#define NPY_PLINT NPY_INT32
#ifdef PL_DOUBLE
-#define NPY_PLFLT NPY_DOUBLE
+#define NPY_PLFLT NPY_FLOAT64
#else
-#define NPY_PLFLT NPY_FLOAT
+#define NPY_PLFLT NPY_FLOAT32
#endif
// python-1.5 compatibility mode?
@@ -271,7 +271,7 @@
// some really twisted stuff to allow calling a single precision library from python
PyArrayObject* myArray_ContiguousFromObject( PyObject* in, int type, int mindims, int maxdims )
{
- PyArrayObject* tmp = (PyArrayObject *) PyArray_ContiguousFromObject( in, PyArray_FLOAT,
+ PyArrayObject* tmp = (PyArrayObject *) PyArray_ContiguousFromObject( in, NPY_FLOAT32,
mindims, maxdims );
if ( !tmp )
{
@@ -279,7 +279,7 @@
if ( PyArray_Check( in ) )
{
PyErr_Clear();
- tmp = (PyArrayObject *) PyArray_Cast( (PyArrayObject *) in, PyArray_FLOAT );
+ tmp = (PyArrayObject *) PyArray_Cast( (PyArrayObject *) in, NPY_FLOAT32 );
}
}
return tmp;
@@ -604,7 +604,7 @@
// list and this ArrayY.
dims[0] = Xlen;
dims[1] = Ylen;
- array = PyArray_SimpleNew( 2, dims, NPY_DOUBLE );
+ array = PyArray_SimpleNew( 2, dims, NPY_FLOAT64 );
if ( !array )
return NULL;
size = (int) ( sizeof ( double ) * Ylen );
@@ -1130,8 +1130,8 @@
px = PyArray_SimpleNewFromData( 1, &nn, NPY_PLFLT, (void *) x );
py = PyArray_SimpleNewFromData( 1, &nn, NPY_PLFLT, (void *) y );
#else
- px = PyArray_FromDimsAndData( 1, &n, PyArray_FLOAT, (char *) x );
- py = PyArray_FromDimsAndData( 1, &n, PyArray_FLOAT, (char *) y );
+ px = PyArray_FromDimsAndData( 1, &n, NPY_PLFLT, (char *) x );
+ py = PyArray_FromDimsAndData( 1, &n, NPY_PLFLT, (char *) y );
#endif
arglist = Py_BuildValue( "(iOO)", n, px, py );
// call the python function
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-10-19 02:51:24
|
Revision: 12605
http://sourceforge.net/p/plplot/code/12605
Author: airwin
Date: 2013-10-19 02:51:19 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
Remove debug flag, clean up CMake logic a bit.
Modified Paths:
--------------
trunk/cmake/build_projects/plplot/bp.cmake
Modified: trunk/cmake/build_projects/plplot/bp.cmake
===================================================================
--- trunk/cmake/build_projects/plplot/bp.cmake 2013-10-17 23:21:35 UTC (rev 12604)
+++ trunk/cmake/build_projects/plplot/bp.cmake 2013-10-19 02:51:19 UTC (rev 12605)
@@ -120,13 +120,11 @@
endif(MSYS_PLATFORM)
message(STATUS "modified BP_PATH for ${BP_PACKAGE}${tag} = ${BP_PATH}")
- # Build PLplot (or PLplot-lite). 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}${tag}
DEPENDS "${${BP_PACKAGE}${tag}_dependencies_targets}"
DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${PLPLOT_LOCAL_SOURCE_DIR} ${EP_BASE}/Source/build_${BP_PACKAGE}${tag}
- CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} CFLAGS=-g ${BP_CMAKE_COMMAND} -DBUILD_TEST=ON -DPLD_pdf=ON ${${BP_PACKAGE}${tag}_cmake_args} ${EP_BASE}/Source/build_${BP_PACKAGE}${tag}
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_CMAKE_COMMAND} -DBUILD_TEST=ON ${${BP_PACKAGE}${tag}_cmake_args} ${EP_BASE}/Source/build_${BP_PACKAGE}${tag}
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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-10-17 23:21:38
|
Revision: 12604
http://sourceforge.net/p/plplot/code/12604
Author: airwin
Date: 2013-10-17 23:21:35 +0000 (Thu, 17 Oct 2013)
Log Message:
-----------
Fix build-system bug by removing an attempt to install the PostScript
form of our DocBook-generated documentation. That form of our
documentation is no longer generated by our build system.
Modified Paths:
--------------
trunk/doc/docbook/src/CMakeLists.txt
Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt 2013-10-17 20:33:55 UTC (rev 12603)
+++ trunk/doc/docbook/src/CMakeLists.txt 2013-10-17 23:21:35 UTC (rev 12604)
@@ -820,7 +820,11 @@
if(BUILD_DVI)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.dvi DESTINATION ${DOC_DIR})
endif(BUILD_DVI)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.pdf ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.ps.gz DESTINATION ${DOC_DIR})
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.pdf DESTINATION ${DOC_DIR})
+ if(NOT DOCBOOK_XML_BACKEND)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.ps.gz DESTINATION ${DOC_DIR})
+ endif(NOT DOCBOOK_XML_BACKEND)
+
endif(BUILD_PRINT OR PREBUILT_DOC)
# Everything below here has to do with the custom target www-install
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-10-17 20:33:59
|
Revision: 12603
http://sourceforge.net/p/plplot/code/12603
Author: airwin
Date: 2013-10-17 20:33:55 +0000 (Thu, 17 Oct 2013)
Log Message:
-----------
Fix libplplottcltk overlinking issues discovered by Orion Poplawski
using rpmlint. The fix is to link to the X11 library alone rather
than X11 library plus extension libraries, and only do that linking
when ENABLE_tk is true (since the pure Tcl library you get with
ENABLE_tk false does not have any undefined symbols in it that need to
be resolved by the X11 library).
Modified Paths:
--------------
trunk/bindings/tcl/CMakeLists.txt
Modified: trunk/bindings/tcl/CMakeLists.txt
===================================================================
--- trunk/bindings/tcl/CMakeLists.txt 2013-10-17 19:31:05 UTC (rev 12602)
+++ trunk/bindings/tcl/CMakeLists.txt 2013-10-17 20:33:55 UTC (rev 12603)
@@ -138,7 +138,6 @@
tclmatrix${LIB_TAG}
plplot${LIB_TAG}
${TCL_LIBRARY}
- ${X11_LIBRARIES}
)
set(
libplplottcltk${LIB_TAG}_LINK_FLAGS
@@ -187,6 +186,7 @@
set(plplottcltk${LIB_TAG}_link_libraries
${plplottcltk${LIB_TAG}_link_libraries}
${TK_LIBRARY}
+ ${X11_X11_LIB}
)
set(
libplplottcltk${LIB_TAG}_LINK_FLAGS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-10-17 19:31:08
|
Revision: 12602
http://sourceforge.net/p/plplot/code/12602
Author: airwin
Date: 2013-10-17 19:31:05 +0000 (Thu, 17 Oct 2013)
Log Message:
-----------
Style (whitespace) improvements.
Modified Paths:
--------------
trunk/bindings/tcl/CMakeLists.txt
Modified: trunk/bindings/tcl/CMakeLists.txt
===================================================================
--- trunk/bindings/tcl/CMakeLists.txt 2013-10-17 16:55:28 UTC (rev 12601)
+++ trunk/bindings/tcl/CMakeLists.txt 2013-10-17 19:31:05 UTC (rev 12602)
@@ -36,375 +36,375 @@
${CMAKE_CURRENT_BINARY_DIR}/plplot_parameters.h_compare
)
-# tclmatrix
-set(tclmatrix${LIB_TAG}_LIB_SRCS
-tclMatrix.c
-matrixInit.c
-)
+ # tclmatrix
+ set(tclmatrix${LIB_TAG}_LIB_SRCS
+ tclMatrix.c
+ matrixInit.c
+ )
-include_directories(
-${TCL_INCLUDE_PATH}
-${CMAKE_SOURCE_DIR}/include
-${CMAKE_SOURCE_DIR}/lib/qsastime
-${CMAKE_CURRENT_SOURCE_DIR}
-${CMAKE_BINARY_DIR}
-${CMAKE_BINARY_DIR}/include
-)
+ include_directories(
+ ${TCL_INCLUDE_PATH}
+ ${CMAKE_SOURCE_DIR}/include
+ ${CMAKE_SOURCE_DIR}/lib/qsastime
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_BINARY_DIR}/include
+ )
-set(
-libplplottcltk${LIB_TAG}_COMPILE_FLAGS
-"-I${TCL_INCLUDE_PATH}"
-)
+ set(
+ libplplottcltk${LIB_TAG}_COMPILE_FLAGS
+ "-I${TCL_INCLUDE_PATH}"
+ )
-if(BUILD_SHARED_LIBS)
- SET_SOURCE_FILES_PROPERTIES(${tclmatrix${LIB_TAG}_LIB_SRCS}
+ if(BUILD_SHARED_LIBS)
+ SET_SOURCE_FILES_PROPERTIES(${tclmatrix${LIB_TAG}_LIB_SRCS}
PROPERTIES COMPILE_FLAGS "-DUSINGDLL" )
-endif(BUILD_SHARED_LIBS)
+ endif(BUILD_SHARED_LIBS)
-add_library(tclmatrix${LIB_TAG} ${tclmatrix${LIB_TAG}_LIB_SRCS})
-target_link_libraries(tclmatrix${LIB_TAG} ${TCL_LIBRARY})
+ add_library(tclmatrix${LIB_TAG} ${tclmatrix${LIB_TAG}_LIB_SRCS})
+ target_link_libraries(tclmatrix${LIB_TAG} ${TCL_LIBRARY})
-if(USE_RPATH)
- set(LIB_INSTALL_RPATH ${LIB_DIR})
- set_target_properties(tclmatrix${LIB_TAG}
- PROPERTIES
- SOVERSION ${tclmatrix_SOVERSION}
- VERSION ${tclmatrix_VERSION}
- INSTALL_RPATH "${LIB_INSTALL_RPATH}"
- INSTALL_NAME_DIR "${LIB_DIR}"
- )
-else(USE_RPATH)
- set_target_properties(tclmatrix${LIB_TAG}
- PROPERTIES
- SOVERSION ${tclmatrix_SOVERSION}
- VERSION ${tclmatrix_VERSION}
- INSTALL_NAME_DIR "${LIB_DIR}"
- )
-endif(USE_RPATH)
+ if(USE_RPATH)
+ set(LIB_INSTALL_RPATH ${LIB_DIR})
+ set_target_properties(tclmatrix${LIB_TAG}
+ PROPERTIES
+ SOVERSION ${tclmatrix_SOVERSION}
+ VERSION ${tclmatrix_VERSION}
+ INSTALL_RPATH "${LIB_INSTALL_RPATH}"
+ INSTALL_NAME_DIR "${LIB_DIR}"
+ )
+ else(USE_RPATH)
+ set_target_properties(tclmatrix${LIB_TAG}
+ PROPERTIES
+ SOVERSION ${tclmatrix_SOVERSION}
+ VERSION ${tclmatrix_VERSION}
+ INSTALL_NAME_DIR "${LIB_DIR}"
+ )
+ endif(USE_RPATH)
-install(TARGETS tclmatrix${LIB_TAG}
-EXPORT export_plplot
-ARCHIVE DESTINATION ${LIB_DIR}
-LIBRARY DESTINATION ${LIB_DIR}
-RUNTIME DESTINATION ${BIN_DIR}
-)
+ install(TARGETS tclmatrix${LIB_TAG}
+ EXPORT export_plplot
+ ARCHIVE DESTINATION ${LIB_DIR}
+ LIBRARY DESTINATION ${LIB_DIR}
+ RUNTIME DESTINATION ${BIN_DIR}
+ )
-set(tclmatrix${LIB_TAG}_INSTALLED_HEADERS
-tclMatrix.h
-)
+ set(tclmatrix${LIB_TAG}_INSTALLED_HEADERS
+ tclMatrix.h
+ )
-install(
-FILES ${tclmatrix${LIB_TAG}_INSTALLED_HEADERS}
-DESTINATION ${INCLUDE_DIR}
-)
-# end tclmatrix
+ install(
+ FILES ${tclmatrix${LIB_TAG}_INSTALLED_HEADERS}
+ DESTINATION ${INCLUDE_DIR}
+ )
+ # end tclmatrix
-# plplottcltk
-set(
-tclgenfiles
-${CMAKE_CURRENT_BINARY_DIR}/tclgen.h
-${CMAKE_CURRENT_BINARY_DIR}/tclgen_s.h
-${CMAKE_CURRENT_BINARY_DIR}/tclgen.c
-)
+ # plplottcltk
+ set(
+ tclgenfiles
+ ${CMAKE_CURRENT_BINARY_DIR}/tclgen.h
+ ${CMAKE_CURRENT_BINARY_DIR}/tclgen_s.h
+ ${CMAKE_CURRENT_BINARY_DIR}/tclgen.c
+ )
-add_custom_command(
-OUTPUT ${tclgenfiles}
-COMMAND ${TCL_TCLSH}
-${CMAKE_CURRENT_SOURCE_DIR}/pltclgen.tcl ${CMAKE_CURRENT_SOURCE_DIR}
-DEPENDS
-${CMAKE_CURRENT_SOURCE_DIR}/pltclgen.tcl
-${CMAKE_CURRENT_SOURCE_DIR}/plapi.tpl
-${CMAKE_CURRENT_SOURCE_DIR}/tclcmd.tpl
-)
+ add_custom_command(
+ OUTPUT ${tclgenfiles}
+ COMMAND ${TCL_TCLSH}
+ ${CMAKE_CURRENT_SOURCE_DIR}/pltclgen.tcl ${CMAKE_CURRENT_SOURCE_DIR}
+ DEPENDS
+ ${CMAKE_CURRENT_SOURCE_DIR}/pltclgen.tcl
+ ${CMAKE_CURRENT_SOURCE_DIR}/plapi.tpl
+ ${CMAKE_CURRENT_SOURCE_DIR}/tclcmd.tpl
+ )
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-set_source_files_properties(
-tclAPI.c
-PROPERTIES OBJECT_DEPENDS "${tclgenfiles}"
-)
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ set_source_files_properties(
+ tclAPI.c
+ PROPERTIES OBJECT_DEPENDS "${tclgenfiles}"
+ )
-set(plplottcltk${LIB_TAG}_LIB_SRCS
-tclAPI.c
-tclMain.c
-)
-if(BUILD_SHARED_LIBS)
- set_source_files_properties(${plplottcltk${LIB_TAG}_LIB_SRCS}
- PROPERTIES COMPILE_FLAGS "-DUSINGDLL"
- )
-endif(BUILD_SHARED_LIBS)
-
-set(
-plplottcltk${LIB_TAG}_link_libraries
-tclmatrix${LIB_TAG}
-plplot${LIB_TAG}
-${TCL_LIBRARY}
-${X11_LIBRARIES}
-)
-set(
-libplplottcltk${LIB_TAG}_LINK_FLAGS
--ltclmatrix${LIB_TAG}
-${TCL_LIBRARY}
-)
-
-if(ENABLE_itcl)
- include_directories(${ITCL_INCLUDE_PATH})
- set(
- libplplottcltk${LIB_TAG}_COMPILE_FLAGS
- "${libplplottcltk${LIB_TAG}_COMPILE_FLAGS} -I${ITCL_INCLUDE_PATH}"
- )
- set(plplottcltk${LIB_TAG}_link_libraries
- ${plplottcltk${LIB_TAG}_link_libraries}
- ${ITCL_LIBRARY}
- )
- set(
- libplplottcltk${LIB_TAG}_LINK_FLAGS
- ${libplplottcltk${LIB_TAG}_LINK_FLAGS}
- ${ITCL_LIBRARY}
- )
-endif(ENABLE_itcl)
-
-if(ENABLE_tk)
set(plplottcltk${LIB_TAG}_LIB_SRCS
- ${plplottcltk${LIB_TAG}_LIB_SRCS}
- ${CMAKE_SOURCE_DIR}/bindings/tk/Pltk_Init.c
- ${CMAKE_SOURCE_DIR}/bindings/tk/plframe.c
- ${CMAKE_SOURCE_DIR}/bindings/tk/plr.c
- ${CMAKE_SOURCE_DIR}/bindings/tk/tcpip.c
- ${CMAKE_SOURCE_DIR}/bindings/tk/tkMain.c
- )
- include_directories(${TK_INCLUDE_PATH})
- # Transform TK_INCLUDE_PATH (which is a list) to blank-delimited flag form.
- string(REGEX REPLACE ";" " -I" TKLIB_COMPILE_FLAGS "-I${TK_INCLUDE_PATH}")
- set(
- libplplottcltk${LIB_TAG}_COMPILE_FLAGS
- "${libplplottcltk${LIB_TAG}_COMPILE_FLAGS} ${TKLIB_COMPILE_FLAGS}"
- )
+ tclAPI.c
+ tclMain.c
+ )
if(BUILD_SHARED_LIBS)
- set_source_files_properties(${plplottcltk${LIB_TAG}_LIB_SRCS}
- PROPERTIES COMPILE_FLAGS "-DUSINGDLL"
- )
+ set_source_files_properties(${plplottcltk${LIB_TAG}_LIB_SRCS}
+ PROPERTIES COMPILE_FLAGS "-DUSINGDLL"
+ )
endif(BUILD_SHARED_LIBS)
- set(plplottcltk${LIB_TAG}_link_libraries
- ${plplottcltk${LIB_TAG}_link_libraries}
- ${TK_LIBRARY}
- )
+
set(
- libplplottcltk${LIB_TAG}_LINK_FLAGS
- ${libplplottcltk${LIB_TAG}_LINK_FLAGS}
- ${TK_LIBRARY}
- )
- if(ENABLE_itk)
- include_directories(${ITK_INCLUDE_PATH})
- set(
- libplplottcltk${LIB_TAG}_COMPILE_FLAGS
- "${libplplottcltk${LIB_TAG}_COMPILE_FLAGS} -I${ITK_INCLUDE_PATH}"
+ plplottcltk${LIB_TAG}_link_libraries
+ tclmatrix${LIB_TAG}
+ plplot${LIB_TAG}
+ ${TCL_LIBRARY}
+ ${X11_LIBRARIES}
)
- set(plplottcltk${LIB_TAG}_link_libraries
- ${plplottcltk${LIB_TAG}_link_libraries}
- ${ITK_LIBRARY}
+ set(
+ libplplottcltk${LIB_TAG}_LINK_FLAGS
+ -ltclmatrix${LIB_TAG}
+ ${TCL_LIBRARY}
)
+
+ if(ENABLE_itcl)
+ include_directories(${ITCL_INCLUDE_PATH})
set(
+ libplplottcltk${LIB_TAG}_COMPILE_FLAGS
+ "${libplplottcltk${LIB_TAG}_COMPILE_FLAGS} -I${ITCL_INCLUDE_PATH}"
+ )
+ set(plplottcltk${LIB_TAG}_link_libraries
+ ${plplottcltk${LIB_TAG}_link_libraries}
+ ${ITCL_LIBRARY}
+ )
+ set(
+ libplplottcltk${LIB_TAG}_LINK_FLAGS
+ ${libplplottcltk${LIB_TAG}_LINK_FLAGS}
+ ${ITCL_LIBRARY}
+ )
+ endif(ENABLE_itcl)
+
+ if(ENABLE_tk)
+ set(plplottcltk${LIB_TAG}_LIB_SRCS
+ ${plplottcltk${LIB_TAG}_LIB_SRCS}
+ ${CMAKE_SOURCE_DIR}/bindings/tk/Pltk_Init.c
+ ${CMAKE_SOURCE_DIR}/bindings/tk/plframe.c
+ ${CMAKE_SOURCE_DIR}/bindings/tk/plr.c
+ ${CMAKE_SOURCE_DIR}/bindings/tk/tcpip.c
+ ${CMAKE_SOURCE_DIR}/bindings/tk/tkMain.c
+ )
+ include_directories(${TK_INCLUDE_PATH})
+ # Transform TK_INCLUDE_PATH (which is a list) to blank-delimited flag form.
+ string(REGEX REPLACE ";" " -I" TKLIB_COMPILE_FLAGS "-I${TK_INCLUDE_PATH}")
+ set(
+ libplplottcltk${LIB_TAG}_COMPILE_FLAGS
+ "${libplplottcltk${LIB_TAG}_COMPILE_FLAGS} ${TKLIB_COMPILE_FLAGS}"
+ )
+ if(BUILD_SHARED_LIBS)
+ set_source_files_properties(${plplottcltk${LIB_TAG}_LIB_SRCS}
+ PROPERTIES COMPILE_FLAGS "-DUSINGDLL"
+ )
+ endif(BUILD_SHARED_LIBS)
+ set(plplottcltk${LIB_TAG}_link_libraries
+ ${plplottcltk${LIB_TAG}_link_libraries}
+ ${TK_LIBRARY}
+ )
+ set(
+ libplplottcltk${LIB_TAG}_LINK_FLAGS
+ ${libplplottcltk${LIB_TAG}_LINK_FLAGS}
+ ${TK_LIBRARY}
+ )
+ if(ENABLE_itk)
+ include_directories(${ITK_INCLUDE_PATH})
+ set(
+ libplplottcltk${LIB_TAG}_COMPILE_FLAGS
+ "${libplplottcltk${LIB_TAG}_COMPILE_FLAGS} -I${ITK_INCLUDE_PATH}"
+ )
+ set(plplottcltk${LIB_TAG}_link_libraries
+ ${plplottcltk${LIB_TAG}_link_libraries}
+ ${ITK_LIBRARY}
+ )
+ set(
+ libplplottcltk${LIB_TAG}_LINK_FLAGS
+ ${libplplottcltk${LIB_TAG}_LINK_FLAGS}
+ ${ITK_LIBRARY}
+ )
+ endif(ENABLE_itk)
+ endif(ENABLE_tk)
+
+ # Transform "${libplplottcltk${LIB_TAG}_LINK_FLAGS}" string to the
+ # standard pkg-config form.
+ pkg_config_link_flags(
libplplottcltk${LIB_TAG}_LINK_FLAGS
- ${libplplottcltk${LIB_TAG}_LINK_FLAGS}
- ${ITK_LIBRARY}
+ "${libplplottcltk${LIB_TAG}_LINK_FLAGS}"
)
- endif(ENABLE_itk)
-endif(ENABLE_tk)
-# Transform "${libplplottcltk${LIB_TAG}_LINK_FLAGS}" string to the
-# standard pkg-config form.
-pkg_config_link_flags(
-libplplottcltk${LIB_TAG}_LINK_FLAGS
-"${libplplottcltk${LIB_TAG}_LINK_FLAGS}"
-)
+ add_library(plplottcltk${LIB_TAG} ${plplottcltk${LIB_TAG}_LIB_SRCS})
-add_library(plplottcltk${LIB_TAG} ${plplottcltk${LIB_TAG}_LIB_SRCS})
+ if(NON_TRANSITIVE)
+ # empty list ==> non-transitive linking for everything that links to
+ # libtclmatrixd and libplplottcltkd in the shared libraries case.
+ target_link_libraries(tclmatrix${LIB_TAG} LINK_INTERFACE_LIBRARIES)
+ target_link_libraries(plplottcltk${LIB_TAG} LINK_INTERFACE_LIBRARIES)
+ # This configures the pkg-config method to use non-transitive linking.
+ set(PC_REQUIRES_TAG "Requires.private")
+ else(NON_TRANSITIVE)
+ # This configures the pkg-config method to use transitive linking
+ set(PC_REQUIRES_TAG "Requires")
+ endif(NON_TRANSITIVE)
-if(NON_TRANSITIVE)
- # empty list ==> non-transitive linking for everything that links to
- # libtclmatrixd and libplplottcltkd in the shared libraries case.
- target_link_libraries(tclmatrix${LIB_TAG} LINK_INTERFACE_LIBRARIES)
- target_link_libraries(plplottcltk${LIB_TAG} LINK_INTERFACE_LIBRARIES)
- # This configures the pkg-config method to use non-transitive linking.
- set(PC_REQUIRES_TAG "Requires.private")
-else(NON_TRANSITIVE)
- # This configures the pkg-config method to use transitive linking
- set(PC_REQUIRES_TAG "Requires")
-endif(NON_TRANSITIVE)
+ #message(STATUS
+ #"plplottcltk${LIB_TAG}_link_libraries =
+ #${plplottcltk${LIB_TAG}_link_libraries}"
+ #)
+ target_link_libraries(
+ plplottcltk${LIB_TAG}
+ ${plplottcltk${LIB_TAG}_link_libraries}
+ )
-#message(STATUS
-#"plplottcltk${LIB_TAG}_link_libraries =
-#${plplottcltk${LIB_TAG}_link_libraries}"
-#)
-target_link_libraries(
-plplottcltk${LIB_TAG}
-${plplottcltk${LIB_TAG}_link_libraries}
-)
+ if(USE_RPATH)
+ get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH)
+ set_target_properties(plplottcltk${LIB_TAG}
+ PROPERTIES
+ SOVERSION ${plplottcltk_SOVERSION}
+ VERSION ${plplottcltk_VERSION}
+ INSTALL_RPATH "${LIB_INSTALL_RPATH}"
+ INSTALL_NAME_DIR "${LIB_DIR}"
+ )
+ else(USE_RPATH)
+ set_target_properties(plplottcltk${LIB_TAG}
+ PROPERTIES
+ SOVERSION ${plplottcltk_SOVERSION}
+ VERSION ${plplottcltk_VERSION}
+ INSTALL_NAME_DIR "${LIB_DIR}"
+ )
+ endif(USE_RPATH)
-if(USE_RPATH)
- get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH)
- set_target_properties(plplottcltk${LIB_TAG}
- PROPERTIES
- SOVERSION ${plplottcltk_SOVERSION}
- VERSION ${plplottcltk_VERSION}
- INSTALL_RPATH "${LIB_INSTALL_RPATH}"
- INSTALL_NAME_DIR "${LIB_DIR}"
- )
-else(USE_RPATH)
- set_target_properties(plplottcltk${LIB_TAG}
- PROPERTIES
- SOVERSION ${plplottcltk_SOVERSION}
- VERSION ${plplottcltk_VERSION}
- INSTALL_NAME_DIR "${LIB_DIR}"
- )
-endif(USE_RPATH)
+ install(TARGETS plplottcltk${LIB_TAG}
+ EXPORT export_plplot
+ ARCHIVE DESTINATION ${LIB_DIR}
+ LIBRARY DESTINATION ${LIB_DIR}
+ RUNTIME DESTINATION ${BIN_DIR}
+ )
-install(TARGETS plplottcltk${LIB_TAG}
-EXPORT export_plplot
-ARCHIVE DESTINATION ${LIB_DIR}
-LIBRARY DESTINATION ${LIB_DIR}
-RUNTIME DESTINATION ${BIN_DIR}
-)
+ set(plplottcltk${LIB_TAG}_INSTALLED_HEADERS
+ pltcl.h
+ )
-set(plplottcltk${LIB_TAG}_INSTALLED_HEADERS
-pltcl.h
-)
+ install(
+ FILES ${plplottcltk${LIB_TAG}_INSTALLED_HEADERS}
+ DESTINATION ${INCLUDE_DIR}
+ )
-install(
-FILES ${plplottcltk${LIB_TAG}_INSTALLED_HEADERS}
-DESTINATION ${INCLUDE_DIR}
-)
+ # end plplottcltk
-# end plplottcltk
+ # Generate plplot.tcl and tclIndex in build tree. At least the first one
+ # is always needed for build-tree tests of tcl examples.
-# Generate plplot.tcl and tclIndex in build tree. At least the first one
-# is always needed for build-tree tests of tcl examples.
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot.tcl
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ ${CMAKE_SOURCE_DIR}/bindings/tk/plplot.tcl
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot.tcl
+ DEPENDS
+ ${CMAKE_SOURCE_DIR}/bindings/tk/plplot.tcl
+ )
-add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot.tcl
- COMMAND ${CMAKE_COMMAND} -E copy_if_different
- ${CMAKE_SOURCE_DIR}/bindings/tk/plplot.tcl
- ${CMAKE_CURRENT_BINARY_DIR}/plplot.tcl
- DEPENDS
- ${CMAKE_SOURCE_DIR}/bindings/tk/plplot.tcl
- )
+ # _target suffix to avoid nameclash with filename plplot.tcl. This
+ # nameclash screwed up ../tk/configuration which had a non-generated file
+ # of the same name which was a dependency of a custom target.
+ add_custom_target(plplot.tcl_target ALL
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot.tcl
+ )
+ set_property(GLOBAL PROPERTY
+ FILES_plplot.tcl_target ${CMAKE_CURRENT_BINARY_DIR}/plplot.tcl
+ )
-# _target suffix to avoid nameclash with filename plplot.tcl. This
-# nameclash screwed up ../tk/configuration which had a non-generated file
-# of the same name which was a dependency of a custom target.
-add_custom_target(plplot.tcl_target ALL
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot.tcl
- )
-set_property(GLOBAL PROPERTY
- FILES_plplot.tcl_target ${CMAKE_CURRENT_BINARY_DIR}/plplot.tcl
- )
+ # A Tcl expert should insert the file depends here.
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tclIndex
+ COMMAND ${TCL_TCLSH} ${MKTCLINDEX} ${MKTCLINDEX_ARGS}
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ )
-# A Tcl expert should insert the file depends here.
-add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tclIndex
- COMMAND ${TCL_TCLSH} ${MKTCLINDEX} ${MKTCLINDEX_ARGS}
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- )
+ add_custom_target(tclIndex_tcl ALL
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tclIndex
+ )
+ set_property(GLOBAL PROPERTY
+ FILES_tclIndex_tcl ${CMAKE_CURRENT_BINARY_DIR}/tclIndex
+ )
-add_custom_target(tclIndex_tcl ALL
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tclIndex
- )
-set_property(GLOBAL PROPERTY
- FILES_tclIndex_tcl ${CMAKE_CURRENT_BINARY_DIR}/tclIndex
- )
+ # I don't think this is necessary, but I am not sure of the file
+ # depends of the custom_command associated with tclIndex_tcl and
+ # serializing these targets doesn't slow down parallel builds very
+ # much.
+ add_dependencies(tclIndex_tcl plplot.tcl_target)
-# I don't think this is necessary, but I am not sure of the file
-# depends of the custom_command associated with tclIndex_tcl and
-# serializing these targets doesn't slow down parallel builds very
-# much.
-add_dependencies(tclIndex_tcl plplot.tcl_target)
+ if(NOT ENABLE_tk)
+ # Only install these two files if the equivalent files are not going to
+ # be installed by the action of ../tk/CMakeLists.txt
-if(NOT ENABLE_tk)
- # Only install these two files if the equivalent files are not going to
- # be installed by the action of ../tk/CMakeLists.txt
+ install(
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot.tcl
+ DESTINATION ${TCL_DIR}
+ )
- install(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot.tcl
- DESTINATION ${TCL_DIR}
- )
+ install(
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/tclIndex
+ DESTINATION ${TCL_DIR}
+ )
+ endif(NOT ENABLE_tk)
- install(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/tclIndex
- DESTINATION ${TCL_DIR}
- )
-endif(NOT ENABLE_tk)
+ set(LIB_HARDDIR ${LIB_DIR})
-set(LIB_HARDDIR ${LIB_DIR})
+ get_target_property(
+ DLNAME_LIBPLPLOTTCLTK
+ plplottcltk${LIB_TAG}
+ LOCATION
+ )
+ get_filename_component(
+ DLNAME_LIBPLPLOTTCLTK
+ ${DLNAME_LIBPLPLOTTCLTK}
+ NAME
+ )
+ string(REPLACE "plplottcltkd" "plplottcltk"
+ DLNAME_LIBPLPLOTTCLTK
+ ${DLNAME_LIBPLPLOTTCLTK}
+ )
+ string(REPLACE "plplottcltk" "plplottcltkd"
+ DLNAME_LIBPLPLOTTCLTKD
+ ${DLNAME_LIBPLPLOTTCLTK}
+ )
-get_target_property(
-DLNAME_LIBPLPLOTTCLTK
-plplottcltk${LIB_TAG}
-LOCATION
-)
-get_filename_component(
-DLNAME_LIBPLPLOTTCLTK
-${DLNAME_LIBPLPLOTTCLTK}
-NAME
-)
-string(REPLACE "plplottcltkd" "plplottcltk"
-DLNAME_LIBPLPLOTTCLTK
-${DLNAME_LIBPLPLOTTCLTK}
-)
-string(REPLACE "plplottcltk" "plplottcltkd"
-DLNAME_LIBPLPLOTTCLTKD
-${DLNAME_LIBPLPLOTTCLTK}
-)
+ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/pkgIndex.tcl.in
+ ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl
+ @ONLY
+ )
-configure_file(
-${CMAKE_CURRENT_SOURCE_DIR}/pkgIndex.tcl.in
-${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl
-@ONLY
-)
+ # Configure pkg-config *.pc file corresponding to libplplottcltk${LIB_TAG}
+ if(PKG_CONFIG_EXECUTABLE)
+ if(LIB_TAG)
+ set(PC_PRECISION "double")
+ else(LIB_TAG)
+ set(PC_PRECISION "single")
+ endif(LIB_TAG)
+ # Each list element must consist of a colon-separated string with the
+ # following fields which are parsed out in the foreach loop below and
+ # used to configure the corresponding pkg-config *.pc file.
+ # BINDING - ENABLE_${BINDING} keeps track of whether a
+ # binding has been enabled (ON) or not (OFF).
+ # Also, ${BINDING} used to determine PC_FILE_SUFFIX
+ # which helps to determine name of configured
+ # *.pc file.
+ # PC_SHORT_NAME - Used in *.pc NAME: field
+ # PC_LONG_NAME - Used in *.pc Description: field
+ # PC_LIBRARY_NAME - Used in *.pc Libs: field
+ # Also used to determine PC_LINK_FLAGS and
+ # PC_COMPILE_FLAGS used in *.pc Libs: and Cflags:
+ # fields.
+ set(PC_DATA "tcl:Tcl/Tk:Tcl/Tk bindings, :plplottcltk${LIB_TAG}")
-# Configure pkg-config *.pc file corresponding to libplplottcltk${LIB_TAG}
-if(PKG_CONFIG_EXECUTABLE)
- if(LIB_TAG)
- set(PC_PRECISION "double")
- else(LIB_TAG)
- set(PC_PRECISION "single")
- endif(LIB_TAG)
- # Each list element must consist of a colon-separated string with the
- # following fields which are parsed out in the foreach loop below and
- # used to configure the corresponding pkg-config *.pc file.
- # BINDING - ENABLE_${BINDING} keeps track of whether a
- # binding has been enabled (ON) or not (OFF).
- # Also, ${BINDING} used to determine PC_FILE_SUFFIX
- # which helps to determine name of configured
- # *.pc file.
- # PC_SHORT_NAME - Used in *.pc NAME: field
- # PC_LONG_NAME - Used in *.pc Description: field
- # PC_LIBRARY_NAME - Used in *.pc Libs: field
- # Also used to determine PC_LINK_FLAGS and
- # PC_COMPILE_FLAGS used in *.pc Libs: and Cflags:
- # fields.
- set(PC_DATA "tcl:Tcl/Tk:Tcl/Tk bindings, :plplottcltk${LIB_TAG}")
-
- string(REGEX REPLACE "^(.*):.*:.*:.*$" "\\1" BINDING ${PC_DATA})
- set(PC_FILE_SUFFIX "-${BINDING}")
- set(PC_REQUIRES "plplot${LIB_TAG}")
- string(REGEX REPLACE "^.*:(.*):.*:.*$" "\\1" PC_SHORT_NAME ${PC_DATA})
- string(REGEX REPLACE "^.*:.*:(.*):.*$" "\\1" PC_LONG_NAME ${PC_DATA})
- string(REGEX REPLACE "^.*:.*:.*:(.*)$" "\\1" PC_LIBRARY_NAME ${PC_DATA})
- set(PC_LINK_FLAGS "${lib${PC_LIBRARY_NAME}_LINK_FLAGS}")
- set(PC_COMPILE_FLAGS "${lib${PC_LIBRARY_NAME}_COMPILE_FLAGS}")
- if(NON_TRANSITIVE)
- set(PC_LINK_FLAGS "-lplplot${LIB_TAG} ${PC_LINK_FLAGS}")
- endif(NON_TRANSITIVE)
- set(PC_LINK_FLAGS "-l${PC_LIBRARY_NAME} ${PC_LINK_FLAGS}")
- set(PC_CONFIGURED_FILE
- ${CMAKE_BINARY_DIR}/pkgcfg/plplot${LIB_TAG}${PC_FILE_SUFFIX}.pc
- )
- configure_file(
- ${CMAKE_SOURCE_DIR}/pkgcfg/plplot-template.pc.in
- ${PC_CONFIGURED_FILE}
- @ONLY
- )
- install(FILES ${PC_CONFIGURED_FILE} DESTINATION ${PKG_CONFIG_DIR})
-endif(PKG_CONFIG_EXECUTABLE)
+ string(REGEX REPLACE "^(.*):.*:.*:.*$" "\\1" BINDING ${PC_DATA})
+ set(PC_FILE_SUFFIX "-${BINDING}")
+ set(PC_REQUIRES "plplot${LIB_TAG}")
+ string(REGEX REPLACE "^.*:(.*):.*:.*$" "\\1" PC_SHORT_NAME ${PC_DATA})
+ string(REGEX REPLACE "^.*:.*:(.*):.*$" "\\1" PC_LONG_NAME ${PC_DATA})
+ string(REGEX REPLACE "^.*:.*:.*:(.*)$" "\\1" PC_LIBRARY_NAME ${PC_DATA})
+ set(PC_LINK_FLAGS "${lib${PC_LIBRARY_NAME}_LINK_FLAGS}")
+ set(PC_COMPILE_FLAGS "${lib${PC_LIBRARY_NAME}_COMPILE_FLAGS}")
+ if(NON_TRANSITIVE)
+ set(PC_LINK_FLAGS "-lplplot${LIB_TAG} ${PC_LINK_FLAGS}")
+ endif(NON_TRANSITIVE)
+ set(PC_LINK_FLAGS "-l${PC_LIBRARY_NAME} ${PC_LINK_FLAGS}")
+ set(PC_CONFIGURED_FILE
+ ${CMAKE_BINARY_DIR}/pkgcfg/plplot${LIB_TAG}${PC_FILE_SUFFIX}.pc
+ )
+ configure_file(
+ ${CMAKE_SOURCE_DIR}/pkgcfg/plplot-template.pc.in
+ ${PC_CONFIGURED_FILE}
+ @ONLY
+ )
+ install(FILES ${PC_CONFIGURED_FILE} DESTINATION ${PKG_CONFIG_DIR})
+ endif(PKG_CONFIG_EXECUTABLE)
endif(ENABLE_tcl)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-10-17 16:55:29
|
Revision: 12601
http://sourceforge.net/p/plplot/code/12601
Author: airwin
Date: 2013-10-17 16:55:28 +0000 (Thu, 17 Oct 2013)
Log Message:
-----------
Remove empty plplotdoc-html.proc file that is generated by xmlto,
but which we don't want in the html manifest. Thanks to Orion Poplawski
for spotting this issue.
Tested by Alan W. Irwin <ai...@us...> using
-DBUILD_DOCS=ON cmake option, and the html target.
Modified Paths:
--------------
trunk/doc/docbook/src/CMakeLists.txt
Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt 2013-10-15 22:15:00 UTC (rev 12600)
+++ trunk/doc/docbook/src/CMakeLists.txt 2013-10-17 16:55:28 UTC (rev 12601)
@@ -316,6 +316,9 @@
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST}
COMMAND ${CMAKE_COMMAND} -E remove_directory ${HTML_TMPDIR}
COMMAND ${XMLTO} -vv -x ${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_HTML} -o ${HTML_TMPDIR} html ${CMAKE_CURRENT_BINARY_DIR}/${PLPLOTDOC}-html.xml
+ # Remove empty plplotdoc-html.proc file that is generated by xmlto,
+ # but which we don't want in the html manifest.
+ COMMAND ${CMAKE_COMMAND} -E remove ${HTML_TMPDIR}/plplotdoc-html.proc
COMMAND ${CMAKE_COMMAND}
-E chdir ${HTML_TMPDIR} ls |cat > ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST}
COMMAND mv ${HTML_TMPDIR}/* ${CMAKE_CURRENT_BINARY_DIR}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-10-15 22:15:03
|
Revision: 12600
http://sourceforge.net/p/plplot/code/12600
Author: airwin
Date: 2013-10-15 22:15:00 +0000 (Tue, 15 Oct 2013)
Log Message:
-----------
For PLplot builds, replace either the download of 5.9.10 + patch
method (which is difficult to maintain) or the alternative of using
svn trunk (which requires the Linux host of the Wine platform to
install samba to support the authorization method used by svn Windows
clients) with the much simpler method of using the known top-level
directory of the local PLplot source tree for the PLplot build.
Modified Paths:
--------------
trunk/cmake/build_projects/CMakeLists.txt
trunk/cmake/build_projects/plplot/bp.cmake
Removed Paths:
-------------
trunk/cmake/build_projects/plplot/plplot.patch
Modified: trunk/cmake/build_projects/CMakeLists.txt
===================================================================
--- trunk/cmake/build_projects/CMakeLists.txt 2013-10-14 19:48:57 UTC (rev 12599)
+++ trunk/cmake/build_projects/CMakeLists.txt 2013-10-15 22:15:00 UTC (rev 12600)
@@ -222,7 +222,10 @@
endif(MSYS_PLATFORM)
set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
-option(PREFER_DOWNLOAD "Prefer to obtain source code for projects using a simple download of tarball rather than via svn, git, hg, or bzr repository access" ON)
+# This option not used currently, but instead of removing it, comment
+# it out because it might be useful later if we ever configure a project
+# where we want a choice between an ordinary download and repository access.
+# option(PREFER_DOWNLOAD "Prefer to obtain source code for projects using a simple download of tarball rather than via svn, git, hg, or bzr repository access" ON)
# Now include the build configurations for certain targets and their
# dependencies.
Modified: trunk/cmake/build_projects/plplot/bp.cmake
===================================================================
--- trunk/cmake/build_projects/plplot/bp.cmake 2013-10-14 19:48:57 UTC (rev 12599)
+++ trunk/cmake/build_projects/plplot/bp.cmake 2013-10-15 22:15:00 UTC (rev 12600)
@@ -76,19 +76,39 @@
# This can be safely done only after above includes.
set(BP_PACKAGE plplot)
-if(PREFER_DOWNLOAD)
- set(PLPLOT_DOWNLOAD_UPDATE
- URL http://prdownloads.sourceforge.net/plplot/plplot/5.9.10%20Source/plplot-5.9.10.tar.gz
- URL_HASH SHA256=6be3e20d6992cb2afd132a00cbc812aa5db170abe5855c44eb01481ac4b0b723
- PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/plplot/plplot.patch
- )
-else(PREFER_DOWNLOAD)
- set(PLPLOT_DOWNLOAD_UPDATE
- SVN_REPOSITORY http://svn.code.sf.net/p/plplot/code/trunk
- )
-endif(PREFER_DOWNLOAD)
+# Now use better method of accessing the latest PLplot so comment out
+# the choices below.
+#if(PREFER_DOWNLOAD)
+# set(PLPLOT_DOWNLOAD_UPDATE
+# URL http://prdownloads.sourceforge.net/plplot/plplot/5.9.10%20Source/plplot-5.9.10.tar.gz
+# URL_HASH SHA256=6be3e20d6992cb2afd132a00cbc812aa5db170abe5855c44eb01481ac4b0b723
+# PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/plplot/plplot.patch
+# )
+#else(PREFER_DOWNLOAD)
+# set(PLPLOT_DOWNLOAD_UPDATE
+# SVN_REPOSITORY http://svn.code.sf.net/p/plplot/code/trunk
+# )
+#endif(PREFER_DOWNLOAD)
+# Assumption that the top-level local PLplot source tree is two directories
+# up from the present top-level directory for build_projects.
+# This assumption is correct if you are accessing build_projects as
+# a subset of the PLplot source tree so that its location is in
+# cmake/build_projects within that source tree.
+# But it is not the case if you have independently
+# checked out just the build_projects subset of the normal PLplot source
+# tree so check that the result really is a plplot source tree.
+get_filename_component(PLPLOT_LOCAL_SOURCE_DIR ${CMAKE_SOURCE_DIR} PATH)
+get_filename_component(PLPLOT_LOCAL_SOURCE_DIR ${PLPLOT_LOCAL_SOURCE_DIR} PATH)
+find_file(IS_PLPLOT_SOURCE_TREE plcore.c
+ HINTS ${PLPLOT_LOCAL_SOURCE_DIR}/src
+ NO_DEFAULT_PATH
+)
+if(NOT IS_PLPLOT_SOURCE_TREE)
+ message(FATAL_ERROR "build_projects not located in cmake/build_projects in a PLplot source tree")
+endif(NOT IS_PLPLOT_SOURCE_TREE)
+
set(tags "" "_lite")
foreach(tag IN LISTS tags)
# Data that is related to the PATH that must be used.
@@ -105,23 +125,24 @@
ExternalProject_Add(
build_${BP_PACKAGE}${tag}
DEPENDS "${${BP_PACKAGE}${tag}_dependencies_targets}"
- ${PLPLOT_DOWNLOAD_UPDATE}
- CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_CMAKE_COMMAND} -DBUILD_TEST=ON -DPLD_pdf=ON ${${BP_PACKAGE}${tag}_cmake_args} ${EP_BASE}/Source/build_${BP_PACKAGE}${tag}
+ DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${PLPLOT_LOCAL_SOURCE_DIR} ${EP_BASE}/Source/build_${BP_PACKAGE}${tag}
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} CFLAGS=-g ${BP_CMAKE_COMMAND} -DBUILD_TEST=ON -DPLD_pdf=ON ${${BP_PACKAGE}${tag}_cmake_args} ${EP_BASE}/Source/build_${BP_PACKAGE}${tag}
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
+ STEP_TARGETS configure build install test
)
# Add custom commands to the current test step.
- add_custom_command(
- OUTPUT
- ${EP_BASE}/Stamp/build_${BP_PACKAGE}${tag}/build_${BP_PACKAGE}${tag}-test
- COMMAND echo made_it_to_extra_test
- COMMENT "Test installed examples from ${BP_PACKAGE}${tag}"
- APPEND
- )
+ # One commented-out fragment to show how to do it....
+# add_custom_command(
+# OUTPUT
+# ${EP_BASE}/Stamp/build_${BP_PACKAGE}${tag}/build_${BP_PACKAGE}${tag}-test
+# COMMAND echo made_it_to_extra_test
+# COMMENT "Test installed examples from ${BP_PACKAGE}${tag}"
+# APPEND
+# )
list(APPEND build_target_LIST build_${BP_PACKAGE}${tag})
Deleted: trunk/cmake/build_projects/plplot/plplot.patch
===================================================================
--- trunk/cmake/build_projects/plplot/plplot.patch 2013-10-14 19:48:57 UTC (rev 12599)
+++ trunk/cmake/build_projects/plplot/plplot.patch 2013-10-15 22:15:00 UTC (rev 12600)
@@ -1,318 +0,0 @@
-diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/bindings/java/CMakeLists.txt plplot_allura/bindings/java/CMakeLists.txt
---- export/plplot-5.9.10/bindings/java/CMakeLists.txt 2010-05-14 14:19:09.000000000 -0700
-+++ plplot_allura/bindings/java/CMakeLists.txt 2013-10-04 17:39:27.731052638 -0700
-@@ -200,8 +200,9 @@
- add_custom_command(
- OUTPUT ${output_file}
- COMMAND ${CMAKE_Java_COMPILER}
-- -classpath ${CMAKE_CURRENT_BINARY_DIR} ${srcfile} -d ${CMAKE_CURRENT_BINARY_DIR}
-+ ${JAVACFLAGS} -classpath ${CMAKE_CURRENT_BINARY_DIR} ${srcfile} -d ${CMAKE_CURRENT_BINARY_DIR}
- DEPENDS ${srcfile} ${${output_file}_DEPENDS}
-+ VERBATIM
- )
- endforeach( srcfile ${JAVA_FILES_FULL} )
- add_custom_target(plplot_core ALL DEPENDS ${JAVA_CLASSES})
-diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/cmake/modules/FindLua.cmake plplot_allura/cmake/modules/FindLua.cmake
---- export/plplot-5.9.10/cmake/modules/FindLua.cmake 2012-02-17 14:39:16.000000000 -0800
-+++ plplot_allura/cmake/modules/FindLua.cmake 2013-10-13 16:52:51.709359625 -0700
-@@ -73,19 +73,9 @@
- #
- # * Kitware, Inc.
-
-+# No PATHS or anything else to make sure do not find Linux version
-+# on Wine.
- find_program(LUA_EXECUTABLE lua
-- HINTS
-- $ENV{LUA_DIR}
-- PATH_SUFFIXES bin
-- PATHS
-- ~/Library/Frameworks
-- /Library/Frameworks
-- /usr/local
-- /usr
-- /sw # Fink
-- /opt/local # DarwinPorts
-- /opt/csw # Blastwave
-- /opt
- )
-
- if(LUA_EXECUTABLE)
-diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/cmake/modules/Findhpdf.cmake plplot_allura/cmake/modules/Findhpdf.cmake
---- export/plplot-5.9.10/cmake/modules/Findhpdf.cmake 2013-06-30 21:22:35.000000000 -0700
-+++ plplot_allura/cmake/modules/Findhpdf.cmake 2013-10-12 22:06:38.628179635 -0700
-@@ -8,7 +8,12 @@
- # hpdf_LIBRARY_DIRS, the directory where libhpdf (either shared or static)
- # is found.
-
--find_path(hpdf_INCLUDE_DIR hpdf/hpdf.h /usr/local/include /usr/include)
-+# Give preference to header found in hpdf subdirectory (which is the
-+# result of a build and install of upstream libharu), then if not
-+# found look for the case of no such subdirectory (which is how the
-+# Debian system version of libharu headers is installed).
-+find_path(hpdf_INCLUDE_DIR hpdf.h PATHS /usr/local/include /usr/include PATH_SUFFIXES hpdf)
-+find_path(hpdf_INCLUDE_DIR hpdf.h PATHS /usr/local/include /usr/include)
-
- if(hpdf_INCLUDE_DIR)
- find_library(hpdf_LIBRARY
-diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/cmake/modules/drivers-init.cmake plplot_allura/cmake/modules/drivers-init.cmake
---- export/plplot-5.9.10/cmake/modules/drivers-init.cmake 2012-11-17 14:49:34.000000000 -0800
-+++ plplot_allura/cmake/modules/drivers-init.cmake 2013-10-11 12:52:27.712350616 -0700
-@@ -196,7 +196,7 @@
- # no alpha transparency) and poorly maintained (the double free for
- # example 2 has not been fixed). Therefore retire this device.
- # "pbm:pbm:OFF:F:OFF"
-- "pdf:pdf:OFF:F:OFF"
-+ "pdf:pdf:ON:F:OFF"
- # (2007-09-01) As discussed on list, don't enable plmeta until we sort
- # out the known issues (e.g., strings, aspect ratio, and TrueType fonts).
- # This is going to take time/energy for some volunteer who has not volunteered
-diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/cmake/modules/java.cmake plplot_allura/cmake/modules/java.cmake
---- export/plplot-5.9.10/cmake/modules/java.cmake 2013-05-02 15:44:50.000000000 -0700
-+++ plplot_allura/cmake/modules/java.cmake 2013-10-04 17:39:27.107064998 -0700
-@@ -96,3 +96,8 @@
- # it appears this CMake variable is defined on Mac OS X and other platforms.
- set(PLPLOTJAVAC_WRAP_DLL plplotjavac_wrap${CMAKE_SHARED_LIBRARY_SUFFIX})
- endif(ENABLE_java)
-+
-+# Set up java compiler flags and turn into a list suitable for add_custom_command
-+set(DEFAULT_JAVACFLAGS "")
-+set(JAVACFLAGS ${DEFAULT_JAVACFLAGS} CACHE STRING "Java compiler flags")
-+string(REGEX REPLACE " " ";" JAVACFLAGS "${JAVACFLAGS}")
-diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/cmake/modules/pkg-config.cmake plplot_allura/cmake/modules/pkg-config.cmake
---- export/plplot-5.9.10/cmake/modules/pkg-config.cmake 2012-01-05 05:59:36.000000000 -0800
-+++ plplot_allura/cmake/modules/pkg-config.cmake 2013-10-10 21:43:09.958581690 -0700
-@@ -175,7 +175,7 @@
-
- if("${_link_flags_in}" STREQUAL "")
- set(${_link_flags_out})
-- else("${_link_flags_in}" STREQUAL ""})
-+ else("${_link_flags_in}" STREQUAL "")
- #message("(original link flags) = ${_link_flags_in}")
- # Convert link flags to a list. Note some link flags are blank-delimited
- # (such as "-framework whatever") so preserve those by splitting into
-diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/cmake/modules/qt.cmake plplot_allura/cmake/modules/qt.cmake
---- export/plplot-5.9.10/cmake/modules/qt.cmake 2012-08-21 04:45:29.000000000 -0700
-+++ plplot_allura/cmake/modules/qt.cmake 2013-10-10 21:55:38.160255690 -0700
-@@ -212,5 +212,5 @@
- endif(PYQT_SIP_FLAGS_ERR)
- # Must change from blank-delimited string to CMake list so that sip
- # COMMAND will work properly with these flags later on.
-- string(REGEX REPLACE " " ";"PYQT_SIP_FLAGS "${PYQT_SIP_FLAGS}")
-+ string(REGEX REPLACE " " ";" PYQT_SIP_FLAGS "${PYQT_SIP_FLAGS}")
- endif(ENABLE_pyqt4)
-diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/drivers/cairo.c plplot_allura/drivers/cairo.c
---- export/plplot-5.9.10/drivers/cairo.c 2013-09-21 19:20:12.000000000 -0700
-+++ plplot_allura/drivers/cairo.c 2013-10-04 17:39:27.899049313 -0700
-@@ -108,6 +108,7 @@
- char *pangoMarkupString;
- short upDown;
- float fontSize;
-+ short uline;
-
- // These are arguments for plP_script_scale which must be retained
- // in aStream for the alt_unicode approach. level has an
-@@ -648,6 +649,7 @@
-
- aStream = (PLCairo *) pls->dev;
- aStream->upDown = 0;
-+ aStream->uline = 0;
- aStream->level = 0;
- aStream->pangoMarkupString = (char *) malloc( sizeof ( char ) * MAX_MARKUP_LEN );
- // Calculate the font size (in points since DPI = 72).
-@@ -742,6 +744,23 @@
- }
- aStream->upDown--;
- break;
-+ case PLTEXT_UNDERLINE:
-+ if ( aStream->uline == 1 )
-+ {
-+ strncat( aStream->pangoMarkupString, "</span>", MAX_MARKUP_LEN - 1 - strlen( aStream->pangoMarkupString ) );
-+ aStream->level++;
-+ }
-+ else
-+ {
-+ strncat( aStream->pangoMarkupString, "<span underline=\"single\">", MAX_MARKUP_LEN - 1 - strlen( aStream->pangoMarkupString ) );
-+ aStream->level++;
-+ }
-+ aStream->uline = !aStream->uline;
-+ break;
-+ case PLTEXT_BACKCHAR:
-+ case PLTEXT_OVERLINE:
-+ plwarn( "'-', and 'b/B' text escape sequences not processed." );
-+ break;
- }
- }
-
-@@ -970,7 +989,7 @@
- // http://developer.gnome.org/doc/API/2.0/pango/PangoMarkupFormat.html
- //--------------------------------------------------------------------------
-
--char *ucs4_to_pango_markup_format( PLUNICODE *ucs4, int ucs4Len, float fontSize )
-+char *ucs4_to_pango_markup_format( PLUNICODE *ucs4, int ucs4Len, float fontSize)
- {
- char plplotEsc;
- int i;
-@@ -979,7 +998,8 @@
- char utf8[5];
- char *pangoMarkupString;
- PLFLT old_sscale, sscale, old_soffset, soffset;
-- PLINT level = 0.;
-+ PLINT level = 0;
-+ short uline = 0;
-
- // Will this be big enough? We might have lots of markup.
- pangoMarkupString = (char *) malloc( sizeof ( char ) * MAX_MARKUP_LEN );
-@@ -1071,6 +1091,21 @@
- }
- upDown--;
- }
-+ if ( ucs4[i] == (PLUNICODE) '-' ) // Superscript
-+ {
-+ if ( uline == 1 )
-+ {
-+ strncat( pangoMarkupString, "</span>", MAX_MARKUP_LEN - 1 - strlen( pangoMarkupString ) );
-+ level++;
-+ }
-+ else
-+ {
-+ strncat( pangoMarkupString,
-+ "<span underline=\"single\">",
-+ MAX_MARKUP_LEN - 1 - strlen( pangoMarkupString ) );
-+ }
-+ uline = uline;
-+ }
- i++;
- }
- }
-diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/drivers/pdf.c plplot_allura/drivers/pdf.c
---- export/plplot-5.9.10/drivers/pdf.c 2013-06-30 21:22:35.000000000 -0700
-+++ plplot_allura/drivers/pdf.c 2013-10-11 17:45:07.713536623 -0700
-@@ -1,4 +1,4 @@
--// $Id: pdf.c 12401 2013-07-01 04:22:35Z airwin $
-+// $Id: pdf.c 12589 2013-10-12 00:45:01Z airwin $
- //
- // PLplot driver for PDF based on the haru library http://www.libharu.org.
- //
-@@ -38,7 +38,7 @@
- #include <math.h>
- #include <setjmp.h>
-
--#include "hpdf/hpdf.h"
-+#include "hpdf.h"
-
- // PLplot header files
- #define DEBUG
-diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/examples/d/x20d.d plplot_allura/examples/d/x20d.d
---- export/plplot-5.9.10/examples/d/x20d.d 2013-06-27 12:49:07.000000000 -0700
-+++ plplot_allura/examples/d/x20d.d 2013-10-02 13:15:11.891948211 -0700
-@@ -1,4 +1,4 @@
--// $Id: x20d.d 12393 2013-06-27 19:49:07Z andrewross $
-+// $Id: x20d.d 12568 2013-10-02 09:23:08Z andrewross $
- //
- // plimage demo
- //
-@@ -6,6 +6,7 @@
-
- import std.math;
- import std.stdio;
-+import std.file;
-
- import plplot;
-
-diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/examples/java/CMakeLists.txt plplot_allura/examples/java/CMakeLists.txt
---- export/plplot-5.9.10/examples/java/CMakeLists.txt 2012-10-03 14:16:31.000000000 -0700
-+++ plplot_allura/examples/java/CMakeLists.txt 2013-10-04 17:39:27.843050422 -0700
-@@ -101,8 +101,9 @@
- add_custom_command(
- OUTPUT ${out_file}
- COMMAND ${CMAKE_Java_COMPILER}
-- -classpath ${CMAKE_BINARY_DIR}/bindings/java -d ${CMAKE_CURRENT_BINARY_DIR} -encoding UTF-8 ${in_file}
-+ ${JAVACFLAGS} -classpath ${CMAKE_BINARY_DIR}/bindings/java -d ${CMAKE_CURRENT_BINARY_DIR} -encoding UTF-8 ${in_file}
- DEPENDS ${in_file} ${files_plplot_core}
-+ VERBATIM
- )
- add_custom_target(x${STRING_INDEX}j ALL DEPENDS ${out_file})
- add_dependencies(x${STRING_INDEX}j plplot_core)
-@@ -160,8 +161,9 @@
- add_custom_command(
- OUTPUT ${out_file}
- COMMAND ${CMAKE_Java_COMPILER}
-- -classpath ${INSTALLED_JAR_FILE} -d ${CMAKE_CURRENT_BINARY_DIR} -encoding UTF-8 ${in_file}
-+ ${JAVACFLAGS} -classpath ${INSTALLED_JAR_FILE} -d ${CMAKE_CURRENT_BINARY_DIR} -encoding UTF-8 ${in_file}
- DEPENDS ${in_file} ${INSTALLED_JAR_FILE}
-+ VERBATIM
- )
- add_custom_target(x${STRING_INDEX}j ALL DEPENDS ${out_file})
- set_property(GLOBAL APPEND PROPERTY TARGETS_examples_java x${STRING_INDEX}j)
-diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/examples/python/CMakeLists.txt plplot_allura/examples/python/CMakeLists.txt
---- export/plplot-5.9.10/examples/python/CMakeLists.txt 2013-07-12 12:22:25.000000000 -0700
-+++ plplot_allura/examples/python/CMakeLists.txt 2013-10-04 17:39:27.863050025 -0700
-@@ -79,7 +79,6 @@
- xw17.py
- xw31.py
- plplot_logo.py
-- plplot_py_demos.py
- test_circle.py
- test_axis_precision.py
- test_symbol_clip.py
-@@ -142,6 +141,7 @@
- set(
- python_DATA
- ${python_DATA}
-+ plplot_py_demos.py
- README.pythondemos
- README.rendering_tests
- README.logo
-diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/include/plplot.h plplot_allura/include/plplot.h
---- export/plplot-5.9.10/include/plplot.h 2013-05-22 15:35:01.000000000 -0700
-+++ plplot_allura/include/plplot.h 2013-10-04 17:39:27.827050738 -0700
-@@ -1,4 +1,4 @@
--// $Id: plplot.h 12343 2013-05-22 22:35:01Z andrewross $
-+// $Id: plplot.h 12577 2013-10-04 21:43:12Z andrewross $
- //
- // Macros and prototypes for the PLplot package. This header file must
- // be included by all user codes.
-@@ -250,6 +250,9 @@
- #define PLTEXT_FONTCHANGE 0 // font change in the text stream
- #define PLTEXT_SUPERSCRIPT 1 // superscript in the text stream
- #define PLTEXT_SUBSCRIPT 2 // subscript in the text stream
-+#define PLTEXT_BACKCHAR 3 // back-char in the text stream
-+#define PLTEXT_OVERLINE 4 // toggle overline in the text stream
-+#define PLTEXT_UNDERLINE 5 // toggle underline in the text stream
-
- // image operations
- #define ZEROW2B 1
-diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/src/plcore.c plplot_allura/src/plcore.c
---- export/plplot-5.9.10/src/plcore.c 2013-01-29 20:40:35.000000000 -0800
-+++ plplot_allura/src/plcore.c 2013-10-04 17:39:27.667053907 -0700
-@@ -1,4 +1,4 @@
--// $Id: plcore.c 12288 2013-01-30 04:40:35Z airwin $
-+// $Id: plcore.c 12577 2013-10-04 21:43:12Z andrewross $
- //
- // Central dispatch facility for PLplot.
- // Also contains the PLplot main data structures, external access
-@@ -1069,6 +1069,24 @@
- plP_esc( PLESC_CONTROL_CHAR, &args );
- i += 1;
- skip = 1;
-+ break;
-+ case 'b':
-+ args.n_ctrl_char = PLTEXT_BACKCHAR;
-+ plP_esc( PLESC_CONTROL_CHAR, &args );
-+ i += 1;
-+ skip = 1;
-+ break;
-+ case '+':
-+ args.n_ctrl_char = PLTEXT_OVERLINE;
-+ plP_esc( PLESC_CONTROL_CHAR, &args );
-+ i += 1;
-+ skip = 1;
-+ break;
-+ case '-':
-+ args.n_ctrl_char = PLTEXT_UNDERLINE;
-+ plP_esc( PLESC_CONTROL_CHAR, &args );
-+ i += 1;
-+ skip = 1;
- break;
- }
- }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-10-14 19:49:00
|
Revision: 12599
http://sourceforge.net/p/plplot/code/12599
Author: airwin
Date: 2013-10-14 19:48:57 +0000 (Mon, 14 Oct 2013)
Log Message:
-----------
Implement PREFER_DOWNLOAD approach by default. The result for PLplot
is (currently) to use a 5.9.10 download plus a patch called
plplot.patch to add the important PLplot changes since the 5.9.10
release. That patch was created with the following command:
diff -Naur --exclude=doc --exclude=plplot_octave_txt \
--exclude=build_projects --exclude=.svn --exclude="*README*" \
--exclude="#*#" --exclude=debian --exclude="*.pyc" --exclude=sys \
--exclude=www --exclude=docbook.cmake $prefix1 $prefix2 \
>| plplot_allura/cmake/build_projects/plplot/plplot.patch
where the excludes get rid of unimportant differences (from the point
of view of building software) between the two prefixes such as changes
in the documentation that have occurred since the 5.9.10 release.
Note, that $prefix1 is the directory location of the top of the source
tree from the unpacked 5.9.10 tarball, and $prefix2 is the top of the
local copy of the source tree created from svn trunk with local
changes potentially added (and also potentially added to the patch).
As a result, the -DPREFER_DOWNLOAD=ON approach that is used by default
for the PLplot build has maintenance issues because it requires
keeping that patch up to date. On the other hand, it also removes
some uncertainty due to svn head for PLplot being a moving target.
Also, on the other hand, it avoids the considerable downside of using
the subversion approach on Windows which requires (a) a subversion
client be installed which adds the normal security concerns about
running any downloaded Windows binary from some new location on the
web, and (b) all dependencies of that client be installed. The latter
is especially important for Wine since Windows subversion clients use
ntml authorization. Wine can only provide that if the Linux platform
underneath Wine has Samba installed which might open a channel for
viruses to propagate from Wine to the underlying Linux platform. So
my view is -DPREFER_DOWNLOAD=ON has sufficiently fewer security and
moving target downsides that it justifies the maintenance cost of
keeping the patch up to date. At the same time, if the user has
subversion installed, and they want to follow the moving target of the
svn trunk version of PLplot, they are always free to specify
-DPREFER_DOWNLOAD=OFF.
Modified Paths:
--------------
trunk/cmake/build_projects/CMakeLists.txt
trunk/cmake/build_projects/plplot/bp.cmake
Added Paths:
-----------
trunk/cmake/build_projects/plplot/plplot.patch
Modified: trunk/cmake/build_projects/CMakeLists.txt
===================================================================
--- trunk/cmake/build_projects/CMakeLists.txt 2013-10-14 19:17:47 UTC (rev 12598)
+++ trunk/cmake/build_projects/CMakeLists.txt 2013-10-14 19:48:57 UTC (rev 12599)
@@ -222,6 +222,8 @@
endif(MSYS_PLATFORM)
set(BP_PATH "${BP_ORIGINAL_NATIVE_PATH}")
+option(PREFER_DOWNLOAD "Prefer to obtain source code for projects using a simple download of tarball rather than via svn, git, hg, or bzr repository access" ON)
+
# Now include the build configurations for certain targets and their
# dependencies.
Modified: trunk/cmake/build_projects/plplot/bp.cmake
===================================================================
--- trunk/cmake/build_projects/plplot/bp.cmake 2013-10-14 19:17:47 UTC (rev 12598)
+++ trunk/cmake/build_projects/plplot/bp.cmake 2013-10-14 19:48:57 UTC (rev 12599)
@@ -76,6 +76,19 @@
# This can be safely done only after above includes.
set(BP_PACKAGE plplot)
+if(PREFER_DOWNLOAD)
+ set(PLPLOT_DOWNLOAD_UPDATE
+ URL http://prdownloads.sourceforge.net/plplot/plplot/5.9.10%20Source/plplot-5.9.10.tar.gz
+ URL_HASH SHA256=6be3e20d6992cb2afd132a00cbc812aa5db170abe5855c44eb01481ac4b0b723
+ PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/plplot/plplot.patch
+ )
+else(PREFER_DOWNLOAD)
+ set(PLPLOT_DOWNLOAD_UPDATE
+ SVN_REPOSITORY http://svn.code.sf.net/p/plplot/code/trunk
+ )
+endif(PREFER_DOWNLOAD)
+
+
set(tags "" "_lite")
foreach(tag IN LISTS tags)
# Data that is related to the PATH that must be used.
@@ -92,7 +105,7 @@
ExternalProject_Add(
build_${BP_PACKAGE}${tag}
DEPENDS "${${BP_PACKAGE}${tag}_dependencies_targets}"
- SVN_REPOSITORY http://svn.code.sf.net/p/plplot/code/trunk
+ ${PLPLOT_DOWNLOAD_UPDATE}
CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_CMAKE_COMMAND} -DBUILD_TEST=ON -DPLD_pdf=ON ${${BP_PACKAGE}${tag}_cmake_args} ${EP_BASE}/Source/build_${BP_PACKAGE}${tag}
BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND}
INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} install
Added: trunk/cmake/build_projects/plplot/plplot.patch
===================================================================
--- trunk/cmake/build_projects/plplot/plplot.patch (rev 0)
+++ trunk/cmake/build_projects/plplot/plplot.patch 2013-10-14 19:48:57 UTC (rev 12599)
@@ -0,0 +1,318 @@
+diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/bindings/java/CMakeLists.txt plplot_allura/bindings/java/CMakeLists.txt
+--- export/plplot-5.9.10/bindings/java/CMakeLists.txt 2010-05-14 14:19:09.000000000 -0700
++++ plplot_allura/bindings/java/CMakeLists.txt 2013-10-04 17:39:27.731052638 -0700
+@@ -200,8 +200,9 @@
+ add_custom_command(
+ OUTPUT ${output_file}
+ COMMAND ${CMAKE_Java_COMPILER}
+- -classpath ${CMAKE_CURRENT_BINARY_DIR} ${srcfile} -d ${CMAKE_CURRENT_BINARY_DIR}
++ ${JAVACFLAGS} -classpath ${CMAKE_CURRENT_BINARY_DIR} ${srcfile} -d ${CMAKE_CURRENT_BINARY_DIR}
+ DEPENDS ${srcfile} ${${output_file}_DEPENDS}
++ VERBATIM
+ )
+ endforeach( srcfile ${JAVA_FILES_FULL} )
+ add_custom_target(plplot_core ALL DEPENDS ${JAVA_CLASSES})
+diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/cmake/modules/FindLua.cmake plplot_allura/cmake/modules/FindLua.cmake
+--- export/plplot-5.9.10/cmake/modules/FindLua.cmake 2012-02-17 14:39:16.000000000 -0800
++++ plplot_allura/cmake/modules/FindLua.cmake 2013-10-13 16:52:51.709359625 -0700
+@@ -73,19 +73,9 @@
+ #
+ # * Kitware, Inc.
+
++# No PATHS or anything else to make sure do not find Linux version
++# on Wine.
+ find_program(LUA_EXECUTABLE lua
+- HINTS
+- $ENV{LUA_DIR}
+- PATH_SUFFIXES bin
+- PATHS
+- ~/Library/Frameworks
+- /Library/Frameworks
+- /usr/local
+- /usr
+- /sw # Fink
+- /opt/local # DarwinPorts
+- /opt/csw # Blastwave
+- /opt
+ )
+
+ if(LUA_EXECUTABLE)
+diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/cmake/modules/Findhpdf.cmake plplot_allura/cmake/modules/Findhpdf.cmake
+--- export/plplot-5.9.10/cmake/modules/Findhpdf.cmake 2013-06-30 21:22:35.000000000 -0700
++++ plplot_allura/cmake/modules/Findhpdf.cmake 2013-10-12 22:06:38.628179635 -0700
+@@ -8,7 +8,12 @@
+ # hpdf_LIBRARY_DIRS, the directory where libhpdf (either shared or static)
+ # is found.
+
+-find_path(hpdf_INCLUDE_DIR hpdf/hpdf.h /usr/local/include /usr/include)
++# Give preference to header found in hpdf subdirectory (which is the
++# result of a build and install of upstream libharu), then if not
++# found look for the case of no such subdirectory (which is how the
++# Debian system version of libharu headers is installed).
++find_path(hpdf_INCLUDE_DIR hpdf.h PATHS /usr/local/include /usr/include PATH_SUFFIXES hpdf)
++find_path(hpdf_INCLUDE_DIR hpdf.h PATHS /usr/local/include /usr/include)
+
+ if(hpdf_INCLUDE_DIR)
+ find_library(hpdf_LIBRARY
+diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/cmake/modules/drivers-init.cmake plplot_allura/cmake/modules/drivers-init.cmake
+--- export/plplot-5.9.10/cmake/modules/drivers-init.cmake 2012-11-17 14:49:34.000000000 -0800
++++ plplot_allura/cmake/modules/drivers-init.cmake 2013-10-11 12:52:27.712350616 -0700
+@@ -196,7 +196,7 @@
+ # no alpha transparency) and poorly maintained (the double free for
+ # example 2 has not been fixed). Therefore retire this device.
+ # "pbm:pbm:OFF:F:OFF"
+- "pdf:pdf:OFF:F:OFF"
++ "pdf:pdf:ON:F:OFF"
+ # (2007-09-01) As discussed on list, don't enable plmeta until we sort
+ # out the known issues (e.g., strings, aspect ratio, and TrueType fonts).
+ # This is going to take time/energy for some volunteer who has not volunteered
+diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/cmake/modules/java.cmake plplot_allura/cmake/modules/java.cmake
+--- export/plplot-5.9.10/cmake/modules/java.cmake 2013-05-02 15:44:50.000000000 -0700
++++ plplot_allura/cmake/modules/java.cmake 2013-10-04 17:39:27.107064998 -0700
+@@ -96,3 +96,8 @@
+ # it appears this CMake variable is defined on Mac OS X and other platforms.
+ set(PLPLOTJAVAC_WRAP_DLL plplotjavac_wrap${CMAKE_SHARED_LIBRARY_SUFFIX})
+ endif(ENABLE_java)
++
++# Set up java compiler flags and turn into a list suitable for add_custom_command
++set(DEFAULT_JAVACFLAGS "")
++set(JAVACFLAGS ${DEFAULT_JAVACFLAGS} CACHE STRING "Java compiler flags")
++string(REGEX REPLACE " " ";" JAVACFLAGS "${JAVACFLAGS}")
+diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/cmake/modules/pkg-config.cmake plplot_allura/cmake/modules/pkg-config.cmake
+--- export/plplot-5.9.10/cmake/modules/pkg-config.cmake 2012-01-05 05:59:36.000000000 -0800
++++ plplot_allura/cmake/modules/pkg-config.cmake 2013-10-10 21:43:09.958581690 -0700
+@@ -175,7 +175,7 @@
+
+ if("${_link_flags_in}" STREQUAL "")
+ set(${_link_flags_out})
+- else("${_link_flags_in}" STREQUAL ""})
++ else("${_link_flags_in}" STREQUAL "")
+ #message("(original link flags) = ${_link_flags_in}")
+ # Convert link flags to a list. Note some link flags are blank-delimited
+ # (such as "-framework whatever") so preserve those by splitting into
+diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/cmake/modules/qt.cmake plplot_allura/cmake/modules/qt.cmake
+--- export/plplot-5.9.10/cmake/modules/qt.cmake 2012-08-21 04:45:29.000000000 -0700
++++ plplot_allura/cmake/modules/qt.cmake 2013-10-10 21:55:38.160255690 -0700
+@@ -212,5 +212,5 @@
+ endif(PYQT_SIP_FLAGS_ERR)
+ # Must change from blank-delimited string to CMake list so that sip
+ # COMMAND will work properly with these flags later on.
+- string(REGEX REPLACE " " ";"PYQT_SIP_FLAGS "${PYQT_SIP_FLAGS}")
++ string(REGEX REPLACE " " ";" PYQT_SIP_FLAGS "${PYQT_SIP_FLAGS}")
+ endif(ENABLE_pyqt4)
+diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/drivers/cairo.c plplot_allura/drivers/cairo.c
+--- export/plplot-5.9.10/drivers/cairo.c 2013-09-21 19:20:12.000000000 -0700
++++ plplot_allura/drivers/cairo.c 2013-10-04 17:39:27.899049313 -0700
+@@ -108,6 +108,7 @@
+ char *pangoMarkupString;
+ short upDown;
+ float fontSize;
++ short uline;
+
+ // These are arguments for plP_script_scale which must be retained
+ // in aStream for the alt_unicode approach. level has an
+@@ -648,6 +649,7 @@
+
+ aStream = (PLCairo *) pls->dev;
+ aStream->upDown = 0;
++ aStream->uline = 0;
+ aStream->level = 0;
+ aStream->pangoMarkupString = (char *) malloc( sizeof ( char ) * MAX_MARKUP_LEN );
+ // Calculate the font size (in points since DPI = 72).
+@@ -742,6 +744,23 @@
+ }
+ aStream->upDown--;
+ break;
++ case PLTEXT_UNDERLINE:
++ if ( aStream->uline == 1 )
++ {
++ strncat( aStream->pangoMarkupString, "</span>", MAX_MARKUP_LEN - 1 - strlen( aStream->pangoMarkupString ) );
++ aStream->level++;
++ }
++ else
++ {
++ strncat( aStream->pangoMarkupString, "<span underline=\"single\">", MAX_MARKUP_LEN - 1 - strlen( aStream->pangoMarkupString ) );
++ aStream->level++;
++ }
++ aStream->uline = !aStream->uline;
++ break;
++ case PLTEXT_BACKCHAR:
++ case PLTEXT_OVERLINE:
++ plwarn( "'-', and 'b/B' text escape sequences not processed." );
++ break;
+ }
+ }
+
+@@ -970,7 +989,7 @@
+ // http://developer.gnome.org/doc/API/2.0/pango/PangoMarkupFormat.html
+ //--------------------------------------------------------------------------
+
+-char *ucs4_to_pango_markup_format( PLUNICODE *ucs4, int ucs4Len, float fontSize )
++char *ucs4_to_pango_markup_format( PLUNICODE *ucs4, int ucs4Len, float fontSize)
+ {
+ char plplotEsc;
+ int i;
+@@ -979,7 +998,8 @@
+ char utf8[5];
+ char *pangoMarkupString;
+ PLFLT old_sscale, sscale, old_soffset, soffset;
+- PLINT level = 0.;
++ PLINT level = 0;
++ short uline = 0;
+
+ // Will this be big enough? We might have lots of markup.
+ pangoMarkupString = (char *) malloc( sizeof ( char ) * MAX_MARKUP_LEN );
+@@ -1071,6 +1091,21 @@
+ }
+ upDown--;
+ }
++ if ( ucs4[i] == (PLUNICODE) '-' ) // Superscript
++ {
++ if ( uline == 1 )
++ {
++ strncat( pangoMarkupString, "</span>", MAX_MARKUP_LEN - 1 - strlen( pangoMarkupString ) );
++ level++;
++ }
++ else
++ {
++ strncat( pangoMarkupString,
++ "<span underline=\"single\">",
++ MAX_MARKUP_LEN - 1 - strlen( pangoMarkupString ) );
++ }
++ uline = uline;
++ }
+ i++;
+ }
+ }
+diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/drivers/pdf.c plplot_allura/drivers/pdf.c
+--- export/plplot-5.9.10/drivers/pdf.c 2013-06-30 21:22:35.000000000 -0700
++++ plplot_allura/drivers/pdf.c 2013-10-11 17:45:07.713536623 -0700
+@@ -1,4 +1,4 @@
+-// $Id: pdf.c 12401 2013-07-01 04:22:35Z airwin $
++// $Id: pdf.c 12589 2013-10-12 00:45:01Z airwin $
+ //
+ // PLplot driver for PDF based on the haru library http://www.libharu.org.
+ //
+@@ -38,7 +38,7 @@
+ #include <math.h>
+ #include <setjmp.h>
+
+-#include "hpdf/hpdf.h"
++#include "hpdf.h"
+
+ // PLplot header files
+ #define DEBUG
+diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/examples/d/x20d.d plplot_allura/examples/d/x20d.d
+--- export/plplot-5.9.10/examples/d/x20d.d 2013-06-27 12:49:07.000000000 -0700
++++ plplot_allura/examples/d/x20d.d 2013-10-02 13:15:11.891948211 -0700
+@@ -1,4 +1,4 @@
+-// $Id: x20d.d 12393 2013-06-27 19:49:07Z andrewross $
++// $Id: x20d.d 12568 2013-10-02 09:23:08Z andrewross $
+ //
+ // plimage demo
+ //
+@@ -6,6 +6,7 @@
+
+ import std.math;
+ import std.stdio;
++import std.file;
+
+ import plplot;
+
+diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/examples/java/CMakeLists.txt plplot_allura/examples/java/CMakeLists.txt
+--- export/plplot-5.9.10/examples/java/CMakeLists.txt 2012-10-03 14:16:31.000000000 -0700
++++ plplot_allura/examples/java/CMakeLists.txt 2013-10-04 17:39:27.843050422 -0700
+@@ -101,8 +101,9 @@
+ add_custom_command(
+ OUTPUT ${out_file}
+ COMMAND ${CMAKE_Java_COMPILER}
+- -classpath ${CMAKE_BINARY_DIR}/bindings/java -d ${CMAKE_CURRENT_BINARY_DIR} -encoding UTF-8 ${in_file}
++ ${JAVACFLAGS} -classpath ${CMAKE_BINARY_DIR}/bindings/java -d ${CMAKE_CURRENT_BINARY_DIR} -encoding UTF-8 ${in_file}
+ DEPENDS ${in_file} ${files_plplot_core}
++ VERBATIM
+ )
+ add_custom_target(x${STRING_INDEX}j ALL DEPENDS ${out_file})
+ add_dependencies(x${STRING_INDEX}j plplot_core)
+@@ -160,8 +161,9 @@
+ add_custom_command(
+ OUTPUT ${out_file}
+ COMMAND ${CMAKE_Java_COMPILER}
+- -classpath ${INSTALLED_JAR_FILE} -d ${CMAKE_CURRENT_BINARY_DIR} -encoding UTF-8 ${in_file}
++ ${JAVACFLAGS} -classpath ${INSTALLED_JAR_FILE} -d ${CMAKE_CURRENT_BINARY_DIR} -encoding UTF-8 ${in_file}
+ DEPENDS ${in_file} ${INSTALLED_JAR_FILE}
++ VERBATIM
+ )
+ add_custom_target(x${STRING_INDEX}j ALL DEPENDS ${out_file})
+ set_property(GLOBAL APPEND PROPERTY TARGETS_examples_java x${STRING_INDEX}j)
+diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/examples/python/CMakeLists.txt plplot_allura/examples/python/CMakeLists.txt
+--- export/plplot-5.9.10/examples/python/CMakeLists.txt 2013-07-12 12:22:25.000000000 -0700
++++ plplot_allura/examples/python/CMakeLists.txt 2013-10-04 17:39:27.863050025 -0700
+@@ -79,7 +79,6 @@
+ xw17.py
+ xw31.py
+ plplot_logo.py
+- plplot_py_demos.py
+ test_circle.py
+ test_axis_precision.py
+ test_symbol_clip.py
+@@ -142,6 +141,7 @@
+ set(
+ python_DATA
+ ${python_DATA}
++ plplot_py_demos.py
+ README.pythondemos
+ README.rendering_tests
+ README.logo
+diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/include/plplot.h plplot_allura/include/plplot.h
+--- export/plplot-5.9.10/include/plplot.h 2013-05-22 15:35:01.000000000 -0700
++++ plplot_allura/include/plplot.h 2013-10-04 17:39:27.827050738 -0700
+@@ -1,4 +1,4 @@
+-// $Id: plplot.h 12343 2013-05-22 22:35:01Z andrewross $
++// $Id: plplot.h 12577 2013-10-04 21:43:12Z andrewross $
+ //
+ // Macros and prototypes for the PLplot package. This header file must
+ // be included by all user codes.
+@@ -250,6 +250,9 @@
+ #define PLTEXT_FONTCHANGE 0 // font change in the text stream
+ #define PLTEXT_SUPERSCRIPT 1 // superscript in the text stream
+ #define PLTEXT_SUBSCRIPT 2 // subscript in the text stream
++#define PLTEXT_BACKCHAR 3 // back-char in the text stream
++#define PLTEXT_OVERLINE 4 // toggle overline in the text stream
++#define PLTEXT_UNDERLINE 5 // toggle underline in the text stream
+
+ // image operations
+ #define ZEROW2B 1
+diff -Naur '--exclude=doc' '--exclude=plplot_octave_txt' '--exclude=build_projects' '--exclude=.svn' '--exclude=*README*' '--exclude=#*#' '--exclude=debian' '--exclude=*.pyc' '--exclude=sys' '--exclude=www' '--exclude=docbook.cmake' export/plplot-5.9.10/src/plcore.c plplot_allura/src/plcore.c
+--- export/plplot-5.9.10/src/plcore.c 2013-01-29 20:40:35.000000000 -0800
++++ plplot_allura/src/plcore.c 2013-10-04 17:39:27.667053907 -0700
+@@ -1,4 +1,4 @@
+-// $Id: plcore.c 12288 2013-01-30 04:40:35Z airwin $
++// $Id: plcore.c 12577 2013-10-04 21:43:12Z andrewross $
+ //
+ // Central dispatch facility for PLplot.
+ // Also contains the PLplot main data structures, external access
+@@ -1069,6 +1069,24 @@
+ plP_esc( PLESC_CONTROL_CHAR, &args );
+ i += 1;
+ skip = 1;
++ break;
++ case 'b':
++ args.n_ctrl_char = PLTEXT_BACKCHAR;
++ plP_esc( PLESC_CONTROL_CHAR, &args );
++ i += 1;
++ skip = 1;
++ break;
++ case '+':
++ args.n_ctrl_char = PLTEXT_OVERLINE;
++ plP_esc( PLESC_CONTROL_CHAR, &args );
++ i += 1;
++ skip = 1;
++ break;
++ case '-':
++ args.n_ctrl_char = PLTEXT_UNDERLINE;
++ plP_esc( PLESC_CONTROL_CHAR, &args );
++ i += 1;
++ skip = 1;
+ break;
+ }
+ }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-10-14 19:17:49
|
Revision: 12598
http://sourceforge.net/p/plplot/code/12598
Author: airwin
Date: 2013-10-14 19:17:47 +0000 (Mon, 14 Oct 2013)
Log Message:
-----------
CMake's current behaviour on Windows systems is that all possible
drive letters are searched for PATHS values (e.g., /usr/bin) which do
not have a drive letter specified. The result is that with /usr/bin
in the PATHS variable, the LUA_EXECUTABLE was found corresponding to
z:/usr/bin/lua, where z: happens to be the drive letter containing a
mount of the Linux OS files on a Windows system. This unexpected
result for find, happened, for example, on Wine (which does mount all
Linux files on z:).
To work around this issue, remove all specific PATHS values when
searching for lua. The result is that lua will only be found
(both on Unix and Windows) if it is in the PATH, which is generally
the desired result.
Modified Paths:
--------------
trunk/cmake/modules/FindLua.cmake
Modified: trunk/cmake/modules/FindLua.cmake
===================================================================
--- trunk/cmake/modules/FindLua.cmake 2013-10-13 15:54:18 UTC (rev 12597)
+++ trunk/cmake/modules/FindLua.cmake 2013-10-14 19:17:47 UTC (rev 12598)
@@ -73,19 +73,9 @@
#
# * Kitware, Inc.
+# No PATHS or anything else to make sure to not find Linux version
+# on Wine.
find_program(LUA_EXECUTABLE lua
- HINTS
- $ENV{LUA_DIR}
- PATH_SUFFIXES bin
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
- /usr/local
- /usr
- /sw # Fink
- /opt/local # DarwinPorts
- /opt/csw # Blastwave
- /opt
)
if(LUA_EXECUTABLE)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-10-13 15:54:23
|
Revision: 12597
http://sourceforge.net/p/plplot/code/12597
Author: airwin
Date: 2013-10-13 15:54:18 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
Restore minimum version of 2.8.11.2 (and also the associated touch
patch that is needed for that case) since there is some evidence that
2.8.12 is problematic on Wine.
Modified Paths:
--------------
trunk/cmake/build_projects/CMakeLists.txt
trunk/cmake/build_projects/ExternalProject.cmake
Modified: trunk/cmake/build_projects/CMakeLists.txt
===================================================================
--- trunk/cmake/build_projects/CMakeLists.txt 2013-10-13 05:23:53 UTC (rev 12596)
+++ trunk/cmake/build_projects/CMakeLists.txt 2013-10-13 15:54:18 UTC (rev 12597)
@@ -25,7 +25,7 @@
message(STATUS "CMAKE_GENERATOR = ${CMAKE_GENERATOR}")
message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}")
-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.8.11.2 FATAL_ERROR)
set(EP_BASE ${CMAKE_BINARY_DIR}/build_projects)
message(STATUS "EP_BASE = ${EP_BASE}")
Modified: trunk/cmake/build_projects/ExternalProject.cmake
===================================================================
--- trunk/cmake/build_projects/ExternalProject.cmake 2013-10-13 05:23:53 UTC (rev 12596)
+++ trunk/cmake/build_projects/ExternalProject.cmake 2013-10-13 15:54:18 UTC (rev 12597)
@@ -1121,7 +1121,7 @@
set_property(SOURCE ${stamp_file} PROPERTY SYMBOLIC 1)
set(touch)
else()
- set(touch ${CMAKE_COMMAND} -E touch ${stamp_file})
+ set(touch ${TOUCH_EXECUTABLE} ${stamp_file})
endif()
# Wrap with log script?
@@ -1791,8 +1791,8 @@
OUTPUT ${complete_outputs}
COMMENT "Completed '${name}'"
COMMAND ${CMAKE_COMMAND} -E make_directory ${cmf_dir}${cfgdir}
- COMMAND ${CMAKE_COMMAND} -E touch ${complete_stamp_file}
- COMMAND ${CMAKE_COMMAND} -E touch ${done_stamp_file}
+ COMMAND ${TOUCH_EXECUTABLE} ${complete_stamp_file}
+ COMMAND ${TOUCH_EXECUTABLE} ${done_stamp_file}
DEPENDS ${install_stamp_file}
VERBATIM
)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-10-13 05:23:58
|
Revision: 12596
http://sourceforge.net/p/plplot/code/12596
Author: airwin
Date: 2013-10-13 05:23:53 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
Search for hpdf headers found in a suffix subdirectory named hpdf before searching
for those headers without such a suffix subdirectory.
Modified Paths:
--------------
trunk/cmake/modules/Findhpdf.cmake
Modified: trunk/cmake/modules/Findhpdf.cmake
===================================================================
--- trunk/cmake/modules/Findhpdf.cmake 2013-10-13 00:56:24 UTC (rev 12595)
+++ trunk/cmake/modules/Findhpdf.cmake 2013-10-13 05:23:53 UTC (rev 12596)
@@ -8,7 +8,12 @@
# hpdf_LIBRARY_DIRS, the directory where libhpdf (either shared or static)
# is found.
-find_path(hpdf_INCLUDE_DIR hpdf.h /usr/local/include/hpdf /usr/local/include /usr/include/hpdf /usr/include)
+# Give preference to header found in hpdf subdirectory (which is the
+# result of a build and install of upstream libharu), then if not
+# found look for the case of no such subdirectory (which is how the
+# Debian system version of libharu headers is installed).
+find_path(hpdf_INCLUDE_DIR hpdf.h PATHS /usr/local/include /usr/include PATH_SUFFIXES hpdf)
+find_path(hpdf_INCLUDE_DIR hpdf.h PATHS /usr/local/include /usr/include)
if(hpdf_INCLUDE_DIR)
find_library(hpdf_LIBRARY
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-10-13 00:56:31
|
Revision: 12595
http://sourceforge.net/p/plplot/code/12595
Author: airwin
Date: 2013-10-13 00:56:24 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
Add swig build configuration.
Tested by: Alan W. Irwin <ai...@us...> by
using the cmake option -DBUILD_THE_BUILDTOOLS=ON and building
the resulting build_swig target on both Linux and MSYS/Wine.
Modified Paths:
--------------
trunk/cmake/build_projects/CMakeLists.txt
trunk/cmake/build_projects/add_packages.xml
Added Paths:
-----------
trunk/cmake/build_projects/swig/
trunk/cmake/build_projects/swig/bp.cmake
Modified: trunk/cmake/build_projects/CMakeLists.txt
===================================================================
--- trunk/cmake/build_projects/CMakeLists.txt 2013-10-13 00:51:13 UTC (rev 12594)
+++ trunk/cmake/build_projects/CMakeLists.txt 2013-10-13 00:56:24 UTC (rev 12595)
@@ -252,7 +252,7 @@
#cmake
pkg-config
#subversion
- libpcre
+ swig
)
else(BUILD_THE_BUILDTOOLS)
# List of all configurations. Order doesn't matter because multiple
Modified: trunk/cmake/build_projects/add_packages.xml
===================================================================
--- trunk/cmake/build_projects/add_packages.xml 2013-10-13 00:51:13 UTC (rev 12594)
+++ trunk/cmake/build_projects/add_packages.xml 2013-10-13 00:56:24 UTC (rev 12595)
@@ -41,7 +41,13 @@
<autotools id="ragel">
<branch hash="sha256:dd7f7d22f3a58147379bda61334d341c2caa0caf9f71897e3e4ec05c8f398764" module="ragel/ragel-6.8.tar.gz" repo="http://www.complang.org/" size="1211146" version="6.8"/>
</autotools>
- <autotools autogenargs="--enable-unicode-properties --enable-pcre16 --enable-pcre32 --enable-pcregrep-libz --disable-static" id="libpcre">
+ <autotools autogenargs="--enable-unicode-properties --enable-pcre16 --enable-pcre32 --disable-static" id="libpcre">
<branch hash="md5:21514018448ac10062ece7a668fca949" module="pcre/pcre-8.33.tar.bz2" repo="http://downloads.sourceforge.net/" size="1211146" version="8.33"/>
</autotools>
+ <autotools autogenargs="--with-pcre-prefix=${BP_CMAKE_INSTALL_PREFIX}" id="swig">
+ <branch hash="sha256:63780bf29f53937ad399a1f68bccb3730c90f65746868c4cdfc25cafcd0a424e" module="swig/swig/swig-2.0.11/swig-2.0.11.tar.gz" repo="http://downloads.sourceforge.net/" size="1211146" version="6.8"/>
+ <dependencies>
+ <dep package="libpcre"/>
+ </dependencies>
+ </autotools>
</moduleset>
Added: trunk/cmake/build_projects/swig/bp.cmake
===================================================================
--- trunk/cmake/build_projects/swig/bp.cmake (rev 0)
+++ trunk/cmake/build_projects/swig/bp.cmake 2013-10-13 00:56:24 UTC (rev 12595)
@@ -0,0 +1,96 @@
+# swig/bp.cmake
+# N.B. this file is generated so if you edit it you will lose all your
+# changes the next time it is generated (typically by running
+# either/both the update_added_packages.sh or update_pango_packages.sh
+# scripts). If those scripts do not provide good results, then
+# consider changing their source files (e.g., by editing the files
+# used in those scripts) or add a patch to be run by those scripts).
+
+# This file should be included directly or indirectly from a top-level
+# CMakeLists.txt file to configure the build of swig.
+
+# 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.
+
+# Protect against configuring a build twice in one CMake call
+if(swig_configured)
+ return()
+endif(swig_configured)
+set(swig_configured ON)
+
+# List of dependencies (most of which are build tools) which should be
+# ignored.
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
+
+set(swig_dependencies_LIST libpcre)
+# Remove dependencies that should be ignored.
+if(swig_dependencies_LIST)
+ list(REMOVE_ITEM swig_dependencies_LIST ${BP_ignored_dependencies_LIST})
+endif(swig_dependencies_LIST)
+
+set(swig_dependencies_targets)
+foreach(build_configuration ${swig_dependencies_LIST})
+ if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+ include(${build_configuration}/bp.cmake)
+ list(APPEND swig_dependencies_targets build_${build_configuration})
+ else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+ message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of swig has been installed another way.")
+ endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+endforeach(build_configuration ${swig_dependences_LIST})
+
+# This can be safely done only after above includes.
+set(BP_PACKAGE swig)
+
+# Data that is related to downloads.
+set(${BP_PACKAGE}_URL http://downloads.sourceforge.net/swig/swig/swig-2.0.11/swig-2.0.11.tar.gz)
+set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE SHA256)
+set(${BP_PACKAGE}_DOWNLOAD_HASH 63780bf29f53937ad399a1f68bccb3730c90f65746868c4cdfc25cafcd0a424e)
+
+# 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}")
+ # Must have all elements of env command in MSYS platform form
+ determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+ set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+else(MSYS_PLATFORM)
+ set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+ set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+endif(MSYS_PLATFORM)
+#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+
+ExternalProject_Add(
+ build_${BP_PACKAGE}
+ DEPENDS ${${BP_PACKAGE}_dependencies_targets}
+ URL ${${BP_PACKAGE}_URL}
+ URL_HASH ${${BP_PACKAGE}_DOWNLOAD_HASH_TYPE}=${${BP_PACKAGE}_DOWNLOAD_HASH}
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND} --with-pcre-prefix=${BP_CMAKE_INSTALL_PREFIX}
+ BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND}
+ BUILD_IN_SOURCE OFF
+ INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_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-10-13 00:51:18
|
Revision: 12594
http://sourceforge.net/p/plplot/code/12594
Author: airwin
Date: 2013-10-13 00:51:13 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
Download PLplot source from svn trunk.
This means build_projects users must have a subversion client
installed, but the big advantage of this new approach is they don't
have to edit the local PLplot location anymore in this configuration
file.
Modified Paths:
--------------
trunk/cmake/build_projects/plplot/bp.cmake
Modified: trunk/cmake/build_projects/plplot/bp.cmake
===================================================================
--- trunk/cmake/build_projects/plplot/bp.cmake 2013-10-13 00:47:13 UTC (rev 12593)
+++ trunk/cmake/build_projects/plplot/bp.cmake 2013-10-13 00:51:13 UTC (rev 12594)
@@ -76,19 +76,6 @@
# This can be safely done only after above includes.
set(BP_PACKAGE plplot)
-# 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)
-
set(tags "" "_lite")
foreach(tag IN LISTS tags)
# Data that is related to the PATH that must be used.
@@ -97,12 +84,6 @@
set(BP_PATH "${EP_BASE}/Build/build_${BP_PACKAGE}${tag}/dll;${BP_PATH_NODLL}")
message(STATUS "Original BP_PATH for ${BP_PACKAGE}${tag} = ${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(MODIFIED_PLPLOT_LOCAL_SOURCE_DIR z:${PLPLOT_LOCAL_SOURCE_DIR})
- else(MSYS_PLATFORM)
- set(MODIFIED_PLPLOT_LOCAL_SOURCE_DIR ${PLPLOT_LOCAL_SOURCE_DIR})
endif(MSYS_PLATFORM)
message(STATUS "modified BP_PATH for ${BP_PACKAGE}${tag} = ${BP_PATH}")
@@ -111,8 +92,7 @@
ExternalProject_Add(
build_${BP_PACKAGE}${tag}
DEPENDS "${${BP_PACKAGE}${tag}_dependencies_targets}"
- #TEMPORARY
- DOWNLOAD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${MODIFIED_PLPLOT_LOCAL_SOURCE_DIR} ${EP_BASE}/Source/build_${BP_PACKAGE}${tag}
+ SVN_REPOSITORY http://svn.code.sf.net/p/plplot/code/trunk
CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_CMAKE_COMMAND} -DBUILD_TEST=ON -DPLD_pdf=ON ${${BP_PACKAGE}${tag}_cmake_args} ${EP_BASE}/Source/build_${BP_PACKAGE}${tag}
BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND}
INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_BUILD_COMMAND} install
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-10-13 00:47:15
|
Revision: 12593
http://sourceforge.net/p/plplot/code/12593
Author: airwin
Date: 2013-10-13 00:47:13 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
Drop the --enable-pcregrep-libz configure option to make the MSYS/Wine
build work without the autotools finagling required to find the
MSYS zlib library and header.
Modified Paths:
--------------
trunk/cmake/build_projects/libpcre/bp.cmake
Modified: trunk/cmake/build_projects/libpcre/bp.cmake
===================================================================
--- trunk/cmake/build_projects/libpcre/bp.cmake 2013-10-12 19:50:43 UTC (rev 12592)
+++ trunk/cmake/build_projects/libpcre/bp.cmake 2013-10-13 00:47:13 UTC (rev 12593)
@@ -84,7 +84,7 @@
DEPENDS ${${BP_PACKAGE}_dependencies_targets}
URL ${${BP_PACKAGE}_URL}
URL_HASH ${${BP_PACKAGE}_DOWNLOAD_HASH_TYPE}=${${BP_PACKAGE}_DOWNLOAD_HASH}
- CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND} --enable-unicode-properties --enable-pcre16 --enable-pcre32 --enable-pcregrep-libz --disable-static
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND} --enable-unicode-properties --enable-pcre16 --enable-pcre32 --disable-static
BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND}
BUILD_IN_SOURCE OFF
INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} install
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-10-12 19:50:48
|
Revision: 12592
http://sourceforge.net/p/plplot/code/12592
Author: airwin
Date: 2013-10-12 19:50:43 +0000 (Sat, 12 Oct 2013)
Log Message:
-----------
Add libpcre as one of the dependencies for the future
swig BUILD_THE_BUILDTOOLS configuration.
Tested by Alan W. Irwin <ai...@us...> using
the cmake -DBUILD_THE_BUILDTOOLS=ON option and the build_libppcre target
for the build_projects project.
Modified Paths:
--------------
trunk/cmake/build_projects/CMakeLists.txt
trunk/cmake/build_projects/add_packages.xml
Added Paths:
-----------
trunk/cmake/build_projects/libpcre/
trunk/cmake/build_projects/libpcre/bp.cmake
Modified: trunk/cmake/build_projects/CMakeLists.txt
===================================================================
--- trunk/cmake/build_projects/CMakeLists.txt 2013-10-12 18:13:59 UTC (rev 12591)
+++ trunk/cmake/build_projects/CMakeLists.txt 2013-10-12 19:50:43 UTC (rev 12592)
@@ -105,9 +105,8 @@
)
message(STATUS "PYTHON_VERSION = ${PYTHON_VERSION}")
-# Use modified version of ExternalProject where cmake -E touch has
-# been replaced with the TOUCH_EXECUTABLE command (to work around
-# cmake bug 14020)
+# Use modified version of the CMake 2.8.12 ExternalProject module
+# where the tar.xz processing has been fixed.
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})
include(ExternalProject)
@@ -250,9 +249,10 @@
endforeach(executable ${executables_LIST})
set(build_configuration_LIST
- cmake
+ #cmake
pkg-config
#subversion
+ libpcre
)
else(BUILD_THE_BUILDTOOLS)
# List of all configurations. Order doesn't matter because multiple
Modified: trunk/cmake/build_projects/add_packages.xml
===================================================================
--- trunk/cmake/build_projects/add_packages.xml 2013-10-12 18:13:59 UTC (rev 12591)
+++ trunk/cmake/build_projects/add_packages.xml 2013-10-12 19:50:43 UTC (rev 12592)
@@ -41,4 +41,7 @@
<autotools id="ragel">
<branch hash="sha256:dd7f7d22f3a58147379bda61334d341c2caa0caf9f71897e3e4ec05c8f398764" module="ragel/ragel-6.8.tar.gz" repo="http://www.complang.org/" size="1211146" version="6.8"/>
</autotools>
+ <autotools autogenargs="--enable-unicode-properties --enable-pcre16 --enable-pcre32 --enable-pcregrep-libz --disable-static" id="libpcre">
+ <branch hash="md5:21514018448ac10062ece7a668fca949" module="pcre/pcre-8.33.tar.bz2" repo="http://downloads.sourceforge.net/" size="1211146" version="8.33"/>
+ </autotools>
</moduleset>
Added: trunk/cmake/build_projects/libpcre/bp.cmake
===================================================================
--- trunk/cmake/build_projects/libpcre/bp.cmake (rev 0)
+++ trunk/cmake/build_projects/libpcre/bp.cmake 2013-10-12 19:50:43 UTC (rev 12592)
@@ -0,0 +1,96 @@
+# libpcre/bp.cmake
+# N.B. this file is generated so if you edit it you will lose all your
+# changes the next time it is generated (typically by running
+# either/both the update_added_packages.sh or update_pango_packages.sh
+# scripts). If those scripts do not provide good results, then
+# consider changing their source files (e.g., by editing the files
+# used in those scripts) or add a patch to be run by those scripts).
+
+# This file should be included directly or indirectly from a top-level
+# CMakeLists.txt file to configure the build of libpcre.
+
+# 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.
+
+# Protect against configuring a build twice in one CMake call
+if(libpcre_configured)
+ return()
+endif(libpcre_configured)
+set(libpcre_configured ON)
+
+# List of dependencies (most of which are build tools) which should be
+# ignored.
+set(BP_ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list})
+
+set(libpcre_dependencies_LIST )
+# Remove dependencies that should be ignored.
+if(libpcre_dependencies_LIST)
+ list(REMOVE_ITEM libpcre_dependencies_LIST ${BP_ignored_dependencies_LIST})
+endif(libpcre_dependencies_LIST)
+
+set(libpcre_dependencies_targets)
+foreach(build_configuration ${libpcre_dependencies_LIST})
+ if(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+ include(${build_configuration}/bp.cmake)
+ list(APPEND libpcre_dependencies_targets build_${build_configuration})
+ else(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+ message(STATUS "Warning: A build_configuration for ${build_configuration} does not exist so it is assumed this dependency of libpcre has been installed another way.")
+ endif(EXISTS ${CMAKE_SOURCE_DIR}/${build_configuration}/bp.cmake)
+endforeach(build_configuration ${libpcre_dependences_LIST})
+
+# This can be safely done only after above includes.
+set(BP_PACKAGE libpcre)
+
+# Data that is related to downloads.
+set(${BP_PACKAGE}_URL http://downloads.sourceforge.net/pcre/pcre-8.33.tar.bz2)
+set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE MD5)
+set(${BP_PACKAGE}_DOWNLOAD_HASH 21514018448ac10062ece7a668fca949)
+
+# 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}")
+ # Must have all elements of env command in MSYS platform form
+ determine_msys_path(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+ set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+else(MSYS_PLATFORM)
+ set(source_PATH "${EP_BASE}/Source/build_${BP_PACKAGE}")
+ set(${BP_PACKAGE}_SET_CFLAGS "CFLAGS=$ENV{CFLAGS}")
+endif(MSYS_PLATFORM)
+#message(STATUS "modified BP_PATH for ${BP_PACKAGE} = ${BP_PATH}")
+
+ExternalProject_Add(
+ build_${BP_PACKAGE}
+ DEPENDS ${${BP_PACKAGE}_dependencies_targets}
+ URL ${${BP_PACKAGE}_URL}
+ URL_HASH ${${BP_PACKAGE}_DOWNLOAD_HASH_TYPE}=${${BP_PACKAGE}_DOWNLOAD_HASH}
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} ${source_PATH}/${BP_CONFIGURE_COMMAND} --enable-unicode-properties --enable-pcre16 --enable-pcre32 --enable-pcregrep-libz --disable-static
+ BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND}
+ BUILD_IN_SOURCE OFF
+ INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_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-10-12 18:14:02
|
Revision: 12591
http://sourceforge.net/p/plplot/code/12591
Author: airwin
Date: 2013-10-12 18:13:59 +0000 (Sat, 12 Oct 2013)
Log Message:
-----------
Rename gtk_packages_add.xml ==> add_packages.xml to provide a more
descriptive name for this file (since it will soon do more than
add to the gtk packages).
Added Paths:
-----------
trunk/cmake/build_projects/add_packages.xml
Removed Paths:
-------------
trunk/cmake/build_projects/gtk_packages_add.xml
Copied: trunk/cmake/build_projects/add_packages.xml (from rev 12588, trunk/cmake/build_projects/gtk_packages_add.xml)
===================================================================
--- trunk/cmake/build_projects/add_packages.xml (rev 0)
+++ trunk/cmake/build_projects/add_packages.xml 2013-10-12 18:13:59 UTC (rev 12591)
@@ -0,0 +1,44 @@
+<?xml version="1.0" ?>
+<!--
+Most of these data derived from http://www.linuxfromscratch.org, a
+wonderful site that provides fundamental build information for a lot
+of different free software packages.
+-->
+<moduleset>
+ <autotools id="libffi">
+ <branch hash="sha256:1dddde1400c3bcb7749d398071af88c3e4754058d2d4c0b3696c2f82dc5cf11c" module="libffi/libffi-3.0.13.tar.gz" repo="ftp://sourceware.org/pub/" size="845747" version="3.0.13"/>
+ </autotools>
+ <autotools id="intltool">
+ <branch hash="md5:23fbd879118253cb99aeac067da5f591" module="intltool/trunk/0.50.2/+download/intltool-0.50.2.tar.gz" repo="http://launchpad.net/" size="189483" version="0.50.2"/>
+ </autotools>
+ <autotools autogenargs="--disable-gtk" id="pixman">
+ <pkg-config/>
+ <branch hash="sha256:1d812f9f60215099355f5c13c6f06d7db1135c99f34ff03535b71b64435125fd" module="releases/pixman-0.30.0.tar.gz" repo="http://cairographics.org/" size="801692" version="0.30.0"/>
+ </autotools>
+ <autotools id="gperf">
+ <branch hash="sha256:767112a204407e62dbc3106647cf839ed544f3cf5d0f0523aaa2508623aad63e" module="gnu/gperf/gperf-3.0.4.tar.gz" repo="http://ftp.gnu.org/" size="983500" version="3.0.4"/>
+ </autotools>
+<!-- without these python shenanigans the python components of libxml2 are
+installed with the system prefix rather than desired special prefix
+-->
+ <autotools id="libxml2" makeargs="PYTHON_SITE_PACKAGES=${BP_CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages">
+ <branch hash="md5:9c0cfef285d5c4a5c80d00904ddab380" module="sources/libxml2-2.9.1.tar.gz" repo="http://xmlsoft.org/" size="983500" version="2.9.1"/>
+<!-- This package (which installs nothing on Unix platforms) is
+required as a workaround for the xmlcatalog argument mangling that
+occurs when xmlcatalog (linked with the MinGW runtime as per this
+build of libxml2) is called from a programme (e.g., bash.exe) which is
+linked with the MSYS runtime -->
+ <dependencies>
+ <dep package="xmlcatalog-wrapper"/>
+ </dependencies>
+ </autotools>
+ <autotools id="libxslt">
+ <branch hash="md5:9667bf6f9310b957254fdcf6596600b7" module="sources/libxslt-1.1.28.tar.gz" repo="http://xmlsoft.org/" size="983500" version="1.1.28"/>
+ <dependencies>
+ <dep package="libxml2"/>
+ </dependencies>
+ </autotools>
+ <autotools id="ragel">
+ <branch hash="sha256:dd7f7d22f3a58147379bda61334d341c2caa0caf9f71897e3e4ec05c8f398764" module="ragel/ragel-6.8.tar.gz" repo="http://www.complang.org/" size="1211146" version="6.8"/>
+ </autotools>
+ </moduleset>
Deleted: trunk/cmake/build_projects/gtk_packages_add.xml
===================================================================
--- trunk/cmake/build_projects/gtk_packages_add.xml 2013-10-12 00:49:36 UTC (rev 12590)
+++ trunk/cmake/build_projects/gtk_packages_add.xml 2013-10-12 18:13:59 UTC (rev 12591)
@@ -1,44 +0,0 @@
-<?xml version="1.0" ?>
-<!--
-Most of these data derived from http://www.linuxfromscratch.org, a
-wonderful site that provides fundamental build information for a lot
-of different free software packages.
--->
-<moduleset>
- <autotools id="libffi">
- <branch hash="sha256:1dddde1400c3bcb7749d398071af88c3e4754058d2d4c0b3696c2f82dc5cf11c" module="libffi/libffi-3.0.13.tar.gz" repo="ftp://sourceware.org/pub/" size="845747" version="3.0.13"/>
- </autotools>
- <autotools id="intltool">
- <branch hash="md5:23fbd879118253cb99aeac067da5f591" module="intltool/trunk/0.50.2/+download/intltool-0.50.2.tar.gz" repo="http://launchpad.net/" size="189483" version="0.50.2"/>
- </autotools>
- <autotools autogenargs="--disable-gtk" id="pixman">
- <pkg-config/>
- <branch hash="sha256:1d812f9f60215099355f5c13c6f06d7db1135c99f34ff03535b71b64435125fd" module="releases/pixman-0.30.0.tar.gz" repo="http://cairographics.org/" size="801692" version="0.30.0"/>
- </autotools>
- <autotools id="gperf">
- <branch hash="sha256:767112a204407e62dbc3106647cf839ed544f3cf5d0f0523aaa2508623aad63e" module="gnu/gperf/gperf-3.0.4.tar.gz" repo="http://ftp.gnu.org/" size="983500" version="3.0.4"/>
- </autotools>
-<!-- without these python shenanigans the python components of libxml2 are
-installed with the system prefix rather than desired special prefix
--->
- <autotools id="libxml2" makeargs="PYTHON_SITE_PACKAGES=${BP_CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages">
- <branch hash="md5:9c0cfef285d5c4a5c80d00904ddab380" module="sources/libxml2-2.9.1.tar.gz" repo="http://xmlsoft.org/" size="983500" version="2.9.1"/>
-<!-- This package (which installs nothing on Unix platforms) is
-required as a workaround for the xmlcatalog argument mangling that
-occurs when xmlcatalog (linked with the MinGW runtime as per this
-build of libxml2) is called from a programme (e.g., bash.exe) which is
-linked with the MSYS runtime -->
- <dependencies>
- <dep package="xmlcatalog-wrapper"/>
- </dependencies>
- </autotools>
- <autotools id="libxslt">
- <branch hash="md5:9667bf6f9310b957254fdcf6596600b7" module="sources/libxslt-1.1.28.tar.gz" repo="http://xmlsoft.org/" size="983500" version="1.1.28"/>
- <dependencies>
- <dep package="libxml2"/>
- </dependencies>
- </autotools>
- <autotools id="ragel">
- <branch hash="sha256:dd7f7d22f3a58147379bda61334d341c2caa0caf9f71897e3e4ec05c8f398764" module="ragel/ragel-6.8.tar.gz" repo="http://www.complang.org/" size="1211146" version="6.8"/>
- </autotools>
- </moduleset>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-10-12 00:49:39
|
Revision: 12590
http://sourceforge.net/p/plplot/code/12590
Author: airwin
Date: 2013-10-12 00:49:36 +0000 (Sat, 12 Oct 2013)
Log Message:
-----------
Enable the pdf device by default. Assuming that the libhpdf library
this device depends on has the patch available at
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=726069 applied, all
standard examples should work with this device.
Modified Paths:
--------------
trunk/cmake/modules/drivers-init.cmake
Modified: trunk/cmake/modules/drivers-init.cmake
===================================================================
--- trunk/cmake/modules/drivers-init.cmake 2013-10-12 00:45:01 UTC (rev 12589)
+++ trunk/cmake/modules/drivers-init.cmake 2013-10-12 00:49:36 UTC (rev 12590)
@@ -196,7 +196,7 @@
# no alpha transparency) and poorly maintained (the double free for
# example 2 has not been fixed). Therefore retire this device.
# "pbm:pbm:OFF:F:OFF"
- "pdf:pdf:OFF:F:OFF"
+ "pdf:pdf:ON:F:OFF"
# (2007-09-01) As discussed on list, don't enable plmeta until we sort
# out the known issues (e.g., strings, aspect ratio, and TrueType fonts).
# This is going to take time/energy for some volunteer who has not volunteered
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.
