RFR: 8140723: Remove source code conditionalized on JAVASE_EMBEDDED
The bug report for this is confidential but quite simply all of the little tweaks and knobs we added to the open build and source files to support the Java SE Embedded product no longer need to be there for JDK 9. Many of them have already been removed via other changes but this cleans up the rest. webrev: http://cr.openjdk.java.net/~dholmes/8140723/webrev.jdk/ The changes relate to: - Java version information - isEmbedded() check in test code Platform.java - special AWT build settings for Embedded - special Toolkit handling for Embedded In make/lib/Awt2dLibraries.gmk I commented out a setting which was seemingly introduced only to support (old) embedded releases: # decimal constant is unsigned only in ISO C90 (JAVASE_EMBEDDED) BUILD_LIBAWT_XAWT_XToolkit.c_CFLAGS := -w which I think pertained to: #define DEF_AWT_MAX_POLL_TIMEOUT ((uint32_t)4000000000) Unless AWT folk indicate otherwise I will delete those two lines in final push. Thanks, David -----
On 14 Jul 2016, at 06:25, David Holmes <david.holmes@oracle.com> wrote:
The bug report for this is confidential but quite simply all of the little tweaks and knobs we added to the open build and source files to support the Java SE Embedded product no longer need to be there for JDK 9. Many of them have already been removed via other changes but this cleans up the rest.
webrev: http://cr.openjdk.java.net/~dholmes/8140723/webrev.jdk/
The changes relate to: - Java version information - isEmbedded() check in test code Platform.java - special AWT build settings for Embedded - special Toolkit handling for Embedded
In make/lib/Awt2dLibraries.gmk I commented out a setting which was seemingly introduced only to support (old) embedded releases:
# decimal constant is unsigned only in ISO C90 (JAVASE_EMBEDDED) BUILD_LIBAWT_XAWT_XToolkit.c_CFLAGS := -w
which I think pertained to:
#define DEF_AWT_MAX_POLL_TIMEOUT ((uint32_t)4000000000)
Unless AWT folk indicate otherwise I will delete those two lines in final push.
+1 Paul.
Thanks for the review Paul! David On 14/07/2016 11:12 PM, Paul Sandoz wrote:
On 14 Jul 2016, at 06:25, David Holmes <david.holmes@oracle.com> wrote:
The bug report for this is confidential but quite simply all of the little tweaks and knobs we added to the open build and source files to support the Java SE Embedded product no longer need to be there for JDK 9. Many of them have already been removed via other changes but this cleans up the rest.
webrev: http://cr.openjdk.java.net/~dholmes/8140723/webrev.jdk/
The changes relate to: - Java version information - isEmbedded() check in test code Platform.java - special AWT build settings for Embedded - special Toolkit handling for Embedded
In make/lib/Awt2dLibraries.gmk I commented out a setting which was seemingly introduced only to support (old) embedded releases:
# decimal constant is unsigned only in ISO C90 (JAVASE_EMBEDDED) BUILD_LIBAWT_XAWT_XToolkit.c_CFLAGS := -w
which I think pertained to:
#define DEF_AWT_MAX_POLL_TIMEOUT ((uint32_t)4000000000)
Unless AWT folk indicate otherwise I will delete those two lines in final push.
+1
Paul.
On 14/07/2016 05:25, David Holmes wrote:
The bug report for this is confidential but quite simply all of the little tweaks and knobs we added to the open build and source files to support the Java SE Embedded product no longer need to be there for JDK 9. Many of them have already been removed via other changes but this cleans up the rest.
webrev: http://cr.openjdk.java.net/~dholmes/8140723/webrev.jdk/ Looks okay to me, hopefully the line in BUILD_LIBAWT_XAWT_XToolkit.c_CFLAGS can be removed.
-Alan
Thanks for the review Alan! David On 15/07/2016 6:52 AM, Alan Bateman wrote:
On 14/07/2016 05:25, David Holmes wrote:
The bug report for this is confidential but quite simply all of the little tweaks and knobs we added to the open build and source files to support the Java SE Embedded product no longer need to be there for JDK 9. Many of them have already been removed via other changes but this cleans up the rest.
webrev: http://cr.openjdk.java.net/~dholmes/8140723/webrev.jdk/ Looks okay to me, hopefully the line in BUILD_LIBAWT_XAWT_XToolkit.c_CFLAGS can be removed.
-Alan
Can I please get someone from AWT to approve this. Thanks, David On 14/07/2016 2:25 PM, David Holmes wrote:
The bug report for this is confidential but quite simply all of the little tweaks and knobs we added to the open build and source files to support the Java SE Embedded product no longer need to be there for JDK 9. Many of them have already been removed via other changes but this cleans up the rest.
webrev: http://cr.openjdk.java.net/~dholmes/8140723/webrev.jdk/
The changes relate to: - Java version information - isEmbedded() check in test code Platform.java - special AWT build settings for Embedded - special Toolkit handling for Embedded
In make/lib/Awt2dLibraries.gmk I commented out a setting which was seemingly introduced only to support (old) embedded releases:
# decimal constant is unsigned only in ISO C90 (JAVASE_EMBEDDED) BUILD_LIBAWT_XAWT_XToolkit.c_CFLAGS := -w
which I think pertained to:
#define DEF_AWT_MAX_POLL_TIMEOUT ((uint32_t)4000000000)
Unless AWT folk indicate otherwise I will delete those two lines in final push.
Thanks, David -----
The fix looks good to me. Thanks, Alexandr. On 7/16/2016 2:55 AM, David Holmes wrote:
Can I please get someone from AWT to approve this.
Thanks, David
On 14/07/2016 2:25 PM, David Holmes wrote:
The bug report for this is confidential but quite simply all of the little tweaks and knobs we added to the open build and source files to support the Java SE Embedded product no longer need to be there for JDK 9. Many of them have already been removed via other changes but this cleans up the rest.
webrev: http://cr.openjdk.java.net/~dholmes/8140723/webrev.jdk/
The changes relate to: - Java version information - isEmbedded() check in test code Platform.java - special AWT build settings for Embedded - special Toolkit handling for Embedded
In make/lib/Awt2dLibraries.gmk I commented out a setting which was seemingly introduced only to support (old) embedded releases:
# decimal constant is unsigned only in ISO C90 (JAVASE_EMBEDDED) BUILD_LIBAWT_XAWT_XToolkit.c_CFLAGS := -w
which I think pertained to:
#define DEF_AWT_MAX_POLL_TIMEOUT ((uint32_t)4000000000)
Unless AWT folk indicate otherwise I will delete those two lines in final push.
Thanks, David -----
Thanks Alexandr! David On 19/07/2016 9:26 PM, Alexandr Scherbatiy wrote:
The fix looks good to me.
Thanks, Alexandr.
On 7/16/2016 2:55 AM, David Holmes wrote:
Can I please get someone from AWT to approve this.
Thanks, David
On 14/07/2016 2:25 PM, David Holmes wrote:
The bug report for this is confidential but quite simply all of the little tweaks and knobs we added to the open build and source files to support the Java SE Embedded product no longer need to be there for JDK 9. Many of them have already been removed via other changes but this cleans up the rest.
webrev: http://cr.openjdk.java.net/~dholmes/8140723/webrev.jdk/
The changes relate to: - Java version information - isEmbedded() check in test code Platform.java - special AWT build settings for Embedded - special Toolkit handling for Embedded
In make/lib/Awt2dLibraries.gmk I commented out a setting which was seemingly introduced only to support (old) embedded releases:
# decimal constant is unsigned only in ISO C90 (JAVASE_EMBEDDED) BUILD_LIBAWT_XAWT_XToolkit.c_CFLAGS := -w
which I think pertained to:
#define DEF_AWT_MAX_POLL_TIMEOUT ((uint32_t)4000000000)
Unless AWT folk indicate otherwise I will delete those two lines in final push.
Thanks, David -----
participants (4)
-
Alan Bateman
-
Alexandr Scherbatiy
-
David Holmes
-
Paul Sandoz