From: <ai...@us...> - 2008-07-24 21:59:21
|
Revision: 8588 http://plplot.svn.sourceforge.net/plplot/?rev=8588&view=rev Author: airwin Date: 2008-07-24 21:59:31 +0000 (Thu, 24 Jul 2008) Log Message: ----------- Allow independent setting of WWW_USER and WWW_HOST. Echo scp and ssh commands so the user can tell what is really happening with those. 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-07-24 15:20:24 UTC (rev 8587) +++ trunk/scripts/htdocs-gen_plot-examples.sh 2008-07-24 21:59:31 UTC (rev 8588) @@ -129,22 +129,23 @@ # appear in the PLplot web site WWW_GROUP=${WWW_GROUP:-plplot} -WWW_HOST=${WWW_HOST:-${WWW_USER:+$WWW_USER@}shell.sf.net} +WWW_HOST=${WWW_HOST:-shell.sf.net} +WWW_USER_AT_HOST=${WWW_USER:+$WWW_USER@}$WWW_HOST 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 -scp $TARBALL $WWW_HOST:$WWW_DIR -echo Changing its permission to allow group access -ssh $WWW_HOST chmod g=u $WWW_DIR/$TARBALL -echo Unpacking the remote tarball -ssh $WWW_HOST tar -x -z -C $WWW_DIR -f $WWW_DIR/$TARBALL -echo Changing group of the remote examples directory -ssh $WWW_HOST chgrp -R $WWW_GROUP $WWW_DIR/$EXDIR -echo Changing group permissions of the remote examples directory -ssh $WWW_HOST chmod -R g=u $WWW_DIR/$EXDIR -echo Removing the remote tarball -ssh $WWW_HOST rm -f $WWW_DIR/$TARBALL +echo "ssh $WWW_USER_AT_HOST mkdir -p $WWW_DIR" +ssh $WWW_USER_AT_HOST mkdir -p $WWW_DIR +echo "ssh $WWW_USER_AT_HOST rm -rf $WWW_DIR/$EXDIR" +ssh $WWW_USER_AT_HOST rm -rf $WWW_DIR/$EXDIR +echo "scp $TARBALL $WWW_USER_AT_HOST:$WWW_DIR" +scp $TARBALL $WWW_USER_AT_HOST:$WWW_DIR +echo "ssh $WWW_USER_AT_HOST chmod g=u $WWW_DIR/$TARBALL" +ssh $WWW_USER_AT_HOST chmod g=u $WWW_DIR/$TARBALL +echo "ssh $WWW_USER_AT_HOST tar -x -z -C $WWW_DIR -f $WWW_DIR/$TARBALL" +ssh $WWW_USER_AT_HOST tar -x -z -C $WWW_DIR -f $WWW_DIR/$TARBALL +echo "ssh $WWW_USER_AT_HOST chgrp -R $WWW_GROUP $WWW_DIR/$EXDIR" +ssh $WWW_USER_AT_HOST chgrp -R $WWW_GROUP $WWW_DIR/$EXDIR +echo "ssh $WWW_USER_AT_HOST chmod -R g=u $WWW_DIR/$EXDIR" +ssh $WWW_USER_AT_HOST chmod -R g=u $WWW_DIR/$EXDIR +echo "ssh $WWW_USER_AT_HOST rm -f $WWW_DIR/$TARBALL" +ssh $WWW_USER_AT_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: <ai...@us...> - 2008-09-20 17:12:05
|
Revision: 8785 http://plplot.svn.sourceforge.net/plplot/?rev=8785&view=rev Author: airwin Date: 2008-09-20 17:11:40 +0000 (Sat, 20 Sep 2008) Log Message: ----------- Alphabetize lists of files by source code language to help keep track of what is included. Add OCaml examples source code files to the source code files that will be available on our 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 2008-09-20 06:11:29 UTC (rev 8784) +++ trunk/scripts/htdocs-gen_plot-examples.sh 2008-09-20 17:11:40 UTC (rev 8785) @@ -87,17 +87,21 @@ rm -rf $EXDIR/demo${exe} 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 \ + # Note both Ada and fortran 77 examples grabbed from the installed + # examples. + for f in + $cexamples_dir/../ada/x${exe}a.adb \ + examples/c/x${exe}c.c \ + examples/c++/x${exe}.cc \ $cexamples_dir/../f77/x${exe}f.f \ examples/f95/x${exe}f.f90 \ - $cexamples_dir/../ada/x${exe}a.adb \ + examples/java/x${exe}.java \ + examples/ocaml/x${exe}.ml \ bindings/octave/demos/x${exe}c.m \ + examples/perl/x${exe}.pl \ examples/python/xw${exe}.py \ - examples/c++/x${exe}.cc \ - examples/perl/x${exe}.pl ; do + examples/tcl/x${exe}.tcl \ + ; do if test -f $f ; then cp $f $EXDIR/demo${exe} else @@ -109,7 +113,19 @@ # rename executables, to avoid browsers trying to execute files # instead of showing them. (cd $EXDIR/demo${exe}; - for j in *.c *.cc *.f *.f90 *.adb *.m *.tcl *.java *.py *.pl; do + for j in \ + *.adb \ + *.c \ + *.cc \ + *.f \ + *.f90 \ + *.java \ + *.ml \ + *.m \ + *.pl \ + *.py \ + *.tcl \ + ; do mv $j $j- done ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2008-09-20 17:35:10
|
Revision: 8787 http://plplot.svn.sourceforge.net/plplot/?rev=8787&view=rev Author: airwin Date: 2008-09-20 17:35:04 +0000 (Sat, 20 Sep 2008) Log Message: ----------- Fix recently introduced syntax error in line continuation. 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-09-20 17:17:24 UTC (rev 8786) +++ trunk/scripts/htdocs-gen_plot-examples.sh 2008-09-20 17:35:04 UTC (rev 8787) @@ -89,7 +89,7 @@ mv *${exe}.??.png $EXDIR/demo${exe} # Note both Ada and fortran 77 examples grabbed from the installed # examples. - for f in + for f in \ $cexamples_dir/../ada/x${exe}a.adb \ examples/c/x${exe}c.c \ examples/c++/x${exe}.cc \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2008-09-20 18:13:34
|
Revision: 8788 http://plplot.svn.sourceforge.net/plplot/?rev=8788&view=rev Author: airwin Date: 2008-09-20 18:13:15 +0000 (Sat, 20 Sep 2008) Log Message: ----------- Get rid of syntax error in continuation (remove trailing space after "\"). Reformat whitespace using emacs mode. 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-09-20 17:35:04 UTC (rev 8787) +++ trunk/scripts/htdocs-gen_plot-examples.sh 2008-09-20 18:13:15 UTC (rev 8788) @@ -37,9 +37,9 @@ cd htdocsgen/build_dir # Specifically enable f77 and Ada so that examples will be generated. cmake -DCMAKE_INSTALL_PREFIX=`pwd`/../install \ - -DDEFAULT_NO_BINDINGS=ON -DENABLE_f77=ON -DENABLE_ada=ON\ + -DDEFAULT_NO_BINDINGS=ON -DENABLE_f77=ON -DENABLE_ada=ON\ -DDEFAULT_NO_DEVICES=ON -DPLD_pngcairo=ON \ - ../../ + ../../ make -j3 make -j3 install cd ../.. @@ -55,31 +55,31 @@ 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 29 30; do + 23 24 25 26 27 28 29 30; do 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' + DRIVEROPT='-drvopt graphics_anti_aliasing=1' else - if test $exe = 09 -o $exe = 21; then + if test $exe = 09 -o $exe = 21; then # Text clipping. - DRIVEROPT='-drvopt text_clipping=1' - else + DRIVEROPT='-drvopt text_clipping=1' + else # Otherwise use default graphics AA which is full AA - DRIVEROPT= - fi + DRIVEROPT= + fi 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 \ - $DRIVEROPT + $DRIVEROPT $cexamples_dir/x${exe}c -dev pngcairo -o prev-x${exe} -fam -fflen 2 \ - $DRIVEROPT -geometry 200x150 + $DRIVEROPT -geometry 200x150 # give png extension for i in `ls x${exe}.?? prev-x${exe}.??`; do - mv $i $i.png; + mv $i $i.png; done; # move to www directory. @@ -90,18 +90,18 @@ # Note both Ada and fortran 77 examples grabbed from the installed # examples. for f in \ - $cexamples_dir/../ada/x${exe}a.adb \ - examples/c/x${exe}c.c \ - examples/c++/x${exe}.cc \ - $cexamples_dir/../f77/x${exe}f.f \ - examples/f95/x${exe}f.f90 \ - examples/java/x${exe}.java \ - examples/ocaml/x${exe}.ml \ - bindings/octave/demos/x${exe}c.m \ - examples/perl/x${exe}.pl \ - examples/python/xw${exe}.py \ - examples/tcl/x${exe}.tcl \ - ; do + $cexamples_dir/../ada/x${exe}a.adb \ + examples/c/x${exe}c.c \ + examples/c++/x${exe}.cc \ + $cexamples_dir/../f77/x${exe}f.f \ + examples/f95/x${exe}f.f90 \ + examples/java/x${exe}.java \ + examples/ocaml/x${exe}.ml \ + bindings/octave/demos/x${exe}c.m \ + examples/perl/x${exe}.pl \ + examples/python/xw${exe}.py \ + examples/tcl/x${exe}.tcl \ + ; do if test -f $f ; then cp $f $EXDIR/demo${exe} else @@ -113,22 +113,22 @@ # rename executables, to avoid browsers trying to execute files # instead of showing them. (cd $EXDIR/demo${exe}; - for j in \ - *.adb \ - *.c \ - *.cc \ - *.f \ - *.f90 \ - *.java \ - *.ml \ - *.m \ - *.pl \ - *.py \ - *.tcl \ - ; do + for j in \ + *.adb \ + *.c \ + *.cc \ + *.f \ + *.f90 \ + *.java \ + *.ml \ + *.m \ + *.pl \ + *.py \ + *.tcl \ + ; do mv $j $j- - done - ) + done + ) done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2008-09-21 18:38:45
|
Revision: 8791 http://plplot.svn.sourceforge.net/plplot/?rev=8791&view=rev Author: airwin Date: 2008-09-21 18:38:39 +0000 (Sun, 21 Sep 2008) Log Message: ----------- Preserve timestamps for cp of example source code to make subsequent rsync step more efficient. Demand WWW_USER, WWW_GROUP, WWW_HOST, and WWW_DIR be non-empty. Tweak commentary. 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-09-21 18:27:24 UTC (rev 8790) +++ trunk/scripts/htdocs-gen_plot-examples.sh 2008-09-21 18:38:39 UTC (rev 8791) @@ -1,37 +1,64 @@ #! /bin/bash -# This script is intended to generate a tarball of source code and screenshots, +# This script generates a tarball of source code and screenshots, # 'htdocs_plot_examples.tgz', that will be part of the 'examples' web page, # +# The original intention was to upload the generated tarball directly to the +# PLplot SourceForge website filesystem and unpack it there using ssh +# commands, but now that SF is no longer ssh accessible, the script +# has been generalized for any ssh-accessible site, which in turn can +# be used to update the SF website using rsync. + # This script must be run in the top plplot source directory as: # -# scripts/htdocs-gen_plot-examples.sh +# WWW_USER=$USERNAME \ +# WWW_GROUP=$GROUPNAME \ +# WWW_HOST=$HOSTNAME \ +# WWW_DIR=$WEBSITE_PREFIX \ +# scripts/htdocs-gen_plot-examples.sh # -# The tarball will be copied to SourceForge and unpacked at the www area. -# If your user name (as given by the environment variable USER) is different -# as that at SF, then launch the script like this: -# -# WWW_USER=joeplplotter scripts/htdocs-gen_plot-examples.sh -# -# It is also possible to override the variables WWW_GROUP, WWW_HOST, -# and WWW_DIR in the same way as with WWW_USER in the example above. -# +# where $USERNAME, $GROUPNAME, $HOSTNAME, and $WEBSITE_PREFIX are the +# appropriate username, groupname, hostname, and website prefix directory +# of the ssh-accessible site. + # To avoid rebuild launch it like this: -# build=false scripts/htdocs-gen_plot-examples.sh +# WWW_USER=$USERNAME \ +# WWW_GROUP=$GROUPNAME \ +# WWW_HOST=$HOSTNAME \ +# WWW_DIR=$WEBSITE_PREFIX \ +# build=false scripts/htdocs-gen_plot-examples.sh +# Sanity checks. +if test -z "$WWW_USER"; then + echo "must specify non-empty WWW_USER environment variable" + exit 1 +fi +if test -z "$WWW_GROUP"; then + echo "must specify non-empty WWW_GROUP environment variable" + exit 1 +fi + +if test -z "$WWW_HOST"; then + echo "must specify non-empty WWW_HOST environment variable" + exit 1 +fi + +if test -z "$WWW_DIR"; then + echo "must specify non-empty WWW_DIR environment variable" + exit 1 +fi +WWW_USER_AT_HOST=${WWW_USER}@$WWW_HOST + +# cp should preserve time stamps to make rsync more efficient for +# website uploading to SourceForge. +CP='cp -p' + # a fresh make, with minimum bindings build=${build:-true} if test "$build" = true; then -# make clean -# make configure -# -# ./configure --disable-static --enable-dyndrivers --prefix=/tmp/plplot \ -# --disable-cxx --disable-python --disable-java --disable-itcl \ -# --disable-octave --enable-f77 --enable-psttf --enable-psttfc -# rm -rf htdocsgen/build_dir htdocsgen/install mkdir -p htdocsgen/build_dir htdocsgen/install cd htdocsgen/build_dir @@ -52,7 +79,7 @@ popd # hack, x20c needs lena in the current directory -cp examples/c/lena.pgm . +$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 29 30; do @@ -103,7 +130,7 @@ examples/tcl/x${exe}.tcl \ ; do if test -f $f ; then - cp $f $EXDIR/demo${exe} + $CP $f $EXDIR/demo${exe} else echo Example `basename $f` is not yet available \ > $EXDIR/demo${exe}/`basename $f` @@ -141,14 +168,9 @@ tar cvzf $TARBALL htdocs rm -rf htdocs -# Transfer the tarball to Sourceforge and unpack it, such that the files will +# Transfer the tarball to $WWW_HOST and unpack it, such that the files will # appear in the PLplot web site -WWW_GROUP=${WWW_GROUP:-plplot} -WWW_HOST=${WWW_HOST:-shell.sf.net} -WWW_USER_AT_HOST=${WWW_USER:+$WWW_USER@}$WWW_HOST -WWW_DIR=${WWW_DIR:-/home/groups/p/pl/plplot} - echo "ssh $WWW_USER_AT_HOST mkdir -p $WWW_DIR" ssh $WWW_USER_AT_HOST mkdir -p $WWW_DIR echo "ssh $WWW_USER_AT_HOST rm -rf $WWW_DIR/$EXDIR" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Alan W. I. <ai...@us...> - 2008-09-23 17:44:14
|
Revision: 8780 http://plplot.svn.sourceforge.net/plplot/?rev=8780&view=rev Author: airwin Date: 2008-09-19 18:50:42 +0000 (Fri, 19 Sep 2008) Log Message: ----------- Enable Ada for build so that generated Ada examples will be available for website. Fix bugs in f77 and ada directory specifications for generated examples. The above changes should make both f77 and Ada source code available for the first time for the 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 2008-09-19 18:45:28 UTC (rev 8779) +++ trunk/scripts/htdocs-gen_plot-examples.sh 2008-09-19 18:50:42 UTC (rev 8780) @@ -35,13 +35,13 @@ rm -rf htdocsgen/build_dir htdocsgen/install mkdir -p htdocsgen/build_dir htdocsgen/install cd htdocsgen/build_dir - # Specifically enable f77 so that examples will be generated. + # Specifically enable f77 and Ada so that examples will be generated. cmake -DCMAKE_INSTALL_PREFIX=`pwd`/../install \ - -DDEFAULT_NO_BINDINGS=ON -DENABLE_f77=ON \ + -DDEFAULT_NO_BINDINGS=ON -DENABLE_f77=ON -DENABLE_ada=ON\ -DDEFAULT_NO_DEVICES=ON -DPLD_pngcairo=ON \ ../../ - make - make install + make -j3 + make -j3 install cd ../.. fi @@ -91,9 +91,9 @@ 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 \ + $cexamples_dir/../f77/x${exe}f.f \ examples/f95/x${exe}f.f90 \ - examples/ada/x${exe}a.adb \ + $cexamples_dir/../ada/x${exe}a.adb \ bindings/octave/demos/x${exe}c.m \ examples/python/xw${exe}.py \ examples/c++/x${exe}.cc \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2008-12-27 20:17:31
|
Revision: 9231 http://plplot.svn.sourceforge.net/plplot/?rev=9231&view=rev Author: airwin Date: 2008-12-27 20:17:26 +0000 (Sat, 27 Dec 2008) Log Message: ----------- Historically for the cairo device drivers, the graphical antialiasing looked bad for examples 08, 16, 20, and 30. Therefore, we turned off graphics AA for these examples for our website. However, since Werner's filled_polygon change to the cairo driver, graphics AA looks better (or at least is no worse for the example 30 case) then if graphics AA is turned off. Therefore, take the default (graphics AA turned on) for these examples just like all other 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 2008-12-25 00:58:07 UTC (rev 9230) +++ trunk/scripts/htdocs-gen_plot-examples.sh 2008-12-27 20:17:26 UTC (rev 9231) @@ -81,12 +81,17 @@ # hack, x20c needs lena in the current directory $CP examples/c/lena.pgm . +# 14 and 17 skipped because these are interactive examples. +# 31 skipped because the plot generated is blank. 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 29 30; do 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' + # The default cairo graphics AA looks good for these examples now + # since Werner's filled_polygon change to the cairo driver so no need + # to explicitly turn graphics AA off any more with + # DRIVEROPT='-drvopt graphics_anti_aliasing=1' + DRIVEROPT= else if test $exe = 09 -o $exe = 21; then # Text clipping. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-01-06 02:22:10
|
Revision: 9254 http://plplot.svn.sourceforge.net/plplot/?rev=9254&view=rev Author: airwin Date: 2009-01-06 01:49:40 +0000 (Tue, 06 Jan 2009) Log Message: ----------- Add Ada thick example source files to the set of Ada source files that are copied to the website. Additional php changes will be required to actually allow users to view these thick example source files. Modified Paths: -------------- trunk/scripts/htdocs-gen_plot-examples.sh Modified: trunk/scripts/htdocs-gen_plot-examples.sh =================================================================== --- trunk/scripts/htdocs-gen_plot-examples.sh 2009-01-05 11:15:52 UTC (rev 9253) +++ trunk/scripts/htdocs-gen_plot-examples.sh 2009-01-06 01:49:40 UTC (rev 9254) @@ -123,6 +123,7 @@ # examples. for f in \ $cexamples_dir/../ada/x${exe}a.adb \ + $cexamples_dir/../ada/xthick${exe}a.adb \ examples/c/x${exe}c.c \ examples/c++/x${exe}.cc \ $cexamples_dir/../f77/x${exe}f.f \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-01-20 21:02:13
|
Revision: 9359 http://plplot.svn.sourceforge.net/plplot/?rev=9359&view=rev Author: airwin Date: 2009-01-20 21:02:02 +0000 (Tue, 20 Jan 2009) Log Message: ----------- Add examples 17 and 31 to the examples list that is used to generate the website example-related files and copy the results to the website. This list automatically controls what example source code is configured (for source code that needs that), as well as what example plots and example thumbnails are generated. This list also automatically controls what examples-related files are copied to the 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 2009-01-20 15:52:13 UTC (rev 9358) +++ trunk/scripts/htdocs-gen_plot-examples.sh 2009-01-20 21:02:02 UTC (rev 9359) @@ -81,10 +81,9 @@ # hack, x20c needs lena in the current directory $CP examples/c/lena.pgm . -# 14 and 17 skipped because these are interactive examples. -# 31 skipped because the plot generated is blank. -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 29 30; do +# 14 skipped because it requires stdin to specify the second output file +for exe in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 17 18 19 20 21 22 \ + 23 24 25 26 27 28 29 30 31; do if [ $exe = "08" -o $exe = "16" -o $exe = "20" -o $exe = "30" ] ; then # The default cairo graphics AA looks good for these examples now This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-01-26 22:44:37
|
Revision: 9398 http://plplot.svn.sourceforge.net/plplot/?rev=9398&view=rev Author: airwin Date: 2009-01-26 21:43:58 +0000 (Mon, 26 Jan 2009) Log Message: ----------- Generate example 14 results including renaming first and second page of slave stream to 3rd and 4th page of overall example. Specify geometry for the non-preview results. This makes (revised) example 31 generate the same sized pages as the rest and similarly for (revised) example 14. Modified Paths: -------------- trunk/scripts/htdocs-gen_plot-examples.sh Modified: trunk/scripts/htdocs-gen_plot-examples.sh =================================================================== --- trunk/scripts/htdocs-gen_plot-examples.sh 2009-01-26 21:30:57 UTC (rev 9397) +++ trunk/scripts/htdocs-gen_plot-examples.sh 2009-01-26 21:43:58 UTC (rev 9398) @@ -81,8 +81,7 @@ # hack, x20c needs lena in the current directory $CP examples/c/lena.pgm . -# 14 skipped because it requires stdin to specify the second output file -for exe in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 17 18 19 20 21 22 \ +for exe in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 \ 23 24 25 26 27 28 29 30 31; do if [ $exe = "08" -o $exe = "16" -o $exe = "20" -o $exe = "30" ] ; then @@ -103,16 +102,27 @@ 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 \ - $DRIVEROPT - $cexamples_dir/x${exe}c -dev pngcairo -o prev-x${exe} -fam -fflen 2 \ - $DRIVEROPT -geometry 200x150 - - # give png extension - for i in `ls x${exe}.?? prev-x${exe}.??`; do - mv $i $i.png; - done; - + if [ $exe = "14" ] ; then + echo x14a.%n.png | \ + $cexamples_dir/x${exe}c -dev pngcairo -o x${exe}.%n.png \ + -fam -fflen 2 $DRIVEROPT -geometry 800x600 + echo prev-x14a.%n.png | \ + $cexamples_dir/x${exe}c -dev pngcairo -o prev-x${exe}.%n.png \ + -fam -fflen 2 $DRIVEROPT -geometry 200x150 + # First and second pages of master stream are already stored as first + # and second pages of overall example. + # Move first and second pages of slave stream to third and fourth + # pages of overall example for easy web viewing. + mv x14a.01.png x14.03.png + mv x14a.02.png x14.04.png + mv prev-x14a.01.png prev-x14.03.png + mv prev-x14a.02.png prev-x14.04.png + else + $cexamples_dir/x${exe}c -dev pngcairo -o x${exe}.%n.png \ + -fam -fflen 2 $DRIVEROPT -geometry 800x600 + $cexamples_dir/x${exe}c -dev pngcairo -o prev-x${exe}.%n.png \ + -fam -fflen 2 $DRIVEROPT -geometry 200x150 + fi # move to www directory. echo populating www directory demo${exe} rm -rf $EXDIR/demo${exe} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2011-04-14 19:30:24
|
Revision: 11703 http://plplot.svn.sourceforge.net/plplot/?rev=11703&view=rev Author: airwin Date: 2011-04-14 19:30:17 +0000 (Thu, 14 Apr 2011) Log Message: ----------- Use the -eofill option for example 27. That means the spirographic curves will be filled using the even-odd fill rule rather than the (default) non-zero winding number fill rule. The motivation for this choice is the even-odd rule produces more "interesting" looking results for our website than would be produced by the non-zero rule (where a much larger fraction of the figure tends to be filled). Modified Paths: -------------- trunk/scripts/htdocs-gen_plot-examples.sh Modified: trunk/scripts/htdocs-gen_plot-examples.sh =================================================================== --- trunk/scripts/htdocs-gen_plot-examples.sh 2011-04-13 18:16:33 UTC (rev 11702) +++ trunk/scripts/htdocs-gen_plot-examples.sh 2011-04-14 19:30:17 UTC (rev 11703) @@ -90,14 +90,16 @@ # to explicitly turn graphics AA off any more with # DRIVEROPT='-drvopt graphics_anti_aliasing=1' DRIVEROPT= + elif [ $exe = "09" -o $exe = "21" ] ; then + # Text clipping. + DRIVEROPT='-drvopt text_clipping=1' + elif [ $exe = "27" ] ; then + # even-odd fill rule (a general option rather than a driver option) + # generates more interesting results. + DRIVEROPT='-eofill' else - if [ $exe = "09" -o $exe = "21" ] ; then - # Text clipping. - DRIVEROPT='-drvopt text_clipping=1' - else - # Otherwise use default graphics AA which is full AA - DRIVEROPT= - fi + # Otherwise use default graphics AA which is full AA + DRIVEROPT= 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: <ai...@us...> - 2010-01-13 21:05:27
|
Revision: 10751 http://plplot.svn.sourceforge.net/plplot/?rev=10751&view=rev Author: airwin Date: 2010-01-13 21:05:20 +0000 (Wed, 13 Jan 2010) Log Message: ----------- Use correct (new) location for octave 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 2010-01-13 21:02:27 UTC (rev 10750) +++ trunk/scripts/htdocs-gen_plot-examples.sh 2010-01-13 21:05:20 UTC (rev 10751) @@ -139,7 +139,7 @@ examples/f95/x${exe}f.f90 \ examples/java/x${exe}.java \ examples/ocaml/x${exe}.ml \ - bindings/octave/demos/x${exe}c.m \ + examples/octave/x${exe}c.m \ examples/perl/x${exe}.pl \ examples/python/xw${exe}.py \ examples/tcl/x${exe}.tcl \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-07-23 05:32:16
|
Revision: 11100 http://plplot.svn.sourceforge.net/plplot/?rev=11100&view=rev Author: airwin Date: 2010-07-23 05:32:08 +0000 (Fri, 23 Jul 2010) Log Message: ----------- Ada examples now copied directly from source tree since they are no longer configured. This concludes the changes that I believe are necessary due to the new non-configured approach to Ada source files that has been initiated by Jerry. N.B. this last change will remain untested until the next attempt to generate the website, but I believe it will be fine since the change is so simple. Modified Paths: -------------- trunk/scripts/htdocs-gen_plot-examples.sh Modified: trunk/scripts/htdocs-gen_plot-examples.sh =================================================================== --- trunk/scripts/htdocs-gen_plot-examples.sh 2010-07-23 05:20:18 UTC (rev 11099) +++ trunk/scripts/htdocs-gen_plot-examples.sh 2010-07-23 05:32:08 UTC (rev 11100) @@ -128,11 +128,11 @@ rm -rf $EXDIR/demo${exe} mkdir -p $EXDIR/demo${exe} mv *${exe}.??.png $EXDIR/demo${exe} - # Note both Ada and fortran 77 examples grabbed from the installed + # Note configured fortran 77 examples must be grabbed from the installed # examples. for f in \ - $cexamples_dir/../ada/x${exe}a.adb \ - $cexamples_dir/../ada/xthick${exe}a.adb \ + examples/ada/x${exe}a.adb \ + examples/ada/xthick${exe}a.adb \ examples/c/x${exe}c.c \ examples/c++/x${exe}.cc \ $cexamples_dir/../f77/x${exe}f.f \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-07-24 17:09:24
|
Revision: 11106 http://plplot.svn.sourceforge.net/plplot/?rev=11106&view=rev Author: airwin Date: 2010-07-24 17:09:18 +0000 (Sat, 24 Jul 2010) Log Message: ----------- Get rid of blank character in bang line. Modified Paths: -------------- trunk/scripts/htdocs-gen_plot-examples.sh Modified: trunk/scripts/htdocs-gen_plot-examples.sh =================================================================== --- trunk/scripts/htdocs-gen_plot-examples.sh 2010-07-24 17:06:17 UTC (rev 11105) +++ trunk/scripts/htdocs-gen_plot-examples.sh 2010-07-24 17:09:18 UTC (rev 11106) @@ -1,4 +1,4 @@ -#! /bin/bash +#!/bin/bash # This script generates a tarball of source code and screenshots, # 'htdocs_plot_examples.tgz', that will be part of the 'examples' web page, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2013-09-26 21:51:39
|
Revision: 12534 http://sourceforge.net/p/plplot/code/12534 Author: airwin Date: 2013-09-26 21:51:35 +0000 (Thu, 26 Sep 2013) Log Message: ----------- Drop f77 and Perl/PDL example source code from being copied to website. Include source code and pngcairo results for x00. For generated results, allow more than 99 pages. (N.B. example 33 currently has 100 pages). Modified Paths: -------------- trunk/scripts/htdocs-gen_plot-examples.sh Modified: trunk/scripts/htdocs-gen_plot-examples.sh =================================================================== --- trunk/scripts/htdocs-gen_plot-examples.sh 2013-09-26 15:32:18 UTC (rev 12533) +++ trunk/scripts/htdocs-gen_plot-examples.sh 2013-09-26 21:51:35 UTC (rev 12534) @@ -62,9 +62,8 @@ rm -rf htdocsgen/build_dir htdocsgen/install mkdir -p htdocsgen/build_dir htdocsgen/install cd htdocsgen/build_dir - # Specifically enable f77 and Ada so that examples will be generated. cmake -DCMAKE_INSTALL_PREFIX=`pwd`/../install \ - -DDEFAULT_NO_BINDINGS=ON -DENABLE_f77=ON -DENABLE_ada=ON\ + -DDEFAULT_NO_BINDINGS=ON \ -DDEFAULT_NO_DEVICES=ON -DPLD_pngcairo=ON \ ../../ make -j3 @@ -81,7 +80,7 @@ # 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 14 15 16 17 18 19 20 21 22 \ +for exe in 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 \ 23 24 25 26 27 28 29 30 31 32 33; do if [ $exe = "08" -o $exe = "16" -o $exe = "20" -o $exe = "30" ] ; then @@ -129,20 +128,17 @@ echo populating www directory demo${exe} rm -rf $EXDIR/demo${exe} mkdir -p $EXDIR/demo${exe} - mv *${exe}.??.png $EXDIR/demo${exe} - # Note configured fortran 77 examples must be grabbed from the installed - # examples. + # page number is two digits or more. + mv *${exe}.*[0-9][0-9].png $EXDIR/demo${exe} for f in \ examples/ada/x${exe}a.adb \ examples/ada/xthick${exe}a.adb \ examples/c/x${exe}c.c \ examples/c++/x${exe}.cc \ - $cexamples_dir/../f77/x${exe}f.f \ examples/f95/x${exe}f.f90 \ examples/java/x${exe}.java \ examples/ocaml/x${exe}.ml \ examples/octave/x${exe}c.m \ - examples/perl/x${exe}.pl \ examples/python/xw${exe}.py \ examples/tcl/x${exe}.tcl \ ; do @@ -161,12 +157,10 @@ *.adb \ *.c \ *.cc \ - *.f \ *.f90 \ *.java \ *.ml \ *.m \ - *.pl \ *.py \ *.tcl \ ; do This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |