Changeset 309 for trunk/openjdk/jdk/make

Timestamp:

Feb 13, 2012, 10:07:12 PM (14 years ago)

Author:

dmik

Message:

trunk: Merged in openjdk6 b24 from branches/vendor/oracle.

Location:

trunk/openjdk

Files:

• . (modified) (1 prop)
• jdk/make/common/shared/Platform.gmk (modified) (5 diffs)
• jdk/make/common/shared/Sanity-Settings.gmk (modified) (1 diff)
• jdk/make/common/shared/Sanity.gmk (modified) (4 diffs)
• jdk/make/mkdemo/jfc/Font2DTest/Makefile (modified) (2 diffs)
• jdk/make/mkdemo/jfc/SwingApplet/Makefile (modified) (2 diffs)
• jdk/make/sun/net/FILES_java.gmk (modified) (1 diff)

trunk/openjdk/jdk/make/common/shared/Platform.gmk

@@ -76 +76 @@
 #     WINDOWS_NT_VERSION_STRING   windows only: long version name
 #     REQUIRED_OS_VERSION         required OS version, e.g. 5.10, 2.4
-#     REQUIRED_FREE_SPACE         minimum disk space needed for outputdir
 #     ISHIELD_TEMP_MIN            windows only: minimum disk space in temp area
 #     REQUIRED_ZIP_VER            required version of zip
@@ -171 +170 @@
   else
     REQUIRED_OS_VERSION = 5.8
-  endif
-  # Minimum disk space needed as determined by running 'du -sk' on
-  #    a fully built workspace.
-  ifeq ($(ARCH_FAMILY), sparc)
-    REQUIRED_FREE_SPACE=1300000
-  else
-    REQUIRED_FREE_SPACE=1040000
   endif
   # How much RAM does this machine have:
@@ -248 +240 @@
   # Suffix for file bundles used in previous release
   BUNDLE_FILE_SUFFIX=.tar.gz
-  # Minimum disk space needed as determined by running 'du -sk' on
-  #    a fully built workspace.
-  REQUIRED_FREE_SPACE=1460000
   LINUX_VERSION_INFO = /etc/redhat-release
   ifeq ($(ARCH_DATA_MODEL), 32)
@@ -372 +361 @@
   # Suffix for file bundles used in previous release
   BUNDLE_FILE_SUFFIX=.tar
-  # Minimum disk space needed as determined by running 'du -sk' on
-  #    a fully built workspace.
-  REQUIRED_FREE_SPACE=500000
   # ISHIELD_TEMP_MIN is the difference of an empty C:\TEMP vs. one after a
   #     bundles build on windows.
@@ -434 +420 @@
   # Suffix for file bundles used in previous release
   BUNDLE_FILE_SUFFIX=.tar
-  # Minimum disk space needed as determined by running 'du -sk' on
-  #    a fully built workspace.
-  REQUIRED_FREE_SPACE=500000
   # How much RAM does this machine have:
   # @todo

trunk/openjdk/jdk/make/common/shared/Sanity-Settings.gmk

@@ -193 +193 @@
 ALL_SETTINGS+=$(call addRequiredVersionSetting,OS_VERSION)
 ALL_SETTINGS+=$(call addRequiredSetting,OS_NAME)
-ALL_SETTINGS+=$(call addRequiredSetting,TEMP_FREE_SPACE)
-ALL_SETTINGS+=$(call addRequiredSetting,FREE_SPACE)
 ALL_SETTINGS+=$(call addRequiredSetting,MB_OF_MEMORY)
 

trunk/openjdk/jdk/make/common/shared/Sanity.gmk

@@ -47 +47 @@
 
 ifeq ($(PLATFORM), solaris)
-  FREE_SPACE := $(shell $(DF) -b $(OUTPUTDIR) | $(TAIL) -1 | $(NAWK) '{print $$2;}')
-  TEMP_FREE_SPACE := $(shell $(DF) -b $(TEMP_DISK) | $(TAIL) -1 | $(NAWK) '{print $$2;}')
   REQ_PATCH_LIST = $(JDK_TOPDIR)/make/PatchList.solaris
   ifeq ($(ARCH_FAMILY), sparc)
@@ -58 +56 @@
 
 ifeq ($(PLATFORM), linux)
-  FREE_SPACE := $(shell $(DF) --sync -kP $(OUTPUTDIR) | $(TAIL) -1 | $(NAWK) '{print $$4;}')
-  TEMP_FREE_SPACE := $(shell $(DF) --sync -kP $(TEMP_DISK) | $(TAIL) -1 | $(NAWK) '{print $$4;}')
   ifeq ($(ARCH), amd64)
     LINUX_VERSION := $(shell \
@@ -83 +79 @@
 
 ifeq ($(PLATFORM), windows)
-  FREE_SPACE := $(shell $(DF) -kP $(OUTPUTDIR) | $(TAIL) -1 | $(NAWK) '{print $$4;}')
-  TEMP_FREE_SPACE := $(shell $(DF) -kP $(TEMP_DISK) | $(TAIL) -1 | $(NAWK) '{print $$4;}')
   # Localized systeminfo has localized labels, but not localized values.
   _WINDOWS_VERSION := \
@@ -681 +675 @@
             "" >> $(ERROR_FILE) ; \
         fi
-        @#
-        @# OUTPUTDIR must have enough free space...
-        @#
-        @if [ $(FREE_SPACE) -lt $(REQUIRED_FREE_SPACE) ]; then \
-          $(ECHO) "WARNING: You may not have enough free space in your OUTPUTDIR. The \n" \
-            "        current value of OUTPUTDIR is \n" \
-            "            $(OUTPUTDIR) \n" \
-            "        You need "$(REQUIRED_FREE_SPACE)" Kbytes free on this device to build \n" \
-            "        and it appears that only "$(FREE_SPACE)" Kbytes are free. \n" \
-            "        Either obtain more space or set ALT_OUTPUTDIR to a larger disk. \n" \
-            "" >> $(WARNING_FILE) ; \
-        fi
 
 ######################################################

trunk/openjdk/jdk/make/mkdemo/jfc/Font2DTest/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -34 +34 @@
 
 DEMO_ROOT       = $(SHARE_SRC)/demo/jfc/$(DEMONAME)
-DEMO_TOPFILES   = ./README.txt
+DEMO_TOPFILES   = ./README.txt ./$(DEMONAME).html
 DEMO_MAINCLASS  = $(DEMONAME)
 DEMO_DESTDIR    = $(DEMODIR)/jfc/$(DEMONAME)

trunk/openjdk/jdk/make/mkdemo/jfc/SwingApplet/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -34 +34 @@
 
 DEMO_ROOT       = $(SHARE_SRC)/demo/jfc/$(DEMONAME)
-DEMO_TOPFILES   = ./README.txt
+DEMO_TOPFILES   = ./README.txt ./$(DEMONAME).html
 DEMO_MAINCLASS  = $(DEMONAME)
 DEMO_DESTDIR    = $(DEMODIR)/jfc/$(DEMONAME)

trunk/openjdk/jdk/make/sun/net/FILES_java.gmk

@@ -1 +1 @@
 #
-# Copyright (c) 1996, 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #