Mercurial > hg > release > icedtea8-forest-3.0 > jaxws
changeset 183:c60879e3b8dd
Merge
author | andrew |
---|---|
date | Tue, 14 Sep 2010 11:37:15 +0100 |
parents | 1eb8299c11fc (current diff) 4f626e0d70bd (diff) |
children | f3444af18aff |
files | .hgtags |
diffstat | 2 files changed, 7 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Sep 08 13:45:58 2010 +0100 +++ b/.hgtags Tue Sep 14 11:37:15 2010 +0100 @@ -84,3 +84,4 @@ 39eb4f3031f4a985664cace00fca3bd1eab1e0aa jdk7-b105 bc45ccc5bcca6cbe4ea433e279d4a93b06ab38c6 jdk7-b106 017612ea6af417a5e378619704da01bb3a583bdb jdk7-b107 +b1ca39340238a239ba6d8489ad5315215e1366ca jdk7-b108
--- a/make/jprt.properties Wed Sep 08 13:45:58 2010 +0100 +++ b/make/jprt.properties Tue Sep 14 11:37:15 2010 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2010, 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 @@ -24,31 +24,13 @@ # # Properties for jprt -jprt.tools.default.release=jdk1.7.0 -# Specific platform list -jprt.build.platforms=\ -solaris_sparc_5.10,\ -solaris_sparcv9_5.10,\ -solaris_i586_5.10,\ -solaris_x64_5.10,\ -linux_i586_2.6,\ -linux_x64_2.6,\ -windows_i586_5.0,\ -windows_x64_5.2 +# Use whatever release that the submitted job requests +jprt.tools.default.release=${jprt.submit.release} -# The different build flavors we want +# The different build flavors we want, we override here so we just get these 2 jprt.build.flavors=product,fastdebug -# Explicitly designate what the 32bit match is for the 64bit build -jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.10 -jprt.solaris_sparcv9_5.10.build.platform.match32=solaris_sparc_5.10 -jprt.solaris_x64.build.platform.match32=solaris_i586_5.10 -jprt.solaris_x64_5.10.build.platform.match32=solaris_i586_5.10 +# Directories to be excluded from the source bundles +jprt.bundle.exclude.src.dirs=build dist webrev -# Standard list of jprt test targets for this workspace -jprt.test.targets= - -# Directories needing to exclude from source bundles -jprt.bundle.exclude.src.dirs=build dist -