1.1 --- a/make/Makefile Fri Feb 19 15:13:37 2010 -0800
1.2 +++ b/make/Makefile Tue Feb 23 10:17:16 2010 -0800
1.3 @@ -240,7 +240,12 @@
1.4
1.5 all build:: sanity-all post-sanity-all
1.6
1.7 -SUBDIRS = tools java javax org sun sunw com jpda mkdemo mksample launchers
1.8 +SUBDIRS = tools java javax sun com
1.9 +SUBDIRS_tools = launchers
1.10 +SUBDIRS_misc = org sunw jpda mkdemo mksample
1.11 +
1.12 +include $(BUILDDIR)/common/Subdirs.gmk
1.13 +
1.14 all build::
1.15 $(SUBDIRS-loop)
1.16
2.1 --- a/make/com/Makefile Fri Feb 19 15:13:37 2010 -0800
2.2 +++ b/make/com/Makefile Tue Feb 23 10:17:16 2010 -0800
2.3 @@ -32,6 +32,8 @@
2.4 include $(BUILDDIR)/common/Defs.gmk
2.5
2.6 SUBDIRS = sun
2.7 +include $(BUILDDIR)/common/Subdirs.gmk
2.8 +
2.9 all build clean clobber::
2.10 $(SUBDIRS-loop)
2.11
3.1 --- a/make/com/sun/Makefile Fri Feb 19 15:13:37 2010 -0800
3.2 +++ b/make/com/sun/Makefile Tue Feb 23 10:17:16 2010 -0800
3.3 @@ -38,10 +38,19 @@
3.4 endif
3.5 endif
3.6
3.7 +# jarsigner is part of JRE
3.8 +SUBDIRS = java security net/ssl jarsigner
3.9 +
3.10 +SUBDIRS_management = jmx
3.11 +SUBDIRS_desktop = image inputmethods
3.12 +SUBDIRS_enterprise = crypto/provider jndi \
3.13 + org xml rowset net/httpserver
3.14 +SUBDIRS_misc = $(SCRIPT_SUBDIR) tracing servicetag nio demo
3.15 +
3.16 # Omit mirror since it's built with the apt tool.
3.17 -SUBDIRS = $(SCRIPT_SUBDIR) image security crypto/provider jndi jmx \
3.18 - java inputmethods org xml rowset net/httpserver net/ssl demo \
3.19 - tools jarsigner tracing servicetag nio
3.20 +SUBDIRS_tools = tools
3.21 +
3.22 +include $(BUILDDIR)/common/Subdirs.gmk
3.23
3.24 all build clean clobber::
3.25 $(SUBDIRS-loop)
4.1 --- a/make/com/sun/demo/Makefile Fri Feb 19 15:13:37 2010 -0800
4.2 +++ b/make/com/sun/demo/Makefile Tue Feb 23 10:17:16 2010 -0800
4.3 @@ -38,6 +38,8 @@
4.4 include $(BUILDDIR)/common/Defs.gmk
4.5
4.6 SUBDIRS = jvmti
4.7 +include $(BUILDDIR)/common/Subdirs.gmk
4.8 +
4.9 all build clean clobber::
4.10 $(SUBDIRS-loop)
4.11
5.1 --- a/make/com/sun/demo/jvmti/Makefile Fri Feb 19 15:13:37 2010 -0800
5.2 +++ b/make/com/sun/demo/jvmti/Makefile Tue Feb 23 10:17:16 2010 -0800
5.3 @@ -38,6 +38,8 @@
5.4 include $(BUILDDIR)/common/Defs.gmk
5.5
5.6 SUBDIRS = hprof
5.7 +include $(BUILDDIR)/common/Subdirs.gmk
5.8 +
5.9 all build clean clobber::
5.10 $(SUBDIRS-loop)
5.11
6.1 --- a/make/com/sun/inputmethods/Makefile Fri Feb 19 15:13:37 2010 -0800
6.2 +++ b/make/com/sun/inputmethods/Makefile Tue Feb 23 10:17:16 2010 -0800
6.3 @@ -32,6 +32,8 @@
6.4 include $(BUILDDIR)/common/Defs.gmk
6.5
6.6 SUBDIRS = indicim thaiim
6.7 +include $(BUILDDIR)/common/Subdirs.gmk
6.8 +
6.9 all build clean clobber::
6.10 $(SUBDIRS-loop)
6.11
7.1 --- a/make/com/sun/java/Makefile Fri Feb 19 15:13:37 2010 -0800
7.2 +++ b/make/com/sun/java/Makefile Tue Feb 23 10:17:16 2010 -0800
7.3 @@ -31,7 +31,10 @@
7.4 PRODUCT = plugin
7.5 include $(BUILDDIR)/common/Defs.gmk
7.6
7.7 -SUBDIRS = browser pack
7.8 +SUBDIRS = pack
7.9 +SUBDIRS_misc = browser
7.10 +include $(BUILDDIR)/common/Subdirs.gmk
7.11 +
7.12 all build clean clobber::
7.13 $(SUBDIRS-loop)
7.14
8.1 --- a/make/com/sun/java/browser/Makefile Fri Feb 19 15:13:37 2010 -0800
8.2 +++ b/make/com/sun/java/browser/Makefile Tue Feb 23 10:17:16 2010 -0800
8.3 @@ -32,6 +32,8 @@
8.4 include $(BUILDDIR)/common/Defs.gmk
8.5
8.6 SUBDIRS = dom net
8.7 +include $(BUILDDIR)/common/Subdirs.gmk
8.8 +
8.9 all build clean clobber::
8.10 $(SUBDIRS-loop)
8.11
9.1 --- a/make/com/sun/jmx/Makefile Fri Feb 19 15:13:37 2010 -0800
9.2 +++ b/make/com/sun/jmx/Makefile Tue Feb 23 10:17:16 2010 -0800
9.3 @@ -51,6 +51,8 @@
9.4 SUBDIRS = snmp
9.5 endif
9.6
9.7 +include $(BUILDDIR)/common/Subdirs.gmk
9.8 +
9.9 all build:
9.10 $(SUBDIRS-loop)
9.11
10.1 --- a/make/com/sun/jndi/Makefile Fri Feb 19 15:13:37 2010 -0800
10.2 +++ b/make/com/sun/jndi/Makefile Tue Feb 23 10:17:16 2010 -0800
10.3 @@ -31,6 +31,8 @@
10.4 include $(BUILDDIR)/common/Defs.gmk
10.5
10.6 SUBDIRS = toolkit cosnaming ldap rmi dns
10.7 +include $(BUILDDIR)/common/Subdirs.gmk
10.8 +
10.9 all build clean clobber::
10.10 $(SUBDIRS-loop)
10.11
11.1 --- a/make/com/sun/jndi/rmi/Makefile Fri Feb 19 15:13:37 2010 -0800
11.2 +++ b/make/com/sun/jndi/rmi/Makefile Tue Feb 23 10:17:16 2010 -0800
11.3 @@ -31,6 +31,8 @@
11.4 include $(BUILDDIR)/common/Defs.gmk
11.5
11.6 SUBDIRS = registry
11.7 +include $(BUILDDIR)/common/Subdirs.gmk
11.8 +
11.9 all build clean clobber::
11.10 $(SUBDIRS-loop)
11.11
12.1 --- a/make/com/sun/nio/Makefile Fri Feb 19 15:13:37 2010 -0800
12.2 +++ b/make/com/sun/nio/Makefile Tue Feb 23 10:17:16 2010 -0800
12.3 @@ -31,6 +31,8 @@
12.4 include $(BUILDDIR)/common/Defs.gmk
12.5
12.6 SUBDIRS = sctp
12.7 +include $(BUILDDIR)/common/Subdirs.gmk
12.8 +
12.9 all build clean clobber::
12.10 $(SUBDIRS-loop)
12.11
13.1 --- a/make/com/sun/org/Makefile Fri Feb 19 15:13:37 2010 -0800
13.2 +++ b/make/com/sun/org/Makefile Tue Feb 23 10:17:16 2010 -0800
13.3 @@ -32,6 +32,8 @@
13.4 include $(BUILDDIR)/common/Defs.gmk
13.5
13.6 SUBDIRS = apache
13.7 +include $(BUILDDIR)/common/Subdirs.gmk
13.8 +
13.9 all build clean clobber::
13.10 $(SUBDIRS-loop)
13.11
14.1 --- a/make/com/sun/org/apache/Makefile Fri Feb 19 15:13:37 2010 -0800
14.2 +++ b/make/com/sun/org/apache/Makefile Tue Feb 23 10:17:16 2010 -0800
14.3 @@ -31,6 +31,7 @@
14.4 include $(BUILDDIR)/common/Defs.gmk
14.5
14.6 SUBDIRS = xml
14.7 +include $(BUILDDIR)/common/Subdirs.gmk
14.8
14.9 all build clean clobber::
14.10 $(SUBDIRS-loop)
15.1 --- a/make/com/sun/security/Makefile Fri Feb 19 15:13:37 2010 -0800
15.2 +++ b/make/com/sun/security/Makefile Tue Feb 23 10:17:16 2010 -0800
15.3 @@ -30,7 +30,10 @@
15.4 BUILDDIR = ../../..
15.5 include $(BUILDDIR)/common/Defs.gmk
15.6
15.7 -SUBDIRS = jgss sasl auth auth/module
15.8 +SUBDIRS = auth
15.9 +SUBDIRS_misc = jgss sasl auth/module
15.10 +include $(BUILDDIR)/common/Subdirs.gmk
15.11 +
15.12 all build clean clobber::
15.13 $(SUBDIRS-loop)
15.14
16.1 --- a/make/com/sun/tools/Makefile Fri Feb 19 15:13:37 2010 -0800
16.2 +++ b/make/com/sun/tools/Makefile Tue Feb 23 10:17:16 2010 -0800
16.3 @@ -35,6 +35,8 @@
16.4 AUTO_FILES_JAVA_DIRS = com/sun/tools/extcheck
16.5
16.6 SUBDIRS = attach
16.7 +include $(BUILDDIR)/common/Subdirs.gmk
16.8 +
16.9 all build:
16.10 $(SUBDIRS-loop)
16.11 clean clobber::
17.1 --- a/make/com/sun/tracing/Makefile Fri Feb 19 15:13:37 2010 -0800
17.2 +++ b/make/com/sun/tracing/Makefile Tue Feb 23 10:17:16 2010 -0800
17.3 @@ -33,6 +33,8 @@
17.4 include $(BUILDDIR)/common/Defs.gmk
17.5
17.6 SUBDIRS = dtrace
17.7 +include $(BUILDDIR)/common/Subdirs.gmk
17.8 +
17.9 all build:
17.10 $(SUBDIRS-loop)
17.11 clean clobber::
18.1 --- a/make/common/Defs.gmk Fri Feb 19 15:13:37 2010 -0800
18.2 +++ b/make/common/Defs.gmk Tue Feb 23 10:17:16 2010 -0800
18.3 @@ -576,17 +576,17 @@
18.4 define install-file
18.5 $(prep-target)
18.6 $(CP) $< $@
18.7 -$(install-module-file)
18.8 +@$(install-module-file)
18.9 endef
18.10
18.11 define chmod-file
18.12 $(CHMOD) $1 $@
18.13 -$(call chmod-module-file, $1)
18.14 +@$(call chmod-module-file, $1)
18.15 endef
18.16
18.17 define install-sym-link
18.18 $(LN) -s $1 $@
18.19 -$(call install-module-sym-link, $1)
18.20 +@$(call install-module-sym-link, $1)
18.21 endef
18.22
18.23 #
18.24 @@ -607,131 +607,9 @@
18.25 if [ -w $(HOTSPOT_LOG_NAME) ] ; then $(RM) $(HOTSPOT_LOG_NAME); fi
18.26 endef
18.27
18.28 -# Default make settings for processing SUBDIRS with clobber or clean names
18.29 -SUBDIRS_MAKEFLAGS-clobber = INCREMENTAL_BUILD=false
18.30 -SUBDIRS_MAKEFLAGS-clean = INCREMENTAL_BUILD=false
18.31 -
18.32 # Current directory
18.33 CURRENT_DIRECTORY := $(shell $(PWD))
18.34
18.35 -# If no timing wanted, we need to define these as empty
18.36 -ifdef NO_TIMING
18.37 -
18.38 -TIMING_ID:=NA
18.39 -
18.40 -define TIMING_start
18.41 -t=0:0:0:0
18.42 -endef
18.43 -
18.44 -define TIMING_end
18.45 -time_used=0
18.46 -endef
18.47 -
18.48 -else # NO_TIMING
18.49 -
18.50 -# Default timing id
18.51 -TIMING_ID:=$(shell $(BASENAME) $(CURRENT_DIRECTORY))
18.52 -
18.53 -# Timing start (must be used in same shell, e.g. same command line)
18.54 -# Defines the shell variable $1 to have the start time.
18.55 -define TIMING_start
18.56 -$1=`$(DATE) +%j:%H:%M:%S`
18.57 -endef
18.58 -
18.59 -# Timing end (must be used in same shell, e.g. same command line)
18.60 -# Expects shell variable $1 to have been defined as the start time.
18.61 -# Expects shell variable $2 to have timing id string
18.62 -# Sets total_seconds shell variable as the total seconds used.
18.63 -# Sets time_used shell variable to contain format "%dh%dm%ds"
18.64 -define TIMING_end
18.65 -begTime="$${$1}"; \
18.66 -timing_id="$${$2}"; \
18.67 -endTime=`$(DATE) +%j:%H:%M:%S`; \
18.68 -d1=`$(ECHO) $${begTime} | $(CUT) -d':' -f1 | $(SED) -e 's@^0*@@'`; \
18.69 -if [ "$${d1}" = "" ] ; then d1=0; fi; \
18.70 -h1=`$(ECHO) $${begTime} | $(CUT) -d':' -f2 | $(SED) -e 's@^0*@@'`; \
18.71 -if [ "$${h1}" = "" ] ; then h1=0; fi; \
18.72 -m1=`$(ECHO) $${begTime} | $(CUT) -d':' -f3 | $(SED) -e 's@^0*@@'`; \
18.73 -if [ "$${m1}" = "" ] ; then m1=0; fi; \
18.74 -s1=`$(ECHO) $${begTime} | $(CUT) -d':' -f4 | $(SED) -e 's@^0*@@'`; \
18.75 -if [ "$${s1}" = "" ] ; then s1=0; fi; \
18.76 -d2=`$(ECHO) $${endTime} | $(CUT) -d':' -f1 | $(SED) -e 's@^0*@@'`; \
18.77 -if [ "$${d2}" = "" ] ; then d2=0; fi; \
18.78 -h2=`$(ECHO) $${endTime} | $(CUT) -d':' -f2 | $(SED) -e 's@^0*@@'`; \
18.79 -if [ "$${h2}" = "" ] ; then h2=0; fi; \
18.80 -m2=`$(ECHO) $${endTime} | $(CUT) -d':' -f3 | $(SED) -e 's@^0*@@'`; \
18.81 -if [ "$${m2}" = "" ] ; then m2=0; fi; \
18.82 -s2=`$(ECHO) $${endTime} | $(CUT) -d':' -f4 | $(SED) -e 's@^0*@@'`; \
18.83 -if [ "$${s2}" = "" ] ; then s2=0; fi; \
18.84 -t1_secs=`$(EXPR) $${d1} '*' 60 '*' 60 '*' 24 '+' $${h1} '*' 60 '*' 60 \
18.85 - '+' $${m1} '*' 60 '+' $${s1}`; \
18.86 -t2_secs=`$(EXPR) $${d2} '*' 60 '*' 60 '*' 24 '+' $${h2} '*' 60 '*' 60 \
18.87 - '+' $${m2} '*' 60 '+' $${s2}`; \
18.88 -total_seconds=`$(EXPR) $${t2_secs} '-' $${t1_secs}`; \
18.89 -if [ "$${total_seconds}" -lt 0 ] ; then total_seconds=0; fi; \
18.90 -t_hour=`$(EXPR) $${total_seconds} '/' '(' 60 '*' 60 ')'`h; \
18.91 -t_min=`$(EXPR) '(' $${total_seconds} '%' '(' 60 '*' 60 ')' ')' '/' 60`m; \
18.92 -t_sec=`$(EXPR) $${total_seconds} '%' 60`s; \
18.93 -time_used=$${t_sec}; \
18.94 -if [ "$${t_hour}" != "0h" ] ; then \
18.95 -time_used=$${t_hour}$${t_min}$${t_sec}; \
18.96 -elif [ "$${t_min}" != "0m" ] ; then \
18.97 -time_used=$${t_min}$${t_sec}; \
18.98 -else \
18.99 -time_used=$${t_sec}; \
18.100 -fi; \
18.101 -$(PRINTF) " Timing: %05d seconds or %s for %s\n" \
18.102 - $${total_seconds} $${time_used} $${timing_id}
18.103 -endef
18.104 -
18.105 -endif # NO_TIMING
18.106 -
18.107 -# Given a SUBDIRS list, cd into them and make them
18.108 -# SUBDIRS_MAKEFLAGS Make settings for a subdir make
18.109 -# SUBDIRS_MAKEFLAGS-$@ Make settings specific to this target
18.110 -define SUBDIRS-loop
18.111 -@$(ECHO) "Begin Processing SUBDIRS: $(SUBDIRS)"
18.112 -@for i in DUMMY $(SUBDIRS) ; do \
18.113 - if [ "$$i" != "DUMMY" ] ; then \
18.114 - $(ECHO) ">>>Recursively making "$$i" "$@" @ `$(DATE)` ..."; \
18.115 - timing_id="$(TIMING_ID)-`$(BASENAME) $${i}`"; \
18.116 - $(call TIMING_start,startTime); \
18.117 - curDir=$(CURRENT_DIRECTORY); \
18.118 - $(CD) $$i; $(MAKE) $@ TIMING_ID=$${timing_id} \
18.119 - $(SUBDIRS_MAKEFLAGS) \
18.120 - $(SUBDIRS_MAKEFLAGS-$@) \
18.121 - FULL_VERSION=$(FULL_VERSION) \
18.122 - RELEASE=$(RELEASE) || exit 1; \
18.123 - $(CD) $${curDir}; \
18.124 - $(call TIMING_end,startTime,timing_id); \
18.125 - $(ECHO) "<<<Finished Recursively making "$$i" "$@" @ `$(DATE)`." ; \
18.126 - fi ; \
18.127 -done
18.128 -@$(ECHO) "Done Processing SUBDIRS: $(SUBDIRS)"
18.129 -endef
18.130 -
18.131 -# Given a OTHERSUBDIRS list, cd into them and make them (extra loop define)
18.132 -# OTHERSUBDIRS_MAKEFLAGS Make settings for a subdir make
18.133 -define OTHERSUBDIRS-loop
18.134 -@$(ECHO) "Begin Processing OTHERSUBDIRS: $(OTHERSUBDIRS)"
18.135 -@for i in DUMMY $(OTHERSUBDIRS) ; do \
18.136 - if [ "$$i" != "DUMMY" ] ; then \
18.137 - $(ECHO) ">>>Recursively making "$$i" "$@" @ `$(DATE)` ..."; \
18.138 - timing_id="$(TIMING_ID)-`$(BASENAME) $${i}`"; \
18.139 - $(call TIMING_start,startTime); \
18.140 - curDir=$(CURRENT_DIRECTORY); \
18.141 - $(CD) $$i; $(MAKE) $@ TIMING_ID=$${timing_id} \
18.142 - $(OTHERSUBDIRS_MAKEFLAGS) \
18.143 - FULL_VERSION=$(FULL_VERSION) \
18.144 - RELEASE=$(RELEASE) || exit 1; \
18.145 - $(CD) $${curDir}; \
18.146 - $(call TIMING_end,startTime,timing_id); \
18.147 - $(ECHO) "<<<Finished Recursively making "$$i" "$@" @ `$(DATE)`." ; \
18.148 - fi ; \
18.149 -done
18.150 -@$(ECHO) "Done Processing OTHERSUBDIRS: $(OTHERSUBDIRS)"
18.151 -endef
18.152 -
18.153 #
18.154 # Create BYFILE OPT and DBG settings, if CFLAGS_OPT/foobar.o is set then it is
18.155 # used for this file, otherwise the default settings are used.
18.156 @@ -819,7 +697,7 @@
18.157
18.158 define install-import-file
18.159 $(install-importonly-file)
18.160 -$(install-module-file)
18.161 +@$(install-module-file)
18.162 endef
18.163
18.164 .PHONY: all build clean clobber
19.1 --- a/make/common/Sanity.gmk Fri Feb 19 15:13:37 2010 -0800
19.2 +++ b/make/common/Sanity.gmk Tue Feb 23 10:17:16 2010 -0800
19.3 @@ -71,7 +71,8 @@
19.4 sane-cacerts \
19.5 sane-ant_version \
19.6 sane-zip_version \
19.7 - sane-msvcrt_path
19.8 + sane-msvcrt_path \
19.9 + sane-build_modules
19.10
19.11 # The rules sanity-* have a one-to-one correspondence with the major targets
19.12 # Each sanity-* rule should have no body to ensure that the post-sanity-* is the
20.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
20.2 +++ b/make/common/Subdirs.gmk Tue Feb 23 10:17:16 2010 -0800
20.3 @@ -0,0 +1,204 @@
20.4 +# Copyright 2010 Sun Microsystems, Inc. All Rights Reserved.
20.5 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
20.6 +#
20.7 +# This code is free software; you can redistribute it and/or modify it
20.8 +# under the terms of the GNU General Public License version 2 only, as
20.9 +# published by the Free Software Foundation. Sun designates this
20.10 +# particular file as subject to the "Classpath" exception as provided
20.11 +# by Sun in the LICENSE file that accompanied this code.
20.12 +#
20.13 +# This code is distributed in the hope that it will be useful, but WITHOUT
20.14 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
20.15 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
20.16 +# version 2 for more details (a copy is included in the LICENSE file that
20.17 +# accompanied this code).
20.18 +#
20.19 +# You should have received a copy of the GNU General Public License version
20.20 +# 2 along with this work; if not, write to the Free Software Foundation,
20.21 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
20.22 +#
20.23 +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
20.24 +# CA 95054 USA or visit www.sun.com if you need additional information or
20.25 +# have any questions
20.26 +#
20.27 +
20.28 +#
20.29 +# Generic makefile for building subdirectories.
20.30 +#
20.31 +# SUBDIRS variables to specify the subdirectories to build recursively.
20.32 +# Makefile has to include Subdirs.gmk AFTER all SUBDIRS variables are
20.33 +# defined.
20.34 +#
20.35 +# This file does not contain any rule.
20.36 +#
20.37 +# WARNING: This file is shared with other workspaces.
20.38 +# So when it includes other files, it must use JDK_TOPDIR.
20.39 +
20.40 +#
20.41 +# SUBDIRS subdirs for the base module always get built
20.42 +# SUBDIRS_<group> subdirs for the named group
20.43 +#
20.44 +# By default, subdirs specified in the SUBDIRS and all SUBDIRS_*
20.45 +# variables will be built.
20.46 +#
20.47 +# BUILD_MODULES variable can be used to specify one or more groups
20.48 +# to be built (BUILD_MODULES=all will build all groups).
20.49 +#
20.50 +# Variables of the currently supported groups are:
20.51 +# SUBDIRS_desktop
20.52 +# SUBDIRS_management
20.53 +# SUBDIRS_enterprise
20.54 +# SUBDIRS_misc
20.55 +# SUBDIRS_tools
20.56 +#
20.57 +# Change to the above list also need to update
20.58 +# make/common/shared/Sanity.gmk. NOTE: this list is subject
20.59 +# to change till the JDK 7 SE profiles/modules are finalized.
20.60 +#
20.61 +# Eventually we want to restructure the make directory
20.62 +# according to these grouping (e.g. make/desktop/...) and
20.63 +# the SUBDIRS_<group> variables would not be needed.
20.64 +#
20.65 +# To build the desktop and tools groups only, you can do:
20.66 +# gnumake BUILD_MODULES="desktop tools" ...
20.67 +#
20.68 +
20.69 +# Iterate the subdirectories specified in $1.
20.70 +# - cd into each subdir and make them
20.71 +
20.72 +# Given a SUBDIRS* list (first argument), cd into them and make them
20.73 +# SUBDIRS_MAKEFLAGS Make settings for a subdir make
20.74 +# SUBDIRS_MAKEFLAGS-$@ Make settings specific to this target
20.75 +#
20.76 +define subdirs-group-loop
20.77 +@$(ECHO) "Begin Processing SUBDIRS: $($1)"
20.78 +@for i in DUMMY $($1) ; do \
20.79 + if [ "$$i" != "DUMMY" ] ; then \
20.80 + $(MAKE) -C $$i $@ $(SUBDIRS_MAKEFLAGS) $(SUBDIRS_MAKEFLAGS-$@) \
20.81 + FULL_VERSION=$(FULL_VERSION) RELEASE=$(RELEASE) || exit 1; \
20.82 + fi ; \
20.83 +done
20.84 +@$(ECHO) "Done Processing SUBDIRS: $($1)"
20.85 +endef
20.86 +
20.87 +# Given a OTHERSUBDIRS list, cd into them and make them (extra loop define)
20.88 +# OTHERSUBDIRS_MAKEFLAGS Make settings for a subdir make
20.89 +define OTHERSUBDIRS-loop
20.90 +@$(ECHO) "Begin Processing OTHERSUBDIRS: $(OTHERSUBDIRS)"
20.91 +@for i in DUMMY $(OTHERSUBDIRS) ; do \
20.92 + if [ "$$i" != "DUMMY" ] ; then \
20.93 + $(MAKE) -C $$i $@ $(OTHERSUBDIRS_MAKEFLAGS) \
20.94 + FULL_VERSION=$(FULL_VERSION) RELEASE=$(RELEASE) || exit 1; \
20.95 + fi ; \
20.96 +done
20.97 +@$(ECHO) "Done Processing OTHERSUBDIRS: $(OTHERSUBDIRS)"
20.98 +endef
20.99 +
20.100 +#
20.101 +# Iterate the list specified in SUBDIRS_<group> only if
20.102 +# SUBDIRS_<group> is set and <group> or "all" is specified
20.103 +# in the BUILD_MODULES variable
20.104 +#
20.105 +ifdef SUBDIRS_desktop
20.106 + ifneq (,$(findstring desktop, $(BUILD_MODULES)))
20.107 + define subdirs-desktop-loop
20.108 + @$(call subdirs-group-loop,SUBDIRS_desktop)
20.109 + endef
20.110 + else
20.111 + define subdirs-desktop-loop
20.112 + endef
20.113 + endif
20.114 +else
20.115 + define subdirs-desktop-loop
20.116 + endef
20.117 +endif # SUBDIRS_desktop
20.118 +
20.119 +ifdef SUBDIRS_enterprise
20.120 + ifneq (,$(findstring enterprise, $(BUILD_MODULES)))
20.121 + define subdirs-enterprise-loop
20.122 + @$(call subdirs-group-loop,SUBDIRS_enterprise)
20.123 + endef
20.124 + else
20.125 + define subdirs-enterprise-loop
20.126 + endef
20.127 + endif
20.128 +else
20.129 +define subdirs-enterprise-loop
20.130 +endef
20.131 +endif # SUBDIRS_enterprise
20.132 +
20.133 +ifdef SUBDIRS_management
20.134 + ifneq (,$(findstring management, $(BUILD_MODULES)))
20.135 + define subdirs-management-loop
20.136 + @$(call subdirs-group-loop,SUBDIRS_management)
20.137 + endef
20.138 + else
20.139 + define subdirs-management-loop
20.140 + endef
20.141 + endif
20.142 +else
20.143 +define subdirs-management-loop
20.144 +endef
20.145 +endif # SUBDIRS_management
20.146 +
20.147 +ifdef SUBDIRS_misc
20.148 + ifneq (,$(findstring misc, $(BUILD_MODULES)))
20.149 + define subdirs-misc-loop
20.150 + @$(call subdirs-group-loop,SUBDIRS_misc)
20.151 + endef
20.152 + else
20.153 + define subdirs-misc-loop
20.154 + endef
20.155 + endif
20.156 +else
20.157 +define subdirs-misc-loop
20.158 +endef
20.159 +endif # SUBDIRS_misc
20.160 +
20.161 +ifdef SUBDIRS_tools
20.162 + ifneq (,$(findstring tools, $(BUILD_MODULES)))
20.163 + define subdirs-tools-loop
20.164 + @$(call subdirs-group-loop,SUBDIRS_tools)
20.165 + endef
20.166 + else
20.167 + define subdirs-tools-loop
20.168 + endef
20.169 + endif
20.170 +else
20.171 +define subdirs-tools-loop
20.172 +endef
20.173 +endif # SUBDIRS_tools
20.174 +
20.175 +#
20.176 +# If BUILD_MODULES is not set or it's set to "all",
20.177 +# iterate all groups.
20.178 +SUBDIRS_all = $(SUBDIRS) $(SUBDIRS_desktop) $(SUBDIRS_enterprise) \
20.179 + $(SUBDIRS_management) $(SUBDIRS_misc) $(SUBDIRS_tools)
20.180 +
20.181 +ifndef BUILD_MODULES
20.182 +define SUBDIRS-loop
20.183 + @$(call subdirs-group-loop,SUBDIRS_all)
20.184 +endef
20.185 +
20.186 +else
20.187 +
20.188 +ifneq (,$(findstring all, $(BUILD_MODULES)))
20.189 +define SUBDIRS-loop
20.190 + @$(call subdirs-group-loop,SUBDIRS_all)
20.191 +endef
20.192 +
20.193 +else # BUILD_MODULES set
20.194 +#
20.195 +# Iterate SUBDIRS and the groups specified in BUILD_MODULES
20.196 +#
20.197 +define SUBDIRS-loop
20.198 + @$(call subdirs-group-loop,SUBDIRS)
20.199 + @$(subdirs-desktop-loop)
20.200 + @$(subdirs-enterprise-loop)
20.201 + @$(subdirs-management-loop)
20.202 + @$(subdirs-misc-loop)
20.203 + @$(subdirs-tools-loop)
20.204 +endef
20.205 +
20.206 +endif
20.207 +endif # BUILD_MODULES
21.1 --- a/make/common/shared/Sanity.gmk Fri Feb 19 15:13:37 2010 -0800
21.2 +++ b/make/common/shared/Sanity.gmk Tue Feb 23 10:17:16 2010 -0800
21.3 @@ -218,7 +218,8 @@
21.4 sane-zip_version \
21.5 sane-unzip_version \
21.6 sane-msvcrt_path \
21.7 - sane-freetype
21.8 + sane-freetype \
21.9 + sane-build_modules
21.10
21.11 ######################################################
21.12 # check for COPYRIGHT_YEAR variable
21.13 @@ -845,6 +846,21 @@
21.14 endif
21.15
21.16 ######################################################
21.17 +# if specified, BUILD_MODULES must contain valid values.
21.18 +######################################################
21.19 +MODULES_REGEX="all|base|desktop|management|enterprise|misc|tools"
21.20 +sane-build_modules:
21.21 +ifdef BUILD_MODULES
21.22 + @for m in $(BUILD_MODULES) ; do \
21.23 + valid=`$(ECHO) $$m | $(EGREP) $(MODULES_REGEX)`; \
21.24 + if [ "x$$valid" = "x" ] ; then \
21.25 + $(ECHO) "ERROR: $$m set in the BUILD_MODULES variable is invalid.\n" \
21.26 + "" >> $(ERROR_FILE); \
21.27 + fi \
21.28 + done
21.29 +endif
21.30 +
21.31 +######################################################
21.32 # CUPS_HEADERS_PATH must be valid
21.33 ######################################################
21.34 sane-cups:
22.1 --- a/make/java/Makefile Fri Feb 19 15:13:37 2010 -0800
22.2 +++ b/make/java/Makefile Tue Feb 23 10:17:16 2010 -0800
22.3 @@ -38,9 +38,13 @@
22.4
22.5 # Others
22.6 # Note: java_crw_demo java_hprof_demo are demos but must be delivered built in sdk
22.7 -SUBDIRS += security npt java_crw_demo java_hprof_demo \
22.8 - math awt util text applet net nio dyn \
22.9 - sql rmi jar beans logging management instrument
22.10 +
22.11 +SUBDIRS += security math util text net nio jar
22.12 +
22.13 +SUBDIRS_desktop = awt applet beans
22.14 +SUBDIRS_management = management
22.15 +SUBDIRS_misc = npt java_crw_demo java_hprof_demo \
22.16 + logging instrument dyn sql rmi
22.17
22.18
22.19 ifeq ($(PLATFORM), solaris)
22.20 @@ -53,6 +57,8 @@
22.21 SUBDIRS += jexec
22.22 endif # PLATFORM
22.23
22.24 +include $(BUILDDIR)/common/Subdirs.gmk
22.25 +
22.26 all build clean clobber::
22.27 $(SUBDIRS-loop)
22.28
23.1 --- a/make/java/hpi/Makefile Fri Feb 19 15:13:37 2010 -0800
23.2 +++ b/make/java/hpi/Makefile Tue Feb 23 10:17:16 2010 -0800
23.3 @@ -34,6 +34,8 @@
23.4 # Build specified the HPI implementations
23.5 #
23.6 SUBDIRS = $(HPIS)
23.7 +include $(BUILDDIR)/common/Subdirs.gmk
23.8 +
23.9 all build clean clobber::
23.10 $(SUBDIRS-loop)
23.11
24.1 --- a/make/java/java/Makefile Fri Feb 19 15:13:37 2010 -0800
24.2 +++ b/make/java/java/Makefile Tue Feb 23 10:17:16 2010 -0800
24.3 @@ -218,6 +218,8 @@
24.4 endif
24.5
24.6 SUBDIRS = reflect
24.7 +include $(BUILDDIR)/common/Subdirs.gmk
24.8 +
24.9 all build:
24.10 $(SUBDIRS-loop)
24.11 clean clobber::
25.1 --- a/make/java/java/genlocales.gmk Fri Feb 19 15:13:37 2010 -0800
25.2 +++ b/make/java/java/genlocales.gmk Tue Feb 23 10:17:16 2010 -0800
25.3 @@ -49,7 +49,7 @@
25.4 # $(BUILDDIR)/java/text/FILES_java.gmk contains the "sun.text.resources" for
25.5 # European language support
25.6
25.7 -include $(BUILDDIR)/java/text/FILES_java.gmk
25.8 +include $(BUILDDIR)/java/text/base/FILES_java.gmk
25.9
25.10 Euro_Resources_java += $(FILES_java)
25.11
26.1 --- a/make/java/main/Makefile Fri Feb 19 15:13:37 2010 -0800
26.2 +++ b/make/java/main/Makefile Tue Feb 23 10:17:16 2010 -0800
26.3 @@ -36,6 +36,8 @@
26.4 else
26.5 SUBDIRS = java
26.6 endif
26.7 +include $(BUILDDIR)/common/Subdirs.gmk
26.8 +
26.9 all build clean clobber::
26.10 $(SUBDIRS-loop)
26.11
27.1 --- a/make/java/nio/FILES_java.gmk Fri Feb 19 15:13:37 2010 -0800
27.2 +++ b/make/java/nio/FILES_java.gmk Tue Feb 23 10:17:16 2010 -0800
27.3 @@ -26,7 +26,6 @@
27.4 FILES_src = \
27.5 java/nio/Bits.java \
27.6 java/nio/Buffer.java \
27.7 - java/nio/BufferPoolMXBean.java \
27.8 java/nio/ByteOrder.java \
27.9 java/nio/MappedByteBuffer.java \
27.10 java/nio/StringCharBuffer.java \
28.1 --- a/make/java/nio/Makefile Fri Feb 19 15:13:37 2010 -0800
28.2 +++ b/make/java/nio/Makefile Tue Feb 23 10:17:16 2010 -0800
28.3 @@ -304,7 +304,11 @@
28.4 # Rules
28.5 #
28.6
28.7 +SUBDIRS_management = mxbean
28.8 +include $(BUILDDIR)/common/Subdirs.gmk
28.9 +
28.10 build: sources
28.11 + $(SUBDIRS-loop)
28.12
28.13 clean clobber::
28.14 $(RM) -r $(NIO_GEN) $(SNIO_GEN)
29.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
29.2 +++ b/make/java/nio/mxbean/Makefile Tue Feb 23 10:17:16 2010 -0800
29.3 @@ -0,0 +1,34 @@
29.4 +#
29.5 +# Copyright 2010 Sun Microsystems, Inc. All Rights Reserved.
29.6 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
29.7 +#
29.8 +# This code is free software; you can redistribute it and/or modify it
29.9 +# under the terms of the GNU General Public License version 2 only, as
29.10 +# published by the Free Software Foundation. Sun designates this
29.11 +# particular file as subject to the "Classpath" exception as provided
29.12 +# by Sun in the LICENSE file that accompanied this code.
29.13 +#
29.14 +# This code is distributed in the hope that it will be useful, but WITHOUT
29.15 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
29.16 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
29.17 +# version 2 for more details (a copy is included in the LICENSE file that
29.18 +# accompanied this code).
29.19 +#
29.20 +# You should have received a copy of the GNU General Public License version
29.21 +# 2 along with this work; if not, write to the Free Software Foundation,
29.22 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
29.23 +#
29.24 +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
29.25 +# CA 95054 USA or visit www.sun.com if you need additional information or
29.26 +# have any questions.
29.27 +#
29.28 +
29.29 +BUILDDIR = ../../..
29.30 +MODULE = management
29.31 +PACKAGE = java.nio
29.32 +PRODUCT = java
29.33 +include $(BUILDDIR)/common/Defs.gmk
29.34 +
29.35 +FILES_java = java/nio/BufferPoolMXBean.java
29.36 +
29.37 +include $(BUILDDIR)/common/Classes.gmk
30.1 --- a/make/java/redist/Makefile Fri Feb 19 15:13:37 2010 -0800
30.2 +++ b/make/java/redist/Makefile Tue Feb 23 10:17:16 2010 -0800
30.3 @@ -62,7 +62,10 @@
30.4 # Needed to do file copy
30.5 ABS_BUILDDIR :=$(call FullPath,$(BUILDDIR))
30.6
30.7 -SUBDIRS = fonts sajdi
30.8 +SUBDIRS_desktop = fonts
30.9 +SUBDIRS_tools = sajdi
30.10 +include $(BUILDDIR)/common/Subdirs.gmk
30.11 +
30.12 all clean clobber::
30.13 $(SUBDIRS-loop)
30.14
31.1 --- a/make/java/text/FILES_java.gmk Fri Feb 19 15:13:37 2010 -0800
31.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
31.3 @@ -1,263 +0,0 @@
31.4 -#
31.5 -# Copyright 1996-2007 Sun Microsystems, Inc. All Rights Reserved.
31.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
31.7 -#
31.8 -# This code is free software; you can redistribute it and/or modify it
31.9 -# under the terms of the GNU General Public License version 2 only, as
31.10 -# published by the Free Software Foundation. Sun designates this
31.11 -# particular file as subject to the "Classpath" exception as provided
31.12 -# by Sun in the LICENSE file that accompanied this code.
31.13 -#
31.14 -# This code is distributed in the hope that it will be useful, but WITHOUT
31.15 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
31.16 -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
31.17 -# version 2 for more details (a copy is included in the LICENSE file that
31.18 -# accompanied this code).
31.19 -#
31.20 -# You should have received a copy of the GNU General Public License version
31.21 -# 2 along with this work; if not, write to the Free Software Foundation,
31.22 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
31.23 -#
31.24 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
31.25 -# CA 95054 USA or visit www.sun.com if you need additional information or
31.26 -# have any questions.
31.27 -#
31.28 -
31.29 -FILES_java = \
31.30 - java/text/Annotation.java \
31.31 - java/text/AttributedCharacterIterator.java \
31.32 - java/text/AttributedString.java \
31.33 - java/text/BreakDictionary.java \
31.34 - java/text/BreakIterator.java \
31.35 - java/text/Bidi.java \
31.36 - java/text/CharacterIterator.java \
31.37 - java/text/CharacterIteratorFieldDelegate.java \
31.38 - java/text/ChoiceFormat.java \
31.39 - java/text/Collator.java \
31.40 - java/text/CollationElementIterator.java \
31.41 - java/text/CollationKey.java \
31.42 - java/text/CollationRules.java \
31.43 - java/text/DateFormat.java \
31.44 - java/text/DateFormatSymbols.java \
31.45 - java/text/DecimalFormat.java \
31.46 - java/text/DictionaryBasedBreakIterator.java \
31.47 - java/text/DigitList.java \
31.48 - java/text/EntryPair.java \
31.49 - java/text/Format.java \
31.50 - java/text/FieldPosition.java \
31.51 - java/text/DontCareFieldPosition.java \
31.52 - java/text/MergeCollation.java \
31.53 - java/text/MessageFormat.java \
31.54 - java/text/Normalizer.java \
31.55 - java/text/NumberFormat.java \
31.56 - java/text/DecimalFormatSymbols.java \
31.57 - java/text/ParseException.java \
31.58 - java/text/ParsePosition.java \
31.59 - java/text/PatternEntry.java \
31.60 - java/text/RBCollationTables.java \
31.61 - java/text/RBTableBuilder.java \
31.62 - java/text/RuleBasedBreakIterator.java \
31.63 - java/text/RuleBasedCollator.java \
31.64 - java/text/RuleBasedCollationKey.java \
31.65 - java/text/SimpleDateFormat.java \
31.66 - java/text/StringCharacterIterator.java \
31.67 - java/text/spi/BreakIteratorProvider.java \
31.68 - java/text/spi/CollatorProvider.java \
31.69 - java/text/spi/DateFormatProvider.java \
31.70 - java/text/spi/DateFormatSymbolsProvider.java \
31.71 - java/text/spi/DecimalFormatSymbolsProvider.java \
31.72 - java/text/spi/NumberFormatProvider.java \
31.73 - sun/text/SupplementaryCharacterData.java \
31.74 - sun/text/CodePointIterator.java \
31.75 - sun/text/CollatorUtilities.java \
31.76 - sun/text/CompactByteArray.java \
31.77 - sun/text/ComposedCharIter.java \
31.78 - sun/text/IntHashtable.java \
31.79 - sun/text/Normalizer.java \
31.80 - sun/text/SupplementaryCharacterData.java \
31.81 - sun/text/UCompactIntArray.java \
31.82 - sun/text/bidi/BidiBase.java \
31.83 - sun/text/bidi/BidiLine.java \
31.84 - sun/text/bidi/BidiRun.java \
31.85 - \
31.86 - sun/text/normalizer/CharTrie.java \
31.87 - sun/text/normalizer/CharacterIteratorWrapper.java \
31.88 - sun/text/normalizer/ICUBinary.java \
31.89 - sun/text/normalizer/ICUData.java \
31.90 - sun/text/normalizer/IntTrie.java \
31.91 - sun/text/normalizer/NormalizerBase.java \
31.92 - sun/text/normalizer/NormalizerDataReader.java \
31.93 - sun/text/normalizer/NormalizerImpl.java \
31.94 - sun/text/normalizer/RangeValueIterator.java \
31.95 - sun/text/normalizer/Replaceable.java \
31.96 - sun/text/normalizer/ReplaceableString.java \
31.97 - sun/text/normalizer/ReplaceableUCharacterIterator.java \
31.98 - sun/text/normalizer/RuleCharacterIterator.java \
31.99 - sun/text/normalizer/SymbolTable.java \
31.100 - sun/text/normalizer/Trie.java \
31.101 - sun/text/normalizer/TrieIterator.java \
31.102 - sun/text/normalizer/UBiDiProps.java \
31.103 - sun/text/normalizer/UCharacter.java \
31.104 - sun/text/normalizer/UCharacterIterator.java \
31.105 - sun/text/normalizer/UCharacterProperty.java \
31.106 - sun/text/normalizer/UCharacterPropertyReader.java \
31.107 - sun/text/normalizer/UTF16.java \
31.108 - sun/text/normalizer/UnicodeMatcher.java \
31.109 - sun/text/normalizer/UnicodeSet.java \
31.110 - sun/text/normalizer/UnicodeSetIterator.java \
31.111 - sun/text/normalizer/Utility.java \
31.112 - sun/text/normalizer/VersionInfo.java \
31.113 - \
31.114 - sun/text/resources/BreakIteratorInfo.java \
31.115 - \
31.116 - sun/text/resources/CollationData.java \
31.117 - sun/text/resources/CollationData_be.java \
31.118 - sun/text/resources/CollationData_bg.java \
31.119 - sun/text/resources/CollationData_ca.java \
31.120 - sun/text/resources/CollationData_cs.java \
31.121 - sun/text/resources/CollationData_da.java \
31.122 - sun/text/resources/CollationData_de.java \
31.123 - sun/text/resources/CollationData_el.java \
31.124 - sun/text/resources/CollationData_en.java \
31.125 - sun/text/resources/CollationData_es.java \
31.126 - sun/text/resources/CollationData_et.java \
31.127 - sun/text/resources/CollationData_fi.java \
31.128 - sun/text/resources/CollationData_fr.java \
31.129 - sun/text/resources/CollationData_hr.java \
31.130 - sun/text/resources/CollationData_hu.java \
31.131 - sun/text/resources/CollationData_is.java \
31.132 - sun/text/resources/CollationData_it.java \
31.133 - sun/text/resources/CollationData_lt.java \
31.134 - sun/text/resources/CollationData_lv.java \
31.135 - sun/text/resources/CollationData_mk.java \
31.136 - sun/text/resources/CollationData_nl.java \
31.137 - sun/text/resources/CollationData_no.java \
31.138 - sun/text/resources/CollationData_pl.java \
31.139 - sun/text/resources/CollationData_pt.java \
31.140 - sun/text/resources/CollationData_ro.java \
31.141 - sun/text/resources/CollationData_ru.java \
31.142 - sun/text/resources/CollationData_sk.java \
31.143 - sun/text/resources/CollationData_sl.java \
31.144 - sun/text/resources/CollationData_sq.java \
31.145 - sun/text/resources/CollationData_sr.java \
31.146 - sun/text/resources/CollationData_sv.java \
31.147 - sun/text/resources/CollationData_tr.java \
31.148 - sun/text/resources/CollationData_uk.java \
31.149 - \
31.150 - sun/text/resources/FormatData.java \
31.151 - sun/text/resources/FormatData_be.java \
31.152 - sun/text/resources/FormatData_be_BY.java \
31.153 - sun/text/resources/FormatData_bg.java \
31.154 - sun/text/resources/FormatData_bg_BG.java \
31.155 - sun/text/resources/FormatData_ca.java \
31.156 - sun/text/resources/FormatData_ca_ES.java \
31.157 - sun/text/resources/FormatData_cs.java \
31.158 - sun/text/resources/FormatData_cs_CZ.java \
31.159 - sun/text/resources/FormatData_da.java \
31.160 - sun/text/resources/FormatData_da_DK.java \
31.161 - sun/text/resources/FormatData_de.java \
31.162 - sun/text/resources/FormatData_de_AT.java \
31.163 - sun/text/resources/FormatData_de_CH.java \
31.164 - sun/text/resources/FormatData_de_DE.java \
31.165 - sun/text/resources/FormatData_de_LU.java \
31.166 - sun/text/resources/FormatData_el.java \
31.167 - sun/text/resources/FormatData_el_CY.java \
31.168 - sun/text/resources/FormatData_el_GR.java \
31.169 - sun/text/resources/FormatData_en.java \
31.170 - sun/text/resources/FormatData_en_US.java \
31.171 - sun/text/resources/FormatData_en_AU.java \
31.172 - sun/text/resources/FormatData_en_CA.java \
31.173 - sun/text/resources/FormatData_en_GB.java \
31.174 - sun/text/resources/FormatData_en_IE.java \
31.175 - sun/text/resources/FormatData_en_IN.java \
31.176 - sun/text/resources/FormatData_en_MT.java \
31.177 - sun/text/resources/FormatData_en_NZ.java \
31.178 - sun/text/resources/FormatData_en_PH.java \
31.179 - sun/text/resources/FormatData_en_SG.java \
31.180 - sun/text/resources/FormatData_en_ZA.java \
31.181 - sun/text/resources/FormatData_es.java \
31.182 - sun/text/resources/FormatData_es_BO.java \
31.183 - sun/text/resources/FormatData_es_AR.java \
31.184 - sun/text/resources/FormatData_es_CL.java \
31.185 - sun/text/resources/FormatData_es_CO.java \
31.186 - sun/text/resources/FormatData_es_CR.java \
31.187 - sun/text/resources/FormatData_es_DO.java \
31.188 - sun/text/resources/FormatData_es_EC.java \
31.189 - sun/text/resources/FormatData_es_ES.java \
31.190 - sun/text/resources/FormatData_es_GT.java \
31.191 - sun/text/resources/FormatData_es_HN.java \
31.192 - sun/text/resources/FormatData_es_MX.java \
31.193 - sun/text/resources/FormatData_es_NI.java \
31.194 - sun/text/resources/FormatData_es_PA.java \
31.195 - sun/text/resources/FormatData_es_PE.java \
31.196 - sun/text/resources/FormatData_es_PR.java \
31.197 - sun/text/resources/FormatData_es_PY.java \
31.198 - sun/text/resources/FormatData_es_SV.java \
31.199 - sun/text/resources/FormatData_es_US.java \
31.200 - sun/text/resources/FormatData_es_UY.java \
31.201 - sun/text/resources/FormatData_es_VE.java \
31.202 - sun/text/resources/FormatData_et.java \
31.203 - sun/text/resources/FormatData_et_EE.java \
31.204 - sun/text/resources/FormatData_fi.java \
31.205 - sun/text/resources/FormatData_fi_FI.java \
31.206 - sun/text/resources/FormatData_fr.java \
31.207 - sun/text/resources/FormatData_fr_BE.java \
31.208 - sun/text/resources/FormatData_fr_CA.java \
31.209 - sun/text/resources/FormatData_fr_CH.java \
31.210 - sun/text/resources/FormatData_fr_FR.java \
31.211 - sun/text/resources/FormatData_fr_LU.java \
31.212 - sun/text/resources/FormatData_ga.java \
31.213 - sun/text/resources/FormatData_ga_IE.java \
31.214 - sun/text/resources/FormatData_hr.java \
31.215 - sun/text/resources/FormatData_hr_HR.java \
31.216 - sun/text/resources/FormatData_hu.java \
31.217 - sun/text/resources/FormatData_hu_HU.java \
31.218 - sun/text/resources/FormatData_in.java \
31.219 - sun/text/resources/FormatData_in_ID.java \
31.220 - sun/text/resources/FormatData_is.java \
31.221 - sun/text/resources/FormatData_is_IS.java \
31.222 - sun/text/resources/FormatData_it.java \
31.223 - sun/text/resources/FormatData_it_CH.java \
31.224 - sun/text/resources/FormatData_it_IT.java \
31.225 - sun/text/resources/FormatData_lt.java \
31.226 - sun/text/resources/FormatData_lt_LT.java \
31.227 - sun/text/resources/FormatData_lv.java \
31.228 - sun/text/resources/FormatData_lv_LV.java \
31.229 - sun/text/resources/FormatData_mk.java \
31.230 - sun/text/resources/FormatData_mk_MK.java \
31.231 - sun/text/resources/FormatData_ms.java \
31.232 - sun/text/resources/FormatData_ms_MY.java \
31.233 - sun/text/resources/FormatData_mt.java \
31.234 - sun/text/resources/FormatData_mt_MT.java \
31.235 - sun/text/resources/FormatData_nl.java \
31.236 - sun/text/resources/FormatData_nl_BE.java \
31.237 - sun/text/resources/FormatData_nl_NL.java \
31.238 - sun/text/resources/FormatData_no.java \
31.239 - sun/text/resources/FormatData_no_NO.java \
31.240 - sun/text/resources/FormatData_no_NO_NY.java \
31.241 - sun/text/resources/FormatData_pl.java \
31.242 - sun/text/resources/FormatData_pl_PL.java \
31.243 - sun/text/resources/FormatData_pt.java \
31.244 - sun/text/resources/FormatData_pt_BR.java \
31.245 - sun/text/resources/FormatData_pt_PT.java \
31.246 - sun/text/resources/FormatData_ro.java \
31.247 - sun/text/resources/FormatData_ro_RO.java \
31.248 - sun/text/resources/FormatData_ru.java \
31.249 - sun/text/resources/FormatData_ru_RU.java \
31.250 - sun/text/resources/FormatData_sk.java \
31.251 - sun/text/resources/FormatData_sk_SK.java \
31.252 - sun/text/resources/FormatData_sl.java \
31.253 - sun/text/resources/FormatData_sl_SI.java \
31.254 - sun/text/resources/FormatData_sq.java \
31.255 - sun/text/resources/FormatData_sq_AL.java \
31.256 - sun/text/resources/FormatData_sr.java \
31.257 - sun/text/resources/FormatData_sr_BA.java \
31.258 - sun/text/resources/FormatData_sr_CS.java \
31.259 - sun/text/resources/FormatData_sr_ME.java \
31.260 - sun/text/resources/FormatData_sr_RS.java \
31.261 - sun/text/resources/FormatData_sv.java \
31.262 - sun/text/resources/FormatData_sv_SE.java \
31.263 - sun/text/resources/FormatData_tr.java \
31.264 - sun/text/resources/FormatData_tr_TR.java \
31.265 - sun/text/resources/FormatData_uk.java \
31.266 - sun/text/resources/FormatData_uk_UA.java
32.1 --- a/make/java/text/Makefile Fri Feb 19 15:13:37 2010 -0800
32.2 +++ b/make/java/text/Makefile Tue Feb 23 10:17:16 2010 -0800
32.3 @@ -1,5 +1,5 @@
32.4 #
32.5 -# Copyright 1996-2006 Sun Microsystems, Inc. All Rights Reserved.
32.6 +# Copyright 2010 Sun Microsystems, Inc. All Rights Reserved.
32.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
32.8 #
32.9 # This code is free software; you can redistribute it and/or modify it
32.10 @@ -23,86 +23,19 @@
32.11 # have any questions.
32.12 #
32.13
32.14 +#
32.15 +# Makefile for building all of java.text
32.16 +#
32.17 +
32.18 BUILDDIR = ../..
32.19 -MODULE = base
32.20 -PACKAGE = java.text
32.21 PRODUCT = sun
32.22 -
32.23 include $(BUILDDIR)/common/Defs.gmk
32.24
32.25 -#
32.26 -# Files
32.27 -#
32.28 -include FILES_java.gmk
32.29 +SUBDIRS = base
32.30 +SUBDIRS_desktop = bidi
32.31
32.32 -#
32.33 -# Include
32.34 -#
32.35 -include $(BUILDDIR)/common/Classes.gmk
32.36 +include $(BUILDDIR)/common/Subdirs.gmk
32.37
32.38 -#
32.39 -# Rules to add data files BreakIterator
32.40 -#
32.41 -TEXT_CLASSES = $(BUILDTOOLCLASSDIR)/java.text/classes
32.42 +all build clean clobber::
32.43 + $(SUBDIRS-loop)
32.44
32.45 -# input
32.46 -#
32.47 -# Notes: sun.text.resources.BreakIteratorRules no longer goes to runtime.
32.48 -# They are used at JDK build phase in order to create $(BIFILES) which
32.49 -# are used on runtime instead.
32.50 -#
32.51 -TEXT_SRCDIR = $(SHARE_SRC)/classes/sun/text/resources
32.52 -TEXT_SOURCES = $(TEXT_SRCDIR)/BreakIteratorRules.java \
32.53 - $(TEXT_SRCDIR)/BreakIteratorInfo.java
32.54 -UNICODEDATA = $(BUILDDIR)/tools/UnicodeData
32.55 -
32.56 -# output
32.57 -TEXT_CLASSDIR = $(CLASSBINDIR)/sun/text/resources
32.58 -BIFILES = $(TEXT_CLASSDIR)/CharacterBreakIteratorData \
32.59 - $(TEXT_CLASSDIR)/WordBreakIteratorData \
32.60 - $(TEXT_CLASSDIR)/LineBreakIteratorData \
32.61 - $(TEXT_CLASSDIR)/SentenceBreakIteratorData
32.62 -
32.63 -ICU_FILES = $(TEXT_CLASSDIR)/unorm.icu \
32.64 - $(TEXT_CLASSDIR)/uprops.icu \
32.65 - $(TEXT_CLASSDIR)/ubidi.icu
32.66 -
32.67 -# builder
32.68 -GENERATEBREAKITERATORDATA_JARFILE = \
32.69 - $(BUILDTOOLJARDIR)/generatebreakiteratordata.jar
32.70 -
32.71 -$(BIFILES): $(GENERATEBREAKITERATORDATA_JARFILE) \
32.72 - $(UNICODEDATA)/UnicodeData.txt \
32.73 - $(TEXT_SOURCES)
32.74 - $(prep-target)
32.75 - $(RM) -r $(TEXT_CLASSES)
32.76 - $(MKDIR) -p $(TEXT_CLASSES)
32.77 - $(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \
32.78 - -sourcepath $(TEXT_SRCDIR) \
32.79 - $(TEXT_SOURCES)
32.80 - $(MKDIR) -p $(TEXT_CLASSDIR)
32.81 - $(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \
32.82 - -jar $(GENERATEBREAKITERATORDATA_JARFILE) \
32.83 - -o $(TEXT_CLASSDIR) \
32.84 - -spec $(UNICODEDATA)/UnicodeData.txt
32.85 - @$(java-vm-cleanup)
32.86 -
32.87 -build: $(BIFILES) $(ICU_FILES)
32.88 -
32.89 -#
32.90 -# Extra rules to copy unorm.icu, uprops.icu, and ubidi.icu
32.91 -#
32.92 -$(TEXT_CLASSDIR)/unorm.icu: $(TEXT_SRCDIR)/unorm.icu
32.93 - $(install-file)
32.94 -
32.95 -$(TEXT_CLASSDIR)/uprops.icu: $(TEXT_SRCDIR)/uprops.icu
32.96 - $(install-file)
32.97 -
32.98 -$(TEXT_CLASSDIR)/ubidi.icu: $(TEXT_SRCDIR)/ubidi.icu
32.99 - $(install-file)
32.100 -
32.101 -clean clobber::
32.102 - $(RM) -r $(TEXT_CLASSES)
32.103 - $(RM) -r $(BIFILES)
32.104 - $(RM) $(ICU_FILES)
32.105 -
33.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
33.2 +++ b/make/java/text/base/FILES_java.gmk Tue Feb 23 10:17:16 2010 -0800
33.3 @@ -0,0 +1,258 @@
33.4 +#
33.5 +# Copyright 1996-2007 Sun Microsystems, Inc. All Rights Reserved.
33.6 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
33.7 +#
33.8 +# This code is free software; you can redistribute it and/or modify it
33.9 +# under the terms of the GNU General Public License version 2 only, as
33.10 +# published by the Free Software Foundation. Sun designates this
33.11 +# particular file as subject to the "Classpath" exception as provided
33.12 +# by Sun in the LICENSE file that accompanied this code.
33.13 +#
33.14 +# This code is distributed in the hope that it will be useful, but WITHOUT
33.15 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
33.16 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
33.17 +# version 2 for more details (a copy is included in the LICENSE file that
33.18 +# accompanied this code).
33.19 +#
33.20 +# You should have received a copy of the GNU General Public License version
33.21 +# 2 along with this work; if not, write to the Free Software Foundation,
33.22 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
33.23 +#
33.24 +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
33.25 +# CA 95054 USA or visit www.sun.com if you need additional information or
33.26 +# have any questions.
33.27 +#
33.28 +
33.29 +FILES_java = \
33.30 + java/text/Annotation.java \
33.31 + java/text/AttributedCharacterIterator.java \
33.32 + java/text/AttributedString.java \
33.33 + java/text/BreakDictionary.java \
33.34 + java/text/BreakIterator.java \
33.35 + java/text/CharacterIterator.java \
33.36 + java/text/CharacterIteratorFieldDelegate.java \
33.37 + java/text/ChoiceFormat.java \
33.38 + java/text/Collator.java \
33.39 + java/text/CollationElementIterator.java \
33.40 + java/text/CollationKey.java \
33.41 + java/text/CollationRules.java \
33.42 + java/text/DateFormat.java \
33.43 + java/text/DateFormatSymbols.java \
33.44 + java/text/DecimalFormat.java \
33.45 + java/text/DictionaryBasedBreakIterator.java \
33.46 + java/text/DigitList.java \
33.47 + java/text/EntryPair.java \
33.48 + java/text/Format.java \
33.49 + java/text/FieldPosition.java \
33.50 + java/text/DontCareFieldPosition.java \
33.51 + java/text/MergeCollation.java \
33.52 + java/text/MessageFormat.java \
33.53 + java/text/Normalizer.java \
33.54 + java/text/NumberFormat.java \
33.55 + java/text/DecimalFormatSymbols.java \
33.56 + java/text/ParseException.java \
33.57 + java/text/ParsePosition.java \
33.58 + java/text/PatternEntry.java \
33.59 + java/text/RBCollationTables.java \
33.60 + java/text/RBTableBuilder.java \
33.61 + java/text/RuleBasedBreakIterator.java \
33.62 + java/text/RuleBasedCollator.java \
33.63 + java/text/RuleBasedCollationKey.java \
33.64 + java/text/SimpleDateFormat.java \
33.65 + java/text/StringCharacterIterator.java \
33.66 + java/text/spi/BreakIteratorProvider.java \
33.67 + java/text/spi/CollatorProvider.java \
33.68 + java/text/spi/DateFormatProvider.java \
33.69 + java/text/spi/DateFormatSymbolsProvider.java \
33.70 + java/text/spi/DecimalFormatSymbolsProvider.java \
33.71 + java/text/spi/NumberFormatProvider.java \
33.72 + sun/text/SupplementaryCharacterData.java \
33.73 + sun/text/CodePointIterator.java \
33.74 + sun/text/CollatorUtilities.java \
33.75 + sun/text/CompactByteArray.java \
33.76 + sun/text/ComposedCharIter.java \
33.77 + sun/text/IntHashtable.java \
33.78 + sun/text/Normalizer.java \
33.79 + sun/text/SupplementaryCharacterData.java \
33.80 + sun/text/UCompactIntArray.java \
33.81 + sun/text/normalizer/CharTrie.java \
33.82 + sun/text/normalizer/CharacterIteratorWrapper.java \
33.83 + sun/text/normalizer/ICUBinary.java \
33.84 + sun/text/normalizer/ICUData.java \
33.85 + sun/text/normalizer/IntTrie.java \
33.86 + sun/text/normalizer/NormalizerBase.java \
33.87 + sun/text/normalizer/NormalizerDataReader.java \
33.88 + sun/text/normalizer/NormalizerImpl.java \
33.89 + sun/text/normalizer/RangeValueIterator.java \
33.90 + sun/text/normalizer/Replaceable.java \
33.91 + sun/text/normalizer/ReplaceableString.java \
33.92 + sun/text/normalizer/ReplaceableUCharacterIterator.java \
33.93 + sun/text/normalizer/RuleCharacterIterator.java \
33.94 + sun/text/normalizer/SymbolTable.java \
33.95 + sun/text/normalizer/Trie.java \
33.96 + sun/text/normalizer/TrieIterator.java \
33.97 + sun/text/normalizer/UBiDiProps.java \
33.98 + sun/text/normalizer/UCharacter.java \
33.99 + sun/text/normalizer/UCharacterIterator.java \
33.100 + sun/text/normalizer/UCharacterProperty.java \
33.101 + sun/text/normalizer/UCharacterPropertyReader.java \
33.102 + sun/text/normalizer/UTF16.java \
33.103 + sun/text/normalizer/UnicodeMatcher.java \
33.104 + sun/text/normalizer/UnicodeSet.java \
33.105 + sun/text/normalizer/UnicodeSetIterator.java \
33.106 + sun/text/normalizer/Utility.java \
33.107 + sun/text/normalizer/VersionInfo.java \
33.108 + \
33.109 + sun/text/resources/BreakIteratorInfo.java \
33.110 + \
33.111 + sun/text/resources/CollationData.java \
33.112 + sun/text/resources/CollationData_be.java \
33.113 + sun/text/resources/CollationData_bg.java \
33.114 + sun/text/resources/CollationData_ca.java \
33.115 + sun/text/resources/CollationData_cs.java \
33.116 + sun/text/resources/CollationData_da.java \
33.117 + sun/text/resources/CollationData_de.java \
33.118 + sun/text/resources/CollationData_el.java \
33.119 + sun/text/resources/CollationData_en.java \
33.120 + sun/text/resources/CollationData_es.java \
33.121 + sun/text/resources/CollationData_et.java \
33.122 + sun/text/resources/CollationData_fi.java \
33.123 + sun/text/resources/CollationData_fr.java \
33.124 + sun/text/resources/CollationData_hr.java \
33.125 + sun/text/resources/CollationData_hu.java \
33.126 + sun/text/resources/CollationData_is.java \
33.127 + sun/text/resources/CollationData_it.java \
33.128 + sun/text/resources/CollationData_lt.java \
33.129 + sun/text/resources/CollationData_lv.java \
33.130 + sun/text/resources/CollationData_mk.java \
33.131 + sun/text/resources/CollationData_nl.java \
33.132 + sun/text/resources/CollationData_no.java \
33.133 + sun/text/resources/CollationData_pl.java \
33.134 + sun/text/resources/CollationData_pt.java \
33.135 + sun/text/resources/CollationData_ro.java \
33.136 + sun/text/resources/CollationData_ru.java \
33.137 + sun/text/resources/CollationData_sk.java \
33.138 + sun/text/resources/CollationData_sl.java \
33.139 + sun/text/resources/CollationData_sq.java \
33.140 + sun/text/resources/CollationData_sr.java \
33.141 + sun/text/resources/CollationData_sv.java \
33.142 + sun/text/resources/CollationData_tr.java \
33.143 + sun/text/resources/CollationData_uk.java \
33.144 + \
33.145 + sun/text/resources/FormatData.java \
33.146 + sun/text/resources/FormatData_be.java \
33.147 + sun/text/resources/FormatData_be_BY.java \
33.148 + sun/text/resources/FormatData_bg.java \
33.149 + sun/text/resources/FormatData_bg_BG.java \
33.150 + sun/text/resources/FormatData_ca.java \
33.151 + sun/text/resources/FormatData_ca_ES.java \
33.152 + sun/text/resources/FormatData_cs.java \
33.153 + sun/text/resources/FormatData_cs_CZ.java \
33.154 + sun/text/resources/FormatData_da.java \
33.155 + sun/text/resources/FormatData_da_DK.java \
33.156 + sun/text/resources/FormatData_de.java \
33.157 + sun/text/resources/FormatData_de_AT.java \
33.158 + sun/text/resources/FormatData_de_CH.java \
33.159 + sun/text/resources/FormatData_de_DE.java \
33.160 + sun/text/resources/FormatData_de_LU.java \
33.161 + sun/text/resources/FormatData_el.java \
33.162 + sun/text/resources/FormatData_el_CY.java \
33.163 + sun/text/resources/FormatData_el_GR.java \
33.164 + sun/text/resources/FormatData_en.java \
33.165 + sun/text/resources/FormatData_en_US.java \
33.166 + sun/text/resources/FormatData_en_AU.java \
33.167 + sun/text/resources/FormatData_en_CA.java \
33.168 + sun/text/resources/FormatData_en_GB.java \
33.169 + sun/text/resources/FormatData_en_IE.java \
33.170 + sun/text/resources/FormatData_en_IN.java \
33.171 + sun/text/resources/FormatData_en_MT.java \
33.172 + sun/text/resources/FormatData_en_NZ.java \
33.173 + sun/text/resources/FormatData_en_PH.java \
33.174 + sun/text/resources/FormatData_en_SG.java \
33.175 + sun/text/resources/FormatData_en_ZA.java \
33.176 + sun/text/resources/FormatData_es.java \
33.177 + sun/text/resources/FormatData_es_BO.java \
33.178 + sun/text/resources/FormatData_es_AR.java \
33.179 + sun/text/resources/FormatData_es_CL.java \
33.180 + sun/text/resources/FormatData_es_CO.java \
33.181 + sun/text/resources/FormatData_es_CR.java \
33.182 + sun/text/resources/FormatData_es_DO.java \
33.183 + sun/text/resources/FormatData_es_EC.java \
33.184 + sun/text/resources/FormatData_es_ES.java \
33.185 + sun/text/resources/FormatData_es_GT.java \
33.186 + sun/text/resources/FormatData_es_HN.java \
33.187 + sun/text/resources/FormatData_es_MX.java \
33.188 + sun/text/resources/FormatData_es_NI.java \
33.189 + sun/text/resources/FormatData_es_PA.java \
33.190 + sun/text/resources/FormatData_es_PE.java \
33.191 + sun/text/resources/FormatData_es_PR.java \
33.192 + sun/text/resources/FormatData_es_PY.java \
33.193 + sun/text/resources/FormatData_es_SV.java \
33.194 + sun/text/resources/FormatData_es_US.java \
33.195 + sun/text/resources/FormatData_es_UY.java \
33.196 + sun/text/resources/FormatData_es_VE.java \
33.197 + sun/text/resources/FormatData_et.java \
33.198 + sun/text/resources/FormatData_et_EE.java \
33.199 + sun/text/resources/FormatData_fi.java \
33.200 + sun/text/resources/FormatData_fi_FI.java \
33.201 + sun/text/resources/FormatData_fr.java \
33.202 + sun/text/resources/FormatData_fr_BE.java \
33.203 + sun/text/resources/FormatData_fr_CA.java \
33.204 + sun/text/resources/FormatData_fr_CH.java \
33.205 + sun/text/resources/FormatData_fr_FR.java \
33.206 + sun/text/resources/FormatData_fr_LU.java \
33.207 + sun/text/resources/FormatData_ga.java \
33.208 + sun/text/resources/FormatData_ga_IE.java \
33.209 + sun/text/resources/FormatData_hr.java \
33.210 + sun/text/resources/FormatData_hr_HR.java \
33.211 + sun/text/resources/FormatData_hu.java \
33.212 + sun/text/resources/FormatData_hu_HU.java \
33.213 + sun/text/resources/FormatData_in.java \
33.214 + sun/text/resources/FormatData_in_ID.java \
33.215 + sun/text/resources/FormatData_is.java \
33.216 + sun/text/resources/FormatData_is_IS.java \
33.217 + sun/text/resources/FormatData_it.java \
33.218 + sun/text/resources/FormatData_it_CH.java \
33.219 + sun/text/resources/FormatData_it_IT.java \
33.220 + sun/text/resources/FormatData_lt.java \
33.221 + sun/text/resources/FormatData_lt_LT.java \
33.222 + sun/text/resources/FormatData_lv.java \
33.223 + sun/text/resources/FormatData_lv_LV.java \
33.224 + sun/text/resources/FormatData_mk.java \
33.225 + sun/text/resources/FormatData_mk_MK.java \
33.226 + sun/text/resources/FormatData_ms.java \
33.227 + sun/text/resources/FormatData_ms_MY.java \
33.228 + sun/text/resources/FormatData_mt.java \
33.229 + sun/text/resources/FormatData_mt_MT.java \
33.230 + sun/text/resources/FormatData_nl.java \
33.231 + sun/text/resources/FormatData_nl_BE.java \
33.232 + sun/text/resources/FormatData_nl_NL.java \
33.233 + sun/text/resources/FormatData_no.java \
33.234 + sun/text/resources/FormatData_no_NO.java \
33.235 + sun/text/resources/FormatData_no_NO_NY.java \
33.236 + sun/text/resources/FormatData_pl.java \
33.237 + sun/text/resources/FormatData_pl_PL.java \
33.238 + sun/text/resources/FormatData_pt.java \
33.239 + sun/text/resources/FormatData_pt_BR.java \
33.240 + sun/text/resources/FormatData_pt_PT.java \
33.241 + sun/text/resources/FormatData_ro.java \
33.242 + sun/text/resources/FormatData_ro_RO.java \
33.243 + sun/text/resources/FormatData_ru.java \
33.244 + sun/text/resources/FormatData_ru_RU.java \
33.245 + sun/text/resources/FormatData_sk.java \
33.246 + sun/text/resources/FormatData_sk_SK.java \
33.247 + sun/text/resources/FormatData_sl.java \
33.248 + sun/text/resources/FormatData_sl_SI.java \
33.249 + sun/text/resources/FormatData_sq.java \
33.250 + sun/text/resources/FormatData_sq_AL.java \
33.251 + sun/text/resources/FormatData_sr.java \
33.252 + sun/text/resources/FormatData_sr_BA.java \
33.253 + sun/text/resources/FormatData_sr_CS.java \
33.254 + sun/text/resources/FormatData_sr_ME.java \
33.255 + sun/text/resources/FormatData_sr_RS.java \
33.256 + sun/text/resources/FormatData_sv.java \
33.257 + sun/text/resources/FormatData_sv_SE.java \
33.258 + sun/text/resources/FormatData_tr.java \
33.259 + sun/text/resources/FormatData_tr_TR.java \
33.260 + sun/text/resources/FormatData_uk.java \
33.261 + sun/text/resources/FormatData_uk_UA.java
34.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
34.2 +++ b/make/java/text/base/Makefile Tue Feb 23 10:17:16 2010 -0800
34.3 @@ -0,0 +1,108 @@
34.4 +#
34.5 +# Copyright 1996-2006 Sun Microsystems, Inc. All Rights Reserved.
34.6 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
34.7 +#
34.8 +# This code is free software; you can redistribute it and/or modify it
34.9 +# under the terms of the GNU General Public License version 2 only, as
34.10 +# published by the Free Software Foundation. Sun designates this
34.11 +# particular file as subject to the "Classpath" exception as provided
34.12 +# by Sun in the LICENSE file that accompanied this code.
34.13 +#
34.14 +# This code is distributed in the hope that it will be useful, but WITHOUT
34.15 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
34.16 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
34.17 +# version 2 for more details (a copy is included in the LICENSE file that
34.18 +# accompanied this code).
34.19 +#
34.20 +# You should have received a copy of the GNU General Public License version
34.21 +# 2 along with this work; if not, write to the Free Software Foundation,
34.22 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
34.23 +#
34.24 +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
34.25 +# CA 95054 USA or visit www.sun.com if you need additional information or
34.26 +# have any questions.
34.27 +#
34.28 +
34.29 +BUILDDIR = ../../..
34.30 +MODULE = base
34.31 +PACKAGE = java.text
34.32 +PRODUCT = sun
34.33 +
34.34 +include $(BUILDDIR)/common/Defs.gmk
34.35 +
34.36 +#
34.37 +# Files
34.38 +#
34.39 +include FILES_java.gmk
34.40 +
34.41 +#
34.42 +# Include
34.43 +#
34.44 +include $(BUILDDIR)/common/Classes.gmk
34.45 +
34.46 +#
34.47 +# Rules to add data files BreakIterator
34.48 +#
34.49 +TEXT_CLASSES = $(BUILDTOOLCLASSDIR)/java.text/classes
34.50 +
34.51 +# input
34.52 +#
34.53 +# Notes: sun.text.resources.BreakIteratorRules no longer goes to runtime.
34.54 +# They are used at JDK build phase in order to create $(BIFILES) which
34.55 +# are used on runtime instead.
34.56 +#
34.57 +TEXT_SRCDIR = $(SHARE_SRC)/classes/sun/text/resources
34.58 +TEXT_SOURCES = $(TEXT_SRCDIR)/BreakIteratorRules.java \
34.59 + $(TEXT_SRCDIR)/BreakIteratorInfo.java
34.60 +UNICODEDATA = $(BUILDDIR)/tools/UnicodeData
34.61 +
34.62 +# output
34.63 +TEXT_CLASSDIR = $(CLASSBINDIR)/sun/text/resources
34.64 +BIFILES = $(TEXT_CLASSDIR)/CharacterBreakIteratorData \
34.65 + $(TEXT_CLASSDIR)/WordBreakIteratorData \
34.66 + $(TEXT_CLASSDIR)/LineBreakIteratorData \
34.67 + $(TEXT_CLASSDIR)/SentenceBreakIteratorData
34.68 +
34.69 +ICU_FILES = $(TEXT_CLASSDIR)/unorm.icu \
34.70 + $(TEXT_CLASSDIR)/uprops.icu \
34.71 + $(TEXT_CLASSDIR)/ubidi.icu
34.72 +
34.73 +# builder
34.74 +GENERATEBREAKITERATORDATA_JARFILE = \
34.75 + $(BUILDTOOLJARDIR)/generatebreakiteratordata.jar
34.76 +
34.77 +$(BIFILES): $(GENERATEBREAKITERATORDATA_JARFILE) \
34.78 + $(UNICODEDATA)/UnicodeData.txt \
34.79 + $(TEXT_SOURCES)
34.80 + $(prep-target)
34.81 + $(RM) -r $(TEXT_CLASSES)
34.82 + $(MKDIR) -p $(TEXT_CLASSES)
34.83 + $(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \
34.84 + -sourcepath $(TEXT_SRCDIR) \
34.85 + $(TEXT_SOURCES)
34.86 + $(MKDIR) -p $(TEXT_CLASSDIR)
34.87 + $(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \
34.88 + -jar $(GENERATEBREAKITERATORDATA_JARFILE) \
34.89 + -o $(TEXT_CLASSDIR) \
34.90 + -spec $(UNICODEDATA)/UnicodeData.txt
34.91 + @$(java-vm-cleanup)
34.92 +
34.93 +build: $(BIFILES) $(ICU_FILES)
34.94 +
34.95 +#
34.96 +# Extra rules to copy unorm.icu, uprops.icu, and ubidi.icu
34.97 +#
34.98 +$(TEXT_CLASSDIR)/unorm.icu: $(TEXT_SRCDIR)/unorm.icu
34.99 + $(install-file)
34.100 +
34.101 +$(TEXT_CLASSDIR)/uprops.icu: $(TEXT_SRCDIR)/uprops.icu
34.102 + $(install-file)
34.103 +
34.104 +$(TEXT_CLASSDIR)/ubidi.icu: $(TEXT_SRCDIR)/ubidi.icu
34.105 + $(install-file)
34.106 +
34.107 +clean clobber::
34.108 + $(RM) -r $(TEXT_CLASSES)
34.109 + $(RM) -r $(BIFILES)
34.110 + $(RM) $(ICU_FILES)
34.111 +
35.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
35.2 +++ b/make/java/text/bidi/Makefile Tue Feb 23 10:17:16 2010 -0800
35.3 @@ -0,0 +1,44 @@
35.4 +#
35.5 +# Copyright 2010 Sun Microsystems, Inc. All Rights Reserved.
35.6 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
35.7 +#
35.8 +# This code is free software; you can redistribute it and/or modify it
35.9 +# under the terms of the GNU General Public License version 2 only, as
35.10 +# published by the Free Software Foundation. Sun designates this
35.11 +# particular file as subject to the "Classpath" exception as provided
35.12 +# by Sun in the LICENSE file that accompanied this code.
35.13 +#
35.14 +# This code is distributed in the hope that it will be useful, but WITHOUT
35.15 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
35.16 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
35.17 +# version 2 for more details (a copy is included in the LICENSE file that
35.18 +# accompanied this code).
35.19 +#
35.20 +# You should have received a copy of the GNU General Public License version
35.21 +# 2 along with this work; if not, write to the Free Software Foundation,
35.22 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
35.23 +#
35.24 +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
35.25 +# CA 95054 USA or visit www.sun.com if you need additional information or
35.26 +# have any questions.
35.27 +#
35.28 +
35.29 +BUILDDIR = ../../..
35.30 +PACKAGE = java.text
35.31 +PRODUCT = sun
35.32 +include $(BUILDDIR)/common/Defs.gmk
35.33 +
35.34 +#
35.35 +# Files for Bidi that is not in the base module
35.36 +#
35.37 +FILES_java = \
35.38 + java/text/Bidi.java \
35.39 + sun/text/bidi/BidiBase.java \
35.40 + sun/text/bidi/BidiLine.java \
35.41 + sun/text/bidi/BidiRun.java \
35.42 + sun/text/CodePointIterator.java
35.43 +
35.44 +#
35.45 +# Include
35.46 +#
35.47 +include $(BUILDDIR)/common/Classes.gmk
36.1 --- a/make/javax/Makefile Fri Feb 19 15:13:37 2010 -0800
36.2 +++ b/make/javax/Makefile Tue Feb 23 10:17:16 2010 -0800
36.3 @@ -30,19 +30,24 @@
36.4 BUILDDIR = ..
36.5 include $(BUILDDIR)/common/Defs.gmk
36.6
36.7 +SUBDIRS = others
36.8 +
36.9 +SUBDIRS_management = management
36.10 +
36.11 +SUBDIRS_misc = \
36.12 + crypto \
36.13 + sql \
36.14 + rmi
36.15 +
36.16 # imageio uses xml, so build it last
36.17 +SUBDIRS_desktop = \
36.18 + accessibility \
36.19 + print \
36.20 + swing \
36.21 + sound \
36.22 + imageio
36.23
36.24 -SUBDIRS = \
36.25 - others \
36.26 - accessibility \
36.27 - print \
36.28 - swing \
36.29 - crypto \
36.30 - sound \
36.31 - sql \
36.32 - rmi \
36.33 - management \
36.34 - imageio
36.35 +include $(BUILDDIR)/common/Subdirs.gmk
36.36
36.37 all build:
36.38 $(SUBDIRS-loop)
37.1 --- a/make/javax/rmi/Makefile Fri Feb 19 15:13:37 2010 -0800
37.2 +++ b/make/javax/rmi/Makefile Tue Feb 23 10:17:16 2010 -0800
37.3 @@ -31,6 +31,8 @@
37.4 include $(BUILDDIR)/common/Defs.gmk
37.5
37.6 SUBDIRS = ssl
37.7 +include $(BUILDDIR)/common/Subdirs.gmk
37.8 +
37.9 all build clean clobber::
37.10 $(SUBDIRS-loop)
37.11
38.1 --- a/make/javax/sound/Makefile Fri Feb 19 15:13:37 2010 -0800
38.2 +++ b/make/javax/sound/Makefile Tue Feb 23 10:17:16 2010 -0800
38.3 @@ -159,6 +159,7 @@
38.4 # Include rules
38.5 #
38.6 include $(BUILDDIR)/common/Library.gmk
38.7 +include $(BUILDDIR)/common/Subdirs.gmk
38.8
38.9 #
38.10 # Rules that copy files.
39.1 --- a/make/javax/swing/Makefile Fri Feb 19 15:13:37 2010 -0800
39.2 +++ b/make/javax/swing/Makefile Tue Feb 23 10:17:16 2010 -0800
39.3 @@ -40,6 +40,7 @@
39.4 SUBDIRS = html32dtd plaf
39.5
39.6 include $(BUILDDIR)/common/Classes.gmk
39.7 +include $(BUILDDIR)/common/Subdirs.gmk
39.8
39.9 build: other_files
39.10 $(SUBDIRS-loop)
40.1 --- a/make/jpda/Makefile Fri Feb 19 15:13:37 2010 -0800
40.2 +++ b/make/jpda/Makefile Tue Feb 23 10:17:16 2010 -0800
40.3 @@ -35,6 +35,7 @@
40.4 # Core.
40.5 #
40.6 SUBDIRS = jdwp back front transport expr tty bdi gui
40.7 +include $(BUILDDIR)/common/Subdirs.gmk
40.8
40.9 all build clean clobber::
40.10 $(SUBDIRS-loop)
41.1 --- a/make/jpda/transport/Makefile Fri Feb 19 15:13:37 2010 -0800
41.2 +++ b/make/jpda/transport/Makefile Tue Feb 23 10:17:16 2010 -0800
41.3 @@ -36,6 +36,8 @@
41.4 ifeq ($(PLATFORM), windows)
41.5 SUBDIRS += shmem
41.6 endif # PLATFORM
41.7 +
41.8 +include $(BUILDDIR)/common/Subdirs.gmk
41.9 all build clean clobber::
41.10 $(SUBDIRS-loop)
41.11
42.1 --- a/make/mkdemo/Makefile Fri Feb 19 15:13:37 2010 -0800
42.2 +++ b/make/mkdemo/Makefile Tue Feb 23 10:17:16 2010 -0800
42.3 @@ -31,7 +31,13 @@
42.4 PRODUCT = demos
42.5 include $(BUILDDIR)/common/Defs.gmk
42.6
42.7 -SUBDIRS = applets jfc jvmti management jni scripting jpda
42.8 +SUBDIRS = jni
42.9 +SUBDIRS_desktop = applets jfc
42.10 +SUBDIRS_management = management
42.11 +SUBDIRS_misc = scripting
42.12 +SUBDIRS_tools = jpda jvmti
42.13 +
42.14 +include $(BUILDDIR)/common/Subdirs.gmk
42.15
42.16 all build:: nbproject
42.17 $(SUBDIRS-loop)
43.1 --- a/make/mkdemo/applets/Makefile Fri Feb 19 15:13:37 2010 -0800
43.2 +++ b/make/mkdemo/applets/Makefile Tue Feb 23 10:17:16 2010 -0800
43.3 @@ -40,6 +40,7 @@
43.4
43.5 SUBDIRS_MAKEFLAGS += DEMO_IS_APPLET=true
43.6
43.7 +include $(BUILDDIR)/common/Subdirs.gmk
43.8 all build clean clobber::
43.9 $(SUBDIRS-loop)
43.10
44.1 --- a/make/mkdemo/jfc/Makefile Fri Feb 19 15:13:37 2010 -0800
44.2 +++ b/make/mkdemo/jfc/Makefile Tue Feb 23 10:17:16 2010 -0800
44.3 @@ -46,6 +46,7 @@
44.4 SUBDIRS += Java2D SwingSet2 Stylepad
44.5 endif
44.6
44.7 +include $(BUILDDIR)/common/Subdirs.gmk
44.8 all build clean clobber::
44.9 $(SUBDIRS-loop)
44.10
45.1 --- a/make/mkdemo/jni/Makefile Fri Feb 19 15:13:37 2010 -0800
45.2 +++ b/make/mkdemo/jni/Makefile Tue Feb 23 10:17:16 2010 -0800
45.3 @@ -37,6 +37,8 @@
45.4 SUBDIRS += Poller
45.5 endif
45.6
45.7 +include $(BUILDDIR)/common/Subdirs.gmk
45.8 +
45.9 all build clean clobber::
45.10 $(SUBDIRS-loop)
45.11
46.1 --- a/make/mkdemo/jvmti/Makefile Fri Feb 19 15:13:37 2010 -0800
46.2 +++ b/make/mkdemo/jvmti/Makefile Tue Feb 23 10:17:16 2010 -0800
46.3 @@ -48,6 +48,8 @@
46.4 waiters \
46.5 hprof
46.6
46.7 +include $(BUILDDIR)/common/Subdirs.gmk
46.8 +
46.9 all build clean clobber::
46.10 $(SUBDIRS-loop)
46.11
47.1 --- a/make/mkdemo/management/Makefile Fri Feb 19 15:13:37 2010 -0800
47.2 +++ b/make/mkdemo/management/Makefile Tue Feb 23 10:17:16 2010 -0800
47.3 @@ -38,6 +38,8 @@
47.4 MemoryMonitor \
47.5 JTop
47.6
47.7 +include $(BUILDDIR)/common/Subdirs.gmk
47.8 +
47.9 all build clean clobber::
47.10 $(SUBDIRS-loop)
47.11
48.1 --- a/make/mkdemo/scripting/Makefile Fri Feb 19 15:13:37 2010 -0800
48.2 +++ b/make/mkdemo/scripting/Makefile Tue Feb 23 10:17:16 2010 -0800
48.3 @@ -32,6 +32,7 @@
48.4 include $(BUILDDIR)/common/Defs.gmk
48.5
48.6 SUBDIRS = jconsole-plugin
48.7 +include $(BUILDDIR)/common/Subdirs.gmk
48.8
48.9 all build clean clobber::
48.10 $(SUBDIRS-loop)
49.1 --- a/make/mksample/Makefile Fri Feb 19 15:13:37 2010 -0800
49.2 +++ b/make/mksample/Makefile Tue Feb 23 10:17:16 2010 -0800
49.3 @@ -37,13 +37,18 @@
49.4 WEBSERVICES_SUBDIR = webservices
49.5 endif
49.6
49.7 -SUBDIRS = nio jmx scripting $(WEBSERVICES_SUBDIR) nbproject
49.8 +SUBDIRS =
49.9 +SUBDIRS_misc = nio scripting nbproject
49.10 +SUBDIRS_enterprise = $(WEBSERVICES_SUBDIR)
49.11 +SUBDIRS_management = jmx
49.12
49.13 # include dtrace samples in Solaris builds
49.14 ifeq ($(PLATFORM), solaris)
49.15 SUBDIRS += dtrace
49.16 endif
49.17
49.18 +include $(BUILDDIR)/common/Subdirs.gmk
49.19 +
49.20 all build clean clobber::
49.21 $(SUBDIRS-loop)
49.22
50.1 --- a/make/mksample/jmx/Makefile Fri Feb 19 15:13:37 2010 -0800
50.2 +++ b/make/mksample/jmx/Makefile Tue Feb 23 10:17:16 2010 -0800
50.3 @@ -32,6 +32,8 @@
50.4 include $(BUILDDIR)/common/Defs.gmk
50.5
50.6 SUBDIRS = jmx-scandir
50.7 +include $(BUILDDIR)/common/Subdirs.gmk
50.8 +
50.9 all build clean clobber::
50.10 $(SUBDIRS-loop)
50.11
51.1 --- a/make/mksample/nio/Makefile Fri Feb 19 15:13:37 2010 -0800
51.2 +++ b/make/mksample/nio/Makefile Tue Feb 23 10:17:16 2010 -0800
51.3 @@ -32,6 +32,8 @@
51.4 include $(BUILDDIR)/common/Defs.gmk
51.5
51.6 SUBDIRS = file multicast server
51.7 +include $(BUILDDIR)/common/Subdirs.gmk
51.8 +
51.9 all build clean clobber::
51.10 $(SUBDIRS-loop)
51.11
52.1 --- a/make/mksample/scripting/Makefile Fri Feb 19 15:13:37 2010 -0800
52.2 +++ b/make/mksample/scripting/Makefile Tue Feb 23 10:17:16 2010 -0800
52.3 @@ -32,6 +32,8 @@
52.4 include $(BUILDDIR)/common/Defs.gmk
52.5
52.6 SUBDIRS = scriptpad
52.7 +include $(BUILDDIR)/common/Subdirs.gmk
52.8 +
52.9 all build clean clobber::
52.10 $(SUBDIRS-loop)
52.11
53.1 --- a/make/mksample/webservices/Makefile Fri Feb 19 15:13:37 2010 -0800
53.2 +++ b/make/mksample/webservices/Makefile Tue Feb 23 10:17:16 2010 -0800
53.3 @@ -32,6 +32,7 @@
53.4 include $(BUILDDIR)/common/Defs.gmk
53.5
53.6 SUBDIRS = EbayClient EbayServer
53.7 +include $(BUILDDIR)/common/Subdirs.gmk
53.8
53.9 all build clean clobber::
53.10 $(SUBDIRS-loop)
54.1 --- a/make/org/Makefile Fri Feb 19 15:13:37 2010 -0800
54.2 +++ b/make/org/Makefile Tue Feb 23 10:17:16 2010 -0800
54.3 @@ -32,6 +32,7 @@
54.4 include $(BUILDDIR)/common/Defs.gmk
54.5
54.6 SUBDIRS = ietf jcp
54.7 +include $(BUILDDIR)/common/Subdirs.gmk
54.8
54.9 all build clean clobber::
54.10 $(SUBDIRS-loop)
55.1 --- a/make/org/ietf/Makefile Fri Feb 19 15:13:37 2010 -0800
55.2 +++ b/make/org/ietf/Makefile Tue Feb 23 10:17:16 2010 -0800
55.3 @@ -31,6 +31,8 @@
55.4 include $(BUILDDIR)/common/Defs.gmk
55.5
55.6 SUBDIRS = jgss
55.7 +include $(BUILDDIR)/common/Subdirs.gmk
55.8 +
55.9 all build clean clobber::
55.10 $(SUBDIRS-loop)
55.11
56.1 --- a/make/sun/Makefile Fri Feb 19 15:13:37 2010 -0800
56.2 +++ b/make/sun/Makefile Tue Feb 23 10:17:16 2010 -0800
56.3 @@ -58,13 +58,18 @@
56.4 else
56.5 RENDER_SUBDIR = dcpr
56.6 endif
56.7 +
56.8 # nio need to be compiled before awt to have all charsets ready
56.9 -SUBDIRS = jar security javazic misc jkernel net audio $(RENDER_SUBDIR) image \
56.10 - nio awt splashscreen $(XAWT_SUBDIR) \
56.11 - $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \
56.12 - font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \
56.13 - jawt text launcher management $(ORG_SUBDIR) \
56.14 - native2ascii serialver tools jconsole tracing
56.15 +SUBDIRS = jar security javazic misc net nio text launcher
56.16 +SUBDIRS_desktop = audio $(RENDER_SUBDIR) image \
56.17 + awt splashscreen $(XAWT_SUBDIR) \
56.18 + $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \
56.19 + jawt font jpeg cmm applet beans
56.20 +SUBDIRS_management = management
56.21 +SUBDIRS_misc = jkernel $(ORG_SUBDIR) \
56.22 + rmi $(JDBC_SUBDIR) tracing
56.23 +SUBDIRS_tools = native2ascii serialver tools jconsole
56.24 +include $(BUILDDIR)/common/Subdirs.gmk
56.25
56.26 all build clean clobber::
56.27 $(SUBDIRS-loop)
57.1 --- a/make/sun/cmm/Makefile Fri Feb 19 15:13:37 2010 -0800
57.2 +++ b/make/sun/cmm/Makefile Tue Feb 23 10:17:16 2010 -0800
57.3 @@ -36,6 +36,8 @@
57.4 ICCPROFILE_SRC_DIR = $(CLOSED_SRC)/share/lib/cmm/kcms
57.5 endif # OPENJDK
57.6
57.7 +include $(BUILDDIR)/common/Subdirs.gmk
57.8 +
57.9 #
57.10 # ICC Profiles used by the CMM.
57.11 #
58.1 --- a/make/sun/image/Makefile Fri Feb 19 15:13:37 2010 -0800
58.2 +++ b/make/sun/image/Makefile Tue Feb 23 10:17:16 2010 -0800
58.3 @@ -43,6 +43,8 @@
58.4 endif
58.5 endif
58.6
58.7 +include $(BUILDDIR)/common/Subdirs.gmk
58.8 +
58.9 all build clean clobber::
58.10 $(SUBDIRS-loop)
58.11
59.1 --- a/make/sun/management/Makefile Fri Feb 19 15:13:37 2010 -0800
59.2 +++ b/make/sun/management/Makefile Tue Feb 23 10:17:16 2010 -0800
59.3 @@ -47,6 +47,8 @@
59.4 endif
59.5 SUBDIRS += jmxremote
59.6
59.7 +include $(BUILDDIR)/common/Subdirs.gmk
59.8 +
59.9 all build clean clobber::
59.10 $(SUBDIRS-loop)
59.11
60.1 --- a/make/sun/net/Makefile Fri Feb 19 15:13:37 2010 -0800
60.2 +++ b/make/sun/net/Makefile Tue Feb 23 10:17:16 2010 -0800
60.3 @@ -29,6 +29,8 @@
60.4 include $(BUILDDIR)/common/Defs.gmk
60.5
60.6 SUBDIRS = others spi
60.7 +include $(BUILDDIR)/common/Subdirs.gmk
60.8 +
60.9 all build clean clobber::
60.10 $(SUBDIRS-loop)
60.11
61.1 --- a/make/sun/net/spi/Makefile Fri Feb 19 15:13:37 2010 -0800
61.2 +++ b/make/sun/net/spi/Makefile Tue Feb 23 10:17:16 2010 -0800
61.3 @@ -26,7 +26,9 @@
61.4 BUILDDIR = ../../..
61.5 include $(BUILDDIR)/common/Defs.gmk
61.6
61.7 -SUBDIRS = nameservice
61.8 +SUBDIRS_misc = nameservice
61.9 +include $(BUILDDIR)/common/Subdirs.gmk
61.10 +
61.11 all build clean clobber::
61.12 $(SUBDIRS-loop)
61.13
62.1 --- a/make/sun/net/spi/nameservice/Makefile Fri Feb 19 15:13:37 2010 -0800
62.2 +++ b/make/sun/net/spi/nameservice/Makefile Tue Feb 23 10:17:16 2010 -0800
62.3 @@ -27,6 +27,8 @@
62.4 include $(BUILDDIR)/common/Defs.gmk
62.5
62.6 SUBDIRS = dns
62.7 +include $(BUILDDIR)/common/Subdirs.gmk
62.8 +
62.9 all build clean clobber::
62.10 $(SUBDIRS-loop)
62.11
63.1 --- a/make/sun/nio/Makefile Fri Feb 19 15:13:37 2010 -0800
63.2 +++ b/make/sun/nio/Makefile Tue Feb 23 10:17:16 2010 -0800
63.3 @@ -29,6 +29,8 @@
63.4 include $(BUILDDIR)/common/Defs.gmk
63.5
63.6 SUBDIRS = cs
63.7 +include $(BUILDDIR)/common/Subdirs.gmk
63.8 +
63.9 all build clean clobber::
63.10 $(SUBDIRS-loop)
63.11
64.1 --- a/make/sun/org/Makefile Fri Feb 19 15:13:37 2010 -0800
64.2 +++ b/make/sun/org/Makefile Tue Feb 23 10:17:16 2010 -0800
64.3 @@ -32,6 +32,8 @@
64.4 include $(BUILDDIR)/common/Defs.gmk
64.5
64.6 SUBDIRS = mozilla
64.7 +include $(BUILDDIR)/common/Subdirs.gmk
64.8 +
64.9 all build clean clobber::
64.10 $(SUBDIRS-loop)
64.11
65.1 --- a/make/sun/org/mozilla/Makefile Fri Feb 19 15:13:37 2010 -0800
65.2 +++ b/make/sun/org/mozilla/Makefile Tue Feb 23 10:17:16 2010 -0800
65.3 @@ -32,6 +32,8 @@
65.4 include $(BUILDDIR)/common/Defs.gmk
65.5
65.6 SUBDIRS = javascript
65.7 +include $(BUILDDIR)/common/Subdirs.gmk
65.8 +
65.9 all build clean clobber::
65.10 $(SUBDIRS-loop)
65.11
66.1 --- a/make/sun/rmi/Makefile Fri Feb 19 15:13:37 2010 -0800
66.2 +++ b/make/sun/rmi/Makefile Tue Feb 23 10:17:16 2010 -0800
66.3 @@ -43,6 +43,8 @@
66.4 SUBDIRS += cgi
66.5 endif # PLATFORM
66.6
66.7 +include $(BUILDDIR)/common/Subdirs.gmk
66.8 +
66.9 # Then do the rest
66.10 all build clean clobber ::
66.11 $(SUBDIRS-loop)
67.1 --- a/make/sun/security/Makefile Fri Feb 19 15:13:37 2010 -0800
67.2 +++ b/make/sun/security/Makefile Tue Feb 23 10:17:16 2010 -0800
67.3 @@ -67,8 +67,10 @@
67.4 INTREE_EC =
67.5 endif
67.6
67.7 -SUBDIRS = $(INTREE_EC) other action util tools jgss krb5 smartcardio \
67.8 - $(PKCS11) $(JGSS_WRAPPER) $(MSCAPI)
67.9 +SUBDIRS = $(INTREE_EC) other action util krb5
67.10 +SUBDIRS_misc = jgss $(PKCS11) $(JGSS_WRAPPER) $(MSCAPI) smartcardio
67.11 +SUBDIRS_tools = tools
67.12 +include $(BUILDDIR)/common/Subdirs.gmk
67.13
67.14 all build clean clobber::
67.15 $(SUBDIRS-loop)
68.1 --- a/make/sun/tracing/Makefile Fri Feb 19 15:13:37 2010 -0800
68.2 +++ b/make/sun/tracing/Makefile Tue Feb 23 10:17:16 2010 -0800
68.3 @@ -33,6 +33,8 @@
68.4 include $(BUILDDIR)/common/Defs.gmk
68.5
68.6 SUBDIRS = dtrace
68.7 +include $(BUILDDIR)/common/Subdirs.gmk
68.8 +
68.9 all build:
68.10 $(SUBDIRS-loop)
68.11 clean clobber::
69.1 --- a/make/tools/Makefile Fri Feb 19 15:13:37 2010 -0800
69.2 +++ b/make/tools/Makefile Tue Feb 23 10:17:16 2010 -0800
69.3 @@ -56,6 +56,8 @@
69.4 SUBDIRS += generate_nimbus
69.5 endif
69.6
69.7 +include $(BUILDDIR)/common/Subdirs.gmk
69.8 +
69.9 all build clean clobber::
69.10 $(SUBDIRS-loop)
69.11
70.1 --- a/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java Fri Feb 19 15:13:37 2010 -0800
70.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java Tue Feb 23 10:17:16 2010 -0800
70.3 @@ -27,7 +27,6 @@
70.4
70.5 import java.io.*;
70.6 import java.util.*;
70.7 -import java.util.logging.Level;
70.8 import com.sun.java.util.jar.pack.Package.Class;
70.9 import com.sun.java.util.jar.pack.Package.File;
70.10 import com.sun.java.util.jar.pack.Package.InnerClass;
70.11 @@ -162,7 +161,7 @@
70.12
70.13 ok = true;
70.14 } catch (Exception ee) {
70.15 - Utils.log.log(Level.WARNING, "Error on input: "+ee, ee);
70.16 + Utils.log.warning("Error on input: "+ee, ee);
70.17 if (verbose > 0)
70.18 Utils.log.info("Stream offsets:"+
70.19 " served="+in.getBytesServed()+
71.1 --- a/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java Fri Feb 19 15:13:37 2010 -0800
71.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java Tue Feb 23 10:17:16 2010 -0800
71.3 @@ -27,7 +27,6 @@
71.4
71.5 import java.io.*;
71.6 import java.util.*;
71.7 -import java.util.logging.Level;
71.8 import com.sun.java.util.jar.pack.Package.Class;
71.9 import com.sun.java.util.jar.pack.Package.File;
71.10 import com.sun.java.util.jar.pack.Package.InnerClass;
71.11 @@ -84,7 +83,7 @@
71.12
71.13 ok = true;
71.14 } catch (Exception ee) {
71.15 - Utils.log.log(Level.WARNING, "Error on output: "+ee, ee);
71.16 + Utils.log.warning("Error on output: "+ee, ee);
71.17 //if (verbose > 0) ee.printStackTrace();
71.18 // Write partial output only if we are verbose.
71.19 if (verbose > 0) finalOut.close();
72.1 --- a/src/share/classes/com/sun/java/util/jar/pack/Utils.java Fri Feb 19 15:13:37 2010 -0800
72.2 +++ b/src/share/classes/com/sun/java/util/jar/pack/Utils.java Tue Feb 23 10:17:16 2010 -0800
72.3 @@ -28,9 +28,10 @@
72.4 import java.util.*;
72.5 import java.util.jar.*;
72.6 import java.util.zip.*;
72.7 -import java.util.logging.*;
72.8 import java.io.*;
72.9
72.10 +import sun.util.logging.PlatformLogger;
72.11 +
72.12 class Utils {
72.13 static final String COM_PREFIX = "com.sun.java.util.jar.pack.";
72.14 static final String METAINF = "META-INF";
72.15 @@ -130,31 +131,53 @@
72.16 = Boolean.getBoolean(Utils.COM_PREFIX+"nolog");
72.17
72.18
72.19 - static final Logger log
72.20 - = new Logger("java.util.jar.Pack200", null) {
72.21 - public void log(LogRecord record) {
72.22 - int verbose = currentPropMap().getInteger(DEBUG_VERBOSE);
72.23 - if (verbose > 0) {
72.24 - if (nolog &&
72.25 - record.getLevel().intValue() < Level.WARNING.intValue()) {
72.26 - System.out.println(record.getMessage());
72.27 - } else {
72.28 - super.log(record);
72.29 - }
72.30 + static class Pack200Logger {
72.31 + private final String name;
72.32 + private PlatformLogger log;
72.33 + Pack200Logger(String name) {
72.34 + this.name = name;
72.35 + }
72.36 +
72.37 + private synchronized PlatformLogger getLogger() {
72.38 + if (log == null) {
72.39 + log = PlatformLogger.getLogger(name);
72.40 + }
72.41 + return log;
72.42 + }
72.43 +
72.44 + public void warning(String msg, Object param) {
72.45 + int verbose = currentPropMap().getInteger(DEBUG_VERBOSE);
72.46 + if (verbose > 0) {
72.47 + getLogger().warning(msg, param);
72.48 + }
72.49 + }
72.50 +
72.51 + public void warning(String msg) {
72.52 + warning(msg, null);
72.53 + }
72.54 +
72.55 + public void info(String msg) {
72.56 + int verbose = currentPropMap().getInteger(DEBUG_VERBOSE);
72.57 + if (verbose > 0) {
72.58 + if (nolog) {
72.59 + System.out.println(msg);
72.60 + } else {
72.61 + getLogger().info(msg);
72.62 }
72.63 }
72.64 + }
72.65
72.66 - public void fine(String msg) {
72.67 - int verbose = currentPropMap().getInteger(DEBUG_VERBOSE);
72.68 - if (verbose > 0) {
72.69 - System.out.println(msg);
72.70 - }
72.71 + public void fine(String msg) {
72.72 + int verbose = currentPropMap().getInteger(DEBUG_VERBOSE);
72.73 + if (verbose > 0) {
72.74 + System.out.println(msg);
72.75 }
72.76 - };
72.77 - static {
72.78 - LogManager.getLogManager().addLogger(log);
72.79 + }
72.80 }
72.81
72.82 + static final Pack200Logger log
72.83 + = new Pack200Logger("java.util.jar.Pack200");
72.84 +
72.85 // Returns the Max Version String of this implementation
72.86 static String getVersionString() {
72.87 return "Pack200, Vendor: Sun Microsystems, Version: " +
73.1 --- a/src/share/classes/sun/management/Flag.java Fri Feb 19 15:13:37 2010 -0800
73.2 +++ b/src/share/classes/sun/management/Flag.java Tue Feb 23 10:17:16 2010 -0800
73.3 @@ -68,27 +68,42 @@
73.4 }
73.5
73.6 static Flag getFlag(String name) {
73.7 - Flag[] fs = new Flag[1];
73.8 String[] names = new String[1];
73.9 names[0] = name;
73.10 - int count = getFlags(names, fs, 1);
73.11 - if (count == 1) {
73.12 - return fs[0];
73.13 +
73.14 + List<Flag> flags = getFlags(names, 1);
73.15 + if (flags.isEmpty()) {
73.16 + return null;
73.17 } else {
73.18 - return null;
73.19 + // flags should have only one element
73.20 + return flags.get(0);
73.21 }
73.22 }
73.23
73.24 static List<Flag> getAllFlags() {
73.25 int numFlags = getInternalFlagCount();
73.26 - Flag[] fs = new Flag[numFlags];
73.27
73.28 // Get all internal flags with names = null
73.29 - int count = getFlags(null, fs, numFlags);
73.30 - return Arrays.asList(fs);
73.31 + return getFlags(null, numFlags);
73.32 + }
73.33 +
73.34 + private static List<Flag> getFlags(String[] names, int numFlags) {
73.35 + Flag[] flags = new Flag[numFlags];
73.36 + int count = getFlags(names, flags, numFlags);
73.37 +
73.38 + List<Flag> result = new ArrayList<Flag>();
73.39 + for (Flag f : flags) {
73.40 + if (f != null) {
73.41 + result.add(f);
73.42 + }
73.43 + }
73.44 + return result;
73.45 }
73.46
73.47 private static native String[] getAllFlagNames();
73.48 + // getFlags sets each element in the given flags array
73.49 + // with a Flag object only if the name is valid and the
73.50 + // type is supported. The flags array may contain null elements.
73.51 private static native int getFlags(String[] names, Flag[] flags, int count);
73.52 private static native int getInternalFlagCount();
73.53
74.1 --- a/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java Fri Feb 19 15:13:37 2010 -0800
74.2 +++ b/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java Tue Feb 23 10:17:16 2010 -0800
74.3 @@ -111,7 +111,7 @@
74.4 * at the same time, then all but the first will block until
74.5 * the first completes its authentication.
74.6 */
74.7 - static private HashMap requests = new HashMap ();
74.8 + static private HashMap<String,Thread> requests = new HashMap<>();
74.9
74.10 /* check if a request for this destination is in progress
74.11 * return false immediately if not. Otherwise block until
74.12 @@ -125,7 +125,7 @@
74.13 synchronized (requests) {
74.14 Thread t, c;
74.15 c = Thread.currentThread();
74.16 - if ((t=(Thread)requests.get(key))==null) {
74.17 + if ((t = requests.get(key)) == null) {
74.18 requests.put (key, c);
74.19 return false;
74.20 }
74.21 @@ -147,8 +147,11 @@
74.22 */
74.23 static private void requestCompleted (String key) {
74.24 synchronized (requests) {
74.25 - boolean waspresent = requests.remove (key) != null;
74.26 - assert waspresent;
74.27 + Thread thread = requests.get(key);
74.28 + if (thread != null && thread == Thread.currentThread()) {
74.29 + boolean waspresent = requests.remove(key) != null;
74.30 + assert waspresent;
74.31 + }
74.32 requests.notifyAll();
74.33 }
74.34 }
75.1 --- a/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java Fri Feb 19 15:13:37 2010 -0800
75.2 +++ b/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java Tue Feb 23 10:17:16 2010 -0800
75.3 @@ -423,7 +423,7 @@
75.4
75.5 // Try keep-alive only on first attempt
75.6 if (!failedOnce && http.getHttpKeepAliveSet()) {
75.7 - if (http.usingProxy) {
75.8 + if (http.usingProxy && tunnelState() != TunnelState.TUNNELING) {
75.9 requests.setIfNotSet("Proxy-Connection", "keep-alive");
75.10 } else {
75.11 requests.setIfNotSet("Connection", "keep-alive");
76.1 --- a/src/share/classes/sun/security/tools/KeyTool.java Fri Feb 19 15:13:37 2010 -0800
76.2 +++ b/src/share/classes/sun/security/tools/KeyTool.java Tue Feb 23 10:17:16 2010 -0800
76.3 @@ -151,7 +151,7 @@
76.4
76.5 enum Command {
76.6 CERTREQ("Generates a certificate request",
76.7 - ALIAS, SIGALG, FILEOUT, KEYPASS, KEYSTORE,
76.8 + ALIAS, SIGALG, FILEOUT, KEYPASS, KEYSTORE, DNAME,
76.9 STOREPASS, STORETYPE, PROVIDERNAME, PROVIDERCLASS,
76.10 PROVIDERARG, PROVIDERPATH, V, PROTECTED),
76.11 CHANGEALIAS("Changes an entry's alias",
76.12 @@ -167,7 +167,7 @@
76.13 STORETYPE, PROVIDERNAME, PROVIDERCLASS, PROVIDERARG,
76.14 PROVIDERPATH, V, PROTECTED),
76.15 GENKEYPAIR("Generates a key pair",
76.16 - ALIAS, KEYALG, KEYSIZE, SIGALG, DESTALIAS,
76.17 + ALIAS, KEYALG, KEYSIZE, SIGALG, DESTALIAS, DNAME,
76.18 STARTDATE, EXT, VALIDITY, KEYPASS, KEYSTORE,
76.19 STOREPASS, STORETYPE, PROVIDERNAME, PROVIDERCLASS,
76.20 PROVIDERARG, PROVIDERPATH, V, PROTECTED),
76.21 @@ -176,7 +176,7 @@
76.22 STOREPASS, STORETYPE, PROVIDERNAME, PROVIDERCLASS,
76.23 PROVIDERARG, PROVIDERPATH, V, PROTECTED),
76.24 GENCERT("Generates certificate from a certificate request",
76.25 - RFC, INFILE, OUTFILE, ALIAS, SIGALG,
76.26 + RFC, INFILE, OUTFILE, ALIAS, SIGALG, DNAME,
76.27 STARTDATE, EXT, VALIDITY, KEYPASS, KEYSTORE,
76.28 STOREPASS, STORETYPE, PROVIDERNAME, PROVIDERCLASS,
76.29 PROVIDERARG, PROVIDERPATH, V, PROTECTED),
77.1 --- a/src/share/native/sun/management/Flag.c Fri Feb 19 15:13:37 2010 -0800
77.2 +++ b/src/share/native/sun/management/Flag.c Tue Feb 23 10:17:16 2010 -0800
77.3 @@ -84,6 +84,7 @@
77.4
77.5 jint num_flags, i, index;
77.6 jmmVMGlobal* globals;
77.7 + size_t gsize;
77.8 const char* class_name = "sun/management/Flag";
77.9 const char* signature = "(Ljava/lang/String;Ljava/lang/Object;ZZLcom/sun/management/VMOption$Origin;)V";
77.10 jobject origin;
77.11 @@ -100,12 +101,14 @@
77.12 return 0;
77.13 }
77.14
77.15 - globals = (jmmVMGlobal*) malloc(count * sizeof(jmmVMGlobal));
77.16 + gsize = count * sizeof(jmmVMGlobal);
77.17 + globals = (jmmVMGlobal*) malloc(gsize);
77.18 if (globals == NULL) {
77.19 JNU_ThrowOutOfMemoryError(env, 0);
77.20 return 0;
77.21 }
77.22
77.23 + memset(globals, 0, gsize);
77.24 num_flags = jmm_interface->GetVMGlobals(env, names, globals, count);
77.25 if (num_flags == 0) {
77.26 free(globals);
78.1 --- a/src/solaris/native/sun/net/spi/DefaultProxySelector.c Fri Feb 19 15:13:37 2010 -0800
78.2 +++ b/src/solaris/native/sun/net/spi/DefaultProxySelector.c Tue Feb 23 10:17:16 2010 -0800
78.3 @@ -44,6 +44,7 @@
78.4 * The GConf-2 settings used are:
78.5 * - /system/http_proxy/use_http_proxy boolean
78.6 * - /system/http_proxy/use_authentcation boolean
78.7 + * - /system/http_proxy/use_same_proxy boolean
78.8 * - /system/http_proxy/host string
78.9 * - /system/http_proxy/authentication_user string
78.10 * - /system/http_proxy/authentication_password string
78.11 @@ -158,6 +159,7 @@
78.12 char *mode = NULL;
78.13 int pport = 0;
78.14 int use_proxy;
78.15 + int use_same_proxy = 0;
78.16 const char* urlhost;
78.17 jobject isa = NULL;
78.18 jobject proxy = NULL;
78.19 @@ -179,6 +181,15 @@
78.20 * entries.
78.21 */
78.22
78.23 + use_same_proxy = (*my_get_bool_func)(gconf_client, "/system/http_proxy/use_same_proxy", NULL);
78.24 + if (use_same_proxy) {
78.25 + use_proxy = (*my_get_bool_func)(gconf_client, "/system/http_proxy/use_http_proxy", NULL);
78.26 + if (use_proxy) {
78.27 + phost = (*my_get_string_func)(gconf_client, "/system/http_proxy/host", NULL);
78.28 + pport = (*my_get_int_func)(gconf_client, "/system/http_proxy/port", NULL);
78.29 + }
78.30 + }
78.31 +
78.32 /**
78.33 * HTTP:
78.34 * /system/http_proxy/use_http_proxy (boolean)
78.35 @@ -188,8 +199,10 @@
78.36 if (strcasecmp(cproto, "http") == 0) {
78.37 use_proxy = (*my_get_bool_func)(gconf_client, "/system/http_proxy/use_http_proxy", NULL);
78.38 if (use_proxy) {
78.39 - phost = (*my_get_string_func)(gconf_client, "/system/http_proxy/host", NULL);
78.40 - pport = (*my_get_int_func)(gconf_client, "/system/http_proxy/port", NULL);
78.41 + if (!use_same_proxy) {
78.42 + phost = (*my_get_string_func)(gconf_client, "/system/http_proxy/host", NULL);
78.43 + pport = (*my_get_int_func)(gconf_client, "/system/http_proxy/port", NULL);
78.44 + }
78.45 CHECK_NULL(type_proxy = (*env)->GetStaticObjectField(env, ptype_class, ptype_httpID));
78.46 }
78.47 }
78.48 @@ -203,8 +216,10 @@
78.49 if (strcasecmp(cproto, "https") == 0) {
78.50 mode = (*my_get_string_func)(gconf_client, "/system/proxy/mode", NULL);
78.51 if (mode != NULL && (strcasecmp(mode,"manual") == 0)) {
78.52 - phost = (*my_get_string_func)(gconf_client, "/system/proxy/secure_host", NULL);
78.53 - pport = (*my_get_int_func)(gconf_client, "/system/proxy/secure_port", NULL);
78.54 + if (!use_same_proxy) {
78.55 + phost = (*my_get_string_func)(gconf_client, "/system/proxy/secure_host", NULL);
78.56 + pport = (*my_get_int_func)(gconf_client, "/system/proxy/secure_port", NULL);
78.57 + }
78.58 use_proxy = (phost != NULL);
78.59 if (use_proxy)
78.60 type_proxy = (*env)->GetStaticObjectField(env, ptype_class, ptype_httpID);
78.61 @@ -220,8 +235,10 @@
78.62 if (strcasecmp(cproto, "ftp") == 0) {
78.63 mode = (*my_get_string_func)(gconf_client, "/system/proxy/mode", NULL);
78.64 if (mode != NULL && (strcasecmp(mode,"manual") == 0)) {
78.65 - phost = (*my_get_string_func)(gconf_client, "/system/proxy/ftp_host", NULL);
78.66 - pport = (*my_get_int_func)(gconf_client, "/system/proxy/ftp_port", NULL);
78.67 + if (!use_same_proxy) {
78.68 + phost = (*my_get_string_func)(gconf_client, "/system/proxy/ftp_host", NULL);
78.69 + pport = (*my_get_int_func)(gconf_client, "/system/proxy/ftp_port", NULL);
78.70 + }
78.71 use_proxy = (phost != NULL);
78.72 if (use_proxy)
78.73 type_proxy = (*env)->GetStaticObjectField(env, ptype_class, ptype_httpID);
78.74 @@ -237,8 +254,10 @@
78.75 if (strcasecmp(cproto, "gopher") == 0) {
78.76 mode = (*my_get_string_func)(gconf_client, "/system/proxy/mode", NULL);
78.77 if (mode != NULL && (strcasecmp(mode,"manual") == 0)) {
78.78 - phost = (*my_get_string_func)(gconf_client, "/system/proxy/gopher_host", NULL);
78.79 - pport = (*my_get_int_func)(gconf_client, "/system/proxy/gopher_port", NULL);
78.80 + if (!use_same_proxy) {
78.81 + phost = (*my_get_string_func)(gconf_client, "/system/proxy/gopher_host", NULL);
78.82 + pport = (*my_get_int_func)(gconf_client, "/system/proxy/gopher_port", NULL);
78.83 + }
78.84 use_proxy = (phost != NULL);
78.85 if (use_proxy)
78.86 type_proxy = (*env)->GetStaticObjectField(env, ptype_class, ptype_httpID);
78.87 @@ -254,8 +273,10 @@
78.88 if (strcasecmp(cproto, "socks") == 0) {
78.89 mode = (*my_get_string_func)(gconf_client, "/system/proxy/mode", NULL);
78.90 if (mode != NULL && (strcasecmp(mode,"manual") == 0)) {
78.91 - phost = (*my_get_string_func)(gconf_client, "/system/proxy/socks_host", NULL);
78.92 - pport = (*my_get_int_func)(gconf_client, "/system/proxy/socks_port", NULL);
78.93 + if (!use_same_proxy) {
78.94 + phost = (*my_get_string_func)(gconf_client, "/system/proxy/socks_host", NULL);
78.95 + pport = (*my_get_int_func)(gconf_client, "/system/proxy/socks_port", NULL);
78.96 + }
78.97 use_proxy = (phost != NULL);
78.98 if (use_proxy)
78.99 type_proxy = (*env)->GetStaticObjectField(env, ptype_class, ptype_socksID);
79.1 --- a/test/ProblemList.txt Fri Feb 19 15:13:37 2010 -0800
79.2 +++ b/test/ProblemList.txt Tue Feb 23 10:17:16 2010 -0800
79.3 @@ -692,7 +692,6 @@
79.4 java/net/URLConnection/ZeroContentLength.java generic-all
79.5
79.6 # Solaris 11 i586 fails with samevm, not sure why
79.7 -java/net/Authenticator/B4769350.java generic-all
79.8 java/net/HttpURLConnection/HttpResponseCode.java generic-all
79.9 java/net/ResponseCache/B6181108.java generic-all
79.10 java/net/ResponseCache/ResponseCacheTest.java generic-all
80.1 --- a/test/java/net/Authenticator/B4769350.java Fri Feb 19 15:13:37 2010 -0800
80.2 +++ b/test/java/net/Authenticator/B4769350.java Tue Feb 23 10:17:16 2010 -0800
80.3 @@ -26,9 +26,12 @@
80.4 * @bug 4769350
80.5 * @library ../../../sun/net/www/httptest/
80.6 * @build HttpCallback HttpServer ClosedChannelList HttpTransaction AbstractCallback
80.7 - * @run main B4769350 server
80.8 - * @run main B4769350 proxy
80.9 + * @run main/othervm B4769350 server
80.10 + * @run main/othervm B4769350 proxy
80.11 * @summary proxy authentication username and password caching only works in serial case
80.12 + * Run in othervm since the test sets system properties that are read by the
80.13 + * networking stack and cached when the HTTP handler is invoked, and previous
80.14 + * tests may already have invoked the HTTP handler.
80.15 */
80.16
80.17 import java.io.*;
81.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
81.2 +++ b/test/java/net/ProxySelector/SystemProxies.java Tue Feb 23 10:17:16 2010 -0800
81.3 @@ -0,0 +1,61 @@
81.4 +/*
81.5 + * Copyright 2010 Sun Microsystems, Inc. All Rights Reserved.
81.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
81.7 + *
81.8 + * This code is free software; you can redistribute it and/or modify it
81.9 + * under the terms of the GNU General Public License version 2 only, as
81.10 + * published by the Free Software Foundation.
81.11 + *
81.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
81.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
81.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
81.15 + * version 2 for more details (a copy is included in the LICENSE file that
81.16 + * accompanied this code).
81.17 + *
81.18 + * You should have received a copy of the GNU General Public License version
81.19 + * 2 along with this work; if not, write to the Free Software Foundation,
81.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
81.21 + *
81.22 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
81.23 + * CA 95054 USA or visit www.sun.com if you need additional information or
81.24 + * have any questions.
81.25 + */
81.26 +
81.27 +/*
81.28 + * This is a manual test to determine the proxies set on the system for various
81.29 + * protocols. See bug 6912868.
81.30 + */
81.31 +import java.net.Proxy;
81.32 +import java.net.ProxySelector;
81.33 +import java.net.URI;
81.34 +import java.net.URISyntaxException;
81.35 +import java.util.List;
81.36 +
81.37 +public class SystemProxies {
81.38 +
81.39 + static final String uriAuthority = "myMachine/";
81.40 + static final ProxySelector proxySel = ProxySelector.getDefault();
81.41 +
81.42 + public static void main(String[] args) {
81.43 + if (! "true".equals(System.getProperty("java.net.useSystemProxies"))) {
81.44 + System.out.println("Usage: java -Djava.net.useSystemProxies SystemProxies");
81.45 + return;
81.46 + }
81.47 +
81.48 + printProxies("http://");
81.49 + printProxies("https://");
81.50 + printProxies("ftp://");
81.51 + }
81.52 +
81.53 + static void printProxies(String proto) {
81.54 + String uriStr = proto + uriAuthority;
81.55 + try {
81.56 + List<Proxy> proxies = proxySel.select(new URI(uriStr));
81.57 + System.out.println("Proxies returned for " + uriStr);
81.58 + for (Proxy proxy : proxies)
81.59 + System.out.println("\t" + proxy);
81.60 + } catch (URISyntaxException e) {
81.61 + System.err.println(e);
81.62 + }
81.63 + }
81.64 +}