[Plplot-cvs] SF.net SVN: plplot:[12195] trunk/doc/docbook/src

[<and...@us...>]

Revision: 12195
          http://plplot.svn.sourceforge.net/plplot/?rev=12195&view=rev
Author:   andrewross
Date:     2012-07-04 20:27:19 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
Fix some dated mentions of ./configure in the documentation and update details on setting freetype fonts. 

Modified Paths:
--------------
    trunk/doc/docbook/src/advanced.xml
    trunk/doc/docbook/src/api-compat.xml
    trunk/doc/docbook/src/deploying.xml

Modified: trunk/doc/docbook/src/advanced.xml
===================================================================
--- trunk/doc/docbook/src/advanced.xml	2012-05-08 01:37:27 UTC (rev 12194)
+++ trunk/doc/docbook/src/advanced.xml	2012-07-04 20:27:19 UTC (rev 12195)
@@ -1731,11 +1731,14 @@
 	and the TrueType fonts that are actually used.  
       </para>
       <para>
-	On Unix/Linux systems, the TrueType fonts corresponding to the 30 possible
-	valid FCIs can be specified using ./configure options. (Use
-	./configure --help to see the possibilities and also the default
-	values for the fonts.) These ./configure defaults for the 30
-	possibilites are taken from fonts available from the ttf-freefont font
+	The TrueType fonts corresponding to the 30 possible
+	valid FCIs can be specified using cmake options. The defaults for the
+        30 cmake variables PL_FREETYPE_FONT[_MODIFIER] (where FONT is one of 
+        MONO, SANS, SCRIPT, SERIF or SYMBOL and the optional MODIFIER is one
+	of BOLD, BOLD_ITALIC, BOLD_OBLIQUE, ITALIC or OBLIQUE) are documented 
+	in cmake/modules/freetype.cmake. On Windows these defaults use standard
+	Windows fonts. On all other platforms defaults
+	are taken from fonts available from the ttf-freefont font
 	package.  We recommend this font package because it has a rather
 	complete set of glyphs for most unicode blocks.  (We also recommend
 	the gucharmap application for determining other unicode font
@@ -1743,11 +1746,6 @@
 	library.)
       </para>
       <para>
-	On Windows systems, the fixed default TrueType fonts are specified in the
-	include/plfci.h file.  (NOT PROGRAMMED YET, so this statement
-	will probably NEED REVISION.)
-      </para>
-      <para>
 	For all systems, the 30 possible TrueType fonts can be specified at run
 	time using the following environment variables:
 	<itemizedlist>
@@ -1904,9 +1902,8 @@
 	</itemizedlist>
 	On Unix/Linux systems if these environment variables are not specified
 	with an absolute path starting with "/", then the absolute path is
-	specified by the configured default (see ./configure --help) or at
-	run time with the
-	environment variable PLPLOT_FREETYPE_FONT_DIR.
+	specified by the cmake variable PL_FREETYPE_FONT_PATH or at
+	run time with the environment variable PLPLOT_FREETYPE_FONT_DIR.
       </para>
     </sect2>
 

Modified: trunk/doc/docbook/src/api-compat.xml
===================================================================
--- trunk/doc/docbook/src/api-compat.xml	2012-05-08 01:37:27 UTC (rev 12194)
+++ trunk/doc/docbook/src/api-compat.xml	2012-07-04 20:27:19 UTC (rev 12195)
@@ -106,11 +106,9 @@
 	    <filename>plplot.h</filename>.  If no prototype is changed,
 	    then the chances are high that no backwards compatibilities
 	    have been introduced.  If new functions has been added, then
-	    the library soname will be kept, although the libtool soversion
-	    string in <filename>configure.ac</filename> must be changed
-	    from <literal>x:y:z</literal> to
-	    <literal>(x+1):0:(z+1)</literal>.  See the
-	    <application>libtool</application> manual for details.
+	    the library soname will be kept, although the soversion
+	    strings in <filename>cmake/module/plplot_version.cmake</filename> 
+	    must be changed following the instructions in that file.
 	  </para>
 	</listitem>
 	<listitem>

Modified: trunk/doc/docbook/src/deploying.xml
===================================================================
--- trunk/doc/docbook/src/deploying.xml	2012-05-08 01:37:27 UTC (rev 12194)
+++ trunk/doc/docbook/src/deploying.xml	2012-07-04 20:27:19 UTC (rev 12195)
@@ -103,8 +103,8 @@
     <itemizedlist>
       <listitem>
 	<para>
-	  Use the <command>./configure</command> option
-	  <userinput>--prefix=/usr/local/plplot</userinput> (or some other
+	  Use the <command>cmake</command> option
+	  <userinput>-DCMAKE_INSTALL_PREFIX=/usr/local/plplot</userinput> (or some other
 	  unique but consistent directory that is available on the build
 	  machine and all users' machines).
 	</para>
@@ -128,9 +128,10 @@
       </listitem>
       <listitem>
 	<para>
-	  Build the application(s) on the build machine using the results
-	  of the <userinput>pkg-config --cflags --libs plplotd</userinput>
-	  command, and copy the resulting executable(s) to the users'
+	  Build the application(s) on the build machine using either the
+	  make or cmake based build system in 
+	  /usr/local/plplot/share/plplotX.Y.Z/examples where X.Y.Z is 
+	  the plplot version, and copy the resulting executable(s) to the users'
 	  machines.  Since the PLplot install location is consistent on all
 	  machines, the application should work the same way on all
 	  machines.

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