stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8009429: Miscellaneous profiles cleanup

Browse Source 
Reviewed-by: jjg, alanb
This commit is contained in:
David Holmes 2013-03-14 01:45:44 -04:00
parent 82210b98a8
commit 52954e063d
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
langtools/src/share/classes/com/sun/tools/javac/sym/Profiles.java
View File

@ -149,12 +149,13 @@ public abstract class Profiles {
} }
final static Map<String, Package> packages = new TreeMap<String, Package>(); final static Map<String, Package> packages = new TreeMap<String, Package>();
int maxProfile;
final int maxProfile = 4; // Three compact profiles plus full JRE
MakefileProfiles(Properties p) { MakefileProfiles(Properties p) {
int profile = 1; for (int profile = 1; profile <= maxProfile; profile++) {
while (true) { String prefix = (profile < maxProfile ? "PROFILE_" + profile : "FULL_JRE");
String inclPackages = p.getProperty("PROFILE_" + profile + "_RTJAR_INCLUDE_PACKAGES"); String inclPackages = p.getProperty(prefix + "_RTJAR_INCLUDE_PACKAGES");
if (inclPackages == null) if (inclPackages == null)
break; break;
for (String pkg: inclPackages.substring(1).trim().split("\\s+")) { for (String pkg: inclPackages.substring(1).trim().split("\\s+")) {
@ -162,22 +163,20 @@ public abstract class Profiles {
pkg = pkg.substring(0, pkg.length() - 1); pkg = pkg.substring(0, pkg.length() - 1);
includePackage(profile, pkg); includePackage(profile, pkg);
} }
String inclTypes = p.getProperty("PROFILE_" + profile + "_RTJAR_INCLUDE_TYPES"); String inclTypes = p.getProperty(prefix + "_RTJAR_INCLUDE_TYPES");
if (inclTypes != null) { if (inclTypes != null) {
for (String type: inclTypes.replace("$$", "$").split("\\s+")) { for (String type: inclTypes.replace("$$", "$").split("\\s+")) {
if (type.endsWith(".class")) if (type.endsWith(".class"))
includeType(profile, type.substring(0, type.length() - 6)); includeType(profile, type.substring(0, type.length() - 6));
} }
} }
String exclTypes = p.getProperty("PROFILE_" + profile + "_RTJAR_EXCLUDE_TYPES"); String exclTypes = p.getProperty(prefix + "_RTJAR_EXCLUDE_TYPES");
if (exclTypes != null) { if (exclTypes != null) {
for (String type: exclTypes.replace("$$", "$").split("\\s+")) { for (String type: exclTypes.replace("$$", "$").split("\\s+")) {
if (type.endsWith(".class")) if (type.endsWith(".class"))
excludeType(profile, type.substring(0, type.length() - 6)); excludeType(profile, type.substring(0, type.length() - 6));
} }
} }
maxProfile = profile;
profile++;
} }
} }