--- a/usr/src/README	Fri Nov 05 11:26:05 2010 +0000
+++ b/usr/src/README	Fri Nov 05 09:59:41 2010 -0700
@@ -23,17 +23,22 @@
 
 
 Welcome to the mercurial source repository for the Caiman Project:
-Slim Install, Distribution Constructor, Snap Upgrade and Auto Installer.
+GUI Install, Text Install, Distribution Constructor and Auto Installer.
 This source also includes the libraries needed for the Caiman Project.
 --------------------------------------------------------------------
 
 To setup a machine for building this source repository:
 -------------------------------------------------------
+NOTE: The following steps require the user to have sufficient privileges,
+via pfexec or sudo, to install software on the build system.
  1. Get the SunStudio compilers via the Image Packaging System (IPS). To install
-    run the command "pfexec pkg install developer/sunstudioexpress"
+    run the command "pkg install developer/sunstudio12u1"
+	* Alternatively, the package "pkg:/developer/solaris-studio-express" may
+	  be used. However, Solaris Studio 12 update 1 is the currently
+	  supported build environment.
 
  2. Get the OS/Net Build Tools via the Image Packaging System (IPS). To install
-    run the command "pfexec pkg install developer/build/onbld"
+    run the command "pkg install developer/build/onbld"
 
  3. Install required IPS packages:
 
@@ -44,58 +49,33 @@
 	system/zones/internal
 	text/gnu-gettext
 
-    To get these packages, run "pfexec pkg install <package>"
+    To get these packages, run "pkg install <package>"
 
 To setup the repository to be built:
 ------------------------------------
  1. cd usr/src in the repository
 
- 2. cp tools/env/developer.sh .; chmod +w developer.sh.
+ 2. cp tools/env/developer.sh .; chmod +w developer.sh
 
     Some environment variables which might need to be changed:
     *You should - set the path to your repository defined by CODEMGR_WS.
     *You may - need to change the SPRO_ROOT variable to point to your
      installed compilers. Likely locations are:
+	 /opt/sunstudio12.1	(default)
+	 /opt/solstudioex
 	 /opt/SUNWspro
-	 /opt/sunstudio12.1
-	 /opt/SunStudioExpress (default)
-    *If your compilers are not installed into /opt/SUNWspro, you will need
-     to run the command "ln -s /opt/SunStudioExpress /opt/SUNWspro".
-     For more information, see bug 11378:
-        http://defect.opensolaris.org/bz/show_bug.cgi?id=11378
-
- 3. Copy the nightly build script found in /opt/onbld/bin into the
-    usr/src directory.
-
-    cp /opt/onbld/bin/nightly .; chmod +w nightly
-
-    In the nightly script there are three places
-    where getopts is called. You need to add a "+" to two of them.
-
-    while getopts +inS:tV: FLAG
-                  ^
-    and
-
-    while getopts +0AaBCDdFfGIilMmNnOoPpRrS:TtUuWwXxz FLAG $NIGHTLY_OPTIONS
-                  ^
-
-    If you choose not to set these, you will see warning messages 
-    regarding building tools. It won't affect your build otherwise.
-
-    For more information see bug 849 -
-    http://defect.opensolaris.org/bz/show_bug.cgi?id=849
 
 To build this repository use the following steps:
 -------------------------------------------------
  1. cd usr/src in the repository
 
- 2. To build, run: ./nightly developer.sh
+ 2. To build, run: /opt/onbld/bin/nightly developer.sh
     This updates the source from the Mercurial repository.
  
     If you do not wish to do a Mercurial pull as part of the nightly run,
     use the -n option.
 
-    ./nightly -n developer.sh
+    /opt/onbld/bin/nightly -n developer.sh
 
 
 --------------------------------------------------------------------

--- a/usr/src/tools/env/developer.sh	Fri Nov 05 11:26:05 2010 +0000
+++ b/usr/src/tools/env/developer.sh	Fri Nov 05 09:59:41 2010 -0700
@@ -20,9 +20,7 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
+# Copyright (c) 2007, 2010 Oracle and/or its affiliates. All rights reserved.
 #
 
 # Configuration variables for the runtime environment of the nightly
@@ -48,7 +46,7 @@
 # Other features disabled:
 #	CHECK_PATHS	no packaging exception list
 #
-export NIGHTLY_OPTIONS="-ANdlmp +t";
+export NIGHTLY_OPTIONS="-AMNdlmp +t";
 
 # This is a variable for the rest of the script - GATE doesn't matter to
 # nightly itself
@@ -150,9 +148,9 @@
 # Alternately, you can set ONBLD_TOOLS to where you keep the contents of
 # SUNWonbld and SPRO_ROOT to where you keep the compilers.
 #
-#BUILD_TOOLS=/opt;				export BUILD_TOOLS
+#BUILD_TOOLS=/opt;					export BUILD_TOOLS
 #ONBLD_TOOLS=/opt/onbld;				export ONBLD_TOOLS
-SPRO_ROOT=/opt/SunStudioExpress;			export SPRO_ROOT
+SPRO_ROOT=/opt/sunstudio12.1;				export SPRO_ROOT