[Plplot-cvs] SF.net SVN: plplot:[13106] trunk/examples

[<ai...@us...>]

Revision: 13106
          http://sourceforge.net/p/plplot/code/13106
Author:   airwin
Date:     2014-04-21 04:34:46 +0000 (Mon, 21 Apr 2014)
Log Message:
-----------
Clean up test logic in the traditional build system for the installed
examples for the (corner) case where -DPLD_ps=OFF.

Tested on Linux for 

-DDEFAULT_NO_DEVICES=ON
-DPLD_epsqt=ON
-DPLD_pdfqt=ON
-DPLD_qtwidget=ON
-DPLD_bmpqt=ON
-DPLD_jpgqt=ON
-DPLD_pngqt=ON
-DPLD_=ppmqtON
-DPLD_tiffqt=ON
-DPLD_extqt=ON
-DPLD_memqt=ON
-DPLD_svgqt=ON
-DDEFAULT_NO_BINDINGS=ON
-DENABLE_cxx=ON
-DENABLE_qt=ON
-DPLPLOT_USE_QT5=ON

using the comprehensive test_script and an epa_build of Qt5.

N.B. this is the first completely successful comprehensive test of the
-DPLPLOT_USE_QT5=ON case, but certain Qt-related components of PLplot
are still disabled or not implemented for the Qt5 case as discussed on
list.

Modified Paths:
--------------
    trunk/examples/CMakeLists.txt
    trunk/examples/Makefile.examples.in

Modified: trunk/examples/CMakeLists.txt
===================================================================
--- trunk/examples/CMakeLists.txt	2014-04-21 00:26:11 UTC (rev 13105)
+++ trunk/examples/CMakeLists.txt	2014-04-21 04:34:46 UTC (rev 13106)
@@ -34,6 +34,10 @@
       set(PSC_ADA_COMMENT "#")
     endif(NOT ENABLE_ada)
 
+    if(NOT ENABLE_cxx)
+      set(PSC_CXX_COMMENT "#")
+    endif(NOT ENABLE_cxx)
+
     if(NOT ENABLE_d)
       set(PSC_D_COMMENT "#")
     endif(NOT ENABLE_d)
@@ -73,6 +77,7 @@
   else(PLD_ps)
     set(PSC_ADA_COMMENT "#")
     set(PSC_C_COMMENT "#")
+    set(PSC_CXX_COMMENT "#")
     set(PSC_D_COMMENT "#")
     set(PSC_F95_COMMENT "#")
     set(PSC_JAVA_COMMENT "#")
@@ -81,6 +86,7 @@
     set(PSC_PERL_COMMENT "#")
     set(PSC_PYTHON_COMMENT "#")
     set(PSC_TCL_COMMENT "#")
+    set(PSC_LUA_COMMENT "#")
   endif(PLD_ps)
 
   if(NOT(ENABLE_cxx AND (PLD_ps OR ENABLE_qt)))

Modified: trunk/examples/Makefile.examples.in
===================================================================
--- trunk/examples/Makefile.examples.in	2014-04-21 00:26:11 UTC (rev 13105)
+++ trunk/examples/Makefile.examples.in	2014-04-21 04:34:46 UTC (rev 13106)
@@ -32,11 +32,11 @@
 	cd c; $(MAKE) clean
 .PHONY: c_clean
 clean: c_clean
-x01c.psc: c/x01c@EXEEXT@
-	@echo Generate C results for psc device
-	./plplot-test.sh --verbose --front-end=c --device=psc
-test_noninteractive: x01c.psc
-@COMPARE_COMMENT@compare: x01c.psc
+@PSC...@x0...c: c/x01c@EXEEXT@
+@PSC_C_COMMENT@	@echo Generate C results for psc device
+@PSC_C_COMMENT@	./plplot-test.sh --verbose --front-end=c --device=psc
+@PSC_C_COMMENT@test_noninteractive: x01c.psc
+@PSC_C_COMMENT@@COMPARE_COMMENT@compare: x01c.psc
 # Just for c, c++, and tk directories
 test_interactive: c/x01c@EXEEXT@
 
@@ -60,11 +60,11 @@
 @CXX_COMMENT@	cd c++; $(MAKE) clean
 @CXX_COMMENT@.PHONY: cxx_clean
 @CXX_COMMENT@clean: cxx_clean
-@CXX...@x0...c: c++/x01@EXEEXT@
-@CXX_COMMENT@	@echo Generate C++ results for psc device
-@CXX_COMMENT@	./plplot-test.sh --verbose --front-end=cxx --device=psc
-@CXX_COMMENT@test_noninteractive: x01cxx.psc
-@CXX_COMMENT@@COMPARE_COMMENT@compare: x01cxx.psc
+@PSC...@x0...c: c++/x01@EXEEXT@
+@PSC_CXX_COMMENT@	@echo Generate C++ results for psc device
+@PSC_CXX_COMMENT@	./plplot-test.sh --verbose --front-end=cxx --device=psc
+@PSC_CXX_COMMENT@test_noninteractive: x01cxx.psc
+@PSC_CXX_COMMENT@@COMPARE_COMMENT@compare: x01cxx.psc
 # Just for c, c++, and tk directories
 @CXX_COMMENT@test_interactive: c++/x01@EXEEXT@
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.