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...> - 2014-03-31 00:57:59
|
Revision: 13088 http://sourceforge.net/p/plplot/code/13088 Author: airwin Date: 2014-03-31 00:57:53 +0000 (Mon, 31 Mar 2014) Log Message: ----------- Fix up several comprehensive testing issues with epa_build. The wxwidgets-related tests are still individually implemented for all platforms and for the Windows case those tests are dependencies of the more comprehensive interactive test targets. However, for the Unix case those dependencies have been dropped because of "forced mousing" issue that occurs with gtk+3 variant of wxwidgets that is beginning to be available (e.g., for epa_build) on Unix. Implement DROP_GTK_PLUS_2_BUILDS option (which defaults to OFF). When that option is turned ON, all targets which are related to gtk+2 only are dropped. This avoids build-time errors (for the static drivers case) or run-time errors (for the dynamic drivers case) due to clashes with gtk+3 libraries that are potentially used for other parts of PLplot (e.g., the cairo and wxwidgets device drivers). Tested on Linux using the build_plplot target of epa_build that is configured with -DCOMPREHENSIVE_PLPLOT_TEST_INTERACTIVE=ON and -DCOMPREHENSIVE_PLPLOT_TEST_NONINTERACTIVE=ON Modified Paths: -------------- trunk/cmake/epa_build/plplot/CMakeLists.txt trunk/cmake/epa_build/plplot_lite/CMakeLists.txt trunk/cmake/modules/cairo.cmake trunk/cmake/modules/ocaml.cmake trunk/cmake/modules/plplot.cmake trunk/examples/CMakeLists.txt trunk/plplot_test/CMakeLists.txt trunk/plplot_test/plplot-test-interactive.sh.in Modified: trunk/cmake/epa_build/plplot/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/plplot/CMakeLists.txt 2014-03-27 17:56:11 UTC (rev 13087) +++ trunk/cmake/epa_build/plplot/CMakeLists.txt 2014-03-31 00:57:53 UTC (rev 13088) @@ -64,6 +64,13 @@ # other PLplot dependencies that are epa_built. set(cmake_args -DENABLE_octave=OFF) +# Drop gtk+2-only dependencies since those clash (at build time for static +# device drivers and at run-time with dynamic device drivers) with +# gtk+3 that is used with epa_build. +list(APPEND cmake_args + -DDROP_GTK_PLUS_2_BUILDS=ON + ) + if(MSYS_PLATFORM) # Turn off the cairo and qt device drivers for plplot on Windows # until the pango and qt4_lite packages and all their dependencies @@ -88,7 +95,7 @@ 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 "epa_build not located in cmake/epa_build in a PLplot source tree") Modified: trunk/cmake/epa_build/plplot_lite/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/plplot_lite/CMakeLists.txt 2014-03-27 17:56:11 UTC (rev 13087) +++ trunk/cmake/epa_build/plplot_lite/CMakeLists.txt 2014-03-31 00:57:53 UTC (rev 13088) @@ -53,6 +53,13 @@ # other PLplot dependencies that are epa_built. set(cmake_args -DENABLE_octave=OFF) +# Drop gtk+2-only dependencies since those clash (at build time for static +# device drivers and at run-time with dynamic device drivers) with +# gtk+3 that is used with epa_build. +list(APPEND cmake_args + -DDROP_GTK_PLUS_2_BUILDS=ON + ) + # In addition turn off wxwidgets, cairo, and qt for plplot_lite. list(APPEND cmake_args -DPLD_wxwidgets=OFF Modified: trunk/cmake/modules/cairo.cmake =================================================================== --- trunk/cmake/modules/cairo.cmake 2014-03-27 17:56:11 UTC (rev 13087) +++ trunk/cmake/modules/cairo.cmake 2014-03-31 00:57:53 UTC (rev 13088) @@ -48,6 +48,11 @@ # set the environment variable CMAKE_LIBRARY_PATH. # See cmake documentation for further details. +# Turn off PLD_xcairo if gtk+2 dependencies need to be dropped. +if(DROP_GTK_PLUS_2_BUILDS) + set(PLD_xcairo OFF CACHE BOOL "Enable xcairo device" FORCE) +endif(DROP_GTK_PLUS_2_BUILDS) + # Look for cairo headers and libraries with pkg-config if( PLD_memcairo Modified: trunk/cmake/modules/ocaml.cmake =================================================================== --- trunk/cmake/modules/ocaml.cmake 2014-03-27 17:56:11 UTC (rev 13087) +++ trunk/cmake/modules/ocaml.cmake 2014-03-31 00:57:53 UTC (rev 13088) @@ -243,8 +243,12 @@ else(OCAML_HAS_CAIRO) message(STATUS "WARNING:" "Cairo OCaml library not found. Disabling lablgtk2 support") - set(OCAML_HAS_GTK OFF CACHE BOOL "OCaml has the cairo.lablgtk2 package" FORCE) + set(OCAML_HAS_GTK OFF CACHE BOOL "OCaml has the cairo.lablgtk2 package" FORCE) endif(OCAML_HAS_CAIRO) + + if(DROP_GTK_PLUS_2_BUILDS) + set(OCAML_HAS_GTK OFF CACHE BOOL "OCaml has the cairo.lablgtk2 package" FORCE) + endif(DROP_GTK_PLUS_2_BUILDS) if(OCAML_HAS_GTK) set(text_gtk Modified: trunk/cmake/modules/plplot.cmake =================================================================== --- trunk/cmake/modules/plplot.cmake 2014-03-27 17:56:11 UTC (rev 13087) +++ trunk/cmake/modules/plplot.cmake 2014-03-31 00:57:53 UTC (rev 13088) @@ -21,6 +21,8 @@ option(ADD_SPECIAL_CONSISTENCY_CHECKING "Add extra source-tree consistency checking targets that require special tools" OFF) +option(DROP_GTK_PLUS_2_BUILDS "Drop builds of gtk+2-only targets that clash with gtk+3 dependencies" OFF) + # target that depends on all check targets. add_custom_target(check_all) Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2014-03-27 17:56:11 UTC (rev 13087) +++ trunk/examples/CMakeLists.txt 2014-03-31 00:57:53 UTC (rev 13088) @@ -761,7 +761,17 @@ if(files_examples_c AND targets_examples_c) add_dependencies(test_c_${device} ${targets_examples_c}) endif(files_examples_c AND targets_examples_c) - list(APPEND interactive_targets_LIST test_c_${device}) + if(NOT device STREQUAL "wxwidgets") + list(APPEND interactive_targets_LIST test_c_${device}) + elseif(WIN32_AND_NOT_CYGWIN) + list(APPEND interactive_targets_LIST test_c_${device}) + else(NOT device STREQUAL "wxwidgets") + message(STATUS "WARNING: The test_c_wxwidgets target can be run independently on + the Unix platform, but it generates \"forced mousing\" screen + refreshes for the wxwidgets-3.0.0 case so it is temporarily + excluded from being a dependency of other more general interactive + test targets") + endif(NOT device STREQUAL "wxwidgets") if(ENABLE_octave) get_property(targets_examples_octave GLOBAL PROPERTY TARGETS_examples_octave) @@ -836,7 +846,15 @@ if(FILE_DEPENDS_wxwidgets) add_dependencies(test_wxPLplotDemo test_wxwidgets_dyndriver) endif(FILE_DEPENDS_wxwidgets) - list(APPEND interactive_targets_LIST test_wxPLplotDemo) + if(WIN32_AND_NOT_CYGWIN) + list(APPEND interactive_targets_LIST test_wxPLplotDemo) + else(WIN32_AND_NOT_CYGWIN) + message(STATUS "WARNING: The test_wxPLplotDemo target can be run independently on + the Unix platform, but it generates \"forced mousing\" screen + refreshes for the wxwidgets-3.0.0 case so it is temporarily + excluded from being a dependency of other more general interactive + test targets") + endif(WIN32_AND_NOT_CYGWIN) endif(ENABLE_wxwidgets) if(PLD_extqt) Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2014-03-27 17:56:11 UTC (rev 13087) +++ trunk/plplot_test/CMakeLists.txt 2014-03-31 00:57:53 UTC (rev 13088) @@ -2,7 +2,7 @@ ### ### Process this file with cmake to produce Makefile ### -# Copyright (C) 2006-2013 Alan W. Irwin +# Copyright (C) 2006-2014 Alan W. Irwin # # This file is part of PLplot. # @@ -63,7 +63,9 @@ @ONLY ) - # Set up optional tests in the configured plplot-test-interactive.sh file. + # Set up optional tests in the configured plplot-test-interactive.sh file + # which is used by the traditional build system for the installed + # examples to do some interactive testing. set(pkgIndex_LOCATION ${DATA_DIR}) set(SHELL_TEST_PLTCL_STANDARD_EXAMPLES 1) @@ -87,6 +89,17 @@ set(SHELL_TEST_WISH_RUNALLDEMOS 0) endif(BUILD_SHARED_LIBS) + if(WIN32_AND_NOT_CYGWIN) + set(SHELL_TEST_WXWIDGETS 1) + else(WIN32_AND_NOT_CYGWIN) + # FIXME. + # The wxwidgets device on Unix generates "forced mousing" screen + # refreshes for the wxwidgets-3.0.0 case so it is temporarily excluded + # from the interactive tests done for the traditional build system + # for the installed examples. + set(SHELL_TEST_WXWIDGETS 0) + endif(WIN32_AND_NOT_CYGWIN) + configure_file( plplot-test-interactive.sh.in ${CMAKE_CURRENT_BINARY_DIR}/plplot-test-interactive.sh Modified: trunk/plplot_test/plplot-test-interactive.sh.in =================================================================== --- trunk/plplot_test/plplot-test-interactive.sh.in 2014-03-27 17:56:11 UTC (rev 13087) +++ trunk/plplot_test/plplot-test-interactive.sh.in 2014-03-31 00:57:53 UTC (rev 13088) @@ -107,7 +107,10 @@ # These blank-delimited strings must be consistent with previous configured # list of devices. -POSSIBLE_INTERACTIVE_DEVICES_LIST="xwin tk ntk xcairo gcw wxwidgets qtwidget" +POSSIBLE_INTERACTIVE_DEVICES_LIST="xwin tk ntk xcairo gcw qtwidget" +if [ "@SHELL_TEST_WXWIDGETS@" -ne 0 ] ; then + POSSIBLE_INTERACTIVE_DEVICES_LIST="$POSSIBLE_INTERACTIVE_DEVICES_LIST wxwidgets" +fi POSSIBLE_DEVICES_LIST="$POSSIBLE_INTERACTIVE_DEVICES_LIST extcairo extqt" # Default DEVICES_LIST is all eligible devices if environment variable @@ -167,7 +170,7 @@ COUNT=$(( $COUNT + 1 )) fi -if [ "@ENABLE_wxwidgets@" = "ON" -a "@ENABLE_cxx@" = "ON" ] ; then +if [ "@ENABLE_wxwidgets@" = "ON" -a "@ENABLE_cxx@" = "ON" -a "@SHELL_TEST_WXWIDGETS@" -ne 0 ] ; then INDEX_LIST="$INDEX_LIST $COUNT" DIRECTORY[$COUNT]="${EXAMPLES_DIR}/c++" COMMAND[$COUNT]="./wxPLplotDemo" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-03-27 17:56:15
|
Revision: 13087 http://sourceforge.net/p/plplot/code/13087 Author: airwin Date: 2014-03-27 17:56:11 +0000 (Thu, 27 Mar 2014) Log Message: ----------- Use more robust fix noted at http://savannah.gnu.org/bugs/?41965 by Mike Miller which does not depend on assumptions about the internal type used to represent Octave strings. fwrite (fid, text, "schar"); ==> fprintf (fid, "%s", text); This change passes the same test on Linux with Octave 3.6.2 as the last version. Modified Paths: -------------- trunk/bindings/octave/PLplot/support/__makeinfo__.m Modified: trunk/bindings/octave/PLplot/support/__makeinfo__.m =================================================================== --- trunk/bindings/octave/PLplot/support/__makeinfo__.m 2014-03-27 01:12:32 UTC (rev 13086) +++ trunk/bindings/octave/PLplot/support/__makeinfo__.m 2014-03-27 17:56:11 UTC (rev 13087) @@ -120,7 +120,7 @@ if (fid < 0) error ("__makeinfo__: could not create temporary file"); endif - fwrite (fid, text, "schar"); + fprintf (fid, "%s", text); fclose (fid); ## Take action depending on output type This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-03-27 01:12:35
|
Revision: 13086 http://sourceforge.net/p/plplot/code/13086 Author: airwin Date: 2014-03-27 01:12:32 +0000 (Thu, 27 Mar 2014) Log Message: ----------- Add patched version of system __makeinfo__.m which uses the "schar" (signed character) type to write a documentation string to a temporary file. This fixes an Octave issue <http://savannah.gnu.org/bugs/index.php?41965> with the default "uchar" type for fwrite used by the system version of __makeinfo__.m. The result of that default type is all utf8 8-bit binary characters are replaced by nulls (which therefore truncates the output from the help command when the help string contains utf8 characters). This truncation is eliminated by this patched version of __makeinfo__.m, but this file should be withdrawn again once octave fixes bug 41965 and that fix propagates to most octave installations. Tested on Linux with octave 3.6.2 by changing directory to the top of the build tree, setting the octavedir environment variable export octavedir=bindings/octave:../plplot_allura/bindings/octave/PLplot:../plplot_allura/bindings/octave/PLplot/support/:../plplot_allura/bindings/octave/misc/: , and then executing the following octave commands inside an octave session: addpath(getenv("octavedir")); plplot_stub; help plot3dcl; The latter command gave the full expected utf8 help for plplot3dl without truncation. Modified Paths: -------------- trunk/bindings/octave/PLplot/support/CMakeLists.txt Added Paths: ----------- trunk/bindings/octave/PLplot/support/__makeinfo__.m Modified: trunk/bindings/octave/PLplot/support/CMakeLists.txt =================================================================== --- trunk/bindings/octave/PLplot/support/CMakeLists.txt 2014-03-27 00:24:08 UTC (rev 13085) +++ trunk/bindings/octave/PLplot/support/CMakeLists.txt 2014-03-27 01:12:32 UTC (rev 13086) @@ -50,6 +50,7 @@ __plt__.m is_strmatrix.m is_strvector.m +__makeinfo__.m ) install(FILES ${m_files} DESTINATION ${PLPLOT_OCTAVE_DIR}/support) Added: trunk/bindings/octave/PLplot/support/__makeinfo__.m =================================================================== --- trunk/bindings/octave/PLplot/support/__makeinfo__.m (rev 0) +++ trunk/bindings/octave/PLplot/support/__makeinfo__.m 2014-03-27 01:12:32 UTC (rev 13086) @@ -0,0 +1,150 @@ +## Copyright (C) 2009-2012 S�ren Hauberg +## +## This file is part of Octave. +## +## Octave is free software; you can redistribute it and/or modify it +## under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 3 of the License, or (at +## your option) any later version. +## +## Octave 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 +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Octave; see the file COPYING. If not, see +## <http://www.gnu.org/licenses/>. + +## -*- texinfo -*- +## @deftypefn {Function File} {[@var{retval}, @var{status}] =} __makeinfo__ (@var{text}, @var{output_type}) +## @deftypefnx {Function File} {[@var{retval}, @var{status}] =} __makeinfo__ (@var{text}, @var{output_type}, @var{see_also}) +## Undocumented internal function. +## @end deftypefn + +## Run @code{makeinfo} on a given text. +## +## The string @var{text} is run through the @code{__makeinfo__} program +## to generate output in various formats. This string must contain valid +## Texinfo formatted text. +## +## The @var{output_type} selects the format of the output. This can be either +## @t{"html"}, @t{"texinfo"}, or @t{"plain text"}. By default this is +## @t{"plain text"}. If @var{output_type} is @t{"texinfo"}, the @t{@@seealso} +## macro is expanded, but otherwise the text is unaltered. +## +## If the optional argument @var{see_also} is present, it is used to expand the +## Octave specific @t{@@seealso} macro. This argument must be a function handle, +## that accepts a cell array of strings as input argument (each elements of the +## array corresponds to the arguments to the @t{@@seealso} macro), and return +## the expanded string. If this argument is not given, the @t{@@seealso} macro +## will be expanded to the text +## +## @example +## See also: arg1, arg2, ... +## @end example +## +## @noindent +## for @t{"plain text"} output, and +## +## @example +## See also: @@ref@{arg1@}, @@ref@{arg2@}, ... +## @end example +## +## @noindent +## otherwise. +## +## The optional output argument @var{status} contains the exit status of the +## @code{makeinfo} program as returned by @code{system}. + +function [retval, status] = __makeinfo__ (text, output_type = "plain text", fsee_also) + + ## Check input + if (nargin < 1 || nargin > 3) + print_usage (); + endif + + if (! ischar (text)) + error ("__makeinfo__: first input argument must be a string"); + endif + + if (! ischar (output_type)) + error ("__makeinfo__: second input argument must be a string"); + endif + + if (nargin < 3) + if (strcmpi (output_type, "plain text")) + fsee_also = @(T) strcat ... + ("\nSee also:", sprintf (" %s,", T{:})(1:end-1), "\n"); + else + fsee_also = @(T) strcat ... + ("\nSee also:", sprintf (" @ref{%s},", T{:})(1:end-1), "\n"); + endif + endif + + if (! isa (fsee_also, "function_handle")) + error ("__makeinfo__: third input argument must be a function handle"); + endif + + + ## It seems like makeinfo sometimes gets angry if the first character + ## on a line is a space, so we remove these. + text = strrep (text, "\n ", "\n"); + + ## Handle @seealso macro + see_also_pat = '@seealso *\{(.*)\}'; + args = regexp (text, see_also_pat, 'tokens'); + for ii = 1:numel (args) + expanded = fsee_also (strtrim (strsplit (args{ii}{:}, ',', true))); + text = regexprep (text, see_also_pat, expanded, 'once'); + endfor + + ## Handle @nospell macro + text = regexprep (text, '@nospell *\{([^}]*)\}', "$1"); + ## Handle @xcode macro + text = regexprep (text, '@xcode *\{([^}]*)\}', "$1"); + + if (strcmpi (output_type, "texinfo")) + status = 0; + retval = text; + return; + endif + + ## Create the final TeXinfo input string + text = sprintf ("\\input texinfo\n\n%s\n\n@bye\n", text); + + unwind_protect + ## Write Texinfo to tmp file + template = "octave-help-XXXXXX"; + [fid, name] = mkstemp (fullfile (P_tmpdir, template), true); + if (fid < 0) + error ("__makeinfo__: could not create temporary file"); + endif + fwrite (fid, text, "schar"); + fclose (fid); + + ## Take action depending on output type + switch (lower (output_type)) + case "plain text" + cmd = sprintf ("%s --no-headers --no-warn --force --no-validate %s", + makeinfo_program (), name); + case "html" + cmd = sprintf ("%s --no-headers --html --no-warn --no-validate --force %s", + makeinfo_program (), name); + otherwise + error ("__makeinfo__: unsupported output type: '%s'", output_type); + endswitch + + ## Call makeinfo + [status, retval] = system (cmd); + + unwind_protect_cleanup + if (exist (name, "file")) + delete (name); + endif + end_unwind_protect +endfunction + +## No test needed for internal helper function. +%!assert (1) + Property changes on: trunk/bindings/octave/PLplot/support/__makeinfo__.m ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-03-27 00:24:14
|
Revision: 13085 http://sourceforge.net/p/plplot/code/13085 Author: airwin Date: 2014-03-27 00:24:08 +0000 (Thu, 27 Mar 2014) Log Message: ----------- One more post-massage cleanup. Remove bindings/octave/etc since this directory and its contents plplot.doc are no longer mentioned anywhere in our source tree. Removed Paths: ------------- trunk/bindings/octave/etc/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-03-21 20:40:50
|
Revision: 13084 http://sourceforge.net/p/plplot/code/13084 Author: airwin Date: 2014-03-21 20:40:45 +0000 (Fri, 21 Mar 2014) Log Message: ----------- Both OCTAVE_HAS_CAIRO and OCTAVE_HAS_GTK are made configurable by the user with the default ON. Modified Paths: -------------- trunk/cmake/modules/ocaml.cmake Modified: trunk/cmake/modules/ocaml.cmake =================================================================== --- trunk/cmake/modules/ocaml.cmake 2014-03-18 03:13:46 UTC (rev 13083) +++ trunk/cmake/modules/ocaml.cmake 2014-03-21 20:40:45 UTC (rev 13084) @@ -2,7 +2,7 @@ # # Copyright (C) 2008 Andrew Ross # Copyright (C) 2009 Hezekiah M. Carty -# Copyright (C) 2009 Alan W. Irwin +# Copyright (C) 2009-2014 Alan W. Irwin # # This file is part of PLplot. # @@ -195,21 +195,21 @@ # Test for the availability of Cairo and Gtk+ bindings if(OCAMLFIND) if(PLD_extcairo) - set(text_cairo "module C = Cairo") - file(WRITE ${CMAKE_BINARY_DIR}/test_cairo.ml ${text_cairo}) - execute_process( - COMMAND ${OCAMLFIND} c -package cairo -linkpkg test_cairo.ml -o test_cairo - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - RESULT_VARIABLE OCAML_HAS_CAIRO - OUTPUT_QUIET - ERROR_QUIET - ) - # zero return code indicates no errors. Thus, OCAML_HAS_CAIRO must have - # truth inverted. + option(OCAML_HAS_CAIRO "OCaml has the cairo package" ON) if(OCAML_HAS_CAIRO) - set(OCAML_HAS_CAIRO OFF) - else(OCAML_HAS_CAIRO) - set(OCAML_HAS_CAIRO ON) + set(text_cairo "module C = Cairo") + file(WRITE ${CMAKE_BINARY_DIR}/test_cairo.ml ${text_cairo}) + execute_process( + COMMAND ${OCAMLFIND} c -package cairo -linkpkg test_cairo.ml -o test_cairo + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + RESULT_VARIABLE OCAML_HAS_CAIRO_RC + OUTPUT_QUIET + ERROR_QUIET + ) + # non-zero return code indicates errors. + if(OCAML_HAS_CAIRO_RC) + set(OCAML_HAS_CAIRO OFF CACHE BOOL "OCaml has the cairo package" FORCE) + endif(OCAML_HAS_CAIRO_RC) endif(OCAML_HAS_CAIRO) if(OCAML_HAS_CAIRO) @@ -226,36 +226,43 @@ else(linkflags) message(STATUS "WARNING:" "pkg-config could not find cairo module. Disabling Plcairo module") - set(OCAML_HAS_CAIRO OFF) + set(OCAML_HAS_CAIRO OFF CACHE BOOL "OCaml has the cairo package" FORCE) endif(linkflags) else(PKG_CONFIG_EXECUTABLE) message(STATUS "WARNING:" "pkg-config not found. Disabling Plcairo module") - set(OCAML_HAS_CAIRO OFF) + set(OCAML_HAS_CAIRO OFF CACHE BOOL "OCaml has the cairo package" FORCE) endif(PKG_CONFIG_EXECUTABLE) else(OCAML_HAS_CAIRO) message(STATUS "WARNING:" "Cairo OCaml library not found. Disabling Plcairo module") endif(OCAML_HAS_CAIRO) - set(text_gtk - "module G = Gtk + if(OCAML_HAS_CAIRO) + option(OCAML_HAS_GTK "OCaml has the cairo.lablgtk2 package" ON) + else(OCAML_HAS_CAIRO) + message(STATUS "WARNING:" + "Cairo OCaml library not found. Disabling lablgtk2 support") + set(OCAML_HAS_GTK OFF CACHE BOOL "OCaml has the cairo.lablgtk2 package" FORCE) + endif(OCAML_HAS_CAIRO) + + if(OCAML_HAS_GTK) + set(text_gtk + "module G = Gtk module C = Cairo_lablgtk" - ) - file (WRITE ${CMAKE_BINARY_DIR}/test_gtk.ml ${text_gtk}) - execute_process( - COMMAND ${OCAMLFIND} c -package cairo.lablgtk2 -linkpkg test_gtk.ml -o test_gtk - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - RESULT_VARIABLE OCAML_HAS_GTK - OUTPUT_QUIET - ERROR_QUIET - ) - # zero return code indicates no errors. Thus, OCAML_HAS_CAIRO must have - # truth inverted. - if(OCAML_HAS_GTK) - set(OCAML_HAS_GTK OFF) - else(OCAML_HAS_GTK) - set(OCAML_HAS_GTK ON) + ) + file (WRITE ${CMAKE_BINARY_DIR}/test_gtk.ml ${text_gtk}) + execute_process( + COMMAND ${OCAMLFIND} c -package cairo.lablgtk2 -linkpkg test_gtk.ml -o test_gtk + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + RESULT_VARIABLE OCAML_HAS_GTK_RC + OUTPUT_QUIET + ERROR_QUIET + ) + # non-zero return code indicates errors. + if(OCAML_HAS_GTK_RC) + set(OCAML_HAS_GTK OFF CACHE BOOL "OCaml has the cairo.lablgtk2 package" FORCE) + endif(OCAML_HAS_GTK_RC) endif(OCAML_HAS_GTK) if(OCAML_HAS_GTK) @@ -266,11 +273,13 @@ endif (PLD_extcairo) else(OCAMLFIND) message(STATUS "WARNING:" - "ocamlfind not available. Disabling Plcairo module and lablgtk support") - set(OCAML_HAS_CAIRO OFF) - set(OCAML_HAS_GTK OFF) + "ocamlfind not available. Disabling Plcairo module and lablgtk2 support") + set(OCAML_HAS_CAIRO OFF CACHE BOOL "OCaml has the cairo package" FORCE) + set(OCAML_HAS_GTK OFF CACHE BOOL "OCaml has the cairo.lablgtk2 package" FORCE) endif(OCAMLFIND) else(ENABLE_ocaml) - set(OCAML_HAS_CAIRO OFF) - set(OCAML_HAS_GTK OFF) + message(STATUS "WARNING:" + "ENABLE_ocaml is OFF so disabling Plcairo module and lablgtk2 support") + set(OCAML_HAS_CAIRO OFF CACHE BOOL "OCaml has the cairo package" FORCE) + set(OCAML_HAS_GTK OFF CACHE BOOL "OCaml has the cairo.lablgtk2 package" FORCE) endif(ENABLE_ocaml) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-03-18 03:13:50
|
Revision: 13083 http://sourceforge.net/p/plplot/code/13083 Author: airwin Date: 2014-03-18 03:13:46 +0000 (Tue, 18 Mar 2014) Log Message: ----------- Disable the octave binding for both plplot and plplot_lite. There is no epa_build of octave yet. Furthermore, non-epa_built versions of octave will have many dependencies that are likely to clash with the versions of the other PLplot dependencies that are epa_built. For the plplot (as opposed to plplot_lite) case on the Windows platform exclude the pango and qt4_lite dependencies and disable the corresponding PLplot capabilities because pango, qt4_lite, and all their dependent packages do not epa_build correctly yet on Windows. Thus, on Windows the only difference between plplot and plplot_lite at the moment is the former has a dependency on the wxwidgets epa_build and allows the corresponding wxwidgets device driver to be built and tested. On Unix, the differences between plplot and plplot_lite are larger; the former has a dependency on wxwidgets, pango, and qt4_lite and allows the corresponding PLplot capabilities to be built and tested. Modified Paths: -------------- trunk/cmake/epa_build/plplot/CMakeLists.txt trunk/cmake/epa_build/plplot_lite/CMakeLists.txt Modified: trunk/cmake/epa_build/plplot/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/plplot/CMakeLists.txt 2014-03-18 02:55:19 UTC (rev 13082) +++ trunk/cmake/epa_build/plplot/CMakeLists.txt 2014-03-18 03:13:46 UTC (rev 13083) @@ -29,11 +29,20 @@ libharu libqhull shapelib - pango - qt4_lite wxwidgets ) +# For now only add in these dependencies for the Unix case because +# these epa_builds do not yet work on Windows. + +if(NOT MSYS_PLATFORM) + list(APPEND dependencies_LIST + pango + qt4_lite + ) +endif(NOT MSYS_PLATFORM) + + # Do boilerplate tasks that must be done for each different project # that is configured as part of epa_build. epa_boilerplate( @@ -49,12 +58,23 @@ set(CXXFLAGS "$ENV{CXXFLAGS}") set(FFLAGS "$ENV{FFLAGS}") -# Leave everything ON by default for plplot. Since octave currently -# (and for a long time into the future) does not have an epa_build -# configuration for octave, the system version of octave will be -# used if it exists. -set(cmake_args) +# Disable the octave binding for PLplot. There is no epa_build of +# octave yet. Furthermore, non-epa_built versions of octave will have +# many dependencies that are likely to clash with the versions of the +# other PLplot dependencies that are epa_built. +set(cmake_args -DENABLE_octave=OFF) +if(MSYS_PLATFORM) + # Turn off the cairo and qt device drivers for plplot on Windows + # until the pango and qt4_lite packages and all their dependencies + # build properly on that platform + list(APPEND cmake_args + -DDEFAULT_NO_CAIRO_DEVICES:BOOL=ON + -DDEFAULT_NO_QT_DEVICES:BOOL=ON + -DENABLE_qt=OFF + ) +endif(MSYS_PLATFORM) + # Assumption that the top-level local PLplot source tree is two directories # up from the present top-level directory for epa_build. # This assumption is correct if you are accessing epa_build as Modified: trunk/cmake/epa_build/plplot_lite/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/plplot_lite/CMakeLists.txt 2014-03-18 02:55:19 UTC (rev 13082) +++ trunk/cmake/epa_build/plplot_lite/CMakeLists.txt 2014-03-18 03:13:46 UTC (rev 13083) @@ -47,8 +47,14 @@ set(CXXFLAGS "$ENV{CXXFLAGS}") set(FFLAGS "$ENV{FFLAGS}") -# Turn off wxwidgets, cairo, and qt for plplot_lite. -set(cmake_args +# Disable the octave binding for PLplot. There is no epa_build of +# octave yet. Furthermore, non-epa_built versions of octave will have +# many dependencies that are likely to clash with the versions of the +# other PLplot dependencies that are epa_built. +set(cmake_args -DENABLE_octave=OFF) + +# In addition turn off wxwidgets, cairo, and qt for plplot_lite. +list(APPEND cmake_args -DPLD_wxwidgets=OFF -DENABLE_wxwidgets=OFF -DDEFAULT_NO_CAIRO_DEVICES:BOOL=ON This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-03-18 02:55:23
|
Revision: 13082 http://sourceforge.net/p/plplot/code/13082 Author: airwin Date: 2014-03-18 02:55:19 +0000 (Tue, 18 Mar 2014) Log Message: ----------- Replace "d" by ${LIB_TAG} as appropriate so that new scheme with empty LIB_TAG works properly. This issue only affected the Windows case. Modified Paths: -------------- trunk/bindings/ada/CMakeLists.txt Modified: trunk/bindings/ada/CMakeLists.txt =================================================================== --- trunk/bindings/ada/CMakeLists.txt 2014-03-17 19:56:51 UTC (rev 13081) +++ trunk/bindings/ada/CMakeLists.txt 2014-03-18 02:55:19 UTC (rev 13082) @@ -74,7 +74,7 @@ if(NON_TRANSITIVE) # empty list ==> non-transitive linking for everything that links to - # libplplotadad in the shared libraries case. + # libplplotada${LIB_TAG} in the shared libraries case. target_link_libraries(plplotada${LIB_TAG} LINK_INTERFACE_LIBRARIES) # This configures the pkg-config method to use non-transitive linking. set(PC_REQUIRES_TAG "Requires.private") @@ -90,7 +90,7 @@ add_custom_command( TARGET plplotada${LIB_TAG} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different - libplplotadad.dll libplplotadad.dll.a + libplplotada${LIB_TAG}.dll libplplotada${LIB_TAG}.dll.a WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/dll VERBATIM ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-03-17 19:56:55
|
Revision: 13081 http://sourceforge.net/p/plplot/code/13081 Author: airwin Date: 2014-03-17 19:56:51 +0000 (Mon, 17 Mar 2014) Log Message: ----------- Use --with-gtk=3 option only for non-Windows case. Modified Paths: -------------- trunk/cmake/epa_build/wxwidgets/CMakeLists.txt Modified: trunk/cmake/epa_build/wxwidgets/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/wxwidgets/CMakeLists.txt 2014-03-17 04:50:38 UTC (rev 13080) +++ trunk/cmake/epa_build/wxwidgets/CMakeLists.txt 2014-03-17 19:56:51 UTC (rev 13081) @@ -55,6 +55,7 @@ # and therefore (now that epa_build has a gtk+ configuration) # we must specificially add gtk+ as a dependency of wxwidgets. list(APPEND dependencies_LIST gtk+) + set(toolkit_options --enable-debug --enable-debug_gdb --with-gtk=3) endif(MSYS_PLATFORM) set(CFLAGS "$ENV{CFLAGS}") @@ -76,7 +77,7 @@ build_${PACKAGE} URL ${URL} URL_HASH ${URL_HASH} - CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --enable-shared --enable-unicode --enable-debug --enable-debug_gdb --with-gtk=3 ${toolkit_options} + CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --enable-shared --enable-unicode ${toolkit_options} BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} BUILD_IN_SOURCE 1 INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_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...> - 2014-03-17 04:50:41
|
Revision: 13080 http://sourceforge.net/p/plplot/code/13080 Author: airwin Date: 2014-03-17 04:50:38 +0000 (Mon, 17 Mar 2014) Log Message: ----------- Let plplot build using the wxwidgets device driver which was problematic before in the epa_build case because previously the epa_build of wxwidgets depended on a bad mixture of pango/cairo from gtk+3 stack and the rest of the gtk+2 stack from the Linux system. The resulting wxwidgets device driver builds find, and mostly runs fine as well (see further discussions about that on list). Modified Paths: -------------- trunk/cmake/epa_build/plplot/CMakeLists.txt Modified: trunk/cmake/epa_build/plplot/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/plplot/CMakeLists.txt 2014-03-17 04:46:07 UTC (rev 13079) +++ trunk/cmake/epa_build/plplot/CMakeLists.txt 2014-03-17 04:50:38 UTC (rev 13080) @@ -31,6 +31,7 @@ shapelib pango qt4_lite + wxwidgets ) # Do boilerplate tasks that must be done for each different project @@ -48,14 +49,11 @@ set(CXXFLAGS "$ENV{CXXFLAGS}") set(FFLAGS "$ENV{FFLAGS}") -# Leave everything ON by default for plplot. -# Except for turning off all wxwidgets dependencies temporarily because -# of mixed linking issues until epa_build implements build configurations -# for a consistent stack of libraries for all of gtk. -set(cmake_args - -DPLD_wxwidgets=OFF - -DENABLE_wxwidgets=OFF - ) +# Leave everything ON by default for plplot. Since octave currently +# (and for a long time into the future) does not have an epa_build +# configuration for octave, the system version of octave will be +# used if it exists. +set(cmake_args) # Assumption that the top-level local PLplot source tree is two directories # up from the present top-level directory for epa_build. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-03-17 04:46:13
|
Revision: 13079 http://sourceforge.net/p/plplot/code/13079 Author: airwin Date: 2014-03-17 04:46:07 +0000 (Mon, 17 Mar 2014) Log Message: ----------- Update build from wxwidgets version 2.8.12 (which does not run correctly on Linux when linked to gtk+ version 3 that is built with epa_build) to to wxwidgets version 3.0.0. Add configure option --with-gtk=3 to inform wxwidgets-3.0.0 that it is meant to be built against gtk+ version 3. Work around build bug introduced as of wxwidgets-3.0.0 for a separate build tree by forcing an in-source build. The result builds without issues on Linux and mostly produces good run-time results with PLplot (see further discussion on list). Modified Paths: -------------- trunk/cmake/epa_build/wxwidgets/CMakeLists.txt Modified: trunk/cmake/epa_build/wxwidgets/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/wxwidgets/CMakeLists.txt 2014-03-16 23:09:57 UTC (rev 13078) +++ trunk/cmake/epa_build/wxwidgets/CMakeLists.txt 2014-03-17 04:46:07 UTC (rev 13079) @@ -64,14 +64,20 @@ string(REGEX REPLACE "-fvisibility=hidden" "" CXXFLAGS "${CXXFLAGS}") # Data that is related to downloads. -set(URL http://prdownloads.sourceforge.net/wxwindows/wxWidgets-2.8.12.tar.gz) -set(URL_MD5 2fa39da14bc06ea86fe902579fedc5b1) +# N.B. 2.8.12 does not work properly with gtk+ version 3. At minimum +# you need wxwidgets-2.9.4 (which is the first version to honor the +# ---with-gtk=3 option below). +#set(URL http://prdownloads.sourceforge.net/wxwindows/wxWidgets-2.8.12.tar.gz) +#set(URL_HASH MD5=2fa39da14bc06ea86fe902579fedc5b1) +set(URL http://prdownloads.sourceforge.net/wxwindows/3.0.0/wxWidgets-3.0.0.tar.bz2) +set(URL_HASH SHA1=756a9c54d1f411e262f03bacb78ccef085a9880a) ExternalProject_Add( build_${PACKAGE} URL ${URL} - URL_MD5 ${URL_MD5} - CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --enable-shared --enable-unicode --enable-debug --enable-debug_gdb ${toolkit_options} + URL_HASH ${URL_HASH} + CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --enable-shared --enable-unicode --enable-debug --enable-debug_gdb --with-gtk=3 ${toolkit_options} BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} + BUILD_IN_SOURCE 1 INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_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...> - 2014-03-16 23:10:02
|
Revision: 13078 http://sourceforge.net/p/plplot/code/13078 Author: airwin Date: 2014-03-16 23:09:57 +0000 (Sun, 16 Mar 2014) Log Message: ----------- Add gtk+ dependency to wxwidgets for the Unix case and also add wxwidgets as a "starting" package for the top-level CMakeLists.txt file so a build of wxwidgets will always be possible regardless of whether plplot depends on it or not. Modified Paths: -------------- trunk/cmake/epa_build/CMakeLists.txt trunk/cmake/epa_build/wxwidgets/CMakeLists.txt Modified: trunk/cmake/epa_build/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/CMakeLists.txt 2014-03-16 22:22:46 UTC (rev 13077) +++ trunk/cmake/epa_build/CMakeLists.txt 2014-03-16 23:09:57 UTC (rev 13078) @@ -416,6 +416,7 @@ plplot plplot_lite gtk+ + wxwidgets qt4_lite ) endif(BUILD_THE_BUILDTOOLS) Modified: trunk/cmake/epa_build/wxwidgets/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/wxwidgets/CMakeLists.txt 2014-03-16 22:22:46 UTC (rev 13077) +++ trunk/cmake/epa_build/wxwidgets/CMakeLists.txt 2014-03-16 23:09:57 UTC (rev 13078) @@ -39,6 +39,7 @@ if(MSYS_PLATFORM) set(CXXFLAGS "-fno-keep-inline-dllexport $ENV{CXXFLAGS}") + # No further dependencies required on Windows. else(MSYS_PLATFORM) set(CXXFLAGS "$ENV{CXXFLAGS}") # To avoid having to build all of gtk with epa_build in a consistent @@ -51,8 +52,9 @@ # that is provided by the default gtk toolkit and needed by the # PLplot build of the wxwidgets device. # The inevitable conclusion is that on Unix, we must use the gtk toolkit - # and therefore epa_build must provide a consistent version of that - # as a dependency of wxwidgets. + # and therefore (now that epa_build has a gtk+ configuration) + # we must specificially add gtk+ as a dependency of wxwidgets. + list(APPEND dependencies_LIST gtk+) endif(MSYS_PLATFORM) set(CFLAGS "$ENV{CFLAGS}") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-03-16 22:22:49
|
Revision: 13077 http://sourceforge.net/p/plplot/code/13077 Author: airwin Date: 2014-03-16 22:22:46 +0000 (Sun, 16 Mar 2014) Log Message: ----------- Mention LD_LIBRARY_PATH for the Unix case. Modified Paths: -------------- trunk/cmake/epa_build/README Modified: trunk/cmake/epa_build/README =================================================================== --- trunk/cmake/epa_build/README 2014-03-16 22:20:32 UTC (rev 13076) +++ trunk/cmake/epa_build/README 2014-03-16 22:22:46 UTC (rev 13077) @@ -156,6 +156,7 @@ CMAKE_LIBRARY_PATH PATH PKG_CONFIG_PATH +LD_LIBRARY_PATH (only required on Unix so far) BUILD_COMMAND GENERATOR_STRING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-03-16 22:20:36
|
Revision: 13076 http://sourceforge.net/p/plplot/code/13076 Author: airwin Date: 2014-03-16 22:20:32 +0000 (Sun, 16 Mar 2014) Log Message: ----------- Set LD_LIBRARY_PATH environment variable to overcome some current rpath deficiencies of the gtk+ stack of libraries (but not pango/cairo subset of that stack). Modified Paths: -------------- trunk/cmake/epa_build/setup/setup_linux_makefiles Modified: trunk/cmake/epa_build/setup/setup_linux_makefiles =================================================================== --- trunk/cmake/epa_build/setup/setup_linux_makefiles 2014-03-16 20:50:39 UTC (rev 13075) +++ trunk/cmake/epa_build/setup/setup_linux_makefiles 2014-03-16 22:20:32 UTC (rev 13076) @@ -51,6 +51,12 @@ # Put install-location pkg-config directories at top of PKG_CONFIG_PATH PKG_CONFIG_PATH=$INSTALL_PREFIX/share/pkgconfig:$INSTALL_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH +# Some autotools package in the gtk+ superset (but not pango/cairo subset +# of that stack) do not handle rpath properly for non-standard install +# locations. Therefore, must set LD_LIBRARY_PATH until those rpath issues +# are sorted out. +export LD_LIBRARY_PATH=${INSTALL_PREFIX}/lib + # As temporary measure also use system-installed *.pc files for dependencies # which are currently not built. Put these at the end of PKG_CONFIG_PATH # so they are only used as a last resort. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-03-16 20:50:44
|
Revision: 13075 http://sourceforge.net/p/plplot/code/13075 Author: airwin Date: 2014-03-16 20:50:39 +0000 (Sun, 16 Mar 2014) Log Message: ----------- Update developer instructions for epa_build to be consistent with latest gtk+ results. Also, list the outstanding development issues that need work. Modified Paths: -------------- trunk/cmake/epa_build/README.developers Modified: trunk/cmake/epa_build/README.developers =================================================================== --- trunk/cmake/epa_build/README.developers 2014-03-16 20:21:30 UTC (rev 13074) +++ trunk/cmake/epa_build/README.developers 2014-03-16 20:50:39 UTC (rev 13075) @@ -11,65 +11,76 @@ # that file, create a schema for that file, "gtk_packages.rnc" (not # used for anything but debugging of xml issues), convert that file to # a sequential form that can be read in by cmake called -# "pango_packages.data", transform those data into build -# configurations, */CMakeLists.txt, and patch those results. -./update_pango_packages.sh +# "gtk+_packages.data", transform those data into build +# configurations, */CMakeLists.txt, and patch those results. The shell +# script that implements all of this is run as follows: -Check for any errors: +./update_gtk+_packages.sh -# Check for errors: -less pango_packages.stderr - -# That file currently shows there are 10 "good" -# packages (ones found as a result of the pango package dependency -# chain) and 14 "bad" packages (ones not found this way which have to -# be configured another way). - # N.B. there are no plans to keep gtk_packages.xml, gtk_packages.rnc, -# or pango_packages.data under version control. However, all -# essential files referred to by update_pango_packages.sh such as +# or gtk+_packages.data under version control. However, all +# essential files referred to by update_gtk+_packages.sh such as # gtk_xml_recursive_process.py, patch_gtk_packages.xml, and # gtk_transform.py are all kept under version control so that # gtk_packages_$GTK_VERSION.xml, gtk_packages_$GTK_VERSION.rnc, and -# pango_packages.data can be reproduced at any time for the current +# gtk+_packages.data can be reproduced at any time for the current # $GTK_VERSION value or produced for some updated $GTK_VERSION value # in the future. Note that in that latter case, it will be necessary # to edit the file names in patch_gtk_packages.xml to conform to the # new version. -# One known issue with the gtk+ stack and other software we build is -# certain package dependencies are completely missing (called "bad -# packages above) such as pkg-config and libffi which have to be built -# independently. For some of those missing packages we use a -# hand-generated configuration (e.g., pkg-config/CMakeLists.txt). For -# others that can be configured with a template (e.g., libffi) we add -# additional configurations to add_packages.xml, process that file -# with enough starting packages to include all dependent packages -# in the resulting sequential file called "add_packages.data" which -# is then processed to generated added build configurations such as libffi. +# Check for any errors in the above procedure: +less gtk+_packages.stderr +# That file currently shows there are 17 dependencies of gtk+ that are +# found with good jhbuild configurations and 22 dependencies of gtk+ +# that are not found (because there are no jhbuild configurations for +# them). + +# 10 of those "not found" packages are officially ignored as a matter of policy. +# See configure_epa.cmake for the full list, and the reasons for the +# policy. + +# Some of those "not found" packages (i.e., libjpeg, libpng, and libtiff) +# still may require epa_build configurations, but for now we +# are putting up with the CMake warnings about these missing packages +# until we evaluate whether their lack compromises the +# wxwidgets capabilities on Unix (wxwidgets is the only PLplot-related +# package that depends on gtk+, and that dependency only occurs for +# the Unix case). + +# The rest of the "not found" packages such as pkg-config and libffi have +# epa_build configurations that have been independently implemented. +# Some of those have hand-generated configurations (e.g., +# pkg-config/CMakeLists.txt). + +# Other "not found" packages have been configured with a template +# (e.g., libffi). This is done by adding additional configurations to +# add_packages.xml, processing that file with enough starting packages +# to include all dependent packages in the resulting sequential file +# called "add_packages.data" which is then processed to generated +# added build configurations such as libffi. The shell script +# that implements this is run as follows: + ./update_added_packages.sh # Look for any bad results: less add_packages.stderr -# It turns out there is one "bad" package, pkg-config which must be -# configured with a hand-edited configuration. - # N.B. The build configurations generated by -# "./update_pango_packages.sh" and "./update_added_packages.sh" are +# "./update_gtk+_packages.sh" and "./update_added_packages.sh" are # committed under svn control so that care should be used to keep # everything consistent so that the above scripts introduce no svn # diffs. # Assuming no changes have been made to the essential files used by -# "update_pango_packages.sh" (which are gtk_xml_recursive_process.py, +# "update_gtk+_packages.sh" (which are gtk_xml_recursive_process.py, # patch_gtk_packages.xml, and gtk_transform.py) to generate -# pango_packages.data, then you can quickly check for such consistency -# without running "./update_pango_packages.sh" using +# gtk+_packages.data, then you can quickly check for such consistency +# without running "./update_gtk+_packages.sh" using -cmake -DFILENAME:FILEPATH=pango_packages.data -P configure_epa.cmake -patch --reverse --no-backup-if-mismatch -p0 <configured_pango.patch +cmake -DFILENAME:FILEPATH=gtk+_packages.data -P configure_epa.cmake +patch --reverse --no-backup-if-mismatch -p0 <configured_gtk+.patch svn diff # Similarly, assuming no changes have been made to the essential files @@ -82,7 +93,23 @@ OTHER NOTES: -The epa_build configurations are still missing for certain packages. +It is becoming clear that substantial numbers of users are +beginning to switch from the classical combination of MinGW and MSYS +to the more modern combination of mingw-w64 and MSYS2 (see +<http://sourceforge.net/p/msys2/wiki/MSYS2 installation/> for install +directions for that newer version). Note that new platform cannot be +currently tested on Wine because of +<http://bugs.winehq.org/show_bug.cgi?id=35561> so my (AWI's) +participation in such tests could only be indirect. Nevertheless, I +would encourage such tests for epa_build since apparently MSYS2 (a +simplified fork of modern Cygwin) has fewer bugs and uses more +up-to-date versions of software than the traditional MSYS (a +simplified fork of ancient Cygwin). + +There are still a number of outstanding development issues for epa_build. +Please consult with AWI if you wish to work on one or more of these. + +* The epa_build configurations are still missing for certain packages. For example, a build of a strong-enough version of cmake so that it can support "https" downloads (sometimes required by epa_build itself) requires that cmake not use its weak internal curl library and instead @@ -96,18 +123,50 @@ dependency. Note, that URL contains mingw-w64 build directions for a large number of free software packages so it may also be useful to solve some epa_build problems for some packages for the pango/cairo -stack of libraries that currently have epa_build configuration -problems for MinGW/MSYS. +subset of the gtk+ stack of libraries that currently have epa_build +configuration problems for MinGW/MSYS. -Also, it is becoming clear that many users are switching from the -classical combination of MinGW and MSYS to the combination of -mingw-w64 and MSYS2 (see <http://sourceforge.net/p/msys2/wiki/MSYS2 -installation/> for install directions for that newer version). Note -that new platform cannot be currently tested on Wine because of -<http://bugs.winehq.org/show_bug.cgi?id=35561> so my (AWI's) -participation in such tests could only be indirect. Nevertheless, I -would encourage such tests since apparently MSYS2 (a simplification of -modern Cygwin) has fewer bugs and uses more up-to-date versions of -software than the traditional MSYS (a simplification of ancient -Cygwin). +* A qt5_lite epa_build configuration is planned which would enable +me to test PLplot against Qt5 (see recent list discussions concerning +Qt5). +* The qt4_lite build works fine on Linux but has not yet been tested on +Windows. + +* The gtk+ complete stack of libraries (only required on Unix to +satisfy a wxwidgets Unix dependency) builds fine on Linux. Part of +these good Linux build results are for the pango/cairo subset of the +gtk+ stack which is necessary on all platforms to support the "cairo" +PLplot device driver and the libLASi library (necessary to support the +psttf PLplot device driver). Unfortunately, the pango/cairo subset of +gtk+ appears to have a number of build issues on Wine. I suspect most +of those issues are not due to Wine bugs so I expect they will show up +on Microsoft Windows as soon as someone attempts a build of pango or +plplot (as opposed to plplot_lite) on that platform. + +* Currently epa_build has only been tested on Windows using my +(extraordinarily slow) MinGW/MSYS/Wine platform for the plplot_lite +case. The Wine developers view any deviation from Microsoft Windows +behaviour as a Wine bug. So since it is unlikely that I am by +accident taking advantage of some Wine bug to make this work, it +should be trivial (and more than an order of magnitude faster than the +Wine case) to follow what I have done for the MinGW/MSYS/Microsoft +Windows case _if_ the bash.exe environment variable approach I +document in cmake/epa_build/README is religiously followed. I also +believe it should be straightforward to make the plplot_lite case work +on the Cygwin platform, a mingw-w64/MSYS2 Windows platform, and a Windows +platform consisting of the combination of MSYS (bash.exe and other +MSYS tools are required for testing PLplot but will not be used for +building it in this case) and MSVC. I have access to none of those +platforms so volunteers are needed for this testing of epa_build for +the plplot_lite case. + +* The epa_build of octave has not been configured. Octave has an +enormous number of dependencies (much worse than PLplot), and I have +no experience building octave. So I have decided to indefinitely put +off working on this epa_build configuration. As a result, the octave +component of the plplot epa_build is currently disabled both for +plplot and plplot_lite, and it will likely be a long time before this +limitation is removed unless someone else is motivated to +make this work. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-03-16 20:21:34
|
Revision: 13074 http://sourceforge.net/p/plplot/code/13074 Author: airwin Date: 2014-03-16 20:21:30 +0000 (Sun, 16 Mar 2014) Log Message: ----------- Drop swig from the automatically generated epa_build configurations because that configuration is hand-modified now. Modified Paths: -------------- trunk/cmake/epa_build/update_added_packages.sh Modified: trunk/cmake/epa_build/update_added_packages.sh =================================================================== --- trunk/cmake/epa_build/update_added_packages.sh 2014-03-16 20:19:05 UTC (rev 13073) +++ trunk/cmake/epa_build/update_added_packages.sh 2014-03-16 20:21:30 UTC (rev 13074) @@ -9,7 +9,7 @@ # PACKAGE_LIST contains a list of "starting" packages and the # dependencies of those should suck in the rest of the packages in # add_packages.xml. -PACKAGE_LIST="libffi intltool pixman gperf swig libxslt ragel" +PACKAGE_LIST="libffi intltool pixman gperf libxslt ragel" for PACKAGE in $PACKAGE_LIST; do ./gtk_transform.py $PACKAGE 1 <add_packages.xml 1>> add_packages.data 2>> add_packages.stderr done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-03-16 20:19:09
|
Revision: 13073 http://sourceforge.net/p/plplot/code/13073 Author: airwin Date: 2014-03-16 20:19:05 +0000 (Sun, 16 Mar 2014) Log Message: ----------- Use clearer designations of the kind of packages. good ==> found bad ==> not found This change makes the error report easier to understand but does not change the principal results that are written to stdout. Modified Paths: -------------- trunk/cmake/epa_build/gtk_transform.py Modified: trunk/cmake/epa_build/gtk_transform.py =================================================================== --- trunk/cmake/epa_build/gtk_transform.py 2014-03-16 20:14:33 UTC (rev 13072) +++ trunk/cmake/epa_build/gtk_transform.py 2014-03-16 20:19:05 UTC (rev 13073) @@ -183,9 +183,9 @@ overall_dependencies.update(suggests) overall_dependencies.update(after) - good_packages = {} - good_packages[id] = None - bad_packages = {} + found_packages = {} + found_packages[id] = None + not_found_packages = {} dependencies_list = overall_dependencies.keys() for dep in dependencies_list: if called.has_key(dep): @@ -197,12 +197,12 @@ continue extra = parse_jhbuild(root, dep, depend_track, if_dependencies, called) if extra == None: - bad_packages[dep] = None + not_found_packages[dep] = None else: - good_packages.update(extra[0]) - bad_packages.update(extra[1]) + found_packages.update(extra[0]) + not_found_packages.update(extra[1]) - return (good_packages, bad_packages) + return (found_packages, not_found_packages) else: sys.stdout.write(id + "\n") sys.stdout.write(config_type + "\n") @@ -254,15 +254,15 @@ if dependency_dictionary == None: sys.stderr.write("some failure for start_package = %s or else no dependencies for that start_package\n" % start_package) else: - good_packages_list = dependency_dictionary[0].keys() - bad_packages_list = dependency_dictionary[1].keys() - good_packages_list.sort() - bad_packages_list.sort() - sys.stderr.write("number of good packages = %s\n" % len(good_packages_list)) - sys.stderr.write("good packages = " + ":".join(good_packages_list) + "\n") - sys.stderr.write("number of bad packages = %s\n" % len(bad_packages_list)) - sys.stderr.write("bad packages = " + ":".join(bad_packages_list) + "\n") + found_packages_list = dependency_dictionary[0].keys() + not_found_packages_list = dependency_dictionary[1].keys() + found_packages_list.sort() + not_found_packages_list.sort() + sys.stderr.write("number of packages that are found = %s\n" % len(found_packages_list)) + sys.stderr.write("packages that are found = " + ":".join(found_packages_list) + "\n") + sys.stderr.write("number of packages that are not found = %s\n" % len(not_found_packages_list)) + sys.stderr.write("packages that are not found = " + ":".join(not_found_packages_list) + "\n") - # Output on stdout good package results. - for id in good_packages_list: + # Output on stdout results for the packages that have been found. + for id in found_packages_list: parse_jhbuild(root, id, depend_track, False, {}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-03-16 20:14:36
|
Revision: 13072 http://sourceforge.net/p/plplot/code/13072 Author: airwin Date: 2014-03-16 20:14:33 +0000 (Sun, 16 Mar 2014) Log Message: ----------- Drop swig from the automatically generated epa_build configurations because that configuration is hand-modified now. Modified Paths: -------------- trunk/cmake/epa_build/add_packages.xml Modified: trunk/cmake/epa_build/add_packages.xml =================================================================== --- trunk/cmake/epa_build/add_packages.xml 2014-03-16 20:12:20 UTC (rev 13071) +++ trunk/cmake/epa_build/add_packages.xml 2014-03-16 20:14:33 UTC (rev 13072) @@ -44,10 +44,4 @@ <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=${EPA_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> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-03-16 20:12:23
|
Revision: 13071 http://sourceforge.net/p/plplot/code/13071 Author: airwin Date: 2014-03-16 20:12:20 +0000 (Sun, 16 Mar 2014) Log Message: ----------- Update ignored dependencies list to be consistent with all other gtk+-related packages. This change has no practical effect because non of these additional ignored dependencies occur for these particular gtk+-related packages. Modified Paths: -------------- trunk/cmake/epa_build/gperf/CMakeLists.txt trunk/cmake/epa_build/intltool/CMakeLists.txt trunk/cmake/epa_build/libffi/CMakeLists.txt trunk/cmake/epa_build/libpcre/CMakeLists.txt trunk/cmake/epa_build/libxml2/CMakeLists.txt trunk/cmake/epa_build/libxslt/CMakeLists.txt trunk/cmake/epa_build/pixman/CMakeLists.txt trunk/cmake/epa_build/ragel/CMakeLists.txt Modified: trunk/cmake/epa_build/gperf/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/gperf/CMakeLists.txt 2014-03-16 18:23:01 UTC (rev 13070) +++ trunk/cmake/epa_build/gperf/CMakeLists.txt 2014-03-16 20:12:20 UTC (rev 13071) @@ -29,7 +29,7 @@ # List of dependencies (most of which are build tools) which should be # ignored. -set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) +set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list}) set(dependencies_LIST ) Modified: trunk/cmake/epa_build/intltool/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/intltool/CMakeLists.txt 2014-03-16 18:23:01 UTC (rev 13070) +++ trunk/cmake/epa_build/intltool/CMakeLists.txt 2014-03-16 20:12:20 UTC (rev 13071) @@ -29,7 +29,7 @@ # List of dependencies (most of which are build tools) which should be # ignored. -set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) +set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list}) set(dependencies_LIST ) Modified: trunk/cmake/epa_build/libffi/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/libffi/CMakeLists.txt 2014-03-16 18:23:01 UTC (rev 13070) +++ trunk/cmake/epa_build/libffi/CMakeLists.txt 2014-03-16 20:12:20 UTC (rev 13071) @@ -29,7 +29,7 @@ # List of dependencies (most of which are build tools) which should be # ignored. -set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) +set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list}) set(dependencies_LIST ) Modified: trunk/cmake/epa_build/libpcre/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/libpcre/CMakeLists.txt 2014-03-16 18:23:01 UTC (rev 13070) +++ trunk/cmake/epa_build/libpcre/CMakeLists.txt 2014-03-16 20:12:20 UTC (rev 13071) @@ -29,7 +29,7 @@ # List of dependencies (most of which are build tools) which should be # ignored. -set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) +set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list}) set(dependencies_LIST ) Modified: trunk/cmake/epa_build/libxml2/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/libxml2/CMakeLists.txt 2014-03-16 18:23:01 UTC (rev 13070) +++ trunk/cmake/epa_build/libxml2/CMakeLists.txt 2014-03-16 20:12:20 UTC (rev 13071) @@ -29,7 +29,7 @@ # List of dependencies (most of which are build tools) which should be # ignored. -set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) +set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list}) set(dependencies_LIST xmlcatalog-wrapper) Modified: trunk/cmake/epa_build/libxslt/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/libxslt/CMakeLists.txt 2014-03-16 18:23:01 UTC (rev 13070) +++ trunk/cmake/epa_build/libxslt/CMakeLists.txt 2014-03-16 20:12:20 UTC (rev 13071) @@ -29,7 +29,7 @@ # List of dependencies (most of which are build tools) which should be # ignored. -set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) +set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list}) set(dependencies_LIST libxml2) Modified: trunk/cmake/epa_build/pixman/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/pixman/CMakeLists.txt 2014-03-16 18:23:01 UTC (rev 13070) +++ trunk/cmake/epa_build/pixman/CMakeLists.txt 2014-03-16 20:12:20 UTC (rev 13071) @@ -29,7 +29,7 @@ # List of dependencies (most of which are build tools) which should be # ignored. -set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) +set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list}) set(dependencies_LIST pkg-config) Modified: trunk/cmake/epa_build/ragel/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/ragel/CMakeLists.txt 2014-03-16 18:23:01 UTC (rev 13070) +++ trunk/cmake/epa_build/ragel/CMakeLists.txt 2014-03-16 20:12:20 UTC (rev 13071) @@ -29,7 +29,7 @@ # List of dependencies (most of which are build tools) which should be # ignored. -set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) +set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list}) set(dependencies_LIST ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-03-16 18:23:03
|
Revision: 13070 http://sourceforge.net/p/plplot/code/13070 Author: airwin Date: 2014-03-16 18:23:01 +0000 (Sun, 16 Mar 2014) Log Message: ----------- Update automatic procedure (including renaming configured_pango.patch to configured_gtk+.patch) for generating epa_build configurations for gtk+ and all its dependencies. (The previous version only generated the pango subset of those dependencies.) The results of this procedure are consistent with the series of tested commits just made for the epa_build configurations of gtk+ and its dependencies. Modified Paths: -------------- trunk/cmake/epa_build/configure_epa.cmake trunk/cmake/epa_build/patch_gtk_packages.xml trunk/cmake/epa_build/update_gtk+_packages.sh Added Paths: ----------- trunk/cmake/epa_build/configured_gtk+.patch Removed Paths: ------------- trunk/cmake/epa_build/configured_pango.patch Modified: trunk/cmake/epa_build/configure_epa.cmake =================================================================== --- trunk/cmake/epa_build/configure_epa.cmake 2014-03-16 18:15:12 UTC (rev 13069) +++ trunk/cmake/epa_build/configure_epa.cmake 2014-03-16 18:23:01 UTC (rev 13070) @@ -1,17 +1,31 @@ cmake_policy(SET CMP0007 NEW) -# List of dependencies (mostly these are build-tools) which should be -# ignored. +# List of dependencies which should be ignored. set(ignored_dependencies_LIST - # build tools + # build tools which are installed or built (-DBUILD_THE_BUILDTOOLS=ON) + # by other means. pkg-config bison flex python2-devel - # dependencies which we want to ignore - # ignore libXft since that is an X library that - # presumably won't be needed on Windows systems. + # Always ignore X11 dependencies since X11 is a difficult build. In + # any case, X11 is either installed already (Unix and Cygwin) or not + # needed because other software handles the display (non-Cygwin + # Windows and also Cygwin for the case where the epa_build user + # might be trying to use the Windows display software directly + # rather than the slow X11). + libX11 libXft + xorg-kbproto + xorg-macros + xorg-xproto + # Always ignore dbus. It is really base system software. For + # example, according to Linux from Scratch, you have to supply a + # UID, etc., for it to run background maintenance tasks. + # Furthermore, it is likely dbus will already be installed on + # platforms (e.g., Linux) where it is needed, and it is unlikely to + # be needed on platforms where it is not already installed. + dbus ) file(STRINGS ${FILENAME} lines) Copied: trunk/cmake/epa_build/configured_gtk+.patch (from rev 13058, trunk/cmake/epa_build/configured_pango.patch) =================================================================== --- trunk/cmake/epa_build/configured_gtk+.patch (rev 0) +++ trunk/cmake/epa_build/configured_gtk+.patch 2014-03-16 18:23:01 UTC (rev 13070) @@ -0,0 +1,19 @@ +Index: itstool/CMakeLists.txt +=================================================================== +--- itstool/CMakeLists.txt (revision 12812) ++++ itstool/CMakeLists.txt (working copy) +@@ -62,14 +62,12 @@ + set(URL http://files.itstool.org/itstool/itstool-1.2.0.tar.bz2) + set(DOWNLOAD_HASH_TYPE SHA256) + set(DOWNLOAD_HASH 46fed63fb89c72dbfc03097b4477084ff05ad6f171212d8f1f1546ea543978aa) +-set(PATCH itstool-1.2.0-python-location-fixes.patch) + + ExternalProject_Add( + build_${PACKAGE} + DEPENDS ${dependencies_targets} + URL ${URL} + URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH} +- PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_SOURCE_DIR}/itstool/${PATCH} + CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} + BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} + BUILD_IN_SOURCE OFF Deleted: trunk/cmake/epa_build/configured_pango.patch =================================================================== --- trunk/cmake/epa_build/configured_pango.patch 2014-03-16 18:15:12 UTC (rev 13069) +++ trunk/cmake/epa_build/configured_pango.patch 2014-03-16 18:23:01 UTC (rev 13070) @@ -1,19 +0,0 @@ -Index: itstool/CMakeLists.txt -=================================================================== ---- itstool/CMakeLists.txt (revision 12812) -+++ itstool/CMakeLists.txt (working copy) -@@ -62,14 +62,12 @@ - set(URL http://files.itstool.org/itstool/itstool-1.2.0.tar.bz2) - set(DOWNLOAD_HASH_TYPE SHA256) - set(DOWNLOAD_HASH 46fed63fb89c72dbfc03097b4477084ff05ad6f171212d8f1f1546ea543978aa) --set(PATCH itstool-1.2.0-python-location-fixes.patch) - - ExternalProject_Add( - build_${PACKAGE} - DEPENDS ${dependencies_targets} - URL ${URL} - URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH} -- PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_SOURCE_DIR}/itstool/${PATCH} - CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} - BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} - BUILD_IN_SOURCE OFF Modified: trunk/cmake/epa_build/patch_gtk_packages.xml =================================================================== --- trunk/cmake/epa_build/patch_gtk_packages.xml 2014-03-16 18:15:12 UTC (rev 13069) +++ trunk/cmake/epa_build/patch_gtk_packages.xml 2014-03-16 18:23:01 UTC (rev 13070) @@ -1,6 +1,14 @@ ---- gtk_packages_3.9.4.xml_original 2013-08-04 10:48:34.157911200 -0700 -+++ gtk_packages_3.9.4.xml 2013-08-07 16:08:44.571614474 -0700 -@@ -640,11 +640,13 @@ +--- gtk_packages_3.9.4.xml 2014-03-16 09:50:11.390911485 -0700 ++++ gtk_packages_3.9.4.xml_patched 2014-03-16 09:47:48.865523190 -0700 +@@ -591,6 +591,7 @@ + <pkg-config/> + <branch hash="sha256:96d0d1e3f9b74d2ca3469ff187c5e5f25649b1ad35cf06f4f3a83847dff4ac13" module="releases/cairo-${version}.tar.xz" repo="cairo.org" version="1.12.14"/> + <dependencies> ++ <dep package="glib"/> + <dep package="fontconfig"/> + <dep package="gtk-doc"/> + <dep package="pixman"/> +@@ -640,11 +641,14 @@ <autotools id="gnome-common"> <branch hash="sha256:2af2d97010d2a9aeb3b99dd2ce07d1ef023e15a27b412ffe4f067f016ff7117b" module="gnome-common/3.7/gnome-common-3.7.4.tar.xz" repo="http://download.gnome.org/sources/" size="151864" version="3.7.4"/> </autotools> @@ -8,6 +16,7 @@ + <autotools autogenargs="--with-xml-catalog=${CMAKE_INSTALL_PREFIX}/etc/xml/catalog" id="gtk-doc"> <branch hash="sha256:27df247fa828433a9390368e2088cc22f954f2ce1f255ddbd12ab6e027b12e68" module="gtk-doc/1.19/gtk-doc-1.19.tar.xz" repo="http://download.gnome.org/sources/" size="597880" version="1.19"/> <dependencies> ++ <dep package="glib"/> <dep package="libxslt"/> <dep package="yelp-tools"/> + <dep package="docbook-xml"/> @@ -15,6 +24,35 @@ </dependencies> </autotools> <autotools id="iso-codes"> +@@ -751,10 +755,9 @@ + <dep package="libtiff"/> + </dependencies> + </autotools> +- <autotools autogenargs="--enable-installed-tests" id="glib"> ++ <autotools autogenargs="--enable-installed-tests --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf" id="glib"> + <branch hash="sha256:7e76a32e6ea0ced118aa64f87e46cdf5c3e90527f1f0eb93eabe42a03cebd1e7" module="glib/2.37/glib-2.37.4.tar.xz" repo="http://download.gnome.org/sources/" size="6698320" version="2.37.4"/> + <dependencies> +- <dep package="gtk-doc"/> + <dep package="libffi"/> + </dependencies> + <suggests> +@@ -765,7 +768,7 @@ + <dep package="shared-mime-info"/> + </after> + </autotools> +- <autotools autogenargs="--enable-x11-backend --enable-wayland-backend --enable-installed-tests" id="gtk+"> ++ <autotools autogenargs="--enable-x11-backend" id="gtk+"> + <branch hash="sha256:a2053a9556c600e0217ec48df75e96aad909f3bc4ec307d2e04817ac548d39a8" module="gtk+/3.9/gtk+-3.9.8.tar.xz" repo="http://download.gnome.org/sources/" size="13216448" version="3.9.8"/> + <dependencies> + <dep package="atk"/> +@@ -777,7 +780,6 @@ + <dep package="gobject-introspection"/> + <dep package="at-spi2-atk"/> + <dep package="libxkbcommon"/> +- <dep package="wayland"/> + </dependencies> + <suggests> + <dep package="shared-mime-info"/> @@ -925,7 +927,7 @@ </suggests> </autotools> @@ -24,3 +62,15 @@ <branch checkoutdir="harfbuzz" module="harfbuzz" repo="git.freedesktop.org"/> <dependencies> <dep package="glib"/> +@@ -1560,9 +1562,10 @@ + <repository href="http://wayland.freedesktop.org/releases/" name="http://wayland.freedesktop.org/releases/" type="tarball"/> + <repository href="http://people.freedesktop.org/~hughsient/releases/" name="http://people.freedesktop.org/~hughsient/releases/" type="tarball"/> + <repository href="http://www.freedesktop.org/software/colord/releases/" name="http://www.freedesktop.org/software/colord/releases/" type="tarball"/> +- <autotools id="at-spi2-core"> ++ <autotools autogenargs="--with-sysroot=${CMAKE_INSTALL_PREFIX} LDFLAGS=-L${CMAKE_INSTALL_PREFIX}/lib" id="at-spi2-core"> + <branch hash="sha256:512701456e61c2af3435326a37877404c604de719c3b28e7d53d1368c237e8ae" module="at-spi2-core/2.9/at-spi2-core-2.9.4.tar.xz" repo="http://download.gnome.org/sources/" size="443788" version="2.9.4"/> + <dependencies> ++ <dep package="intltool"/> + <dep package="dbus"/> + <dep package="glib"/> + </dependencies> Modified: trunk/cmake/epa_build/update_gtk+_packages.sh =================================================================== --- trunk/cmake/epa_build/update_gtk+_packages.sh 2014-03-16 18:15:12 UTC (rev 13069) +++ trunk/cmake/epa_build/update_gtk+_packages.sh 2014-03-16 18:23:01 UTC (rev 13070) @@ -1,6 +1,10 @@ #!/bin/bash -# Update build configurations of pango packages that are described by +# Update build configurations of gtk+ packages that are described by # GTK+ jhbuild build configuration +# Note the patch +# below drops wayland and tests for the gtk+ package which should +# greatly reduce the number of packages that are configured as direct +# and indirect dependencies of gtk+. # Chose this latest version (as of August 2013) because it probably has # improved build and dependency instructions compared to previous versions. @@ -43,22 +47,22 @@ # for following (soft) "suggests", dependencies, and the next least # significant bit is ON for following (would be nice) "after" # dependencies. Currently I use a command variable of 1 to keep -# the number of packages configured for building pango and +# the number of packages configured for building gtk+ and # (hard) dependencies to a minimum. -./gtk_transform.py "pango" 1 <gtk_packages_$GTK_VERSION.xml 1>| pango_packages.data 2>|pango_packages.stderr +./gtk_transform.py "gtk+" 1 <gtk_packages_$GTK_VERSION.xml 1>| gtk+_packages.data 2>|gtk+_packages.stderr # Finally to actually generate build configurations for build_packages run # the following command. -cmake -DFILENAME:FILEPATH=pango_packages.data -P configure_epa.cmake +cmake -DFILENAME:FILEPATH=gtk+_packages.data -P configure_epa.cmake # Patch generated configuration files. This patch file contains # additional changes that cannot be done via a patch to the *.xml file. # Typically, these changes are hand edits which are tested then committed. # So typically the patch is created by rerunning the above cmake -# command then using "svn diff" >| configured_pango.patch" to generate +# command then using "svn diff" >| configured_gtk+.patch" to generate # the reverse form of the patch to change the result created by the # above cmake command into the svn committed form which is done with # the following patch command. -patch --reverse --no-backup-if-mismatch -p0 <configured_pango.patch +patch --reverse --no-backup-if-mismatch -p0 <configured_gtk+.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-03-16 18:15:15
|
Revision: 13069 http://sourceforge.net/p/plplot/code/13069 Author: airwin Date: 2014-03-16 18:15:12 +0000 (Sun, 16 Mar 2014) Log Message: ----------- Add epa_build configurations for gtk+ and all its dependencies that are not already part of epa_build. Note to save build time, this is a somewhat "lite" version of gtk+ where the wayland dependency and installed tests have been disabled. Replace pango by gtk+ in the list of principal packages in the top-level CMakeLists.txt to suck in all dependencies of gtk+ (including pango and its dependencies) into the epa_build configuration. Tested on Linux using the build_gtk+ target. The resulting build was a success (no obvious build errors) and required 23 minutes on my 5-year old PC. Modified Paths: -------------- trunk/cmake/epa_build/CMakeLists.txt Added Paths: ----------- trunk/cmake/epa_build/at-spi2-atk/ trunk/cmake/epa_build/at-spi2-atk/CMakeLists.txt trunk/cmake/epa_build/at-spi2-core/ trunk/cmake/epa_build/at-spi2-core/CMakeLists.txt trunk/cmake/epa_build/atk/ trunk/cmake/epa_build/atk/CMakeLists.txt trunk/cmake/epa_build/gdk-pixbuf/ trunk/cmake/epa_build/gdk-pixbuf/CMakeLists.txt trunk/cmake/epa_build/gnome-common/ trunk/cmake/epa_build/gnome-common/CMakeLists.txt trunk/cmake/epa_build/gtk+/ trunk/cmake/epa_build/gtk+/CMakeLists.txt trunk/cmake/epa_build/libxkbcommon/ trunk/cmake/epa_build/libxkbcommon/CMakeLists.txt Modified: trunk/cmake/epa_build/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/CMakeLists.txt 2014-03-16 17:53:19 UTC (rev 13068) +++ trunk/cmake/epa_build/CMakeLists.txt 2014-03-16 18:15:12 UTC (rev 13069) @@ -415,7 +415,7 @@ ndiff plplot plplot_lite - pango + gtk+ qt4_lite ) endif(BUILD_THE_BUILDTOOLS) Added: trunk/cmake/epa_build/at-spi2-atk/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/at-spi2-atk/CMakeLists.txt (rev 0) +++ trunk/cmake/epa_build/at-spi2-atk/CMakeLists.txt 2014-03-16 18:15:12 UTC (rev 13069) @@ -0,0 +1,75 @@ +# at-spi2-atk/CMakeLists.txt + +# Configure the build of at-spi2-atk. + +# N.B. this file is generated so if you edit it you will lose all your +# changes the next time it is generated (typically by running +# either/both the update_added_packages.sh or update_pango_packages.sh +# scripts). If those scripts do not provide good results, then +# consider changing their source files (e.g., by editing the files +# used in those scripts) or add a patch to be run by those scripts. + +# Copyright (C) 2013 Alan W. Irwin + +# This file is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. + +# This file is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. + +# You should have received a copy of the GNU Lesser General Public +# License along with this file; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +set(PACKAGE at-spi2-atk) + +# List of dependencies (most of which are build tools) which should be +# ignored. +set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list}) + +set(dependencies_LIST at-spi2-core;atk;dbus;glib;libxml2) + +# Do boilerplate tasks that must be done for each different project +# that is configured as part of epa_build. +epa_boilerplate( + ignored_dependencies_LIST + PACKAGE + dependencies_LIST + dependencies_targets + EPA_PATH + source_PATH + ) + +if(MSYS_PLATFORM) + set(CFLAGS "$ENV{CFLAGS}") +else(MSYS_PLATFORM) + set(CFLAGS "$ENV{CFLAGS}") +endif(MSYS_PLATFORM) + +set(CXXFLAGS "$ENV{CXXFLAGS}") + +# Drop -fvisibility=hidden since that option does not work for a +# number of software packages that are configured automatically using +# this template. +string(REGEX REPLACE "-fvisibility=hidden" "" CFLAGS "${CFLAGS}") +string(REGEX REPLACE "-fvisibility=hidden" "" CXXFLAGS "${CXXFLAGS}") + +# Data that is related to downloads. +set(URL http://download.gnome.org/sources/at-spi2-atk/2.9/at-spi2-atk-2.9.4.tar.xz) +set(DOWNLOAD_HASH_TYPE SHA256) +set(DOWNLOAD_HASH b3b95b9c862c5eff801fad8c49c7b2b71cc65089e19dda2c992acee53669f723) + +ExternalProject_Add( + build_${PACKAGE} + DEPENDS ${dependencies_targets} + URL ${URL} + URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH} + CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} + BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} + BUILD_IN_SOURCE OFF + INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install + ) Property changes on: trunk/cmake/epa_build/at-spi2-atk/CMakeLists.txt ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/cmake/epa_build/at-spi2-core/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/at-spi2-core/CMakeLists.txt (rev 0) +++ trunk/cmake/epa_build/at-spi2-core/CMakeLists.txt 2014-03-16 18:15:12 UTC (rev 13069) @@ -0,0 +1,75 @@ +# at-spi2-core/CMakeLists.txt + +# Configure the build of at-spi2-core. + +# N.B. this file is generated so if you edit it you will lose all your +# changes the next time it is generated (typically by running +# either/both the update_added_packages.sh or update_pango_packages.sh +# scripts). If those scripts do not provide good results, then +# consider changing their source files (e.g., by editing the files +# used in those scripts) or add a patch to be run by those scripts. + +# Copyright (C) 2013 Alan W. Irwin + +# This file is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. + +# This file is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. + +# You should have received a copy of the GNU Lesser General Public +# License along with this file; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +set(PACKAGE at-spi2-core) + +# List of dependencies (most of which are build tools) which should be +# ignored. +set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list}) + +set(dependencies_LIST dbus;glib;intltool) + +# Do boilerplate tasks that must be done for each different project +# that is configured as part of epa_build. +epa_boilerplate( + ignored_dependencies_LIST + PACKAGE + dependencies_LIST + dependencies_targets + EPA_PATH + source_PATH + ) + +if(MSYS_PLATFORM) + set(CFLAGS "$ENV{CFLAGS}") +else(MSYS_PLATFORM) + set(CFLAGS "$ENV{CFLAGS}") +endif(MSYS_PLATFORM) + +set(CXXFLAGS "$ENV{CXXFLAGS}") + +# Drop -fvisibility=hidden since that option does not work for a +# number of software packages that are configured automatically using +# this template. +string(REGEX REPLACE "-fvisibility=hidden" "" CFLAGS "${CFLAGS}") +string(REGEX REPLACE "-fvisibility=hidden" "" CXXFLAGS "${CXXFLAGS}") + +# Data that is related to downloads. +set(URL http://download.gnome.org/sources/at-spi2-core/2.9/at-spi2-core-2.9.4.tar.xz) +set(DOWNLOAD_HASH_TYPE SHA256) +set(DOWNLOAD_HASH 512701456e61c2af3435326a37877404c604de719c3b28e7d53d1368c237e8ae) + +ExternalProject_Add( + build_${PACKAGE} + DEPENDS ${dependencies_targets} + URL ${URL} + URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH} + CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --with-sysroot=${CMAKE_INSTALL_PREFIX} LDFLAGS=-L${CMAKE_INSTALL_PREFIX}/lib + BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} + BUILD_IN_SOURCE OFF + INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install + ) Property changes on: trunk/cmake/epa_build/at-spi2-core/CMakeLists.txt ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/cmake/epa_build/atk/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/atk/CMakeLists.txt (rev 0) +++ trunk/cmake/epa_build/atk/CMakeLists.txt 2014-03-16 18:15:12 UTC (rev 13069) @@ -0,0 +1,75 @@ +# atk/CMakeLists.txt + +# Configure the build of atk. + +# N.B. this file is generated so if you edit it you will lose all your +# changes the next time it is generated (typically by running +# either/both the update_added_packages.sh or update_pango_packages.sh +# scripts). If those scripts do not provide good results, then +# consider changing their source files (e.g., by editing the files +# used in those scripts) or add a patch to be run by those scripts. + +# Copyright (C) 2013 Alan W. Irwin + +# This file is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. + +# This file is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. + +# You should have received a copy of the GNU Lesser General Public +# License along with this file; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +set(PACKAGE atk) + +# List of dependencies (most of which are build tools) which should be +# ignored. +set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list}) + +set(dependencies_LIST glib;gnome-common;gobject-introspection;gtk-doc) + +# Do boilerplate tasks that must be done for each different project +# that is configured as part of epa_build. +epa_boilerplate( + ignored_dependencies_LIST + PACKAGE + dependencies_LIST + dependencies_targets + EPA_PATH + source_PATH + ) + +if(MSYS_PLATFORM) + set(CFLAGS "$ENV{CFLAGS}") +else(MSYS_PLATFORM) + set(CFLAGS "$ENV{CFLAGS}") +endif(MSYS_PLATFORM) + +set(CXXFLAGS "$ENV{CXXFLAGS}") + +# Drop -fvisibility=hidden since that option does not work for a +# number of software packages that are configured automatically using +# this template. +string(REGEX REPLACE "-fvisibility=hidden" "" CFLAGS "${CFLAGS}") +string(REGEX REPLACE "-fvisibility=hidden" "" CXXFLAGS "${CXXFLAGS}") + +# Data that is related to downloads. +set(URL http://download.gnome.org/sources/atk/2.9/atk-2.9.3.tar.xz) +set(DOWNLOAD_HASH_TYPE SHA256) +set(DOWNLOAD_HASH 5fdb79c729cfad45042c3e0f55d01f57fdde3b8379b6cb5bbeb8b37478d4456d) + +ExternalProject_Add( + build_${PACKAGE} + DEPENDS ${dependencies_targets} + URL ${URL} + URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH} + CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} + BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} + BUILD_IN_SOURCE OFF + INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install + ) Property changes on: trunk/cmake/epa_build/atk/CMakeLists.txt ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/cmake/epa_build/gdk-pixbuf/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/gdk-pixbuf/CMakeLists.txt (rev 0) +++ trunk/cmake/epa_build/gdk-pixbuf/CMakeLists.txt 2014-03-16 18:15:12 UTC (rev 13069) @@ -0,0 +1,75 @@ +# gdk-pixbuf/CMakeLists.txt + +# Configure the build of gdk-pixbuf. + +# N.B. this file is generated so if you edit it you will lose all your +# changes the next time it is generated (typically by running +# either/both the update_added_packages.sh or update_pango_packages.sh +# scripts). If those scripts do not provide good results, then +# consider changing their source files (e.g., by editing the files +# used in those scripts) or add a patch to be run by those scripts. + +# Copyright (C) 2013 Alan W. Irwin + +# This file is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. + +# This file is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. + +# You should have received a copy of the GNU Lesser General Public +# License along with this file; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +set(PACKAGE gdk-pixbuf) + +# List of dependencies (most of which are build tools) which should be +# ignored. +set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list}) + +set(dependencies_LIST glib;gobject-introspection;gtk-doc;libjpeg;libpng;libtiff) + +# Do boilerplate tasks that must be done for each different project +# that is configured as part of epa_build. +epa_boilerplate( + ignored_dependencies_LIST + PACKAGE + dependencies_LIST + dependencies_targets + EPA_PATH + source_PATH + ) + +if(MSYS_PLATFORM) + set(CFLAGS "$ENV{CFLAGS}") +else(MSYS_PLATFORM) + set(CFLAGS "$ENV{CFLAGS}") +endif(MSYS_PLATFORM) + +set(CXXFLAGS "$ENV{CXXFLAGS}") + +# Drop -fvisibility=hidden since that option does not work for a +# number of software packages that are configured automatically using +# this template. +string(REGEX REPLACE "-fvisibility=hidden" "" CFLAGS "${CFLAGS}") +string(REGEX REPLACE "-fvisibility=hidden" "" CXXFLAGS "${CXXFLAGS}") + +# Data that is related to downloads. +set(URL http://download.gnome.org/sources/gdk-pixbuf/2.29/gdk-pixbuf-2.29.2.tar.xz) +set(DOWNLOAD_HASH_TYPE SHA256) +set(DOWNLOAD_HASH f5e173bf9fe48440f45a77b0bb5ae30b44f4af0da3cd128cd1489b0f3072808d) + +ExternalProject_Add( + build_${PACKAGE} + DEPENDS ${dependencies_targets} + URL ${URL} + URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH} + CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --enable-installed-tests + BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} + BUILD_IN_SOURCE OFF + INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install + ) Property changes on: trunk/cmake/epa_build/gdk-pixbuf/CMakeLists.txt ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/cmake/epa_build/gnome-common/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/gnome-common/CMakeLists.txt (rev 0) +++ trunk/cmake/epa_build/gnome-common/CMakeLists.txt 2014-03-16 18:15:12 UTC (rev 13069) @@ -0,0 +1,75 @@ +# gnome-common/CMakeLists.txt + +# Configure the build of gnome-common. + +# N.B. this file is generated so if you edit it you will lose all your +# changes the next time it is generated (typically by running +# either/both the update_added_packages.sh or update_pango_packages.sh +# scripts). If those scripts do not provide good results, then +# consider changing their source files (e.g., by editing the files +# used in those scripts) or add a patch to be run by those scripts. + +# Copyright (C) 2013 Alan W. Irwin + +# This file is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. + +# This file is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. + +# You should have received a copy of the GNU Lesser General Public +# License along with this file; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +set(PACKAGE gnome-common) + +# List of dependencies (most of which are build tools) which should be +# ignored. +set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list}) + +set(dependencies_LIST ) + +# Do boilerplate tasks that must be done for each different project +# that is configured as part of epa_build. +epa_boilerplate( + ignored_dependencies_LIST + PACKAGE + dependencies_LIST + dependencies_targets + EPA_PATH + source_PATH + ) + +if(MSYS_PLATFORM) + set(CFLAGS "$ENV{CFLAGS}") +else(MSYS_PLATFORM) + set(CFLAGS "$ENV{CFLAGS}") +endif(MSYS_PLATFORM) + +set(CXXFLAGS "$ENV{CXXFLAGS}") + +# Drop -fvisibility=hidden since that option does not work for a +# number of software packages that are configured automatically using +# this template. +string(REGEX REPLACE "-fvisibility=hidden" "" CFLAGS "${CFLAGS}") +string(REGEX REPLACE "-fvisibility=hidden" "" CXXFLAGS "${CXXFLAGS}") + +# Data that is related to downloads. +set(URL http://download.gnome.org/sources/gnome-common/3.7/gnome-common-3.7.4.tar.xz) +set(DOWNLOAD_HASH_TYPE SHA256) +set(DOWNLOAD_HASH 2af2d97010d2a9aeb3b99dd2ce07d1ef023e15a27b412ffe4f067f016ff7117b) + +ExternalProject_Add( + build_${PACKAGE} + DEPENDS ${dependencies_targets} + URL ${URL} + URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH} + CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} + BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} + BUILD_IN_SOURCE OFF + INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install + ) Property changes on: trunk/cmake/epa_build/gnome-common/CMakeLists.txt ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/cmake/epa_build/gtk+/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/gtk+/CMakeLists.txt (rev 0) +++ trunk/cmake/epa_build/gtk+/CMakeLists.txt 2014-03-16 18:15:12 UTC (rev 13069) @@ -0,0 +1,75 @@ +# gtk+/CMakeLists.txt + +# Configure the build of gtk+. + +# N.B. this file is generated so if you edit it you will lose all your +# changes the next time it is generated (typically by running +# either/both the update_added_packages.sh or update_pango_packages.sh +# scripts). If those scripts do not provide good results, then +# consider changing their source files (e.g., by editing the files +# used in those scripts) or add a patch to be run by those scripts. + +# Copyright (C) 2013 Alan W. Irwin + +# This file is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. + +# This file is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. + +# You should have received a copy of the GNU Lesser General Public +# License along with this file; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +set(PACKAGE gtk+) + +# List of dependencies (most of which are build tools) which should be +# ignored. +set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list}) + +set(dependencies_LIST at-spi2-atk;atk;cairo;gdk-pixbuf;glib;gobject-introspection;gtk-doc;libxkbcommon;pango) + +# Do boilerplate tasks that must be done for each different project +# that is configured as part of epa_build. +epa_boilerplate( + ignored_dependencies_LIST + PACKAGE + dependencies_LIST + dependencies_targets + EPA_PATH + source_PATH + ) + +if(MSYS_PLATFORM) + set(CFLAGS "$ENV{CFLAGS}") +else(MSYS_PLATFORM) + set(CFLAGS "$ENV{CFLAGS}") +endif(MSYS_PLATFORM) + +set(CXXFLAGS "$ENV{CXXFLAGS}") + +# Drop -fvisibility=hidden since that option does not work for a +# number of software packages that are configured automatically using +# this template. +string(REGEX REPLACE "-fvisibility=hidden" "" CFLAGS "${CFLAGS}") +string(REGEX REPLACE "-fvisibility=hidden" "" CXXFLAGS "${CXXFLAGS}") + +# Data that is related to downloads. +set(URL http://download.gnome.org/sources/gtk+/3.9/gtk+-3.9.8.tar.xz) +set(DOWNLOAD_HASH_TYPE SHA256) +set(DOWNLOAD_HASH a2053a9556c600e0217ec48df75e96aad909f3bc4ec307d2e04817ac548d39a8) + +ExternalProject_Add( + build_${PACKAGE} + DEPENDS ${dependencies_targets} + URL ${URL} + URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH} + CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --enable-x11-backend + BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} + BUILD_IN_SOURCE OFF + INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install + ) Property changes on: trunk/cmake/epa_build/gtk+/CMakeLists.txt ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/cmake/epa_build/libxkbcommon/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/libxkbcommon/CMakeLists.txt (rev 0) +++ trunk/cmake/epa_build/libxkbcommon/CMakeLists.txt 2014-03-16 18:15:12 UTC (rev 13069) @@ -0,0 +1,75 @@ +# libxkbcommon/CMakeLists.txt + +# Configure the build of libxkbcommon. + +# N.B. this file is generated so if you edit it you will lose all your +# changes the next time it is generated (typically by running +# either/both the update_added_packages.sh or update_pango_packages.sh +# scripts). If those scripts do not provide good results, then +# consider changing their source files (e.g., by editing the files +# used in those scripts) or add a patch to be run by those scripts. + +# Copyright (C) 2013 Alan W. Irwin + +# This file is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. + +# This file is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. + +# You should have received a copy of the GNU Lesser General Public +# License along with this file; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +set(PACKAGE libxkbcommon) + +# List of dependencies (most of which are build tools) which should be +# ignored. +set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list}) + +set(dependencies_LIST libX11;xorg-kbproto;xorg-macros;xorg-xproto) + +# Do boilerplate tasks that must be done for each different project +# that is configured as part of epa_build. +epa_boilerplate( + ignored_dependencies_LIST + PACKAGE + dependencies_LIST + dependencies_targets + EPA_PATH + source_PATH + ) + +if(MSYS_PLATFORM) + set(CFLAGS "$ENV{CFLAGS}") +else(MSYS_PLATFORM) + set(CFLAGS "$ENV{CFLAGS}") +endif(MSYS_PLATFORM) + +set(CXXFLAGS "$ENV{CXXFLAGS}") + +# Drop -fvisibility=hidden since that option does not work for a +# number of software packages that are configured automatically using +# this template. +string(REGEX REPLACE "-fvisibility=hidden" "" CFLAGS "${CFLAGS}") +string(REGEX REPLACE "-fvisibility=hidden" "" CXXFLAGS "${CXXFLAGS}") + +# Data that is related to downloads. +set(URL http://xkbcommon.org/download/libxkbcommon-0.3.1.tar.xz) +set(DOWNLOAD_HASH_TYPE SHA256) +set(DOWNLOAD_HASH 9c973581bba0c883a301fa6474d9c3e4f3a06c34e4ae4f1f4e113692cb18b38e) + +ExternalProject_Add( + build_${PACKAGE} + DEPENDS ${dependencies_targets} + URL ${URL} + URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH} + CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --with-xkb-config-root=/usr/share/X11/xkb + BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} + BUILD_IN_SOURCE OFF + INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install + ) Property changes on: trunk/cmake/epa_build/libxkbcommon/CMakeLists.txt ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-03-16 17:53:22
|
Revision: 13068 http://sourceforge.net/p/plplot/code/13068 Author: airwin Date: 2014-03-16 17:53:19 +0000 (Sun, 16 Mar 2014) Log Message: ----------- Straighten out the dependency mess for glib and gt-doc. gtk-doc has a real dependency on glib so must add that dependency to gtk-doc. But that normally would introduce a circular dependency since glib depends on gtk-doc! So in addition to the gtk-doc package change, fix that circular dependency by disabling use of gtk-doc for glib, and dropping the dependency of glib on gtk-doc. Modified Paths: -------------- trunk/cmake/epa_build/glib/CMakeLists.txt trunk/cmake/epa_build/gtk-doc/CMakeLists.txt Modified: trunk/cmake/epa_build/glib/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/glib/CMakeLists.txt 2014-03-16 17:44:06 UTC (rev 13067) +++ trunk/cmake/epa_build/glib/CMakeLists.txt 2014-03-16 17:53:19 UTC (rev 13068) @@ -29,9 +29,9 @@ # List of dependencies (most of which are build tools) which should be # ignored. -set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) +set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list}) -set(dependencies_LIST gtk-doc;libffi) +set(dependencies_LIST libffi) # Do boilerplate tasks that must be done for each different project # that is configured as part of epa_build. @@ -68,7 +68,7 @@ DEPENDS ${dependencies_targets} URL ${URL} URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH} - CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --enable-installed-tests + CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --enable-installed-tests --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} BUILD_IN_SOURCE OFF INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install Modified: trunk/cmake/epa_build/gtk-doc/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/gtk-doc/CMakeLists.txt 2014-03-16 17:44:06 UTC (rev 13067) +++ trunk/cmake/epa_build/gtk-doc/CMakeLists.txt 2014-03-16 17:53:19 UTC (rev 13068) @@ -29,9 +29,9 @@ # List of dependencies (most of which are build tools) which should be # ignored. -set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) +set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list}) -set(dependencies_LIST docbook-xml;docbook-xsl;libxslt;yelp-tools) +set(dependencies_LIST docbook-xml;docbook-xsl;glib;libxslt;yelp-tools) # Do boilerplate tasks that must be done for each different project # that is configured as part of epa_build. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-03-16 17:44:12
|
Revision: 13067 http://sourceforge.net/p/plplot/code/13067 Author: airwin Date: 2014-03-16 17:44:06 +0000 (Sun, 16 Mar 2014) Log Message: ----------- Add needed glib dependency for cairo. Modified Paths: -------------- trunk/cmake/epa_build/cairo/CMakeLists.txt Modified: trunk/cmake/epa_build/cairo/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/cairo/CMakeLists.txt 2014-03-16 17:41:17 UTC (rev 13066) +++ trunk/cmake/epa_build/cairo/CMakeLists.txt 2014-03-16 17:44:06 UTC (rev 13067) @@ -29,9 +29,9 @@ # List of dependencies (most of which are build tools) which should be # ignored. -set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) +set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list}) -set(dependencies_LIST fontconfig;gtk-doc;pixman;pkg-config) +set(dependencies_LIST fontconfig;glib;gtk-doc;pixman;pkg-config) # Do boilerplate tasks that must be done for each different project # that is configured as part of epa_build. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-03-16 17:41:20
|
Revision: 13066 http://sourceforge.net/p/plplot/code/13066 Author: airwin Date: 2014-03-16 17:41:17 +0000 (Sun, 16 Mar 2014) Log Message: ----------- Update ignored dependencies list to be consistent with all other gtk+-related packages. This change has no practical effect because non of this additional ignored dependencies occur for these particular gtk+-related packages. Modified Paths: -------------- trunk/cmake/epa_build/fontconfig/CMakeLists.txt trunk/cmake/epa_build/gobject-introspection/CMakeLists.txt trunk/cmake/epa_build/harfbuzz/CMakeLists.txt trunk/cmake/epa_build/itstool/CMakeLists.txt trunk/cmake/epa_build/pango/CMakeLists.txt trunk/cmake/epa_build/yelp-tools/CMakeLists.txt trunk/cmake/epa_build/yelp-xsl/CMakeLists.txt Modified: trunk/cmake/epa_build/fontconfig/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/fontconfig/CMakeLists.txt 2014-03-16 00:37:56 UTC (rev 13065) +++ trunk/cmake/epa_build/fontconfig/CMakeLists.txt 2014-03-16 17:41:17 UTC (rev 13066) @@ -29,7 +29,7 @@ # List of dependencies (most of which are build tools) which should be # ignored. -set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) +set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list}) set(dependencies_LIST gperf) Modified: trunk/cmake/epa_build/gobject-introspection/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/gobject-introspection/CMakeLists.txt 2014-03-16 00:37:56 UTC (rev 13065) +++ trunk/cmake/epa_build/gobject-introspection/CMakeLists.txt 2014-03-16 17:41:17 UTC (rev 13066) @@ -29,7 +29,7 @@ # List of dependencies (most of which are build tools) which should be # ignored. -set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) +set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list}) set(dependencies_LIST bison;cairo;flex;glib;python2-devel) Modified: trunk/cmake/epa_build/harfbuzz/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/harfbuzz/CMakeLists.txt 2014-03-16 00:37:56 UTC (rev 13065) +++ trunk/cmake/epa_build/harfbuzz/CMakeLists.txt 2014-03-16 17:41:17 UTC (rev 13066) @@ -29,7 +29,7 @@ # List of dependencies (most of which are build tools) which should be # ignored. -set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) +set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list}) set(dependencies_LIST glib;ragel) Modified: trunk/cmake/epa_build/itstool/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/itstool/CMakeLists.txt 2014-03-16 00:37:56 UTC (rev 13065) +++ trunk/cmake/epa_build/itstool/CMakeLists.txt 2014-03-16 17:41:17 UTC (rev 13066) @@ -29,7 +29,7 @@ # List of dependencies (most of which are build tools) which should be # ignored. -set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) +set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list}) set(dependencies_LIST ) Modified: trunk/cmake/epa_build/pango/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/pango/CMakeLists.txt 2014-03-16 00:37:56 UTC (rev 13065) +++ trunk/cmake/epa_build/pango/CMakeLists.txt 2014-03-16 17:41:17 UTC (rev 13066) @@ -29,7 +29,7 @@ # List of dependencies (most of which are build tools) which should be # ignored. -set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) +set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list}) set(dependencies_LIST cairo;fontconfig;glib;gobject-introspection;gtk-doc;harfbuzz;libXft) Modified: trunk/cmake/epa_build/yelp-tools/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/yelp-tools/CMakeLists.txt 2014-03-16 00:37:56 UTC (rev 13065) +++ trunk/cmake/epa_build/yelp-tools/CMakeLists.txt 2014-03-16 17:41:17 UTC (rev 13066) @@ -29,7 +29,7 @@ # List of dependencies (most of which are build tools) which should be # ignored. -set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) +set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list}) set(dependencies_LIST intltool;itstool;libxml2;libxslt;yelp-xsl) Modified: trunk/cmake/epa_build/yelp-xsl/CMakeLists.txt =================================================================== --- trunk/cmake/epa_build/yelp-xsl/CMakeLists.txt 2014-03-16 00:37:56 UTC (rev 13065) +++ trunk/cmake/epa_build/yelp-xsl/CMakeLists.txt 2014-03-16 17:41:17 UTC (rev 13066) @@ -29,7 +29,7 @@ # List of dependencies (most of which are build tools) which should be # ignored. -set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libXft ${extra_ignored_dependencies_list}) +set(ignored_dependencies_LIST pkg-config;bison;flex;python2-devel;libX11;libXft;xorg-kbproto;xorg-macros;xorg-xproto;dbus ${extra_ignored_dependencies_list}) set(dependencies_LIST intltool;itstool;libxml2;libxslt) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-03-16 00:37:59
|
Revision: 13065 http://sourceforge.net/p/plplot/code/13065 Author: airwin Date: 2014-03-16 00:37:56 +0000 (Sun, 16 Mar 2014) Log Message: ----------- Get rid of all current official notices since those are only relevant to the 5.10.0 release. Add an official notice concerning the backwards incompatible "d" suffix removal. Modified Paths: -------------- trunk/README.release Modified: trunk/README.release =================================================================== --- trunk/README.release 2014-03-16 00:35:36 UTC (rev 13064) +++ trunk/README.release 2014-03-16 00:37:56 UTC (rev 13065) @@ -1,9 +1,9 @@ -PLplot Release 5.10.0 +PLplot Release 5.11.0 ~~~~~~~~~~~~~~~~~~~~ This is a release of the PLplot plotting package. It represents the ongoing best efforts of the PLplot community to improve this package, and it is the only version of PLplot that we attempt -to support. Releases in the 5.x.y series should be available several +to support. Releases in the 5.x.0 series should be available several times per year. If you encounter a problem that is not already documented in the @@ -30,19 +30,31 @@ 1. OFFICIAL NOTICES FOR USERS -The distinction we made prior to 5.10.0 between stable and development -releases was essentially completely artificial and has now been -dropped. In each case, the latest release was "stable" in the sense -that it was the PLplot team's best effort with substantial testing on -the computer platforms available to our test team. And that tradition -continues for the release of 5.10.0. Note we have bumped the minor -number in this release triplet compared to the previous 5.9.11 release -because from now on we want to reserve the patch number in that -triplet only for those (rare) releases that contain emergency fixes -compared to the previous release. Note especially that 5.10.0 is not -that different from the prior release 5.9.11, and we don't ordinarily -require such emergency releases so our forthcoming release numbers are -likely to be 5.11.0, 5.12.0, etc. +Backwards incompatible change. We have forced the CMake variable +LIB_TAG to always be the empty string. The effect of this change is +the "d" suffix has been dropped from our library names that had this +suffix before (e.g, libplplotd ==> libplplot), dropped from the plplot +pkg-config *.pc files used to produce pkg-config results (e.g., +plplotd.pc ==> plplot.pc), and dropped from the directory name where +the device driver dll's are installed (i.e., +$INSTALL_PREFIX/lib/plplot$PLPLOT_VERSION/driversd ==> +$INSTALL_PREFIX/lib/plplot$PLPLOT_VERSION/drivers). This "d" suffix +was a leftover from the days when we routinely built both +single-precision and double-precision forms of the PLplot library, +where the double-precision form was assigned the "d" suffix. This +suffix was confusing (many users assumed it meant "debug" rather than +its actual meaning of "double precision"), did not normally +distinguish from the single-precision case since that case was rarely +built or tested, and was not uniformly applied to all our libraries +(because we produced single- and double-precision variants for only a +subset of our libraries). Also, the single- or double-precision +variants of our library builds are only a small subset of the possible +build variations that can be produced with our build system so the +only safe and reliable way we can recommend for users to explore these +many different possible build variations is for them to use +independent build trees and install prefixes for each of the +variations rather than imposing a variety of easy-to-misinterpret +library, pkg-config, and driver install location suffixes. 2. Changes relative to the previous release This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2014-03-16 00:35:39
|
Revision: 13064 http://sourceforge.net/p/plplot/code/13064 Author: airwin Date: 2014-03-16 00:35:36 +0000 (Sun, 16 Mar 2014) Log Message: ----------- Force LIB_TAG to be the empty string as discussed on list. Tested on Linux using the test_interactive and test_noninteractive targets in the build tree. Modified Paths: -------------- trunk/cmake/modules/double.cmake Modified: trunk/cmake/modules/double.cmake =================================================================== --- trunk/cmake/modules/double.cmake 2014-03-16 00:26:59 UTC (rev 13063) +++ trunk/cmake/modules/double.cmake 2014-03-16 00:35:36 UTC (rev 13064) @@ -25,7 +25,17 @@ option(PL_DOUBLE "Compile the library with double precision floating point" ON) -if(PL_DOUBLE) - set(LIB_TAG "${LIB_TAG}d") -endif(PL_DOUBLE) +# Force LIB_TAG to be empty in all cases. This is completely +# different from the previous case where "d" was appended to the user +# setting of this variable if the library was double precision. As +# discussed on list we are forcing LIB_TAG to be empty because it is +# only applied to a subset of our libraries (because the other ones do +# not have a single-precision or double-precision variant). +# Furthermore, the recommended and absolutely most reliable way to +# distinguish between various kinds of PLplot builds is not by +# appending various confusing library suffixes. (For example, "d" is +# often incorrectly assumed to refer to a debugging version of the +# PLplot library.) Instead, simply use a different install prefix for +# each different kind of build. +set(LIB_TAG "" CACHE STRING "LIB_TAG should _always_ be the empty string" FORCE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |