From: <ai...@us...> - 2007-09-25 16:47:39
|
Revision: 7885 http://plplot.svn.sourceforge.net/plplot/?rev=7885&view=rev Author: airwin Date: 2007-09-25 09:47:40 -0700 (Tue, 25 Sep 2007) Log Message: ----------- Generate the website png files with -dev pngcairo (rather than -dev png). Add examples 26, 27, and 28 to website png files that are generated and also the website sourcefiles for all languages. Add Fortran 95 and Ada example source files to website. Modified Paths: -------------- trunk/scripts/htdocs-gen_plot-examples.sh Modified: trunk/scripts/htdocs-gen_plot-examples.sh =================================================================== --- trunk/scripts/htdocs-gen_plot-examples.sh 2007-09-24 18:26:17 UTC (rev 7884) +++ trunk/scripts/htdocs-gen_plot-examples.sh 2007-09-25 16:47:40 UTC (rev 7885) @@ -56,31 +56,15 @@ # hack, x20c needs lena in the current directory cp examples/c/lena.pgm . -for exe in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 20 21 22 23 24 25; do +for exe in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 20 21 22 \ +23 24 25 26 27 28; do echo Working on example ${exe} # generate standard and preview size images - if test $exe != 24 ; then - if test $exe = 02 ; then - SMOOTH=0 - else - SMOOTH=1 - fi - $cexamples_dir/x${exe}c -dev png -drvopt text,smooth=$SMOOTH \ - -o x${exe} -fam -fflen 2; - $cexamples_dir/x${exe}c -dev png -drvopt text,smooth=$SMOOTH \ - -o prev-x${exe} -fam -fflen 2 -geometry 200x150; - else - $cexamples_dir/x24c -dev psttfc -o test.ps - convert -rotate 90 test.ps -geometry 800x600 x24.01.png - convert -rotate 90 test.ps -geometry 200x150 prev-x24.01.png - rm test.ps - # convert command needs the png suffix, but now take it off to - # be consistent with script below which puts it back on again. - mv x24.01.png x24.01 - mv prev-x24.01.png prev-x24.01 - fi + $cexamples_dir/x${exe}c -dev pngcairo -o x${exe} -fam -fflen 2 + $cexamples_dir/x${exe}c -dev pngcairo -o prev-x${exe} -fam -fflen 2 \ + -geometry 200x150 # give png extension for i in `ls x${exe}.?? prev-x${exe}.??`; do @@ -93,10 +77,15 @@ mkdir -p $EXDIR/demo${exe} mv *${exe}.??.png $EXDIR/demo${exe} # Note fortran 77 examples grabbed from installed examples. - for f in examples/c/x${exe}c.c examples/tcl/x${exe}.tcl \ - examples/java/x${exe}.java cexamples_dir/../f77/x${exe}f.f \ - bindings/octave/demos/x${exe}c.m \ - examples/python/xw${exe}.py examples/c++/x${exe}.cc \ + for f in examples/c/x${exe}c.c \ + examples/tcl/x${exe}.tcl \ + examples/java/x${exe}.java \ + cexamples_dir/../f77/x${exe}f.f \ + examples/f95/x${exe}f.f90 \ + examples/ada/x${exe}a.adb \ + bindings/octave/demos/x${exe}c.m \ + examples/python/xw${exe}.py \ + examples/c++/x${exe}.cc \ examples/perl/x${exe}.pl ; do if test -f $f ; then cp $f $EXDIR/demo${exe} @@ -109,7 +98,7 @@ # rename executables, to avoid browsers trying to execute files # instead of showing them. (cd $EXDIR/demo${exe}; - for j in *.c *.cc *.f *.m *.tcl *.java *.py *.pl; do + for j in *.c *.cc *.f *.f90 *.adb *.m *.tcl *.java *.py *.pl; do mv $j $j- done ) @@ -146,4 +135,3 @@ ssh $WWW_HOST chmod -R g=u $WWW_DIR/$EXDIR echo Removing the remote tarball ssh $WWW_HOST rm -f $WWW_DIR/$TARBALL - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hba...@us...> - 2007-09-28 00:25:19
|
Revision: 7893 http://plplot.svn.sourceforge.net/plplot/?rev=7893&view=rev Author: hbabcock Date: 2007-09-27 17:25:22 -0700 (Thu, 27 Sep 2007) Log Message: ----------- Added the pngcairo driver to the list of drivers built so that it can be used to generate the examples. Modified Paths: -------------- trunk/scripts/htdocs-gen_plot-examples.sh Modified: trunk/scripts/htdocs-gen_plot-examples.sh =================================================================== --- trunk/scripts/htdocs-gen_plot-examples.sh 2007-09-27 21:07:12 UTC (rev 7892) +++ trunk/scripts/htdocs-gen_plot-examples.sh 2007-09-28 00:25:22 UTC (rev 7893) @@ -41,6 +41,7 @@ -DENABLE_python=OFF -DENABLE_java=OFF \ -DENABLE_tcl=OFF -DENABLE_octave=OFF \ -DDEFAULT_NO_DEVICES=ON -DPLD_png=ON -DPLD_psttf=ON \ + -DPLD_pngcairo=ON \ ../../ make make install This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Alan W. I. <ir...@be...> - 2007-09-28 01:02:24
|
On 2007-09-27 17:25-0700 hba...@us... wrote: > Revision: 7893 > http://plplot.svn.sourceforge.net/plplot/?rev=7893&view=rev > Author: hbabcock > Date: 2007-09-27 17:25:22 -0700 (Thu, 27 Sep 2007) > > Log Message: > ----------- > Added the pngcairo driver to the list of drivers built so that it can be used to generate the examples. > > Modified Paths: > -------------- > trunk/scripts/htdocs-gen_plot-examples.sh > > Modified: trunk/scripts/htdocs-gen_plot-examples.sh > =================================================================== > --- trunk/scripts/htdocs-gen_plot-examples.sh 2007-09-27 21:07:12 UTC (rev 7892) > +++ trunk/scripts/htdocs-gen_plot-examples.sh 2007-09-28 00:25:22 UTC (rev 7893) > @@ -41,6 +41,7 @@ > -DENABLE_python=OFF -DENABLE_java=OFF \ > -DENABLE_tcl=OFF -DENABLE_octave=OFF \ > -DDEFAULT_NO_DEVICES=ON -DPLD_png=ON -DPLD_psttf=ON \ > + -DPLD_pngcairo=ON \ > ../../ > make > make install > Hi Hazen: Good catch. However, you no longer need png or psttfc, and there is an easy way to turn off all bindings except f77 (which is only required because the example source files in that case are generated from the *.fm4 files). Thus, here is what I suggest instead: cmake -DCMAKE_INSTALL_PREFIX=pwd/../install \ -DDEFAULT_NO_BINDINGS=ON -DENABLE_f77=ON \ -DDEFAULT_NO_DEVICES=ON -DPLD_pngcairo \ ../../ Could you try this version in the script, and if it works commit it? Thanks. Alan __________________________ Alan W. Irwin Astronomical research affiliation with Department of Physics and Astronomy, University of Victoria (astrowww.phys.uvic.ca). Programming affiliations with the FreeEOS equation-of-state implementation for stellar interiors (freeeos.sf.net); PLplot scientific plotting software package (plplot.org); the libLASi project (unifont.org/lasi); the Loads of Linux Links project (loll.sf.net); and the Linux Brochure Project (lbproject.sf.net). __________________________ Linux-powered Science __________________________ |
From: <hba...@us...> - 2007-09-28 02:41:23
|
Revision: 7894 http://plplot.svn.sourceforge.net/plplot/?rev=7894&view=rev Author: hbabcock Date: 2007-09-27 19:41:27 -0700 (Thu, 27 Sep 2007) Log Message: ----------- Only build the f77 bindings and the pngcairo driver as that is all that is needed to generate the web-site examples. Modified Paths: -------------- trunk/scripts/htdocs-gen_plot-examples.sh Modified: trunk/scripts/htdocs-gen_plot-examples.sh =================================================================== --- trunk/scripts/htdocs-gen_plot-examples.sh 2007-09-28 00:25:22 UTC (rev 7893) +++ trunk/scripts/htdocs-gen_plot-examples.sh 2007-09-28 02:41:27 UTC (rev 7894) @@ -37,11 +37,8 @@ cd htdocsgen/build_dir # Specifically enable f77 so that examples will be generated. cmake -DCMAKE_INSTALL_PREFIX=`pwd`/../install \ - -DENABLE_cxx=OFF -DENABLE_f77=ON -DENABLE_f95=OFF \ - -DENABLE_python=OFF -DENABLE_java=OFF \ - -DENABLE_tcl=OFF -DENABLE_octave=OFF \ - -DDEFAULT_NO_DEVICES=ON -DPLD_png=ON -DPLD_psttf=ON \ - -DPLD_pngcairo=ON \ + -DDEFAULT_NO_BINDINGS=ON -DENABLE_f77=ON \ + -DDEFAULT_NO_DEVICES=ON -DPLD_pngcairo=ON \ ../../ make make install This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2007-09-28 05:33:32
|
Revision: 7895 http://plplot.svn.sourceforge.net/plplot/?rev=7895&view=rev Author: airwin Date: 2007-09-27 22:33:36 -0700 (Thu, 27 Sep 2007) Log Message: ----------- Commit to demonstrate how to specify different drvopt for certain examples. This may need further modification by Hazen. Modified Paths: -------------- trunk/scripts/htdocs-gen_plot-examples.sh Modified: trunk/scripts/htdocs-gen_plot-examples.sh =================================================================== --- trunk/scripts/htdocs-gen_plot-examples.sh 2007-09-28 02:41:27 UTC (rev 7894) +++ trunk/scripts/htdocs-gen_plot-examples.sh 2007-09-28 05:33:36 UTC (rev 7895) @@ -57,12 +57,20 @@ for exe in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 20 21 22 \ 23 24 25 26 27 28; do - echo Working on example ${exe} + if test $exe = 08 -o $exe = 16 -o $exe = 20; then + # No cairo graphics AA (Yep, 1 turns it off). + DRIVEROPT='-drvopt graphics_anti_aliasing=1' + else + # Otherwise use default graphics AA which is full AA + DRIVEROPT= + fi + echo Working on example ${exe} using DRIVEROPT of $DRIVEROPT # generate standard and preview size images - $cexamples_dir/x${exe}c -dev pngcairo -o x${exe} -fam -fflen 2 + $cexamples_dir/x${exe}c -dev pngcairo -o x${exe} -fam -fflen 2 \ + $DRIVEROPT $cexamples_dir/x${exe}c -dev pngcairo -o prev-x${exe} -fam -fflen 2 \ - -geometry 200x150 + $DRIVEROPT -geometry 200x150 # give png extension for i in `ls x${exe}.?? prev-x${exe}.??`; do This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hba...@us...> - 2007-10-17 01:17:22
|
Revision: 7937 http://plplot.svn.sourceforge.net/plplot/?rev=7937&view=rev Author: hbabcock Date: 2007-10-16 18:17:27 -0700 (Tue, 16 Oct 2007) Log Message: ----------- Added text clipping for example 9. Modified Paths: -------------- trunk/scripts/htdocs-gen_plot-examples.sh Modified: trunk/scripts/htdocs-gen_plot-examples.sh =================================================================== --- trunk/scripts/htdocs-gen_plot-examples.sh 2007-10-17 00:56:34 UTC (rev 7936) +++ trunk/scripts/htdocs-gen_plot-examples.sh 2007-10-17 01:17:27 UTC (rev 7937) @@ -61,8 +61,13 @@ # No cairo graphics AA (Yep, 1 turns it off). DRIVEROPT='-drvopt graphics_anti_aliasing=1' else - # Otherwise use default graphics AA which is full AA - DRIVEROPT= + if test $exe = 09; then + # Text clipping. + DRIVEROPT='-drvopt text_clipping=1' + else + # Otherwise use default graphics AA which is full AA + DRIVEROPT= + fi fi echo Working on example ${exe} using DRIVEROPT of $DRIVEROPT This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hba...@us...> - 2007-10-17 01:40:19
|
Revision: 7938 http://plplot.svn.sourceforge.net/plplot/?rev=7938&view=rev Author: hbabcock Date: 2007-10-16 18:40:22 -0700 (Tue, 16 Oct 2007) Log Message: ----------- Added text clipping for example 21. Modified Paths: -------------- trunk/scripts/htdocs-gen_plot-examples.sh Modified: trunk/scripts/htdocs-gen_plot-examples.sh =================================================================== --- trunk/scripts/htdocs-gen_plot-examples.sh 2007-10-17 01:17:27 UTC (rev 7937) +++ trunk/scripts/htdocs-gen_plot-examples.sh 2007-10-17 01:40:22 UTC (rev 7938) @@ -61,7 +61,7 @@ # No cairo graphics AA (Yep, 1 turns it off). DRIVEROPT='-drvopt graphics_anti_aliasing=1' else - if test $exe = 09; then + if test $exe = 09 -o $exe = 21; then # Text clipping. DRIVEROPT='-drvopt text_clipping=1' else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2007-11-24 22:16:52
|
Revision: 8037 http://plplot.svn.sourceforge.net/plplot/?rev=8037&view=rev Author: airwin Date: 2007-11-24 14:16:56 -0800 (Sat, 24 Nov 2007) Log Message: ----------- Create remote directory if it does not exist. Modified Paths: -------------- trunk/scripts/htdocs-gen_plot-examples.sh Modified: trunk/scripts/htdocs-gen_plot-examples.sh =================================================================== --- trunk/scripts/htdocs-gen_plot-examples.sh 2007-11-24 22:14:56 UTC (rev 8036) +++ trunk/scripts/htdocs-gen_plot-examples.sh 2007-11-24 22:16:56 UTC (rev 8037) @@ -132,6 +132,8 @@ WWW_HOST=${WWW_HOST:-${WWW_USER:+$WWW_USER@}shell.sf.net} WWW_DIR=${WWW_DIR:-/home/groups/p/pl/plplot} +echo 'Create remote directory if it does not exist' +ssh $WWW_HOST mkdir -p $WWW_DIR echo Removing remote examples directory ssh $WWW_HOST rm -rf $WWW_DIR/$EXDIR echo Copying the tarball to WWW site This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hba...@us...> - 2008-02-10 15:28:00
|
Revision: 8232 http://plplot.svn.sourceforge.net/plplot/?rev=8232&view=rev Author: hbabcock Date: 2008-02-10 07:28:05 -0800 (Sun, 10 Feb 2008) Log Message: ----------- Added examples 29 & 30 to the generated examples. Turned on anti-aliasing for example 30. Modified Paths: -------------- trunk/scripts/htdocs-gen_plot-examples.sh Modified: trunk/scripts/htdocs-gen_plot-examples.sh =================================================================== --- trunk/scripts/htdocs-gen_plot-examples.sh 2008-02-10 15:25:40 UTC (rev 8231) +++ trunk/scripts/htdocs-gen_plot-examples.sh 2008-02-10 15:28:05 UTC (rev 8232) @@ -55,9 +55,9 @@ cp examples/c/lena.pgm . for exe in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 20 21 22 \ -23 24 25 26 27 28; do +23 24 25 26 27 28 29 30; do - if test $exe = 08 -o $exe = 16 -o $exe = 20; then + if test $exe = 08 -o $exe = 16 -o $exe = 20 -o $exe = 30; then # No cairo graphics AA (Yep, 1 turns it off). DRIVEROPT='-drvopt graphics_anti_aliasing=1' else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |