changeset 75:913628f32a45

Merge from main OpenJDK repository.
author glewis@misty.eyesbeyond.com
date Thu, 12 Mar 2009 10:37:51 -0700
parents 7a9a9b075c71 0f0189d55ce4
children c2c4d8a8b77f
files
diffstat 5 files changed, 14 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Mar 08 17:05:39 2009 -0700
+++ b/Makefile	Thu Mar 12 10:37:51 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 1995-2008 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 1995-2009 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/make/Defs-internal.gmk	Sun Mar 08 17:05:39 2009 -0700
+++ b/make/Defs-internal.gmk	Thu Mar 12 10:37:51 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 1995-2008 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 1995-2009 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/make/jdk-rules.gmk	Sun Mar 08 17:05:39 2009 -0700
+++ b/make/jdk-rules.gmk	Thu Mar 12 10:37:51 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2001-2009 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -106,7 +106,7 @@
 	  $(MAKE) $(JDK_CLOBBER_TARGETS) $(JDK_BUILD_ARGUMENTS) ; )
 
 jdk-sanity::
-	@( $(CD) $(JDK_TOPDIR)/make && \
+	( $(CD) $(JDK_TOPDIR)/make && \
 	  $(MAKE) sanity HOTSPOT_IMPORT_CHECK=false $(JDK_BUILD_ARGUMENTS) ; )
 
 compare-images: compare-image
--- a/make/jprt.config	Sun Mar 08 17:05:39 2009 -0700
+++ b/make/jprt.config	Thu Mar 12 10:37:51 2009 -0700
@@ -1,7 +1,7 @@
 #!echo "This is not a shell script"
 #############################################################################
 #
-# Copyright 2006-2008 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2006-2009 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -358,6 +358,13 @@
     ALT_SPONSOR2DIR=C:/sponsor_binaries 
     export ALT_SPONSOR2DIR
 
+    # JPRT systems can never run msival2.exe, set this to avoid them
+    SKIP_MSIVAL2=true
+    export SKIP_MSIVAL2
+    # Not easy to do
+    SKIP_COMPARE_IMAGES=true
+    export SKIP_COMPARE_IMAGES
+
 fi
 
 # Export PATH setting
--- a/make/jprt.gmk	Sun Mar 08 17:05:39 2009 -0700
+++ b/make/jprt.gmk	Thu Mar 12 10:37:51 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2006-2008 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2006-2009 Sun Microsystems, Inc.  All Rights Reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@
 JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-bundle.zip
 JPRT_ARCHIVE_INSTALL_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-install-bundle.zip
 
-jprt_build_product:  all_product_build
+jprt_build_product:  sanity all_product_build
 	( $(CD) $(OUTPUTDIR)/j2sdk-image && \
 	  $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
 ifdef HAVE_JPRT_SAVE_BUNDLES