Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/Makefile	Wed Dec 22 12:27:14 2010 -0800
     1.2 +++ b/Makefile	Thu Dec 23 18:41:57 2010 -0800
     1.3 @@ -156,12 +156,6 @@
     1.4    clobber:: deploy-clobber
     1.5  endif
     1.6  
     1.7 -ifeq ($(BUILD_JDK), true)
     1.8 -  ifeq ($(BUNDLE_RULES_AVAILABLE), true)
     1.9 -    generic_build_repo_series:: openjdk-binary-plugs-bundles
    1.10 -  endif
    1.11 -endif
    1.12 -
    1.13  # The debug build, fastdebug or debug. Needs special handling.
    1.14  #  Note that debug builds do NOT do INSTALL steps, but must be done
    1.15  #  after the product build and before the INSTALL step of the product build.
    1.16 @@ -301,7 +295,6 @@
    1.17    ifeq ($(BUILD_JDK), true)
    1.18      ifeq ($(BUNDLE_RULES_AVAILABLE), true)
    1.19  
    1.20 -OPENJDK_PLUGS=$(ABS_OUTPUTDIR)/$(OPENJDK_BINARY_PLUGS_INAME)
    1.21  OPENJDK_OUTPUTDIR=$(ABS_OUTPUTDIR)/open-output
    1.22  OPENJDK_BUILD_NAME \
    1.23    = openjdk-$(JDK_MINOR_VERSION)-$(BUILD_NUMBER)-$(PLATFORM)-$(ARCH)-$(BUNDLE_DATE)
    1.24 @@ -330,7 +323,6 @@
    1.25  	  GENERATE_DOCS=false \
    1.26  	  ALT_JDK_DEVTOOLS_DIR=$(JDK_DEVTOOLS_DIR) \
    1.27  	  ALT_OUTPUTDIR=$(OPENJDK_OUTPUTDIR) \
    1.28 -	  ALT_BINARY_PLUGS_PATH=$(OPENJDK_PLUGS) \
    1.29  	  ALT_BOOTDIR=$(OPENJDK_BOOTDIR) \
    1.30  	  ALT_JDK_IMPORT_PATH=$(OPENJDK_IMPORTJDK) \
    1.31  		product_build )
    1.32 @@ -545,7 +537,7 @@
    1.33  "
    1.34  
    1.35  ################################################################
    1.36 -# Source and binary plug bundling
    1.37 +# Source bundling
    1.38  ################################################################
    1.39  ifeq ($(BUNDLE_RULES_AVAILABLE), true)
    1.40    include $(BUNDLE_RULES)

     2.1 --- a/README-builds.html	Wed Dec 22 12:27:14 2010 -0800
     2.2 +++ b/README-builds.html	Thu Dec 23 18:41:57 2010 -0800
     2.3 @@ -64,7 +64,6 @@
     2.4                          <li><a href="#dependencies">Build Dependencies</a>
     2.5                              <ul>
     2.6                                  <li><a href="#bootjdk">Bootstrap JDK</a> </li>
     2.7 -                                <li><a href="#binaryplugs">Binary Plugs</a> </li>
     2.8                                  <li><a href="#importjdk">Optional Import JDK</a> </li>
     2.9                                  <li><a href="#ant">Ant</a> </li>
    2.10                                  <li><a href="#cacerts">Certificate Authority File (cacert)</a> </li>
    2.11 @@ -705,11 +704,6 @@
    2.12                      <tt><a href="#ALT_BOOTDIR">ALT_BOOTDIR</a></tt>.
    2.13                  </li>
    2.14                  <li>
    2.15 -                    Install the
    2.16 -                    <a href="#binaryplugs">Binary Plugs</a>, set
    2.17 -                    <tt><a href="#ALT_BINARY_PLUGS_PATH">ALT_BINARY_PLUGS_PATH</a></tt>.
    2.18 -                </li>
    2.19 -                <li>
    2.20                      <a href="#importjdk">Optional Import JDK</a>, set
    2.21                      <tt><a href="#ALT_JDK_IMPORT_PATH">ALT_JDK_IMPORT_PATH</a></tt>.
    2.22                  </li>
    2.23 @@ -764,11 +758,6 @@
    2.24                      <tt><a href="#ALT_BOOTDIR">ALT_BOOTDIR</a></tt>.
    2.25                  </li>
    2.26                  <li>
    2.27 -                    Install the
    2.28 -                    <a href="#binaryplugs">Binary Plugs</a>, set
    2.29 -                    <tt><a href="#ALT_BINARY_PLUGS_PATH">ALT_BINARY_PLUGS_PATH</a></tt>.
    2.30 -                </li>
    2.31 -                <li>
    2.32                      <a href="#importjdk">Optional Import JDK</a>, set
    2.33                      <tt><a href="#ALT_JDK_IMPORT_PATH">ALT_JDK_IMPORT_PATH</a></tt>.
    2.34                  </li>
    2.35 @@ -856,11 +845,6 @@
    2.36                      <tt><a href="#ALT_BOOTDIR">ALT_BOOTDIR</a></tt>.
    2.37                  </li>
    2.38                  <li>
    2.39 -                    Install the
    2.40 -                    <a href="#binaryplugs">Binary Plugs</a>, set
    2.41 -                    <tt><a href="#ALT_BINARY_PLUGS_PATH">ALT_BINARY_PLUGS_PATH</a></tt>..
    2.42 -                </li>
    2.43 -                <li>
    2.44                      <a href="#importjdk">Optional Import JDK</a>, set
    2.45                      <tt><a href="#ALT_JDK_IMPORT_PATH">ALT_JDK_IMPORT_PATH</a></tt>.
    2.46                  </li>
    2.47 @@ -925,38 +909,6 @@
    2.48                      the makefiles will look in that location for a JDK it can use.
    2.49              </blockquote>
    2.50              <!-- ------------------------------------------------------ -->
    2.51 -            <h4><a name="binaryplugs">Binary Plugs</a></h4>
    2.52 -            <blockquote>
    2.53 -                Not all of the source code that makes up the JDK is available
    2.54 -                under an open-source license.
    2.55 -                This is a temporary situation and these binary plugs will be
    2.56 -                replaced with fully open source replacements as soon as possible.
    2.57 -                So currently, in order to build a complete OpenJDK image,
    2.58 -                you must first download and install the appropriate
    2.59 -                binary plug bundles for the OpenJDK, go to the
    2.60 -                <a href="http://openjdk.java.net" target="_blank">OpenJDK</a> site and select
    2.61 -                the 
    2.62 -                "<b>Bundles(7)</b>"
    2.63 -                link and download the binaryplugs for
    2.64 -                your particular platform.
    2.65 -                The file downloaded is a jar file that must be extracted by running
    2.66 -                the jar file with:
    2.67 -                <blockquote>
    2.68 -                    <pre>
    2.69 -            <tt><b>java -jar jdk-7-ea-plug-b<i>nn</i>-<i>os</i>-<i>arch</i>-<i>dd</i>_<i>month</i>_<i>year</i>.jar</b></tt>
    2.70 -                    </pre>
    2.71 -                </blockquote>
    2.72 -                A prompt will be issued for acceptance of these binary plug files.
    2.73 -                During the OpenJDK build process these "binary plugs"
    2.74 -                for the encumbered components will be copied into your
    2.75 -                resulting OpenJDK binary build image.
    2.76 -                These binary plug files are only for the purpose of
    2.77 -                building an OpenJDK binary.
    2.78 -                Make sure you set
    2.79 -                <tt><a href="#ALT_BINARY_PLUGS_PATH">ALT_BINARY_PLUGS_PATH</a></tt>
    2.80 -                to the root of this installation.
    2.81 -            </blockquote>
    2.82 -            <!-- ------------------------------------------------------ -->
    2.83              <h4><a name="importjdk">Optional Import JDK</a></h4>
    2.84              <blockquote>
    2.85                  The <tt><a href="#ALT_JDK_IMPORT_PATH">ALT_JDK_IMPORT_PATH</a></tt>
    2.86 @@ -1601,14 +1553,6 @@
    2.87                      You should always install your own local Bootstrap JDK and
    2.88                      always set <tt>ALT_BOOTDIR</tt> explicitly.
    2.89                  </dd>
    2.90 -                <dt><a name="ALT_BINARY_PLUGS_PATH"><tt>ALT_BINARY_PLUGS_PATH</tt></a></dt>
    2.91 -                <dd>
    2.92 -                    The location of the binary plugs installation.
    2.93 -                    See <a href="#binaryplugs">Binary Plugs</a> for more information.
    2.94 -                    You should always have a local copy of a
    2.95 -                    recent Binary Plugs install image
    2.96 -                    and set this variable to that location.
    2.97 -                </dd>
    2.98                  <dt><a name="ALT_JDK_IMPORT_PATH"><tt>ALT_JDK_IMPORT_PATH</tt></a></dt>
    2.99                  <dd>
   2.100                      The location of a previously built JDK installation. 
   2.101 @@ -1705,26 +1649,6 @@
   2.102                      Where each of these directories contain the import JDK image
   2.103                      for that platform.
   2.104                  </dd>
   2.105 -                <dt><a name="ALT_BUILD_BINARY_PLUGS_PATH"><tt>ALT_BUILD_BINARY_PLUGS_PATH</tt></a></dt>
   2.106 -                <dd>
   2.107 -                    These are useful in managing builds on multiple platforms.
   2.108 -                    The default network location for all of the binary plug images
   2.109 -                    for all platforms. 
   2.110 -                    If <tt><a href="#ALT_BINARY_PLUGS_PATH">ALT_BINARY_PLUGS_PATH</a></tt>
   2.111 -                    is not set, this directory will be used and should contain 
   2.112 -                    the following directories:
   2.113 -                    <tt>solaris-sparc</tt>,
   2.114 -                    <tt>solaris-i586</tt>,
   2.115 -                    <tt>solaris-sparcv9</tt>,
   2.116 -                    <tt>solaris-amd64</tt>,
   2.117 -                    <tt>linux-i586</tt>,
   2.118 -                    <tt>linux-amd64</tt>,
   2.119 -                    <tt>windows-i586</tt>,
   2.120 -                    and
   2.121 -                    <tt>windows-amd64</tt>.
   2.122 -                    Where each of these directories contain the binary plugs image
   2.123 -                    for that platform.
   2.124 -                </dd>
   2.125                  <dt><strong>Windows specific:</strong></dt>
   2.126                  <dd>
   2.127                      <dl>