Mercurial > hg > openjdk > jigsaw

changeset 396:39765160f744

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author mchung
date Thu, 06 Oct 2011 12:25:34 -0700
parents db00b7627ab1 (current diff) fb1bc13260d7 (diff)
children 199e6ee0a66e
files .hgtags Makefile make/jdk-rules.gmk make/jprt.gmk make/jprt.properties
diffstat 7 files changed, 43 insertions(+), 79 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Aug 22 10:14:31 2011 -0700
+++ b/.hgtags	Thu Oct 06 12:25:34 2011 -0700
@@ -129,3 +129,9 @@
 2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
 d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147
 f42e3d9394b40a423d345b8da22687b5462e5f25 jdk8-b01
+69f592185747226a9c765a9fe139c1d34d616f9c jdk8-b02
+587bb549dff83131b65f40aa51864f69562f34a7 jdk8-b03
+0b66a233bfb9ba2ebda1e5cdfdb0373d6c1e3c69 jdk8-b04
+b910aac18c772b823b1f7da03e2c6528725cc6de jdk8-b05
+28cf2aec4dd7c3c75efc1c15078522467c781a6d jdk8-b06
+0db7ae9f2b1017124c779bccd016c976928859a0 jdk8-b07
--- a/Makefile	Mon Aug 22 10:14:31 2011 -0700
+++ b/Makefile	Thu Oct 06 12:25:34 2011 -0700
@@ -44,9 +44,9 @@
 REL_JDK_OUTPUTDIR = ../$(OUTPUTDIR_BASENAME-$(DEBUG_NAME))
 
 # The created jdk image directory (legacy or module image)
-JDK_IMAGE_DIRNAME = j2sdk-image
-ifdef BUILD_MODULES
-  JDK_IMAGE_DIRNAME=jdk-module-image
+JDK_IMAGE_DIRNAME=jdk-module-image
+ifdef BUILD_LEGACY
+  JDK_IMAGE_DIRNAME = j2sdk-image
 endif
 
 JDK_IMAGE_DIR     = $(OUTPUTDIR)/$(JDK_IMAGE_DIRNAME)
@@ -303,25 +303,6 @@
 	$(MAKE) DEV_ONLY=true clobber
 
 #
-# modules builds
-#
-
-ifndef BUILD_MODULES
-MODULES_BUILD_ARGUMENT = BUILD_MODULES=all
-else
-MODULES_BUILD_ARGUMENT = BUILD_MODULES=$(BUILD_MODULES)
-endif
-
-modules: modules-build
-
-modules-build:
-	$(MAKE) $(MODULES_BUILD_ARGUMENT) all
-modules-sanity:
-	$(MAKE) $(MODULES_BUILD_ARGUMENT) sanity
-modules-clobber:
-	$(MAKE) $(MODULES_BUILD_ARGUMENT) clobber
-
-#
 # Quick jdk verification build
 #
 jdk_only:
@@ -371,7 +352,7 @@
 # Intro help message
 intro_help:
 	@$(ECHO) "\
-Makefile for the JDK builds (all the JDK). \n\
+Makefile for the modular JDK builds (all the JDK). \n\
 "
 
 # Target help
@@ -379,7 +360,6 @@
 	@$(ECHO) "\
 --- Common Targets ---  \n\
 all               -- build the core JDK (default target) \n\
-modules           -- build the JDK module images\n\
 help              -- Print out help information \n\
 check             -- Check make variable values for correctness \n\
 sanity            -- Perform detailed sanity checks on system and settings \n\
--- a/README	Mon Aug 22 10:14:31 2011 -0700
+++ b/README	Thu Oct 06 12:25:34 2011 -0700
@@ -9,11 +9,14 @@
   will be needed.
 
   This one root repository can be obtained with something like:
-    hg clone http://hg.openjdk.java.net/jdk7/jdk7 openjdk7
-  To make sure you have all the nested repositories, you can run:
-    cd openjdk7 && sh ./get_source.sh
-  (This is identical to using the Mercurial Forest Extension command 
-   'hg fclone http://hg.openjdk.java.net/jdk7/jdk7 openjdk7').
+
+    hg clone http://hg.openjdk.java.net/jdk8/jdk8 openjdk8
+  
+  To make sure you have all the nested repositories, you can run the
+  get_source.sh script located in the same respository as this file:
+
+    cd openjdk8 && sh ./get_source.sh
+
   People unfamiliar with Mercurial should read the first few chapters of
   the Mercurial book: http://hgbook.red-bean.com/read/
 
@@ -22,7 +25,7 @@
 Simple Build Instructions:
   
   0. Get the necessary system software/packages installed on your system, see
-     http://hg.openjdk.java.net/jdk7/build/raw-file/tip/README-builds.html
+     http://hg.openjdk.java.net/jdk8/build/raw-file/tip/README-builds.html
 
   1. If you don't have a jdk6 installed, download and install a JDK 6 from
      http://java.sun.com/javase/downloads/index.jsp
--- a/README-builds.html	Mon Aug 22 10:14:31 2011 -0700
+++ b/README-builds.html	Thu Oct 06 12:25:34 2011 -0700
@@ -126,38 +126,15 @@
             <a href="http://openjdk.java.net/guide/repositories.html#installConfig">
                 Developer Guide: Installing and Configuring Mercurial</a>
             section for more information.
-            The Forest Extension is not part of the Mercurial install,
-            and is optional,
-            but can be obtained with the following commands:
-            <blockquote>
-                <tt>
-                    hg clone https://bitbucket.org/pmezard/hgforest-crew/overview/ <i>YourHgForest</i>
-                </tt>
-            </blockquote>
-            Once you have the file <tt>forest.py</tt>, you need to add these
-            lines to your <tt>${HOME}/.hgrc</tt> file:
-            <blockquote>
-                <tt>
-                    [extensions]
-                    <br>forest = <i>YourHgForest</i>/forest.py
-                </tt>
-            </blockquote>
 
             <!-- ------------------------------------------------------ -->
             <h3><a name="get_source">Getting the Source</a></h3>
             <blockquote>
                 To get the entire set of OpenJDK Mercurial repositories
-                using the Forest Extension:
+                use the script <code>get_source.sh</code> located in the root repository:
                 <blockquote>
                     <tt>
-                        hg fclone http://hg.openjdk.java.net/jdk7/jdk7 <i>YourOpenJDK</i>
-                    </tt>
-                </blockquote>
-                To get the entire set of OpenJDK Mercurial repositories
-                without using the Forest Extension:
-                <blockquote>
-                    <tt>
-                        hg clone http://hg.openjdk.java.net/jdk7/jdk7 <i>YourOpenJDK</i>
+                        hg clone http://hg.openjdk.java.net/jdk8/jdk8 <i>YourOpenJDK</i>
                         <br>cd <i>YourOpenJDK</i>
                         <br>sh ./get_source.sh
                     </tt>
@@ -172,9 +149,6 @@
                         <br>sh ./make/scripts/hgforest.sh pull -u
                     </tt>
                 </blockquote>
-                You may find this script <tt>make/scripts/hgforest.sh</tt> faster
-                than the <tt>hg</tt> forest commands provided by the
-                Forest Extension.
             </blockquote>
 
         </blockquote>
@@ -558,7 +532,7 @@
                     understood that this is not ideal for the open source community.
                     It is possible this process could change in the future.
                     <br>
-                    <b>NOTE:</b> The <a href="http://download.java.net/openjdk/jdk7/">
+                    <b>NOTE:</b> The <a href="http://download.java.net/openjdk/jdk8/">
                         Complete OpenJDK Source Bundles</a> <u>will</u> contain the JAXP and
                     JAX-WS sources.
                 </p>
@@ -578,7 +552,7 @@
                         </li>
                         <li>
                             The OpenJDK team copies this new bundle into shared
-                            area (e.g. <tt>/java/devtools/share/jdk7-drops</tt>).
+                            area (e.g. <tt>/java/devtools/share/jdk8-drops</tt>).
                             Older bundles are never deleted so we retain the history.
                         </li>
                         <li>
@@ -1726,7 +1700,7 @@
                     The location of any source drop bundles
                     (see <a href="#drops">Managing the Source Drops</a>).
                     The default will be
-                    <tt>$(ALT_JDK_DEVTOOLS_PATH)/share/jdk7-drops</tt>.
+                    <tt>$(ALT_JDK_DEVTOOLS_PATH)/share/jdk8-drops</tt>.
                 </dd>
                 <dt><a name="ALT_UNIXCCS_PATH"><tt>ALT_UNIXCCS_PATH</tt></a></dt>
                 <dd>
@@ -1931,7 +1905,7 @@
                             PATH, INCLUDE, LIB, LIBPATH, and WINDOWSSDKDIR
                             variables set in your shell environment.
                             These bat files are not easy to use from a shell environment.
-                            However, there is a script placed in the root jdk7 repository called
+                            However, there is a script placed in the root jdk8 repository called
                             vsvars.sh that can help, it should only be done once in a shell
                             that will be doing the build, e.g.<br>
                             <tt>sh ./make/scripts/vsvars.sh -v10 > settings<br>
--- a/make/jdk-rules.gmk	Mon Aug 22 10:14:31 2011 -0700
+++ b/make/jdk-rules.gmk	Thu Oct 06 12:25:34 2011 -0700
@@ -30,20 +30,14 @@
 JDK_JAVA_EXE = $(OUTPUTDIR)/bin/java$(EXE_SUFFIX)
 
 # NO_IMAGES may be set in conjunction with DEV_ONLY
-IMAGES_TARGET = images
+# jigsaw by default builds modules image
+IMAGES_TARGET = modules
 ifdef DEV_ONLY
   ifdef NO_IMAGES
     IMAGES_TARGET =
   endif
 endif
 
-MODULES_TARGET = modules
-ifdef DEV_ONLY
-  ifdef NO_MODULES
-    MODULES_TARGET =
-  endif
-endif
-
 # GENERATE_DOCS determines if we ask for the docs target
 DOCS_TARGET = docs
 ifeq ($(GENERATE_DOCS),false)
@@ -51,11 +45,7 @@
 endif
   
 JDK_BUILD_TARGETS = sanity all $(DOCS_TARGET)
-ifdef BUILD_MODULES
-  JDK_BUILD_TARGETS += $(MODULES_TARGET)
-else
-  JDK_BUILD_TARGETS += $(IMAGES_TARGET)
-endif
+JDK_BUILD_TARGETS += $(IMAGES_TARGET)
 
 JDK_CLOBBER_TARGETS = clobber
 
@@ -79,7 +69,9 @@
   JDK_BUILD_ARGUMENTS += ALT_HOTSPOT_IMPORT_PATH=$(HOTSPOT_DIR)/import
 endif
 
-ifdef BUILD_MODULES
+ifndef BUILD_MODULES
+  JDK_BUILD_ARGUMENTS += BUILD_MODULES=all
+else
   JDK_BUILD_ARGUMENTS += BUILD_MODULES="$(BUILD_MODULES)"
 endif
 
--- a/make/jprt.gmk	Mon Aug 22 10:14:31 2011 -0700
+++ b/make/jprt.gmk	Thu Oct 06 12:25:34 2011 -0700
@@ -44,7 +44,7 @@
 	( $(CD) $(OUTPUTDIR)/bundles && \
 	  $(ZIPEXE) -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . )
 endif
-ifdef BUILD_MODULES
+ifndef BUILD_LEGACY
 	( $(CD) $(OUTPUTDIR) && \
 	  $(ZIPEXE) -q -r $(JPRT_ARCHIVE_MODULES_BUNDLE) jre-base-image jigsaw-pkgs)
 endif
@@ -57,7 +57,7 @@
 	( $(CD) $(OUTPUTDIR)-fastdebug/bundles && \
 	  $(ZIPEXE) -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . )
 endif
-ifdef BUILD_MODULES
+ifndef BUILD_LEGACY
 	( $(CD) $(OUTPUTDIR)-fastdebug && \
 	  $(ZIPEXE) -q -r $(JPRT_ARCHIVE_MODULES_BUNDLE) jre-base-image jigsaw-pkgs)
 endif
@@ -69,7 +69,7 @@
 	( $(CD) $(OUTPUTDIR)-debug/bundles && \
 	  $(ZIPEXE) -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . )
 endif
-ifdef BUILD_MODULES
+ifndef BUILD_LEGACY
 	( $(CD) $(OUTPUTDIR)-debug && \
 	  $(ZIPEXE) -q -r $(JPRT_ARCHIVE_MODULES_BUNDLE) jre-base-image jigsaw-pkgs)
 endif
--- a/make/jprt.properties	Mon Aug 22 10:14:31 2011 -0700
+++ b/make/jprt.properties	Thu Oct 06 12:25:34 2011 -0700
@@ -304,6 +304,15 @@
     windows_i586_5.1-product-c1-jdk_security3, 			\
     windows_x64_5.2-product-c2-jdk_security3, 			\
     								\
+    solaris_sparc_5.10-product-c1-jdk_sound, 			\
+    solaris_sparcv9_5.10-product-c2-jdk_sound, 			\
+    solaris_i586_5.10-product-c1-jdk_sound, 			\
+    solaris_x64_5.10-product-c2-jdk_sound, 			\
+    linux_i586_2.6-product-{c1|c2}-jdk_sound, 			\
+    linux_x64_2.6-product-c2-jdk_sound, 			\
+    windows_i586_5.1-product-c1-jdk_sound, 			\
+    windows_x64_5.2-product-c2-jdk_sound, 			\
+    								\
     solaris_sparc_5.10-product-c1-jdk_swing, 			\
     solaris_sparcv9_5.10-product-c2-jdk_swing, 			\
     solaris_i586_5.10-product-c1-jdk_swing, 			\