On 02/26/2013 01:48 PM, Alan Bateman wrote:
The build changes for Nashorn were pushed to jdk8/tl yesterday and one
of the casualties is the profiles build.
My reading of the make file changes is that ListPathsSafely_If (defined
in MakeBase.gmk) has changed the expansion so that secondary expansion
is no longer required. Erik is away this week but I assume this was
intentional.
If this is the case, then your changes look fine to me. If not, then it
can be revisited later, if required.
-Chris.
Attached is the diffs that I propose to push to jdk8/tl today to get
profiles building again, assuming I get a reviewer.
-Alan
diff --git a/makefiles/profile-rtjar-includes.txt
b/makefiles/profile-rtjar-includes.txt
--- a/makefiles/profile-rtjar-includes.txt
+++ b/makefiles/profile-rtjar-includes.txt
@@ -349,6 +349,7 @@
com/sun/rowset/providers \
com/sun/script/javascript \
com/sun/script/util \
+ com/sun/security/auth \
com/sun/security/auth/callback \
com/sun/security/auth/login \
com/sun/security/auth/module \
@@ -448,8 +449,7 @@
sun/tracing \
sun/tracing/dtrace
-PROFILE_3_RTJAR_INCLUDE_TYPES := \
- com/sun/security/auth/*.class
+PROFILE_3_RTJAR_INCLUDE_TYPES :=
PROFILE_3_RTJAR_EXCLUDE_TYPES := \
javax/management/remote/rmi/_RMIConnectionImpl_Tie.class \
@@ -457,10 +457,10 @@
javax/management/remote/rmi/_RMIServerImpl_Tie.class \
javax/management/remote/rmi/_RMIServer_Stub.class \
com/sun/security/auth/callback/DialogCallbackHandler.class \
- com/sun/security/auth/callback/DialogCallbackHandler\$$$$1.class \
- com/sun/security/auth/callback/DialogCallbackHandler\$$$$2.class \
-
com/sun/security/auth/callback/DialogCallbackHandler\$$$$Action.class \
-
com/sun/security/auth/callback/DialogCallbackHandler\$$$$ConfirmationInfo.class
+ com/sun/security/auth/callback/DialogCallbackHandler\$$1.class \
+ com/sun/security/auth/callback/DialogCallbackHandler\$$2.class \
+ com/sun/security/auth/callback/DialogCallbackHandler\$$Action.class \
+
com/sun/security/auth/callback/DialogCallbackHandler\$$ConfirmationInfo.class
PROFILE_3_INCLUDE_METAINF_SERVICES := \
META-INF/services/javax.script.ScriptEngineFactory
