Changeset 29555

Timestamp:

Oct 25, 2010, 3:39:02 PM (16 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20100823

Location:

trunk

Files:

• . (modified) (1 prop)
• Changes.txt (added)
• dbconfig (modified) (1 prop)
• ippScripts (modified) (1 prop)
• ippTasks (modified) (1 prop)
• psconfig/INSTALL (modified) (5 diffs)
• psconfig/tagsets/ipp-2.9.dist (modified) (1 diff)

trunk/psconfig/INSTALL

@@ -6 +6 @@
 With the psconfig tools, it is easy to switch between different
 installed versions or to recompile subsets of the IPP tree.
-
-0. Choose a target installation directory.
-
-Choose a location to store the installed software and configuration
-files.  The psconfig system places the installed binary files by
-default in directories below ~/psconfig.  There will be one directory
-for each version of the installation for a given hardware
-architecture.  To use a different location, place the following line
-in ~/.psconfigrc (otherwise, this is not needed):
-
-set PSCONFDIR = INSTALL_PATH
-
-where INSTALL_PATH is the top-level directory for all binary
-installations. 
 
 1. Set up the psconfig system.
@@ -75 +61 @@
 installation directories.
 
+3. Building (full build in one pass)
+
+It should be possible to build the full IPP installation by issuing
+the single command in this directory (ipp/psconfig):
+
+psbuild -extbuild
+
+If you have checked the IPP tree out of our svn repository, certain
+steps are slightly modified.  In this case, it is necessary to add the
+option '-dev'.  For additional information on using psbuild, see the
+listing of options below (or type psbuild -help)
+
+psbuild -dev -extbuild
+
 3. Dependencies
 
@@ -112 +112 @@
 pscheckperl -build
 
-4. Building
+4. Building (just IPP tools)
 
 To build the full IPP tree using the psconfig system, run 'psbuild' in
@@ -123 +123 @@
 option '-dev'.  For additional information on using psbuild, see the
 listing of options below (or type psbuild -help)
-
-It should be possible to build the full IPP installation by issuing
-the single command in this directory (ipp/psconfig):
-
-psbuild -extbuild
 
 5. Building Magic.
@@ -180 +175 @@
 pscheckperl -build : build and install external modules
 
+----
+0. Choose a target installation directory.
+
+> Choose a location to store the installed software and configuration
+> files.  The psconfig system places the installed binary files by
+> default in directories below ~/psconfig.  There will be one directory
+> for each version of the installation for a given hardware
+> architecture.  To use a different location, place the following line
+> in ~/.psconfigrc (otherwise, this is not needed):
+> 
+> set PSCONFDIR = INSTALL_PATH
+> 
+> where INSTALL_PATH is the top-level directory for all binary
+> installations. 
+
+** the steps above are probably not actually needed.  When is PSCONFDIR needed?
+

trunk/psconfig/tagsets/ipp-2.9.dist

@@ -80 +80 @@
   YYYYY  magic/censorObjects    ipp-2-9          -0
   YYYYY  magic/remove           ipp-2-9          -0
+  YYYYY  console                ipp-2-9          -0
 
 # there are externally required C libraries and perl modules (see INSTALL)