Mercurial > hg > openjdk > jigsaw
changeset 449:405b7e1ee804
Merge
| author | michaelm |
|---|---|
| date | Tue, 03 Apr 2012 23:44:51 +0100 |
| parents | 51c793afb1eb (current diff) 42f275168fa5 (diff) |
| children | abe87caf9f47 |
| files | .hgtags make/jprt.properties |
| diffstat | 6 files changed, 257 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Mon Jan 30 21:10:41 2012 -0800 +++ b/.hgignore Tue Apr 03 23:44:51 2012 +0100 @@ -3,3 +3,4 @@ /nbproject/private/ ^webrev ^.hgtip +.DS_Store
--- a/.hgtags Mon Jan 30 21:10:41 2012 -0800 +++ b/.hgtags Tue Apr 03 23:44:51 2012 +0100 @@ -151,3 +151,12 @@ cc771d92284f71765eca14d6d08703c4af254c04 jdk8-b21 7ad075c809952e355d25030605da6af30456ed74 jdk8-b22 60d6f64a86b1e511169d264727f6d51415978df0 jdk8-b23 +1a5f1d6b98d6827cdb529a4abe6e52a886d944f4 jdk8-b24 +221a378e06a326f45e5d89e2123cd6323e0181d1 jdk8-b25 +2accafff224ae39caf5f532c305251ba624bf2c0 jdk8-b26 +1533dfab9903e4edcfead3b0192643f38c418b9b jdk8-b27 +6e2541d60f4e342b5b67140271d7611643929dc3 jdk8-b28 +41460de042580bc4a4ce3f863779c66f39cb8578 jdk8-b29 +6cea54809b51db92979c22fd8aa8fcb1cb13d12e jdk8-b30 +0b66f43b89a6c0ac1c15d7ec51992c541cdc9089 jdk8-b31 +88176171e940f02916a312c265a34c32552a8376 jdk8-b32
--- a/make/Defs-internal.gmk Mon Jan 30 21:10:41 2012 -0800 +++ b/make/Defs-internal.gmk Tue Apr 03 23:44:51 2012 +0100 @@ -79,7 +79,7 @@ # Find all build_time_* files and print their contents in a list sorted # on the name of the sub repository. define ReportBuildTimes -$(PRINTF) "-- Build times ----------\nTarget %s\nStart %s\nEnd %s\n%s\n%s\n-------------------------\n" \ +$(PRINTF) -- "-- Build times ----------\nTarget %s\nStart %s\nEnd %s\n%s\n%s\n-------------------------\n" \ $1 \ "`$(CAT) $(BUILDTIMESDIR)/build_time_start_TOTAL_human_readable`" \ "`$(CAT) $(BUILDTIMESDIR)/build_time_end_TOTAL_human_readable`" \
--- a/make/jprt.properties Mon Jan 30 21:10:41 2012 -0800 +++ b/make/jprt.properties Tue Apr 03 23:44:51 2012 +0100 @@ -39,6 +39,7 @@ solaris_x64_5.10-{product|fastdebug}, \ linux_i586_2.6-{product|fastdebug}, \ linux_x64_2.6-{product|fastdebug}, \ + macosx_x64_10.7-{product|fastdebug}, \ windows_i586_5.1-{product|fastdebug}, \ windows_x64_5.2-{product|fastdebug} @@ -53,6 +54,7 @@ solaris_x64_5.10-product-c2-TESTNAME, \ linux_i586_2.6-product-{c1|c2}-TESTNAME, \ linux_x64_2.6-product-c2-TESTNAME, \ + macosx_x64_10.7-product-c2-TESTNAME, \ windows_i586_5.1-product-c1-TESTNAME, \ windows_x64_5.2-product-c2-TESTNAME @@ -63,20 +65,36 @@ # Default jdk test targets (testset=default) jprt.make.rule.default.test.targets= \ - ${jprt.my.test.target.set:TESTNAME=langtools_jtreg}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_beans1}, \ + ${jprt.my.test.target.set:TESTNAME=langtools_jtreg}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_lang}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_math} + +# Default vm test targets (testset=core) +jprt.vm.core.test.targets= \ + ${jprt.vm.default.test.targets} + +# Core jdk test targets (testset=core) +jprt.make.rule.core.test.targets= \ + ${jprt.make.rule.default.test.targets}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_util}, \ ${jprt.my.test.target.set:TESTNAME=jdk_io}, \ ${jprt.my.test.target.set:TESTNAME=jdk_jigsaw}, \ ${jprt.my.test.target.set:TESTNAME=jdk_lang}, \ ${jprt.my.test.target.set:TESTNAME=jdk_math}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_misc}, \ ${jprt.my.test.target.set:TESTNAME=jdk_net}, \ ${jprt.my.test.target.set:TESTNAME=jdk_nio1}, \ ${jprt.my.test.target.set:TESTNAME=jdk_nio2}, \ ${jprt.my.test.target.set:TESTNAME=jdk_nio3}, \ ${jprt.my.test.target.set:TESTNAME=jdk_security1}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_security2}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_security3}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_rmi}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_management1}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_management2}, \ ${jprt.my.test.target.set:TESTNAME=jdk_text}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_util} + ${jprt.my.test.target.set:TESTNAME=jdk_tools1}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_tools2}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_misc} # All vm test targets (testset=all) jprt.vm.all.test.targets= \ @@ -86,19 +104,13 @@ # All jdk test targets (testset=all) jprt.make.rule.all.test.targets= \ - ${jprt.make.rule.default.test.targets}, \ + ${jprt.make.rule.core.test.targets}, \ ${jprt.my.test.target.set:TESTNAME=jdk_awt}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_beans1}, \ ${jprt.my.test.target.set:TESTNAME=jdk_beans2}, \ ${jprt.my.test.target.set:TESTNAME=jdk_beans3}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_management1}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_management2}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_rmi}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_security2}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_security3}, \ ${jprt.my.test.target.set:TESTNAME=jdk_sound}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_swing}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_tools1}, \ - ${jprt.my.test.target.set:TESTNAME=jdk_tools2} + ${jprt.my.test.target.set:TESTNAME=jdk_swing} # JCK test targets in test/Makefile (no windows) jprt.my.jck.test.target.set= \
--- a/make/sanity-rules.gmk Mon Jan 30 21:10:41 2012 -0800 +++ b/make/sanity-rules.gmk Tue Apr 03 23:44:51 2012 +0100 @@ -38,7 +38,7 @@ endif ifeq ($(BUILD_JDK), true) - sanity:: jdk-sanity + sanity:: jdk-sanity endif # Only need these sanity rules when not doing a debug build @@ -64,7 +64,7 @@ purge-sanity: $(ERROR_FILE) $(WARNING_FILE) $(MESSAGE_FILE) -@$(RM) $(ERROR_FILE) $(WARNING_FILE) $(MESSAGE_FILE) -pre-sanity: purge-sanity +pre-sanity: purge-sanity # this should be the last rule in any target's sanity rule. post-sanity post-sanity-hotspot post-sanity-jdk post-sanity-install post-sanity-deploy: @@ -132,7 +132,7 @@ " $* defined. Please unset it and restart your build. \n" \ "" >> $(ERROR_FILE) -# Check the environment variables +# Check the environment variables environment: $(DO_NOT_SET_LIST:%=%.do_not_set) ifeq ($(LANGTOOLS_SRC_AVAILABLE), true) ifneq ($(BUILD_LANGTOOLS), true) @@ -205,7 +205,15 @@ endif endif ifeq ($(GENERATE_DOCS),false) - @$(ECHO) "WARNING: This build does not include running javadoc.\n" \ + @$(ECHO) "WARNING: This build does not include generating javadoc.\n" \ + "" >> $(WARNING_FILE) +endif +ifdef NO_DEMOS + @$(ECHO) "WARNING: This build and any install images will not include demos.\n" \ + "" >> $(WARNING_FILE) +endif +ifdef NO_SAMPLES + @$(ECHO) "WARNING: This build and any install images will not include samples.\n" \ "" >> $(WARNING_FILE) endif ifdef NO_IMAGES @@ -231,7 +239,7 @@ HOSTNAME := $(shell hostname) endif endif -settings:: +settings:: @$(ECHO) "Build Machine Information:" >> $(MESSAGE_FILE) ifeq ($(PLATFORM), windows) @$(ECHO) " build machine = $(COMPUTERNAME)" >> $(MESSAGE_FILE)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/scripts/normalizer.pl Tue Apr 03 23:44:51 2012 +0100 @@ -0,0 +1,208 @@ +#!/usr/bin/perl + +# +# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +# +# Parses java files: +# 1. Removes from the end of lines spaces and TABs +# 2. Replaces TABs by spaces +# 3. Replaces all NewLine separators by Unix NewLine separators +# 4. Makes one and only one empty line at the end of each file + +if ($#ARGV < 0) { + &usage; + + die; +} + +use Cwd 'abs_path'; + +my @extensions = ("java"); + +# Read options +my $dirpos = 0; + +while ($dirpos < $#ARGV) { + if ($ARGV[$dirpos] eq "-e") { + @extensions = split(/,/, $ARGV[$dirpos + 1]); + } else { + last; + } + + $dirpos += 2; +} + +if ($dirpos > $#ARGV) { + &usage; + + die; +} + +use Cwd; +my $currdir = getcwd; + +my $allfiles = 0; + +my $filecount = 0; + +my @tabvalues; + +# Init tabvalues +push (@tabvalues, " "); + +for (my $i = 1; $i < 8; $i++) { + push(@tabvalues, $tabvalues[$i - 1] . " "); +} + +open(FILELIST, ">$currdir/filelist") or die "Failed while open $currdir/filelist: $!\n"; + +while ($dirpos <= $#ARGV) { + use File::Find; + + find(\&parse_file, abs_path($ARGV[$dirpos])); + + $dirpos += 1; +} + +close(FILELIST); + +use Cwd 'chdir'; +chdir $currdir; + +print "Checked $allfiles file(s)\n"; +print "Modified $filecount file(s)\n"; +print "See results in the file $currdir/filelist\n"; + +sub parse_file { + my $filename = $File::Find::name; + + # Skip directories + return if -d; + + # Skip SCCS files + return if ($filename =~ /\/SCCS\//); + + # Skip files with invalid extensions + my $accepted = 0; + foreach my $ext (@extensions) { + if ($_ =~ /\.$ext$/i) { + $accepted = 1; + + last; + } + } + return if ($accepted == 0); + + use File::Basename; + my $dirname = dirname($filename); + + use Cwd 'chdir'; + chdir $dirname; + + open(FILE, $filename) or die "Failed while open $filename: $!\n"; + + # Read file + my @content; + my $line; + my $emptylinescount = 0; + my $modified = 0; + + while ($line = <FILE>) { + my $originalline = $line; + + # Process line + + # Remove from the end of the line spaces and return character + while ($line =~ /\s$/) { + chop($line); + } + + # Replace TABs + for (my $i = 0; $i < length($line); $i++) { + if (substr($line, $i, 1) =~ /\t/) { + $line = substr($line, 0, $i) . $tabvalues[7 - ($i % 8)] . substr($line, $i + 1); + } + } + + if (length($line) == 0) { + $emptylinescount++; + } else { + while ($emptylinescount > 0) { + push(@content, ""); + + $emptylinescount--; + } + + push(@content, $line); + } + + if ($originalline ne ($line . "\n")) { + $modified = 1; + } + + } + + $allfiles++; + + if ($emptylinescount > 0) { + $modified = 1; + } + + close(FILE); + + if ($modified != 0) { + # Write file + open(FILE, ">$filename") or die "Failed while open $filename: $!\n"; + + for (my $i = 0; $i <= $#content; $i++) { + print FILE "$content[$i]\n"; + } + + close(FILE); + + # Print name from current dir + if (index($filename, $currdir) == 0) { + print FILELIST substr($filename, length($currdir) + 1); + } else { + print FILELIST $filename; + } + print FILELIST "\n"; + + $filecount++; + + print "$filename: modified\n"; + } +} + +sub usage { + print "Usage:\n"; + print " normalizer.pl [-options] <dir> [dir2 dir3 ...]\n"; + print " Available options:\n"; + print " -e comma separated files extensions. By default accepts only java files\n"; + print "\n"; + print "Examples:\n"; + print " normalizer.pl -e c,cpp,h,hpp .\n"; +} + +