Compare commits

...

1520 Commits

Author SHA1 Message Date
Vladimir Kharitonov
17277ecbda commit window 2025-06-12 14:14:27 +02:00
Vladimir Kharitonov
4dedc0eb2a init windows 2025-06-11 21:06:29 +02:00
Vladimir Kharitonov
8a60a447ce windows doesn't work 2025-06-11 21:06:28 +02:00
Vladimir Kharitonov
c6b85f9a1d compound literals 2025-06-11 21:06:28 +02:00
Vladimir Kharitonov
7c71d79d48 windows: VK_FATAL_ERROR: log to stderr 2025-06-11 21:06:28 +02:00
Vladimir Kharitonov
c25ab8b76e windows: load vulkan dll 2025-06-11 21:06:28 +02:00
Vladimir Kharitonov
43da8fbc95 fix build windows 2025-06-11 21:06:28 +02:00
Vladimir Kharitonov
b9a32088e2 fix variable-length arrays 2025-06-11 21:06:28 +02:00
Vladimir Kharitonov
4f226ea9c2 fix compound literals 2025-06-11 21:06:27 +02:00
Vladimir Kharitonov
316ef4c886 CArrayUtil: use uthash 2025-06-11 21:06:27 +02:00
Vladimir Kharitonov
621d896c39 CArrayUtil: fix array and ring buffer with MSVC 2025-06-11 21:06:27 +02:00
Vladimir Kharitonov
a3cba30bd7 use CRITICAL_SECTION as mutex in VKTexturePool on windows 2025-06-11 21:06:27 +02:00
Vladimir Kharitonov
7e053d1c6c cross-platform alignas 2025-06-11 21:05:12 +02:00
Vladimir Kharitonov
6d1cba3796 vulkan: windows: fix warnings 2025-06-11 21:04:53 +02:00
Vladimir Kharitonov
1f3704712c build: vulkan: windows: fixpath for glslc 2025-06-11 21:04:36 +02:00
Maxim Kartashev
706b3cd1d2 JBR-8626 Wayland: window shadow 2025-06-11 17:19:09 +04:00
Maxim Kartashev
c9bbe63ba5 JBR-8626 Wayland: sub-surface support 2025-06-11 17:19:04 +04:00
Maxim Kartashev
d8b21eec56 JBR-8626 Wayland: proper encapsulation for WLComponentPeer 2025-06-11 17:19:00 +04:00
Maxim Kartashev
25b3d3e00a JBR-8626 Wayland: uniform data access synhronization for WLComponentPeer 2025-06-11 17:18:56 +04:00
Maxim Kartashev
22b9c7bbd2 JBR-8626 Wayland: relocate rounded corner painting to WLWindowPeer 2025-06-11 17:18:51 +04:00
Maxim Kartashev
7e77f58c0c JBR-8626 Wayland: fall-back client-side window decorations 2025-06-11 17:18:46 +04:00
Vitaly Provodin
61fc6b4f9f Update README.md 2025-06-11 02:03:12 +02:00
Vitaly Provodin
a9bb361d85 fixup! JBR-7800 use jmod from the build for signing libs and execs inside jmod files 2025-06-11 02:03:12 +02:00
Dmitry Drobotov
1866e48ac2 JBR-8490 Improve searching for scroll bars in ScrollAreaAccessibility.
Use JScrollPane.getVerticalScrollBar/getHorizontalScrollBar methods to look for scroll bars. In some cases a scroll bar might be not a direct child of the scroll area, but it can still be assigned to the vertical/horizontalScrollBar property.

(cherry picked from commit 646d2e478f)
2025-06-11 02:03:11 +02:00
Dmitry Drobotov
851453b986 JBR-8408 Post accessibility value changed events for scroll bars
3rd party apps might want to subscribe for scroll bar value changed events to track scroll position. VoiceOver and Zoom don't react on these events.

(cherry picked from commit 4214897d5e)
2025-06-11 02:03:11 +02:00
Nikita Tsarev
28df1d95e2 JBR-5860: Implement drag-and-drop [WLToolkit] 2025-06-11 02:03:11 +02:00
Vitaly Provodin
ceed9df9ff update exclude list on results of 3379 test runs 2025-06-11 02:03:11 +02:00
Nikita Tsarev
6f92920362 JBR-8912: Fix pasting unicode content from clipboard [WLToolkit] 2025-06-11 02:03:11 +02:00
Maxim Kartashev
72d3a20b6a JBR-8949 Wayland: java/awt/Gtk/GtkVersionTest/GtkVersionTest.java: Wrong GTK library version: null 2025-06-11 02:03:11 +02:00
Alexey Ushakov
1c66a26cd8 JBR-8937 Vulkan: crash in disposal code
Added synchronization before disposal
2025-06-11 02:03:11 +02:00
Maxim Kartashev
585cc4a275 JBR-7087 Wayland: enable more GTK tests 2025-06-11 02:03:11 +02:00
Vitaly Provodin
6b80768def update exclude list on results of 3373 test runs 2025-06-11 02:03:11 +02:00
Alexey Ushakov
5f07d9b61c JBR-8911 Backport: 8304825: MacOS metal pipeline - window isn't painted if created during display sleep
Adjusting OpenJDK patch for display link
2025-06-11 02:03:11 +02:00
Vitaly Provodin
69f29d3af3 Update README.md 2025-06-11 02:03:11 +02:00
Sergey Shelomentsev
5f3941899e fixup! JBR-4154 use -V to sort versions 2025-06-11 02:03:11 +02:00
Nikita Gubarkov
d4e3057f21 JBR-8884 JBR API: Use proper class loader for class resolution in ProxyGenerator 2025-06-11 02:03:11 +02:00
Nikita Tsarev
707e24d018 JBR-8833: Refactor Wayland data device abstraction [WLToolkit] 2025-06-11 02:03:11 +02:00
Vitaly Provodin
745e9718fa fixup! JBR-4154 fix extracting version info from sources 2025-06-11 02:03:11 +02:00
Vitaly Provodin
6d09132684 fixup! JBR-4154 fix extracting version info from sources 2025-06-11 02:03:10 +02:00
Vitaly Provodin
de2cb3220f clean up fixed issues from exclude lists 2025-06-11 02:03:10 +02:00
Vitaly Provodin
3e3ef3f403 fixup! JBR-4154 fix extracting version info from sources 2025-06-11 02:03:10 +02:00
Nikita Gubarkov
f079dee71e JBR-8810 Vulkan: Exclude native Vulkan files from vk=off builds 2025-06-11 02:03:10 +02:00
vlad20012
073c8f69c1 JBR-8303 Provide JBR API method to perform GC with more intensive heap shrinking 2025-06-11 02:03:10 +02:00
Maxim Kartashev
9227c7a33a JBR-7457 Provide JBR API method to explicitly call gc() 2025-06-11 02:03:10 +02:00
Artem Bochkarev
8178109057 JBR-8548 Add possibility to build without out-of-process part in Linux. 2025-06-11 02:03:10 +02:00
Vitaly Provodin
4036d97262 Update README.md 2025-06-11 02:03:10 +02:00
Maxim Kartashev
7efaaa5766 JBR-8643 Wayland: popup will not appear if located outside of parent window 2025-06-11 02:03:10 +02:00
Vladimir Lagunov
915ad9309f JBR-8664 Optimize sun.nio.fs.WindowsPath.compareTo 2025-06-11 02:03:10 +02:00
Maxim Kartashev
acaf43120d JBR-6979 Modernize more WaitForSingleObject on Windows
Use -XX:+UnlockExperimentalVMOptions -XX:-UseModernSynchAPI
to switch back to the original implementation
2025-06-11 02:03:10 +02:00
Maxim Kartashev
2058f4fa17 JBR-8304 Wayland: UI/UnninstallUIMemoryLeaks/UnninstallUIMemoryLeaks.java throws HeadlessException: No X11 DISPLAY variable was set
Pass JVM options to sub-tests in a more reliable and uniform fashion
2025-06-11 02:03:10 +02:00
Vitaly Provodin
de7cef037f Update README.md 2025-06-11 02:03:10 +02:00
Vitaly Provodin
06972888e5 JBR-6620 restore displayMode to the state that was before running the test
(cherry picked from commit 285d3d3860)
2025-06-11 02:03:10 +02:00
Maxim Kartashev
4251e9970a JBR-8700 Wayland: Glitchy resize in J2Ddemo 2025-06-11 02:03:09 +02:00
Vitaly Provodin
4ab4ca41ad Update README.md 2025-06-11 02:03:09 +02:00
Nikita Provotorov
df801ca642 JBR-6085: java/awt/event/KeyEvent/AltGraphModifier.java: Modifier Mask is not set.
Stabilizing the test by getting rid of false-positive errors.
2025-06-11 02:03:09 +02:00
Vitaly Provodin
d73f7dfbf2 update exclude list on results of 3316 test runs 2025-06-11 02:03:09 +02:00
Sergey Shelomentsev
2a6d38206b JBR-5819 fix custom title bar tests 2025-06-11 02:03:09 +02:00
Nikita Gubarkov
3cfad08294 JBR-8740 Vulkan: Optimize BLIT 2025-06-11 02:03:09 +02:00
Nikita Gubarkov
b813543d3c JBR-8739 Vulkan: Optimize SURFACE_TO_SW_BLIT 2025-06-11 02:03:09 +02:00
Nikita Gubarkov
e104ddf5cc JBR-8738 Vulkan: Optimize ISO_BLIT 2025-06-11 02:03:09 +02:00
Nikita Gubarkov
45fab574ba JBR-8737 Vulkan: Respect nonCoherentAtomSize in allocator 2025-06-11 02:03:09 +02:00
Nikita Gubarkov
6ff9abef2f JBR-8736 Vulkan: Split VKRenderer into subsystems 2025-06-11 02:03:09 +02:00
bourgesl
340c57dc25 JBR-8276: fixed CPlaformWindow.flushBuffers() to use LWCTooolkit.invokeAndWait() discarded when CGDisplayRegisterReconfigurationCallback() is in progress (ThreadUtilities.blockingThread + removed isWithinPowerTransition code)
- fixed CVDisplayLink management on wake-ups/sleep and display reconfiguration
- restored opengl changes
2025-06-11 02:03:09 +02:00
bourgesl
905645e30f JBR-8278: fixed performOnMainThreadWaiting run block condition to fix FullscreenWindowProps and NoResizeEventOnDMChangeTest tests 2025-06-11 02:03:09 +02:00
Vitaly Provodin
0b5485f49b update exclude list on results of 3297 test runs 2025-06-11 02:03:09 +02:00
Nikita Tsarev
dc4ad8fd90 JBR-8685: Add new macOS 15.4 shortcuts to the system shortcuts API 2025-06-11 02:03:09 +02:00
Nikita Tsarev
dbe2679e0e JBR-8684: Fix for a buffer overrun when reading system hotkey configuration with unexpected shortcuts on macOS 2025-06-11 02:03:08 +02:00
Nikita Gubarkov
461aeda2ec JBR-8682 Vulkan: logicOpEnable Validation Error 2025-06-11 02:03:08 +02:00
Vitaly Provodin
b39e498b79 update exclude list on results of 3293 test runs 2025-06-11 02:03:08 +02:00
Nikita Gubarkov
950479a0be JBR-8673 Disable watch.desktop.geometry on excessive event count 2025-06-11 02:03:08 +02:00
Nikita Gubarkov
7f0895a294 JBR-6225 Revert CGGI_GlyphInfoDescriptor refactoring 2025-06-11 02:03:08 +02:00
Maxim Kartashev
262a386965 JBR-3323 Exclude parts of VM code from sanitizer checks
Exclude VM error-reporting code that treats memory as a raw sequence of
bytes from address sanitizer checks. This is needed to only get true
reports when running tests against the --enable-asan build.

(cherry picked from commit 4c2085b5f7)
2025-06-11 02:03:08 +02:00
Vitaly Provodin
2da42b810f update exclude list on results of 3278 test runs 2025-06-11 02:03:08 +02:00
Vitaly Provodin
2212424458 JBR-8646 add keyRelease invocations for pressed keys 2025-06-11 02:03:08 +02:00
Maxim Kartashev
18f50ea960 JBR-8618 Wayland: GTK LaF does not change appearance when system theme changes 2025-06-11 02:03:08 +02:00
Nikita Gubarkov
a95ac66bc3 JBR-8112 Revert swing.bufferPerWindow back to false on Windows 2025-06-11 02:03:08 +02:00
Dmitrii Morskii
dce0780b1d JBR-7040 implemented FPS counter on D3D 2025-06-11 02:03:08 +02:00
Dmitrii Morskii
80ac32a37f JBR-7900 Improve logic of detecting toolkit inside registerShutdownHook 2025-06-11 02:03:08 +02:00
Dmitrii Morskii
1ea012ab95 JBR-7051 Improved D3D Toolkit:
-Increased rendering performance
	-Improved text rendering quality
	-Accelerated repainting during window resizing
	-Removed unnecessary fallback to GDI rendering
	-Eliminated unnecessary hardware limitations
2025-06-11 02:03:08 +02:00
Anton Tarasov
3c618b0cd8 JRE-119 [use default "sun.java2d.dpiaware=true" to be dpi-aware on Window 7]
This lets awt_Win32GraphicsEnv.cpp SetProcessDPIAwareProperty() call Win7 specific ::SetProcessDPIAware() API func.

(cherry picked from commit 5e7a766090810d839f4352d06fc2812499d766f8)
(cherry picked from commit 7d1d43bfa1)
(cherry picked from commit 2351382562)
2025-06-11 02:03:08 +02:00
Maxim Kartashev
d0dfc1a1f5 JBR-8639 Wayland: exclude tests depending on mouseMove 2025-06-11 02:03:07 +02:00
Maxim Kartashev
4f07526240 JBR-8572 Wayland: java/awt/Desktop/DesktopGtkLoadTest/DesktopGtkLoadTest.java: Wrong GTK library version: null 2025-06-11 02:03:07 +02:00
Maxim Kartashev
296acb8ceb JBR-7087 Wayland: GtkFileDialogPeer implementation 2025-06-11 02:03:07 +02:00
Maxim Kartashev
120b12fe85 JBR-7087 Wayland: Desktop support via GNOME 2025-06-11 02:03:07 +02:00
Maxim Kartashev
716da8eff3 JBR-7087 Wayland: GTKLookAndFeel support 2025-06-11 02:03:07 +02:00
Sergey Shelomentsev
3a066b999c Add problem list for fastdebug configurations 2025-06-11 02:03:07 +02:00
Nikita Gubarkov
d7f3d4e5bd JBR-7882 Calculate point size from both x and y transform components 2025-06-11 02:03:07 +02:00
Nikita Gubarkov
76c89a32ff JBR-8289 Fix invisible glyph encoding in composite fonts 2025-06-11 02:03:07 +02:00
Maxim Kartashev
2c23ed9763 JBR-8210 Exclude javax/swing/JPopupMenu/7156657/bug7156657.java for WLToolkit 2025-06-11 02:03:07 +02:00
Nikita Gubarkov
9b64bc2689 JBR-8608 Vulkan: Cleanup capability checks 2025-06-11 02:03:07 +02:00
Maxim Kartashev
d83808d4a1 JBR-7892 Generate a descriptive error message when awt cannot be loaded 2025-06-11 02:03:07 +02:00
Vladimir Lagunov
cf22f68378 JBR-8539 fix jdk/jfr/event/io/TestFileReadOnly.java: mimic errors in RandomAccessFile.write 2025-06-11 02:03:07 +02:00
Vladimir Lagunov
b15531ed3e JBR-8538 JBR-7700 Change handling of new File("")
A new behavior for java.io.File was introduced in commit 9477c705c0. For example, `new File("").exists()` returns true now, but it used to return false.
2025-06-11 02:03:07 +02:00
Vladimir Lagunov
4bc1c16b5e JBR-7700 Fix the behavior of setReadOnly(false) on Posix 2025-06-11 02:03:07 +02:00
Vladimir Lagunov
00fd95a68e JBR-7700 Prepare for cases when getFileAttributeView returns null
It doesn't happen in any default implementation with default attribute classes, but some 3rd party implementations can do that.
2025-06-11 02:03:07 +02:00
Vladimir Lagunov
e32b4356c9 JBR-7700 Fix the case with deletion of locked file on Windows 2025-06-11 02:03:06 +02:00
Maxim Kartashev
2e51ed43ca JBR-8551 Wayland: javax/swing/JSlider/TestJSliderRendering.java: The slider is not rendered properly 2025-06-11 02:03:06 +02:00
Nikita Gubarkov
8abb3e5237 JBR-8601 Vulkan: Decouple from Wayland 2025-06-11 02:03:06 +02:00
Vitaly Provodin
dba06acb50 Update README.md 2025-06-11 02:03:06 +02:00
Maxim Kartashev
f6e4214382 JBR-3498 Windows: exception when trying to delete a directory with a trailing space
Allow Windows Path to have a trailing space despite Windows naming conventions
discouraging it. Many programs - including Explorer - successfully work
with such files or directories.

(cherry picked from commit 64a468280c)
2025-06-11 02:03:06 +02:00
Maxim Kartashev
3af8b1d88e JBR-8587 jb/build/ResolveSymbolsTest/ResolveSymbolsRealEnv.java fails on Alpine 2025-06-11 02:03:06 +02:00
Vitaly Provodin
d2f8ec1999 JBR-8219 run "clean" separately before building (workaraound for JDK-8349665) 2025-06-11 02:03:06 +02:00
Vitaly Provodin
4ca9e5c94c update exclude list on results of 3188 test runs 2025-06-11 02:03:06 +02:00
Nikita Tsarev
4cf0958bf8 JBR-8533: Fix wrong keys and modifiers being reported for certain non-function key combinations [WLToolkit] 2025-06-11 02:03:06 +02:00
Maxim Kartashev
ba10addf77 JBR-7896 Wayland: Deadlock in WLClipboard
Avoid performing blocking I/O while holding a lock
2025-06-11 02:03:06 +02:00
Nikita Gubarkov
f88033ff64 JBR-8555 Vulkan: Do not flush the surface on transform change 2025-06-11 02:03:06 +02:00
Nikita Gubarkov
b5e29331cf JBR-8553 Vulkan: Respect filtering hints in blits 2025-06-11 02:03:06 +02:00
Nikita Gubarkov
c87bdc751b <TEMP> 8353542: No native raster data for common pixel-interleaved BufferedImages
This duplicates my OpenJDK PR, wait till it's resolved in upstream.
2025-06-11 02:03:06 +02:00
Nikita Gubarkov
626a7f3132 JBR-8525 Vulkan: Fix offscreen surface scaling 2025-06-11 02:03:06 +02:00
Maxim Kartashev
03c6a8f26f JBR-8436 Describe various type of github releases 2025-06-11 02:03:05 +02:00
Vitaly Provodin
d94dc75eef update exclude list on results of 3184 test runs 2025-06-11 02:03:05 +02:00
Alexey Ushakov
ad87dbb06f JBR-7725 Vulkan: low performance in SwingMark
Implemented intermediate buffer for loading raster data
Removed extra synchronization in blits
2025-06-11 02:03:05 +02:00
Nikita Gubarkov
c906dbf46d JBR-8485 Vulkan: Blit surface into itself 2025-06-11 02:03:05 +02:00
Alexey Ushakov
5b64da507a JBR-8479 Support Vulkan accelerated mode in perf scripts
Added the new option, minor refactoring
2025-06-11 02:03:05 +02:00
Nikita Gubarkov
a55112aaba JBR-8478 Vulkan: Pull real supported formats from the device 2025-06-11 02:03:05 +02:00
Nikita Gubarkov
0065e24d54 JBR-8473 Vulkan: Support for various source blit formats via swizzling 2025-06-11 02:03:05 +02:00
Nikita Gubarkov
df78e29f41 JBR-8472 Vulkan: Respect source alpha type in blit routines 2025-06-11 02:03:05 +02:00
Nikita Gubarkov
6100790a74 JBR-8471 Vulkan: Reuse descriptor sets in blit routines 2025-06-11 02:03:05 +02:00
Nikita Tsarev
2a02444bd6 JBR-8422: A temporary workaround for crash in SystemHotkey setup on macOS 15.4 beta 2025-06-11 02:03:05 +02:00
Vitaly Provodin
6fa6c3466a update exclude list on results of 3147 test runs 2025-06-11 02:03:05 +02:00
Nikita Gubarkov
523a693606 JBR-8448 Vulkan: Cleanup & fix Sw->Surface blit 2025-06-11 02:03:05 +02:00
Nikita Gubarkov
468854c836 JBR-8447 Vulkan: Implement multi-view images 2025-06-11 02:03:05 +02:00
bourgesl
cf0ec7e881 JBR-5497: change the default value for the system property "awt.mac.flushBuffers.invokeLater" to 'enabled' to avoid any potential freeze (safe) until a better solution 2025-06-11 02:03:05 +02:00
bourgesl
92f9528ba2 JBR-5497: follow-up fix
- monitors sleep/wake-up notifications to define ThreadUtilities.isWithinPowerTransition()
- fixed CPlatformWindow.flushBuffers() to use this pwm flag to use invokeLater() when the system property '-Dawt.mac.flushBuffers.pwm=true'
- always use invokeLater() when display mirroring is enabled (i.e. '-Dawt.mac.flushBuffers.invokeLater'=[auto|default])
- always use the timeout=0.666s in CPlatformWindow.flushBuffer()
- always use the time limit=13.333s in LWCToolkit.doAWTRunLoop() to ensure avoiding any potential hangs / freezes on macOS
2025-06-11 02:03:04 +02:00
bourgesl
c8dad45d85 JBR-8183: fixed cherry-pick (bad merge) 2025-06-11 02:03:04 +02:00
bourgesl
f8638ea547 JBR-8183: get low resolution display modes (mac intel) and do not call anymore the DisplayConfiguration transaction on the main thread avoid main thread as it hangs for several seconds on macbook intel + macOS 15 2025-06-11 02:03:04 +02:00
Nikita Gubarkov
c5edb5286d <TEMP> 8352407: PixelInterleavedSampleModel with unused components throws RasterFormatException: Incorrect pixel stride
This duplicates my OpenJDK PR, wait till it's resolved in upstream.
2025-06-11 02:03:04 +02:00
Nikita Gubarkov
79878d9f14 JBR-8442 Vulkan: Fix OPAQUE mode rendering 2025-06-11 02:03:04 +02:00
Nikita Gubarkov
2b7e3adc7f JBR-8441 Vulkan: Update CArrayUtil.h 2025-06-11 02:03:04 +02:00
Nikita Gubarkov
61be9cd2de JBR-8440 Vulkan: Pass the surface format to native code 2025-06-11 02:03:04 +02:00
Nikita Gubarkov
5acfc4ada1 JBR-8439 Vulkan: Cleanup Surface->Surface blit 2025-06-11 02:03:04 +02:00
Alexey Ushakov
624d04b093 JBR-8418 Vulkan: RenderPerfTest Image test does not work properly
Added regression test and flush content of the destination surface
2025-06-11 02:03:04 +02:00
Alexey Ushakov
04a37daab4 JBR-8418 Vulkan: RenderPerfTest Image test does not work properly
Passed transform to VKRenderer code
2025-06-11 02:03:04 +02:00
Alexey Ushakov
0b2ff47bdb JBR-8430 Vulkan: move RenderingContext into Renderer
Moved context to the VKRenderer
2025-06-11 02:03:04 +02:00
Vitaly Provodin
22a472a76f update exclude list on results of 3113 test runs 2025-06-11 02:03:04 +02:00
Vitaly Provodin
2690e98c0a JBR-8417 specify XCODE_PATH for JBR building on macOS 2025-06-11 02:03:04 +02:00
Maxim Kartashev
052b9e7590 JBR-8419 sources/TestNoNULL.java: Test found 32 usages of 'NULL' in source files 2025-06-11 02:03:04 +02:00
Nikita Gubarkov
42f09559ea JBR-8424 Vulkan: Format-aware Surface->Sw blit 2025-06-11 02:03:04 +02:00
Nikita Gubarkov
41e106947f JBR-8423 Vulkan: Expose VKFormat on Java side 2025-06-11 02:03:03 +02:00
Nikita Provotorov
f028b49fad JBR-7659 [macOS] SIGILL at [CoreFoundation+0x1d47c5] CFRunLoopRunSpecific.cold.1+0xe / sun.lwawt.macosx.CAccessibility.getChildrenAndRolesRecursive (2K frames).
Fixes crashes caused by multiple javax.accessibility.AccessibleState.EXPANDED/COLLAPSED changes by making sure AppKit has not more than one event of each type being processed or pending in its queue. The logic can be rolled back via a new system property -Dsun.lwawt.macosx.CAccessible.eventsCoalescingEnabled=false.

(cherry picked from commits 84012b5f39, a2707d4e95, fa8c4705e6, a23ab5a040, fe07d2731a)
2025-06-11 02:03:03 +02:00
Vladimir Lagunov
de7f715206 JBR-8396 JBR-7700 Fix FileTest.getCanonicalPath on macOS 2025-06-11 02:03:03 +02:00
Alexey Ushakov
2454dc5314 JBR-8398 Vulkan: refactor shader code to use transforms
Replaced normalization logic with transform matrix
2025-06-11 02:03:03 +02:00
Nikita Gubarkov
5853a72c69 JBR-8413 Vulkan: Make surfaces VKGPU-aware 2025-06-11 02:03:03 +02:00
Nikita Gubarkov
2b632eaf21 JBR-8412 Vulkan: Add generic offscreen GraphicsConfig implementation 2025-06-11 02:03:03 +02:00
Nikita Gubarkov
d511dce476 JBR-8411 Vulkan: Move generic VKGraphicsConfig implementation into shared code 2025-06-11 02:03:03 +02:00
Nikita Gubarkov
4c91837296 JBR-8410 Vulkan: Expose VKDevice on Java side 2025-06-11 02:03:03 +02:00
Nikita Gubarkov
1124f8fff2 JBR-8391 Vulkan: Split instance and device into separate files 2025-06-11 02:03:03 +02:00
Vladimir Lagunov
67bee40d3d JBR-7700 Classes from package java.io. use java.nio.file inside
The option can be enabled/disabled by specifying `-Djbr.java.io.use.nio=true/false`
2025-06-11 02:03:03 +02:00
Vitaly Provodin
21c3516659 update exclude list on results of 3097 test runs 2025-06-11 02:03:03 +02:00
Vitaly Provodin
58c7c69706 Update README.md 2025-06-11 02:03:03 +02:00
Nikita Gubarkov
1a3c35708f JBR-8363 Vulkan: Organize usage of FlushRenderPass and FlushSurface 2025-06-11 02:03:03 +02:00
Nikita Gubarkov
0b482ca1d1 JBR-8359 Vulkan: Put VK_DRAW after VKRenderer_AllocateMaskFillBytes
As VKRenderer_AllocateMaskFillBytes can invalidate draw call state due to overflow, it (and future similar functions) must be called before VK_DRAW.
2025-06-11 02:03:02 +02:00
Nikita Gubarkov
e1d46c7bc2 JBR-8358 Vulkan: Framebuffer destruction queue
Can be generalized to destroy arbitrary resources later.
2025-06-11 02:03:02 +02:00
Nikita Gubarkov
0e0de757e1 JBR-8350 Vulkan: Refactor pipeline cache & composites
This is needed for the implementation of painters (JBR-7646)
- Request pipelines one-by-one instead of a "pipeline sets"
- Split pipeline key into separate "shader" and "topology" (more items may need to be added later)
- Move management of composites into its own file
2025-06-11 02:03:02 +02:00
Alexey Ushakov
abb416d3c5 JBR-8347 Download gtk-shell.xml if absent
Added downloading code
2025-06-11 02:03:02 +02:00
Vitaly Provodin
8b9b700cd6 update exclude list on results of 3054 test runs 2025-06-11 02:03:02 +02:00
Vitaly Provodin
486113257a JBR-8196 fix calculating the number of attempts 2025-06-11 02:03:02 +02:00
Nikita Gubarkov
7fb3ce205b JBR-8342 Vulkan: Skip validation setup if extension is unavailable 2025-06-11 02:03:02 +02:00
Nikita Tsarev
195ef91eb6 JBR-7994: Properly report non-base-level function keys [WLToolkit] 2025-06-11 02:03:02 +02:00
Artem Bochkarev
b7fab5430e JBR-8138 Sign jcef binaries with separate entitlements
Revert to true the OSX entitlement "com.apple.security.cs.allow-dyld-environment-variables"
2025-06-11 02:03:02 +02:00
Vladimir Kharitonov
d0ebdc76fc JBR-8118 TextureWrapperImage for MTLTexture 2025-06-11 02:03:02 +02:00
Alexey Ushakov
648bdc5d48 JBR-8297 Vulkan: Implement ISO_BLIT
Implemented general logic of the blit, removed extra logging
Corrected clipping logic, updated regression tests
Added some flush and init code for the surfaces
2025-06-11 02:03:02 +02:00
Dmitry Drobotov
6f08e4fca3 JBR-8216 Implement setAccessibilityValue method for NavigableTextAccessibility
* This method allows for third-party tools to modify text component contents through the accessibility API on macOS;
* The setAccessibilityValue method is implemented similarly to NavigableTextAccessibility.setAccessibilitySelectedText. On the Java side, it calls AccessibleEditableText.setTextContents according to the comment in JavaTextAccessibility.accessibilitySetValueAttribute;
* The isAccessibilitySelectorAllowed method is implemented similarly to JavaTextAccessibility.accessibilityIsValueAttributeSettable: it checks if the text component implements AccessibleEditableText, is enabled, and additionally checks if the editable property is true, because some components could be enabled but not editable, and we shouldn't allow setting the value in this case.

(cherry picked from commit 61a501351a)
2025-06-11 02:03:02 +02:00
Vitaly Provodin
c88d31b9fa Update README.md 2025-06-11 02:03:02 +02:00
Vitaly Provodin
bf8de466d3 JBR-8255 pass WLToolkit-related settings to subprocesses launched by tests 2025-06-11 02:03:02 +02:00
Vitaly Provodin
1d3cfe817f JBR-8244 add logging stdout/stderr of subprocesses
(cherry picked from commit 41d655243f)
2025-06-11 02:03:02 +02:00
Vitaly Provodin
980555359c update exclude list on results of 3034 test runs 2025-06-11 02:03:01 +02:00
Alexey Ushakov
5c86b86503 JBR-8287 Vulkan: enable hw accelerated VolatileImage
Moved robot pixel grabber into windows surface data
Created offscreen surface data
Separated surfaces implementation into two files
Moved offscreen surface to the shared code

Fix
2025-06-11 02:03:01 +02:00
Nikita Gubarkov
d1432c9472 JBR-8288 Vulkan: Synchronous render queue flush.
RQ doesn't expose async flush operation. All RQ flushes wait for the queue to be drained, effectively serializing queue flusher and EDT execution while still making it prone to deadlocks.
The periodic flush feature of the queue flusher thread is of no use as well, as every observable effect of RQ operation is already immediately followed by a forced flush.
As Vulkan functions have no restriction on the calling thread, keep it simple - lock the monitor and drain the queue synchronously.
2025-06-11 02:03:01 +02:00
Maxim Kartashev
7d1121392e JBR-8264 java/awt/Multiscreen/UpdateGCTest/UpdateGCTest.java throws StackOverflowError at WLComponentPeer.getMinimumSize 2025-06-11 02:03:01 +02:00
Nikita Gubarkov
0d943446bb JBR-8284 Vulkan: fix $VULKAN_SDK autoconf check. 2025-06-11 02:03:01 +02:00
Nikita Gubarkov
54edeab0f0 JBR-8254 Buffer X11GraphicsEnvironment.rebuildDevices calls. 2025-06-11 02:03:01 +02:00
Maxim Kartashev
5e109cf96c JBR-8234 IDE cannot start on Wayland with large scale
Make sure the surface used for the cursor is marked as such prior to
being committed in order to receive an exception from enforcing the rule
about the buffer size having to be multiple of its scale.
2025-06-11 02:03:01 +02:00
Maxim Kartashev
01047adb17 JBR-7897 Tool window resizes is not smooth 2025-06-11 02:03:01 +02:00
Vitaly Provodin
6449506b0a Update README.md 2025-06-11 02:03:01 +02:00
Vitaly Provodin
3ef041dfc7 update exclude list on results of 3005 test runs 2025-06-11 02:03:01 +02:00
Vitaly Provodin
806158e3df Update README.md 2025-06-11 02:03:01 +02:00
Maxim Kartashev
f9db32cb91 JBR-8209 javax/swing/JPopupMenu/NestedFocusablePopupTest.java: WLRobotPeer: wakefield extension not present in Wayland instance 2025-06-11 02:03:01 +02:00
Alexey Ushakov
76703a7cf5 JBR-8201 Vulkan: crash in VKRenderer_MaskFill
Supported fully opaque mask
2025-06-11 02:03:01 +02:00
Vitaly Provodin
5971e47da3 Update README.md 2025-06-11 02:03:01 +02:00
Maxim Kartashev
0b12943ef1 JBR-8197 Wayland: Robot fails if offset in monitor configuration exists 2025-06-11 02:03:00 +02:00
Roman Shevchenko
be77981c76 JBR-8198: substituting empty extension with the "Unix executable" type in the macOS file dialog (#479) 2025-06-11 02:03:00 +02:00
Maxim Kartashev
77853924f3 JBR-8066 Wayland: clipboard size is limited to 65000 symbols 2025-06-11 02:03:00 +02:00
Maxim Kartashev
4817dbed0e JBR-8116 Wayland: support RounderCornersManager JBR API 2025-06-11 02:03:00 +02:00
Nikita Gubarkov
d6e15ada85 Added Clion project setup
(cherry picked from commit db962149ec)
2025-06-11 02:03:00 +02:00
Nikita Gubarkov
3a9e0c94dc Updated IDEA project setup 2025-06-11 02:03:00 +02:00
Vitaly Provodin
f7a79ae470 enabling dtrace-tests: added dtrace keyword
(cherry picked from commit 0b5119ca89)
(cherry picked from commit 1959e4a2a4)
2025-06-11 02:03:00 +02:00
bourgesl
0234fac3c4 JBR-8159: kill CVDisplayLink zombies (sleep / wake-up with multiple monitors in mirroring) + deal with display link thread shutdown (destroy threads at sleep) and restart when needed 2025-06-11 02:03:00 +02:00
Sergey Shelomentsev
304dcd1166 JBR-8046 repack java.base.jmod with correct module hashes after signing 2025-06-11 02:03:00 +02:00
Vitaly Provodin
6fb450920a JBR-8161 Move docker files under jbr-tools 2025-06-11 02:03:00 +02:00
Vitaly Provodin
1f0310ba23 update exclude list on results of 2963 test runs 2025-06-11 02:03:00 +02:00
Alexey Ushakov
d30f01eec9 JBR-8091 X: jb/java/wayland/RobotGet tests thorw java.awt.AWTException: headless environment
Do not run test logic in the headless environment
2025-06-11 02:03:00 +02:00
Roman Shevchenko
1ccea9a1ca JBR-8156 restoring WSL visibility in the folder picker mode 2025-06-11 02:03:00 +02:00
Nikita Tsarev
42ebb95237 JBR-5851: Fix 'DVORAK - QWERTY Cmd' layout 2025-06-11 02:03:00 +02:00
Vitaly Provodin
a43a87de47 Update README.md 2025-06-11 02:03:00 +02:00
Maxim Kartashev
91727c46dc JBR-8133 Runtime crash after jfr drag and drop to IU 2025-06-11 02:02:59 +02:00
Alexey Ushakov
062bd60d77 JBR-7990 Vulkan: Robot pixel grabbing for Vulkan surfaces
Implemented grabbing pixels via partly supported SurfaceToSwBlit, fixed multi-monitor scenario
2025-06-11 02:02:59 +02:00
Vitaly Provodin
46c07223d9 Update README.md 2025-06-11 02:02:59 +02:00
Nikita Tsarev
e7c8cc2caf JBR-8004: Support the context menu key on macOS 2025-06-11 02:02:59 +02:00
Maxim Kartashev
a820612af3 JBR-8123 NPE because FileSystems.getDefault() is null with -Djava.util.zip.use.nio.for.zip.file.access=true 2025-06-11 02:02:59 +02:00
Vitaly Provodin
5bb65115d0 JBR-8104 OL8: enable premier support for docker images 2025-06-11 02:02:59 +02:00
Vitaly Provodin
b400e53af0 JBR-8072 move JBR docker images to registry.jetbrains.team 2025-06-11 02:02:59 +02:00
Vitaly Provodin
1707380707 update exclude list on results of 2925 test runs 2025-06-11 02:02:59 +02:00
Maxim Kartashev
29e46dbd4f JBR-6247 Update JBR-specific tests after JDK-8314823
(cherry picked from commit 791448a24d)
2025-06-11 02:02:59 +02:00
Maxim Kartashev
f6bc19f890 JBR-1430 (8195129) Windows: use UTF16 version of Win32 API to load DLL
Also correct library name encoding in exception messages.

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 82a239a61d)
2025-06-11 02:02:59 +02:00
Vitaly Provodin
f289522be7 update exclude list on results of 2910 test runs 2025-06-11 02:02:59 +02:00
Vitaly Provodin
e1943b572c JBR-7929 remove java/awt/event/KeyEvent/AcceleratorTes/AcceleratorTest.html
that clashes with another test due to revert of "8315701: [macos] Regression: KeyEvent has different keycode on different keyboard layouts" caused by JBR-6387
2025-06-11 02:02:59 +02:00
Vitaly Provodin
9b83f39820 update exclude list on results of 2898 test runs 2025-06-11 02:02:59 +02:00
Maxim Kartashev
35efd81c30 JBR-7988 Wayland: WLPopupLocation test: incorrect size detected 2025-06-11 02:02:59 +02:00
bourgesl
cbdfd425cc JBR-8048: only log system property 'awt.mac.flushBuffers.invokeLater' if manually set 2025-06-11 02:02:58 +02:00
bourgesl
ee93b9f1a5 JBR-5497: improved system property (awt.mac.flushBuffers.invokeLater) handling to support false/auto/true modes and log used value at startup 2025-06-11 02:02:58 +02:00
bourgesl
ccbeef1b3b JBR-5497: simple fix to avoid deadlocks on macOS + mirroring displays:
- added more instrumentation on awt threads and AWTThreading.invokeAndWait() to detect and diagnose deadlocks
- enhanced awtLockListener to adopt nanotime for time accuracy + more advanced logging (caller, wait time) with histograms
- major ThreadUtilities performOnMainThread refactoring to observe thread coordination (state, callstacks) in order to avoid deadlocks while the appkit/main thread is waiting (performOnMainThreadWaiting:YES) in conflict with LWCToolkit.invokeLater() blocked in doAWTRunLoop (2nd)
- fixed CPlatformWindow.flushBuffers() to use LWCToolkit.invokeLater() to avoid deadlocks (EDT <-> main) if the the system property '-Dawt.mac.flushBuffers.invokeLater=true'
- use the new CGraphicsDevice.IsMirroring() to enable fix in CPlatformWindow.flushBuffers() too
- removed changes for JBR-5461 + cleanup + simplified awtLock() + keep few more invokeLater() when computer returns from sleep or displayChanged() to avoid deadlocks until solved definitely
- fixed review comments
2025-06-11 02:02:58 +02:00
bourgesl
a4db501c88 JBR-5497: revert JRSUIController changes (performOnMainThreadWaiting:YES) to avoid UI freeze but appkit violations must be fixed in follow-up fix 2025-06-11 02:02:58 +02:00
Vitaly Provodin
7bbe87134b update exclude list on results of 2865 test runs 2025-06-11 02:02:58 +02:00
Maxim Kartashev
3c8a712691 JBR-7889 Wayland: java/awt/Focus/ComponentLostFocusTest.java: class sun.awt.NullComponentPeer cannot be cast to class java.awt.peer.TextFieldPeer 2025-06-11 02:02:58 +02:00
Maxim Kartashev
c02adc43ec JBR-7989 Wayland: WLPopupVisibility test is failing if launched with fractional sun.java2d.uiScale
Use ceil when scaling the size, use floor when scaling the location
2025-06-11 02:02:58 +02:00
Vitaly Provodin
26aecd2b36 JBR-8006 specify path to gcc-toolset-10 2025-06-11 02:02:58 +02:00
Maxim Kartashev
ba55de4793 JBR-7993 Menus are not displayed directly underneath main menu if offset in monitor configuration exists 2025-06-11 02:02:58 +02:00
Vladimir Kharitonov
51da1dbdd7 JBR-7983 adapt the Dockerfile.oraclelinux to build jcef 2025-06-11 02:02:58 +02:00
Sergey Shelomentsev
8acdcf59c9 JBR-7919 add tests for Wayland popups 2025-06-11 02:02:58 +02:00
Maxim Kartashev
630a429e8c JBR-7972 Wayland: EXTREME lag when scrolling through any type of list in the settings when using WLToolkit
Avoid requesting the Wayland server to change the cursor when the change
is vacuous
2025-06-11 02:02:58 +02:00
Maxim Kartashev
73f9c80913 JBR-7969 Wayland: some popups misplaced when maximized with fractional scale 2025-06-11 02:02:58 +02:00
Maxim Kartashev
0edd747c07 JBR-7071 Wayland: cursor does not change when hovering over gutter icons 2025-06-11 02:02:58 +02:00
Maxim Kartashev
faa6d3f4d2 JBR-7879 Wayland: Self-moving quick-doc popup in nightly
- Position popups at the exact offset given; this is achieved by
  using the XDG_POSITIONER_ANCHOR_TOP_LEFT anchor
- Update of popups location is done in sync with all other updates
  that affect the size (like the surface size update)
- Maintain a popup's location relative to the popup's parent, not
  its toplevel window
2025-06-11 02:02:57 +02:00
Sergey Shelomentsev
c4bff03ba3 JBR-5318 add Github workflow usage for pull requests pre-commit testing
(cherry picked from commit f36aa7f9fa)
2025-06-11 02:02:57 +02:00
Vitaly Provodin
2018c4691d update exclude list on results of 2827 test runs 2025-06-11 02:02:57 +02:00
Vitaly Provodin
6152ef1b68 Update README.md 2025-06-11 02:02:57 +02:00
Sergey Shelomentsev
93f41554c8 JBR-7939 set max wait to 1 min for jetsign client 2025-06-11 02:02:57 +02:00
Nikita Gubarkov
5d3d4438a1 JBR-7683 Revert "8185862: AWT Assertion Failure in ::GetDIBits(hBMDC, hBM, 0, 1, 0, gpBitmapInfo, 0) 'awt_Win32GraphicsDevice.cpp', at line 185"
This reverts commit 1ad3ebcf
2025-06-11 02:02:57 +02:00
Vitaly Provodin
c518dd4651 Update README.md 2025-06-11 02:02:57 +02:00
Vitaly Provodin
6d5647263f update exclude list on results of 2777 test runs 2025-06-11 02:02:57 +02:00
Sergey Shelomentsev
70fea5532f JBR-7867 Notarization scripts: fail build if signing of separate files are failed 2025-06-11 02:02:57 +02:00
Maxim Kartashev
76c2b61801 JBR-7916 Wayland: tests open-sourced in 2024.09 fail 2025-06-11 02:02:57 +02:00
Vitaly Provodin
a3dd961767 update exclude list on results of 2765 test runs 2025-06-11 02:02:57 +02:00
Maxim Kartashev
930c93ac33 JBR-5483 MacOSXWatchService assumes that the default file system is the UnixFileSystem, which might not be the case
(cherry picked from commit 0af640f048)
2025-06-11 02:02:57 +02:00
Maxim Kartashev
5fd3c03470 JBR-3862 Implement native WatchService on MacOS
The watch service is based on FSEvents API that notifies about file
system changes at a directory level. It is possible to go back to
using the old polling watch service with -Dwatch.service.polling=true.

Features include:
- support for FILE_TREE option (recursive directory watching),
- minimum necessary I/O (no filesystem access more than once
  unless needed),
- one thread ("run loop") per WatchService instance,
- changes are detected by comparing file modification times with
  millisecond precision,
- a directory tree snapshot is taken at the time of WatchKey creation
  and can take a long time (proportional to the number of files).

(cherry picked from commit f91ddf657a)
2025-06-11 02:02:57 +02:00
Maxim Kartashev
e4bfb1e3f2 JBR-7859 Wayland: Unexpected focus owner set in a Window 2025-06-11 02:02:57 +02:00
Maxim Kartashev
9fbad5826c JBR-7851 Wayland: IDEA crashes if Esc is pressed to close Diff window 2025-06-11 02:02:56 +02:00
Maxim Kartashev
1a856d6d2b JBR-3572 Wayland: java/awt/Window/WindowTitleVisibleTest/WindowTitleVisibleTestLinuxGnome.java: title bar shown and hidden are the same.
Exclude the test when running under XWayland that doesn't implement
screen capture necessary for the test to function.

(cherry picked from commit 4326028811)
2025-06-11 02:02:56 +02:00
Maxim Kartashev
1c3b3082e2 JBR-7760 Pure wayland: incorrect popup scale
(cherry picked from commit d16c50248d)
2025-06-11 02:02:56 +02:00
Sergey Shelomentsev
6840069d2b JBR-7856 use jmod from currently built JDK
(cherry picked from commit 5c90a8d4aa)
2025-06-11 02:02:56 +02:00
Sergey Shelomentsev
cb8bd42de6 fixup! JBR-7800 Add jnativescan to signing
(cherry picked from commit 3ef8a52e0c)
2025-06-11 02:02:56 +02:00
Nikita Gubarkov
8607a2303c JBR-7846 Vulkan: Fix compilation in Musl Docker container
(cherry picked from commit 79b9f5b71c)
2025-06-11 02:02:56 +02:00
sergey.shelomentsev
19c12ed82d JBR-7800 Fix notarization of jbrsdk (sign libs and execs inside jmod files)
(cherry picked from commit dbb42d10f5)
2025-06-11 02:02:56 +02:00
Vitaly Provodin
412a74216d Update README.md
(cherry picked from commit ff4c5dc7b5)
2025-06-11 02:02:56 +02:00
Vitaly Provodin
9d9ab8fbda JBR-6144 enable building JBR with Vulkan
(cherry picked from commit 099698fa19)
2025-06-11 02:02:56 +02:00
Nikita Gubarkov
1114301350 JBR-7840 Vulkan: Fix compilation in Docker container
(cherry picked from commit f678372d66)
2025-06-11 02:02:56 +02:00
Dmitrii Morskii
8be6ca5f9d JBR-6754 setting nopixfmt in case of running on Remote Desktop
(cherry picked from commit de5d101cac)
2025-06-11 02:02:56 +02:00
Dmitry Batrak
d8dd7bbaaf JBR-7833 Wayland: typeahead problem in a popup
(cherry picked from commit 6093b65936)
2025-06-11 02:02:56 +02:00
Maxim Kartashev
2ae9f5624d JBR-7811 Wayland: IDE dialogs and popups flash black before opening
(cherry picked from commit 0703011d40)
2025-06-11 02:02:56 +02:00
Sergey Shelomentsev
34b93b1ee9 JBR-7734 add zip distribution for Windows
(cherry picked from commit da26c98b82)
2025-06-11 02:02:56 +02:00
Maxim Kartashev
a4f01702ca JBR-7700 Route java.io file system operations via java.nio.file
Use -Djbr.java.io.use.nio=false to undo

(cherry picked from commit ef22b4cc55)
2025-06-11 02:02:56 +02:00
Konstantin Nisht
41acaa6e91 JBR-7466 Exception on VM startup with -Djava.util.zip.use.nio.for.zip.file.access=true
(cherry picked from commit 79f79bf137)
2025-06-11 02:02:55 +02:00
Konstantin Nisht
2dd1687041 JBR-7392: Use NIO FS in ZipFile
(cherry picked from commit e21c67095b)
2025-06-11 02:02:55 +02:00
Vitaly Provodin
44a913d186 Update README.md
(cherry picked from commit 0d66d2bf26)
2025-06-11 02:02:55 +02:00
Vitaly Provodin
d318ca8af0 JBR-7797 build fastdebug without jcef
(cherry picked from commit cb322fe90d)
2025-06-11 02:02:55 +02:00
Maxim Kartashev
ce74603d46 JBR-6691 test/jdk/jdk/internal/misc/VM/RuntimeArguments.java fails on Linux
(cherry picked from commit a3ecac8a79)
2025-06-11 02:02:55 +02:00
Maxim Kartashev
92b4847539 JBR-7663 Wayland: make gtk-shell1 protocol support optional
(cherry picked from commit 30e6c720b6)
2025-06-11 02:02:55 +02:00
Maxim Kartashev
b69449a83e BR-7663 Wayland: generate proxy code with wayland-scanner on the fly
(cherry picked from commit d599043b7d)
2025-06-11 02:02:55 +02:00
Maxim Kartashev
dbb2478149 JBR-7663 Wayland: add wayland-protocols to the docker files
(cherry picked from commit 8d207ee7e7)
2025-06-11 02:02:55 +02:00
Maxim Kartashev
b604c5b2dd JBR-7726 X11 toolkit: Dialog buttons rendering black rectangle after hovering
(cherry picked from commit 18e63514c5)
2025-06-11 02:02:55 +02:00
Dmitrii Morskii
74ea0c5c75 JBR-7302 added additional emptiness check in getGlyphOutlineBounds
(cherry picked from commit 60fd39e59d)
2025-06-11 02:02:55 +02:00
Nikita Gubarkov
ecbe44b367 JBR-7766 Fix VKTexturePool OOM.
(cherry picked from commit 1a806f4f1b)
2025-06-11 02:02:55 +02:00
Nikita Tsarev
c7d2440a61 JBR-7764: Disable window decorations in test/jb/java/awt/Window/RestoreFromFullScreen.java, so that the test doesn't fail spuriously on some WMs
(cherry picked from commit 80c2a5969d)
2025-06-11 02:02:55 +02:00
Maxim Kartashev
118162331d JBR-7749 Settings popup invoked from the main toolbar appears misaligned if fractional scaling set
(cherry picked from commit d41d89e8b4)
2025-06-11 02:02:55 +02:00
Nikita Gubarkov
8035b0ff5c JBR-4725 File dialog modality
(cherry picked from commit 2a5b044c95)
2025-06-11 02:02:55 +02:00
Maxim Kartashev
324c53f638 JBR-7544 Wayland: Cannot resize window to more that 3500px vertically
(cherry picked from commit ef3dfff3ae)
2025-06-11 02:02:54 +02:00
Vitaly Provodin
dfb43ae5d6 Update README.md
(cherry picked from commit 7b6bc93034)
2025-06-11 02:02:54 +02:00
Maxim Kartashev
7a99f238c5 JBR-7748 java/awt/font/JNICheck/FreeTypeScalerJNICheck.java: JNI call made without checking exceptions when required to from CallVoidMethod
(cherry picked from commit ad45f6aec0)
2025-06-11 02:02:54 +02:00
Vitaly Provodin
48e366e4ca Update README.md
(cherry picked from commit dd41dbcb7b)
2025-06-11 02:02:54 +02:00
Maxim Kartashev
8b773539d2 JBR-7721 Copying from IntelliJ in pure Wayland on ChromeOS confuses UTF-8 and UTF-16
Avoid data flavor without an explicit charset

(cherry picked from commit 86acba5870)
2025-06-11 02:02:54 +02:00
Nikita Tsarev
8a18f3e9b5 JBR-6324: JBR API for System Shortcuts (macOS)
(cherry picked from commit 22d406a76b)
2025-06-11 02:02:54 +02:00
Nikita Tsarev
6241d7e4bc JBR-5690: Reload next window shortcut when it changes
(cherry picked from commit be0d27983c)
2025-06-11 02:02:54 +02:00
Nikita Tsarev
e4813a42c7 JBR-5726: Report 'Move focus to the previous window in application' system shortcut
(cherry picked from commit 5721bd6908)
2025-06-11 02:02:54 +02:00
Nikita Gubarkov
9bb7e2eeb4 JBR-7653 Prepare Docker images for Vulkan builds
(cherry picked from commit 249c46bb6b)
2025-06-11 02:02:54 +02:00
Nikita Gubarkov
3f60b9e9b5 JBR-7673 Cleanup docker scripts
(cherry picked from commit 473686a92e)
2025-06-11 02:02:54 +02:00
Nikita Tsarev
f54ecea101 JBR-5448: Return all shortcuts from readSystemHotkeys
(cherry picked from commit bb25ab3424)
2025-06-11 02:02:54 +02:00
Nikita Gubarkov
82293596cc JBR-7579 Fix SurfaceManager.cacheMap retaining strong references.
(cherry picked from commit b8434796ae)
2025-06-11 02:02:54 +02:00
Alexey Ushakov
8ee0dd8877 JBR-7724 Add vulkan support to the performance scripts
Implemented -vulkan option

(cherry picked from commit 6f1ecb9b47)
2025-06-11 02:02:54 +02:00
Vitaly Provodin
40ee68a78f Update README.md
(cherry picked from commit a51b24a7eb)
2025-06-11 02:02:54 +02:00
Nikita Gubarkov
6de4311f23 JBR-7565 Vulkan: Implement clip 2025-06-11 02:02:54 +02:00
Nikita Gubarkov
7179fce399 JBR-7645 Vulkan: Implement hash table for pipeline sets 2025-06-11 02:02:53 +02:00
Nikita Gubarkov
1ae4e49313 JBR-7563 Vulkan: Implement MASK_FILL
Mask bytes are copied to texel buffer to be used in shader.
Up to 256KiB (configurable) of mask can be rendered in a single draw call, with no limit on number of MASK_FILL operations in a single batch.

Also added dirty implementation of greyscale-AA DRAW_GLYPH_LIST and FILL_AAPARALLELOGRAM over MASK_FILL.

(cherry picked from commit 4651c3f096)
2025-06-11 02:02:53 +02:00
Nikita Gubarkov
5772624cdb JBR-7564 Vulkan: Fix HIDPI and multi-monitor scenarios
(cherry picked from commit 7f0b10ad23)
2025-06-11 02:02:53 +02:00
Nikita Gubarkov
5945c42c3e JBR-7575 Vulkan: Implement composites (blending and XOR mode)
- Implemented dynamic pipeline compilation.
- Added 64-bit per pixel format usage in debug mode for testing.
- Now passing colors from Java to Vulkan with straight alpha.

(cherry picked from commit 3d7baad687)
2025-06-11 02:02:53 +02:00
Nikita Gubarkov
b7dea129be JBR-7943 Vulkan: Provide utilities for inspecting image formats 2025-06-11 02:02:53 +02:00
Vitaly Provodin
a761c32700 Update README.md
(cherry picked from commit 770c075320)
2025-06-11 02:02:53 +02:00
Nikita Gubarkov
6d75d405d8 JBR-7574 Vulkan: Implement memory allocator
(cherry picked from commit 0be149c84e)
2025-06-11 02:02:53 +02:00
Nikita Tsarev
a693d8c0dd JBR-7524: Workaround for showing window tiling actions when hovering over the maximize button on macOS
(cherry picked from commit 8fb519bec4)
2025-06-11 02:02:53 +02:00
Maxim Kartashev
10c91bf9fd JBR-7504 Use accurate event serial number with the clipboard
(cherry picked from commit d935bd156e)
2025-06-11 02:02:53 +02:00
Maxim Kartashev
8563c7bcf7 JBR-7504 WLToolkit - Middle click paste doesn't work properly when pasting to other applications
(cherry picked from commit b553c722be)
2025-06-11 02:02:53 +02:00
Alexey Ushakov
63a1f0834d JBR-7677 Vulkan: Implement Graphics.drawImage()
Implemented:
 - raster loading and blit primitive
 - transform for VKBlitSwToTextureViaPooledTexture
Used texture pool to get temporary image

(cherry picked from commit bf04a71bce)
2025-06-11 02:02:53 +02:00
Egor Ushakov
479c628a3c JBR-1354 com/sun/tools/attach/PermissionTest.java: access denied ("java.util.PropertyPermission" "sun.tools.attach.tmp.only" "read")
(cherry picked from commit 3a09f6c1db)
(cherry picked from commit 3b2399fc35)
2025-06-11 02:02:53 +02:00
Egor Ushakov
8e8ed6a32b JBR-1061 .attach_pid files in the working dir - flag to put .attach file in tmp dir only
(cherry picked from commit 4bd3f7835e)
(cherry picked from commit b7a3a346e6)
2025-06-11 02:02:53 +02:00
Vitaly Provodin
46d1d3909e Update README.md
(cherry picked from commit 64f5af4fda)
2025-06-11 02:02:53 +02:00
Nikita Tsarev
7d4113b5a1 JBR-7672: Only abort key repeat when the key that is being repeated is released [WLToolkit]
(cherry picked from commit a500b52ecb)
2025-06-11 02:02:52 +02:00
Nikita Tsarev
3edbbe5b2a JBR-7662: Fix key repeat manager sometimes not cancelling properly [WLToolkit]
(cherry picked from commit e1b1116bb9)
2025-06-11 02:02:52 +02:00
Vitaly Provodin
53e1dfbcad JBR-7511 migrate build platforms to OL8
- remove Vulcan part that causing builds to fail
- modify scripts for building images from Oracle Linux 8
- update jb/build/VerifyDependencies.java to check libraries have no dependency on symbols from glibc version higher than 2.28
- rename Ubuntu2004 docker files
- upgrade wayland up to wayland-devel-1.21.0-1

(cherry picked from commit 2092570840)
2025-06-11 02:02:52 +02:00
bourgesl
c26a68ba21 JBR-7616: fixed type (str)
(cherry picked from commit a6569241db)
2025-06-11 02:02:52 +02:00
Nikita Tsarev
599658479d JBR-7675: Respect disabling key repeat [WLToolkit]
(cherry picked from commit 723f45aca7)
2025-06-11 02:02:52 +02:00
Vitaly Provodin
7745157af3 JBR-7566 apply standard measurement scripts to Render
(cherry picked from commit be24b3e8ed)
2025-06-11 02:02:52 +02:00
Vitaly Provodin
560c955174 JBR-7567 apply standard measurement scripts to Dacapo
(cherry picked from commit 289121d0ea)
2025-06-11 02:02:52 +02:00
bourgesl
48037840e4 JBR-7616: added ThreadUtilities.lwc_plog(env, formatMsg, ...) to use LWCToolkit's PlatformLogger instead of NSlog (only as fallback now) used by MTLRenderQueue, updated MTLUtils to share mtlDstTypeToStr(op)
(cherry picked from commit 8d240740ce)
2025-06-11 02:02:52 +02:00
Vitaly Provodin
6846ddfe09 Update README.md
(cherry picked from commit f3fc7649fb)
2025-06-11 02:02:52 +02:00
Vitaly Provodin
134b976502 Update README.md
(cherry picked from commit 12dd44c724)
2025-06-11 02:02:52 +02:00
Nikita Gubarkov
b3fa0593fd JBR-7572 Bring back VKBuffer functions
(cherry picked from commit 90e516f24c)
2025-06-11 02:02:52 +02:00
Nikita Gubarkov
20233341c1 JBR-7644 Vulkan: Move barrier state tracking from surface into image
(cherry picked from commit 76dbad4387)
2025-06-11 02:02:52 +02:00
Nikita Gubarkov
4e84cd97ef JBR-7572 Vulkan: Implement vertex buffer pool
Track and reuse vertex buffers, no need to allocate and bind a new buffer on each draw.

(cherry picked from commit e607e789c2)
2025-06-11 02:02:52 +02:00
Vitaly Provodin
903aa3b518 Update README.md
(cherry picked from commit 62d575dfe4)
2025-06-11 02:02:52 +02:00
Nikita Gubarkov
f69aee7110 JBR-7556 Check negative glyphID in HBShaper
(cherry picked from commit 76852278f4)
2025-06-11 02:02:52 +02:00
bourgesl
54b9e539ed JBR-7616: improved MTLRenderQueue exception handling
(cherry picked from commit ea57bf75e7)
2025-06-11 02:02:51 +02:00
Maxim Kartashev
3a98f70972 JBR-7600 Provide ability to add messages to fatal error log
Use JNU_LOG_EVENT(env, msg, ...) to save a message in the internal
JVM ring buffer that gets printed out to the Events section
of the fatal error log if JVM crashed.

(cherry picked from commit 7a6184d309)
2025-06-11 02:02:51 +02:00
Nikita Provotorov
0fb0f30cb3 JBR-5673: Wayland: support touch scrolling.
- Adding information to WLPointerEvent about wl_pointer::axis* events along the X axis;
- Introducing 'WLComponentPeer#convertPointerEventToMWEParameters' - a routine for converting WLPointerEvent parameters to parameters required for MouseWheelEvent s;
- Handling both X and Y axes within the WLPointerEvent dispatching routine.

(cherry picked from commit 6afbc34d4b)
(cherry picked from commit 8b091f52d1)
2025-06-11 02:02:51 +02:00
Nikita Provotorov
23a9460570 JBR-7459: Wayland: touchpad scrolling is too sensitive.
- Remaking the mapping of wl_pointer::axis events values to MouseWheelEvent rotations to eliminate the touchpad scrolling behavior "the more slowly the fingers move, the more pixels are scrolled";
- Accumulating the fraction parts of wl_pointer::axis events values to improve the accuracy of touchpad scrolling;
- Distinguishing between wheel scrolling and touchpad scrolling to fine-tune MouseWheelEvent parameters for each of these cases.

(cherry picked from commit 874d5698bc)
(cherry picked from commit cb41fa53f0)
2025-06-11 02:02:51 +02:00
Vitaly Provodin
413f9dbef0 Update README.md
(cherry picked from commit 29f3f9f229)
2025-06-11 02:02:51 +02:00
Sergei Tachenov
a6143f3655 JBR-7586 Fix title click ungrab when an active user component is clicked
Swing requires that clicking frame decorations should cause the window
to be ungrabbed. However, if a custom title is used, and that title contains
user-provided components, then clicking such components should not
cause the window to be ungrabbed, otherwise a menu located in a custom
title behaves incorrectly.

Fix by using the same logic as for the native actions, such as moving the window.
If the native actions are allowed, then ungrabbing is allowed as well.
Otherwise, do not ungrab, let the component behave like it's located in the client area.

The fix is supplemented with a new regression test "test/jdk/jb/javax/swing/CustomTitleBar/JMenuClickToCloseTest.java".

(cherry picked from commit f82c018914)
2025-06-11 02:02:51 +02:00
Nikita Tsarev
677a54cbed JBR-7594 Check for LWCToolkit in JBR TextInput API
(cherry picked from commit 3c1fd1c3e6)
2025-06-11 02:02:51 +02:00
Sergei Tachenov
ed5f4e91e5 JBR-7484 Update the cursor on mouse entered/exited
AppKit resets the cursor on native mouse entered/exited events. Depending on the order of events, it may end up setting the wrong cursor. So update it forcibly on such events.

(cherry picked from commit 2de56405aa)
2025-06-11 02:02:51 +02:00
Sergei Tachenov
800a6e3f77 JBR-7481 Work around mouse entered/exited bug
To fix missing mouse entered/exited events when
using rounded corners, we keep track of mouse moved events. When a mouse moved event is detected, and the current peer under the cursor belongs to a different window, we send fake mouse entered/exit events to the old and new windows. We also filter late mouse exited events.

The workaround is enabled by default with the VM option "awt.mac.enableMouseEnteredExitedWorkaround" to disable it in case something breaks.

About the test:
Use the robot to find the points when the mouse
entered event is sent to the popup when the mouse
enters through a rounded corner, and the similar
point for entering the outer window when exiting
through such a corner.

Once the points are found, move the mouse back
and forth to that point, but not beyond.
The correct behavior is that when the mouse
enters the popup, a mouse exited event is sent
to the outer frame and vice versa.
Therefore, every mouse entered/exited event
should be received exactly once.

Use reflection to set the rounded corners,
as JBR API isn't available in tests.

(cherry picked from commit 0b5beaf2eb)
2025-06-11 02:02:51 +02:00
Vitaly Provodin
08b40f7de9 Update README.md
(cherry picked from commit 170a7cfa7f)
2025-06-11 02:02:51 +02:00
Alexey Ushakov
728d042091 JBR-7588 Metal: Reuse MTLContext for all GCs of the same GPU
Implemented reference counting for shared MTLContext objects. Supported multiple display links per MTLContext. Also, works for macOS version < 10.13

(cherry picked from commit c6aa7f18e5)
2025-06-11 02:02:51 +02:00
Nikita Gubarkov
9e448b2115 JBR-5973 Vulkan: Fix validation errors (#452)
- Added proper synchronization and image layout transitions.
- Refactored VKRenderer to hold per-device rendering context. Isolated surface rendering contexts.
- Implemented reusing of command buffers and semaphores
- Fixed surface resize, made surface initialization more robust.
- Added on-demand pipeline creation for actual surface formats.
- Added missing destruction logic.
- Added macros for easy checking of return codes, logging with source code location.
- Moved implementation details out of headers where possible. Stripped dead code.
- Implemented consistent OOM strategy from dynamic arrays and ring buffers.

(cherry picked from commit 91aafbe5d2)
2025-06-11 02:02:51 +02:00
Maxim Kartashev
640ab868b8 JBR-5615 added missing part for WLToolkit
(cherry picked from commit f407b957f2)
2025-06-11 02:02:51 +02:00
Dominik Matta
568afeb59c JBR-6763 Wayland: application crashes when popup closed
Certain Wayland compositors (wlroots) invalidate xdg_surface after window with popup loses focus. Subsequent attempts to
commit the popup window fail with protocol error "xdg_surface has never been configured".

Handle popup_done event by hiding the popup window. Also emit WINDOW_CLOSING event as otherwise focus remains on the popup parent.

Co-authored-by: Maxim Kartashёv <maxim@kartashev.spb.ru>
(cherry picked from commit 873a085de4)
2025-06-11 02:02:51 +02:00
Maxim Kartashev
b64099a2bc JBR-6468 Wayland: java/awt/datatransfer/MimeFormatsTest.java fails by timeout
Excluded the test from jdk_awt_wayland as it can't be made to work
under Wayland.

(cherry picked from commit 7a3077ded9)
2025-06-11 02:02:50 +02:00
Maxim Kartashev
e6b2bdaa67 Added proper copyright headers
(cherry picked from commit 0d5aea938e)
2025-06-11 02:02:50 +02:00
Nikita Gubarkov
b20f9e334f Fix WindowMoveService on Wayland
(cherry picked from commit 00f213d0ff)
2025-06-11 02:02:50 +02:00
Nikita Gubarkov
d80f58ccfc JBR-7570 Implemented ring buffer. Added lazy implicit initialization for dynamic arrays. (#451)
(cherry picked from commit 7b89fe2311)
2025-06-11 02:02:50 +02:00
Nikita Gubarkov
ac1ff156db JBR-7568 Vulkan: Refactor VKLogicalDevice into VKDevice (#449)
* Renamed VKLogicalDevice to VKDevice for conformance and convenience.
* Refactored device->device to device->handle for clarity.

(cherry picked from commit aba56fd3a9)
2025-06-11 02:02:50 +02:00
Nikita Gubarkov
0cb9ed94a0 JBR-7569 Removed VMA-Hpp (#450)
(cherry picked from commit 3867557192)
2025-06-11 02:02:50 +02:00
Dmitrii Morskii
47c1046ca4 JBR-7126 add more possible names for cursor arrow icon
(cherry picked from commit 95e391166d)
2025-06-11 02:02:50 +02:00
Vitaly Provodin
0a503079dd JBR-5989 Wayland: jdk_swing_wayland test group 2025-06-11 02:02:50 +02:00
Maxim Kartashёv
b0d4fe90cb JBR-7016 IDEA 2024.2 Wayland: UI Crash when selecting Code and pressing Alt+Enter
(cherry picked from commit 35776b5975)
2025-06-11 02:02:50 +02:00
Maxim Kartashёv
d0d746342e JBR-7493 Wayland: can't start in maximized state on WSL
(cherry picked from commit 18e39cafa0)
2025-06-11 02:02:50 +02:00
Maxim Kartashёv
0614f9be61 JBR-7516 Wayland: DamageList_AddList: Assertion `list != add' failed
(cherry picked from commit 674b7d1dac)
2025-06-11 02:02:50 +02:00
Maxim Kartashёv
750234fcb0 JBR-7501 Wayland: SurfaceData.flush() method is mis-used
(cherry picked from commit 1299f0f6c6)
2025-06-11 02:02:50 +02:00
Nikita Tsarev
74477cc018 JBR-7478: Fix wrong timestamps on KEY_TYPED events [WLToolkit]
(cherry picked from commit c47edfa7c7)
2025-06-11 02:02:50 +02:00
lbourges
1bdac04e9e JBR-7461: Implement VKTexturePool for the linux vulkan pipeline:
- based on common AccelTexturePool
 - new VKTexturePool instance in VKLogicalDevice
 - fixed SIGSEGV in VKImage dispose
 - store device in TPI
 - indentation fixes
 - merged with latest changes for JBR-7460
 - use (ATexturePoolLock_init)(void)
 - fixed logs in lock implementations + fixed indentation
 - fixed MTLTexturePool to pre-processor conditions (not runtime) on USE_ACCEL_TEXTURE_POOL

(cherry picked from commit 5515b0fbfc)
2025-06-11 02:02:50 +02:00
Maxim Kartashёv
cd15aebd1f JBR-7313 Wayland: error: xdg_surface buffer does not match the configured maximized state
(cherry picked from commit 4bb0306175)
2025-06-11 02:02:50 +02:00
Maxim Kartashev
3f7cf43f80 JBR-7397 Wayland: make certain interfaces optional
(cherry picked from commit a1dcba231a)
2025-06-11 02:02:49 +02:00
Maxim Kartashev
e9cab827af JBR-7397 CLion 2024.2-EAP/Wayland crashes on startup with Miriway
Check if all non-optional interfaces are supported before actually
starting to run

(cherry picked from commit 632a0ace4c)
2025-06-11 02:02:49 +02:00
Alexey Ushakov
353e010e04 JBR-7452 Vulkan: Reuse VkRenderPass for multiple renderers (#428)
Moved shared VkRenderPass to the logical device

(cherry picked from commit 3d782ed0f0)
2025-06-11 02:02:49 +02:00
Alexey Ushakov
f8f10bcc41 JBR-7420 Vulkan: Implement DRAW_PARALLELOGRAM primitive for flat color rendering (#426)
Refactored rendering code. Provided common implementation for fill and draw operations.

(cherry picked from commit 902f65c6ae)
2025-06-11 02:02:49 +02:00
Nikita Gubarkov
6d0b47537f JBR-7419 Refactor Vulkan code
- Separate instance and device-specific function tables
- Avoid using device from global context when possible
- Set up debug logger

(cherry picked from commit af4eb8b758)
2025-06-11 02:02:49 +02:00
Maxim Kartashёv
8d4bbd2557 JBR-7390 Wayland: need better headless exception message
(cherry picked from commit b68c0ecc6f)
2025-06-11 02:02:49 +02:00
Maxim Kartashёv
e6018ea336 JBR-7259 Find Usages popup can't be resized under Wayland
Popup's positioner size has to be in sync with popup's buffer size

(cherry picked from commit 5d67a135e4)
2025-06-11 02:02:49 +02:00
Maxim Kartashёv
e35e189a31 JBR-7254 Impossible to copy/paste files in Project tree
(cherry picked from commit 762cd2b23e)
2025-06-11 02:02:49 +02:00
Maxim Kartashev
2b4bc57659 JBR-7290 Wayland: window permanently looses focus after invoking Go To Line dialog
(cherry picked from commit c381634aff)
2025-06-11 02:02:49 +02:00
Alexey Ushakov
7e0e2c26a9 JBR-7308 Vulkan: Build failure in vulkan enabled builds
Added missing header (jni_util.h)

(cherry picked from commit 02fb3aee06)
2025-06-11 02:02:49 +02:00
Alexey Ushakov
cfdf1f7ab2 JBR-7305 Vulkan: Implement FILL_SPANS primitive for flat color rendering
Implemented flat color shape rendering

(cherry picked from commit 6f84d82d1d)
2025-06-11 02:02:49 +02:00
Nikita Gubarkov
48ea8a91b9 JBR-7307 Add stub for VKInstance.initNative with disabled Vulkan.
(cherry picked from commit e834ce867f)
2025-06-11 02:02:49 +02:00
Nikita Gubarkov
041be07c1d JBR-7237 Fix cyclic dependency of Wayland and Vulkan initialization (#396)
(cherry picked from commit cde482c1fd)
2025-06-11 02:02:49 +02:00
Maxim Kartashёv
abb9445bee JBR-7072 Wayland: clicks on items of floating context menus are ignored (#405)
JBR-7072 Wayland: clicks on items of floating context menus are ignored

(cherry picked from commit 4083b43591)
2025-06-11 02:02:49 +02:00
Alexey Ushakov
a2fd3f690a JBR-7256 Vulkan: Implement FILL_PARALLELOGRAM primitive for flat color rendering
(cherry picked from commit 57dc1a9e23)
2025-06-11 02:02:48 +02:00
Maxim Kartashev
2a520000cd JBR-7237 Separate display connect from WLToolkit initialization
(cherry picked from commit 768d46d049)
2025-06-11 02:02:48 +02:00
Maxim Kartashev
27068a9dd0 JBR-7202 wayland: memory leak when resizing windows
(cherry picked from commit 64660b0c00)
2025-06-11 02:02:48 +02:00
Maxim Kartashev
d22ebff6ac JBR-7206 Wayland: Stylepad demo flickers when resizing on KDE
(cherry picked from commit 996d4f7490)
2025-06-11 02:02:48 +02:00
Alexey Ushakov
650ee5901c JBR-6543 Vulkan: migrate current code to pure c (#267)
JBR-6543 Vulkan: migrate current code to pure c

Replaced C++ vulkan rendering with C one

(cherry picked from commit 85e44bf973)
2025-06-11 02:02:48 +02:00
Maxim Kartashev
98dc341216 JBR-7209 Wayland: modernize window decorations
(cherry picked from commit d3496bc966)
2025-06-11 02:02:48 +02:00
Maxim Kartashev
c59c973de1 JBR-7201 Wayland: update copyright in files generated by wayland-scanner
(cherry picked from commit 33a7167108)
2025-06-11 02:02:48 +02:00
Maxim Kartashev
8f0f25b6c7 JBR-7198 Wayland: jvm crashes under KDE
Do not copy the buffer if the drawing buffer has not been resized yet as
the size will not match that of the show buffer.
Also, properly guard against the size change by another thread while
copying.

(cherry picked from commit 8ff1d3c6aa)
2025-06-11 02:02:48 +02:00
Maxim Kartashev
a395893a5b JBR-7158 Wayland: scale with wp_viewport instead of buffer scale
(cherry picked from commit 8227e43343)
2025-06-11 02:02:48 +02:00
Maxim Kartashev
70e406c19e JBR-7028 Implement FPS counter on Linux
Use -Dawt.window.counters to enable.
To output counters per second to stdout/stderr,
use -Dawt.window.counters=stdout or =stderr.

A counter by the name swing.RepaintManager.updateWindows
is always available for Swing applications, but it does not
accurately correspond to frames per second.

Toolkit-dependent counters provide much better accuracy.
On Wayland with memory buffers as the backend two are available:
java2d.native.frames - frames delivered to the Wayland server
java2d.native.framesDropped - fully formed frames that were not
delivered to the Wayland server

(cherry picked from commit 639a7b4a5e)
2025-06-11 02:02:48 +02:00
Maxim Kartashev
64008d6bbb JBR-7047 Deadlock on git fetch on Wayland
(cherry picked from commit eabaada5bc)
2025-06-11 02:02:48 +02:00
Maxim Kartashev
890b1a7dc6 JBR-6576 Wayland: exception when double-clicking dialog title bar
(cherry picked from commit e42b74780b)
2025-06-11 02:02:48 +02:00
Maxim Kartashev
bd659eef53 JBR-7058 Wayland: IDE hang on the popup appearance
Clean up the damage list when resizing a surface.
Additionally, clamp the damaged area before copying to its current
actual size in order to safeguard against invalid external input.

(cherry picked from commit 392a016333)
2025-06-11 02:02:48 +02:00
tsarn
6d2a033ae9 JBR-7063: Make .getKeyChar() report chars in KEY_PRESSED/KEY_RELEASED events for compatibility [WLToolkit] (#371)
(cherry picked from commit bc5bdd2b9e)
2025-06-11 02:02:48 +02:00
tsarn
a39575c7ba JBR-6848: Support extra mouse buttons for navigation [WLToolkit]
(cherry picked from commit 2fb530835d)
2025-06-11 02:02:48 +02:00
tsarn
162c89140c JBR-6434: Fix pointer leave also resetting the keyboard modifiers [WLToolkit] (#370)
(cherry picked from commit bae7c40fa5)
2025-06-11 02:02:47 +02:00
tsarn
0c52705414 JBR-7044: Reset clickCount on mouse moves [WLToolkit]
(cherry picked from commit 0dc57e183c)
2025-06-11 02:02:47 +02:00
Maxim Kartashev
a262b6e1a8 JBR-7010 Wayland: Swing window resizing is not smooth enough
(cherry picked from commit 724bdfbabb)
2025-06-11 02:02:47 +02:00
Maxim Kartashev
00023151cf JBR-6926 Wayland: fonts are aliased/grainy on first start
(cherry picked from commit 9ee13ff658)
2025-06-11 02:02:47 +02:00
Maxim Kartashev
30b07430c8 JBR-6920 Wayland: some IDEA popups positioned incorrectly
(cherry picked from commit e28d2bacc7)
2025-06-11 02:02:47 +02:00
Maxim Kartashev
133c00724f JBR-6895 Wayland: cursor changes to resize at edges even when window is maximized
(cherry picked from commit a634a8b345)
2025-06-11 02:02:47 +02:00
Maxim Kartashev
ea7a3704af JBR-6884 SIGSEGV in Java_sun_java2d_wl_WLSMSurfaceData_pixelsAt
(cherry picked from commit 5b883749de)
2025-06-11 02:02:47 +02:00
Maxim Kartashev
80f8766eb3 JBR-6448 Wayland: IDEA window looks pixelated after monitors scale was changed
(cherry picked from commit 3318c2260b)
2025-06-11 02:02:47 +02:00
Maxim Kartashev
59001866e8 JBR-6814 Wayland: support sun.java2d.uiScale property
(cherry picked from commit 2d420bfd59)
2025-06-11 02:02:47 +02:00
Alexey Ushakov
0d6c29986c JBR-6787 WLToolkit/wsl: crash in WLComponentPeer.setCursor
Added check for unavailable cursor pData

(cherry picked from commit b24e4bce02)
2025-06-11 02:02:47 +02:00
Maxim Kartashev
58f104dd52 JBR-6783 MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.java: Found one Java-level deadlock
(cherry picked from commit 4e391051bd)
2025-06-11 02:02:47 +02:00
Maxim Kartashev
f4c03689c1 JBR-6504 Wayland: optional Robot capability to peek at current window's pixels
(cherry picked from commit 4e1bac1d8e)
2025-06-11 02:02:47 +02:00
Maxim Kartashev
bca4798fa4 JBR-6519 Linux: SIGSEGV at [libwayland] wl_proxy_get_version
Guard against passing NULL to libwayland

(cherry picked from commit 74ab4ac224)
2025-06-11 02:02:47 +02:00
Maxim Kartashev
ec35b3eee3 JBR-6736 libwakefield crashes weston
(cherry picked from commit 6777dcb2f7)
2025-06-11 02:02:47 +02:00
Maxim Kartashev
4b719dc680 JBR-6722 OutOfMemoryError: Failed to allocate Wayland surface buffer
(cherry picked from commit 8ccf0e158f)
2025-06-11 02:02:47 +02:00
Maxim Kartashev
8523d0a877 JBR-6617 Wayland: java/awt/Frame/HugeFrame/HugeFrame.java crashes JVM
(cherry picked from commit 1d9a2193c9)
2025-06-11 02:02:46 +02:00
Maxim Kartashev
08ed3d596e JBR-6598 Wayland: window gets un-maximized after switching
When the size of the buffer changes, cancel the frame callback
and make sure that the next surface commit happens with the new buffer.

(cherry picked from commit acb2a54349)
2025-06-11 02:02:46 +02:00
Maxim Kartashev
037c90a319 JBR-6469 Wayland: java/awt/image/ColorModel/DrawCustomColorModel.java throws UnsupportedOperationException
(cherry picked from commit 40da67b44e)
2025-06-11 02:02:46 +02:00
Maxim Kartashev
395c35cfc4 JBR-6467 Wayland: java/awt/GraphicsConfiguration/NormalizingTransformTest/NormalizingTransformTest.java fails
(cherry picked from commit 14339b83cd)
2025-06-11 02:02:46 +02:00
Maxim Kartashev
a4ff43eb6f JBR-6547 WLToolkit: no app icon in GNOME
Allow to associate the application's window with .desktop file with icon
and other info with -Dawt.app.id=... (DBus application name similar to
WM_CLASS in X

(cherry picked from commit 5901915afb)
2025-06-11 02:02:46 +02:00
Maxim Kartashev
9815fc2143 JBR-6559 Wayland: popups may stop working after a while
Cancel the frame callback when hiding a window.

(cherry picked from commit fd4ba3f752)
2025-06-11 02:02:46 +02:00
Maxim Kartashev
e3f50beee9 JBR-6452 Wayland: avoid copying entire surface buffers
(cherry picked from commit b13bcec55b)
2025-06-11 02:02:46 +02:00
Maxim Kartashev
0ef79b93f0 JBR-6452 Wayland: measure and improve surface buffer management
Improved rendering performance by
* reducing memory copy and making it more efficient,
* tying the next frame display to the frame event from Wayland,
  which dramatically reduces load for very quick Swing apps,
* limiting the number of buffers to 2.

(cherry picked from commit e625eeca1e)
2025-06-11 02:02:46 +02:00
Dmitrii Morskii
5ba429e27a JBR-6372 Wayland:
-correctly positioning SplashScreen on multiple monitors;
-correctly correctly handles cases of SplashScreen with gif with transparent parts;
-refactoring;

(cherry picked from commit 7d750cfbcf)
2025-06-11 02:02:46 +02:00
Alexey Ushakov
ac8b2aa398 JBR-6445 Prepare RepaintManager code for displaySync=false
Refactored AWTAccessor code

(cherry picked from commit acbd18f361)
2025-06-11 02:02:46 +02:00
Dmitry Batrak
b6420e97c2 JBR-5961 Wayland: can't switch between projects using menu
fix activation not working on Ubuntu 23 (mutter 45.2), after a mouse button has been pressed in the originally active window

(cherry picked from commit 07fa18103e)
2025-06-11 02:02:46 +02:00
Maxim Kartashev
bda990cfb6 JBR-6416 Wayland: IDEA maximize button out of sync sometimes
(cherry picked from commit 6122875478)
2025-06-11 02:02:46 +02:00
Maxim Kartashev
07ea6319ef JBR-6391 Wayland: memory indicator tooltip flickers
(cherry picked from commit e84bddb1ba)
2025-06-11 02:02:46 +02:00
Dmitrii Morskii
82469f42f8 JBR-6213 Wayland: removed blurring on cursor on multiple monitors with different scales
(cherry picked from commit fa7844da7c)
2025-06-11 02:02:46 +02:00
Maxim Kartashev
7909785870 JBR-6276 Wayland: WLToolkit logs too much
Changed the logging level for such messages to FINE

(cherry picked from commit e946179554)
2025-06-11 02:02:45 +02:00
Maxim Kartashev
fe56b5a466 JBR-6316 Wayland: WLSMSurfaceData.getReplacement() throws UOE
Also fixed the keyboard repeat manager so that it does not prevent
application from shutting down.
Also improved fullscreen support.

(cherry picked from commit a36c9604b1)
2025-06-11 02:02:45 +02:00
Maxim Kartashev
68631a3d82 JBR-6321 Wayland: popup windows do not respect screen bounds
(cherry picked from commit b8b08a36aa)
2025-06-11 02:02:45 +02:00
Maxim Kartashev
c154e73fbb JBR-6313 Wayland: pasting from clipboard doesn't always work
Also added a flush-to-server command following each Wayland request

(cherry picked from commit 58d2d421e0)
2025-06-11 02:02:45 +02:00
Maxim Kartashev
85b727eb5e JBR-6276 Wayland: WLToolkit logs too much
(cherry picked from commit fee20da837)
2025-06-11 02:02:45 +02:00
Nikita Tsarev
cfc8bb6e1b JBR-5678: Refactor Wayland keyboard support
(cherry picked from commit 070ec5bb8c)
2025-06-11 02:02:45 +02:00
Dmitrii Morskii
f42b67a4e6 JBR-5965 Wayland: implement SplashScreen
(cherry picked from commit c0247eae4f)
2025-06-11 02:02:45 +02:00
Maxim Kartashev
a875f35e43 JBR-6253 Wayland: can't run in weston because of xdg_wm_base version 3
(cherry picked from commit 79ddf65b83)
2025-06-11 02:02:45 +02:00
Maxim Kartashev
9776dc08ae JBR-6212 Wayland: app does not terminate upon Wayland protocol error
(cherry picked from commit 5ad4f8a06d)
2025-06-11 02:02:45 +02:00
Maxim Kartashev
9c81e2163e JBR-6209 Wayland: popup windows cannot be moved
(cherry picked from commit 0aecd427d2)
2025-06-11 02:02:45 +02:00
Maxim Kartashev
aa80e0acf3 JBR-5977 Wayland: make undecorated windows natively resizeable
(cherry picked from commit fc735db0dc)
2025-06-11 02:02:45 +02:00
Maxim Kartashev
e0ebebd528 JBR-6207 Wayland: many popup windows positioned incorrectly
When popup's parent is also its top-level window, use that instead of
null

(cherry picked from commit 47d484b60f)
2025-06-11 02:02:45 +02:00
Maxim Kartashev
f3067a80d0 JBR-6183 Wayland: clipboard-related exception in headless environment
(cherry picked from commit e302f472f2)
2025-06-11 02:02:45 +02:00
Nikita Gubarkov
8971b2f7db JBR-6144 Build JBR with Vulkan support
1. Update dockerfile to checkout Vulkan headers
2. Fix --with-vulkan-include configure option

(cherry picked from commit 67c8c4dc1a)
2025-06-11 02:02:45 +02:00
Alexey Ushakov
0669331c74 JBR-6158 Cannot build jbr21 with wayland toolkit on wsl2
Added --with-wayland-lib option to provide custom library path

(cherry picked from commit cdc2b1b7a0)
2025-06-11 02:02:44 +02:00
Maxim Kartashev
4b98b57458 JBR-5857 Wayland: implement clipboard support
(cherry picked from commit c155acb7f5)
2025-06-11 02:02:44 +02:00
Dmitry Batrak
6b33dc42a3 JBR-6145 [Wayland toolkit] Popup windows aren't focusable
A partial solution. Cases not still covered:
* Alt+tab from the app and back should keep popup focused if it was focused initially
* Mouse clicks between popup and owner should transfer focus as expected

(cherry picked from commit 903231dc50)
2025-06-11 02:02:44 +02:00
Maxim Kartashev
42db47b03f JBR-6138 Wayland: utilize gtk_shell1 protocol to mark dialogs as modal
(cherry picked from commit ba60bfa1f4)
2025-06-11 02:02:44 +02:00
Maxim Kartashev
acf88e13d2 JBR-6117 Wayland: JVM shutdown hang
(cherry picked from commit 20b2eeb0cc)
2025-06-11 02:02:44 +02:00
Dmitry Batrak
60b96866be JBR-5961 Wayland: can't switch between projects using menu
prevent using a pointer to destroyed surface

(cherry picked from commit ba1b5cec5f)
2025-06-11 02:02:44 +02:00
Dmitry Batrak
d5ffeba0ab JBR-5961 Wayland: can't switch between projects using menu
fix typo

(cherry picked from commit 1ee3c83ef0)
2025-06-11 02:02:44 +02:00
Dmitry Batrak
a5e473d75e JBR-5961 Wayland: can't switch between projects using menu
support Window.toFront in Wayland toolkit

(cherry picked from commit b42043930f)
2025-06-11 02:02:44 +02:00
Maxim Kartashev
53dc865320 JBR-6071 Alpine Linux compilation: error: implicit declaration of function 'pthread_getname_np'
(cherry picked from commit 72722dac36)
2025-06-11 02:02:44 +02:00
Maxim Kartashev
c4034de9dc JBR-5989 Wayland: jdk_awt_wayland test group
(cherry picked from commit 05ad0c35dd)
2025-06-11 02:02:44 +02:00
Maxim Kartashev
bbe20eeedb JBR-6025 Wayland: miscellaneous small improvements
(cherry picked from commit 9dfeaac204)
2025-06-11 02:02:44 +02:00
Alexey Ushakov
6d662b333f JBR-6045 WLToolkit(Vulkan): Add options to select physical device
Changed access to _name field, minor corrections in verbose print

(cherry picked from commit 36407e978c)
2025-06-11 02:02:44 +02:00
Alexey Ushakov
599d244b0f JBR-6045 WLToolkit(Vulkan): Add options to select physical device
Implemented -Dsun.java2d.vulkan=True and -Dsun.java2d.vulkan.deviceNumber=n VM options

(cherry picked from commit 7ea0f44a6f)
2025-06-11 02:02:44 +02:00
Maxim Kartashev
2a1deec621 JBR-6036 Wayland: Cannot invoke "java.awt.Component.getWidth()" because "popupParent" is null
Not all POPUP Window's have their parent set. And only those who do
shall be treated as popups in the Wayland's sense.

(cherry picked from commit 86080923bb)
2025-06-11 02:02:44 +02:00
Nikita Gubarkov
624b65053a JBR-5973 Implement rendering of no-AA shapes with Vulkan pipeline
Get rid of maxTextureSize in Vulkan code. This concept was introduced to fix macOS-specific bugs and don't map well to Vulkan implementation, as this value is tied to specific device and texture format, so get rid of it for now and see whether we need it at all.

Refactored native surface data hierarchy. There was a C-style "inheritance" model with VKSDOps having an SurfaceDataOps as its first member and conversions back and forth between them. And then also privOps - pointer to the platform-specific part (WLVK). This was refactored into plain inheritance: SurfaceDataOps -> VKSurfaceData -> VKSwapchainSurfaceData -> WLVKSurfaceData

State management, synchronization & layout transition. Now using dynamic rendering and synchronization2 extensions.
Each device has a single timeline semaphore (basically 64-bit counter), monotonically increasing as device executes our commands, allowing us to track the state of the submitted batches and reuse resources which are no longer in use.

Split command recording into primary and secondary command buffers.
This allows us to record commands "in the past", before current render pass started, which gives possibility for some heavy optimizations:
1. When we suddenly need some texture in the middle of the render pass - no need to stop render pass in order to insert necessary synchronization - we can do it as if we knew it beforehand.
2. When we draw something and then clear the surface - just erase all commands inside current render pass we recorded earlier, so the actual drawing will never happen.

Shaders are compiled with glslc or glslangValidator and bytecode is inlined directly into libawt_wlawt

Memory management via VMA, vertex buffer pool, shader push constants.

Other refactoring.

(cherry picked from commit 9ceaebbb60)
2025-06-11 02:02:44 +02:00
Alexey Ushakov
e897c894a9 JBR-6032 WLToolkit: Uninitialized WLComponentPeer sends paint requests
Protected surfaceAssigned from MT access

(cherry picked from commit e5a3802293)
2025-06-11 02:02:43 +02:00
Alexey Ushakov
d79cbcdcfc JBR-6032 WLToolkit: Uninitialized WLComponentPeer sends paint requests
Skip sending paint events for not configured peers

(cherry picked from commit 145d6405e4)
2025-06-11 02:02:43 +02:00
Maxim Kartashev
f6825da307 JBR-5968 Wayland: support PERPIXEL_TRANSLUCENT
(cherry picked from commit 35bb2d2489)
2025-06-11 02:02:43 +02:00
Nikita Tsarev
f13a97ab22 JBR-5963: Fix RobotKeyboard test and implement getLockingKeyState
(cherry picked from commit 8210596700)
2025-06-11 02:02:43 +02:00
Maxim Kartashev
68bcef7d72 JBR-5962 Wayland: fix the main event loop to allow for secondary queues
Return READ_RESULT_FINISHED_NO_EVENTS from WLToolkit.readEvents() in
case of poll returning with no new data (i.e. via timeout).

(cherry picked from commit 2b68207e79)
2025-06-11 02:02:43 +02:00
Nikita Tsarev
65cebb6299 Regenerate wakefield-client-protocol using an older wayland-scanner to temporarily fix build problems
(cherry picked from commit 7310c73a94)
2025-06-11 02:02:43 +02:00
Nikita Tsarev
2dd8979a7a JBR-5676: Support emulating input events in Wakefield
(cherry picked from commit 6544d9d976)
2025-06-11 02:02:43 +02:00
Nikita Tsarev
d0aa8fc31c JBR-5900: Fix deadlock when enabling the Wakefield extension
(cherry picked from commit f1712ababd)
2025-06-11 02:02:43 +02:00
Nikita Tsarev
31f86a4943 JBR-5896: Fix WLToolkit being instantiated twice
(cherry picked from commit 1bdfdc275d)
2025-06-11 02:02:43 +02:00
Maxim Kartashev
745613d580 JBR-5861 Wayland: minimum necessary stubs to run IDEA
(cherry picked from commit d8dbfd7249)
2025-06-11 02:02:43 +02:00
Alexey Ushakov
bfffb2572b JBR-5645 Provide basic classes for Vulkan rendering pipeline
Implemented shared classes for cross-platform vulkan implementation and some support for wayland toolkit

(cherry picked from commit 9ea3d2d0b1)
2025-06-11 02:02:43 +02:00
Maxim Kartashev
8f01846a2d JBR-5661 Wayland: implement heavy-weight popup windows
(cherry picked from commit abdfb7231b)
2025-06-11 02:02:43 +02:00
Maxim Kartashev
0fb1275735 JBR-5666 Wayland: WLToolkit doesn't work with weston
Multiple Wayland buffers support.

(cherry picked from commit 4541c118ff)
2025-06-11 02:02:43 +02:00
Maxim Kartashev
c72625bffa JBR-5658 Wayland: incorrect scaling of window content
The buffer scale is changed atomically with the size.
WLGraphicsConfig made immutable and is re-created when scaling changes.
WLGraphicsDevice is also re-created when its position changes.

(cherry picked from commit 2d0d950d5b)
2025-06-11 02:02:43 +02:00
Maxim Kartashev
4b8e49a9fa JBR-5657 Wayland: sometimes there's a deadlock at the start
Don't exit from toolkit initialization until all the necessary
information has been received from the Wayland server.

(cherry picked from commit 453aa66d79)
2025-06-11 02:02:42 +02:00
Maxim Kartashev
a6d9903538 JBR-5655 java/awt/Toolkit/Wayland/WaylandToolkit.java: WLToolkit not found
WLToolkit made operational in headless mode

(cherry picked from commit 5679e134a7)
2025-06-11 02:02:42 +02:00
Maxim Kartashev
dbce142978 Wayland: fix AWT initialization on macOS
(cherry picked from commit 382e6c6989)
2025-06-11 02:02:42 +02:00
Maxim Kartashev
995663bddc Wayland: fixed build errors on macOS
(cherry picked from commit 82fe989dd7)
2025-06-11 02:02:42 +02:00
Maxim Kartashev
611510de6a Wayland: fixed build errors with older versions of Wayland
(cherry picked from commit d6150b8c8b)
2025-06-11 02:02:42 +02:00
Alexey Ushakov
2b9153b38b Initial version of WLToolkit and Vulkan support
Co-authored-by: Dmitry Batrak <Dmitry.Batrak@jetbrains.com>
Co-authored-by: Nikita Gubarkov <nikita.gubarkov@jetbrains.com>
Co-authored-by: Maxim Kartashev <maxim.kartashev@jetbrains.com>
(cherry picked from commit 2e26de3c45)
2025-06-11 02:02:42 +02:00
Vitaly Provodin
0b3a6f41a3 Update README.md
(cherry picked from commit 49c5e7dd3a)
2025-06-11 02:02:42 +02:00
Vitaly Provodin
5391e8ef41 JBR-7532 upgrade alpine up to 3.14, specify versions of installing packages, and deploy the latest available jdk20 (same as in jbr21)
(cherry picked from commit 794eab0e1f)
2025-06-11 02:02:42 +02:00
Vitaly Provodin
4201281e0b JBR-7456 add regression test checking if implementations of all available the random number generator algorithms can be instantiated, including the default one
(cherry picked from commit 3950e80ba1)
2025-06-11 02:02:42 +02:00
Nikita Tsarev
1dfbd3b1b3 JBR-7529: Explicitly check for press-and-hold in performKeyEquivalent
(cherry picked from commit 9fadadf039)
2025-06-11 02:02:42 +02:00
Vitaly Provodin
82669d3a9d JBR-7517 build JBR artefacts with CDS archives
(cherry picked from commit 0b5462b3ec)
2025-06-11 02:02:42 +02:00
Vitaly Provodin
534319bc3b Update README.md
(cherry picked from commit d27df085c7)
2025-06-11 02:02:42 +02:00
bourgesl
a17ae2d77e JBR-7460: fixed (macos) MTLTexturePool GC implementation: minor syntax updates from JBR-7461
(cherry picked from commit 713162c6b5)
2025-06-11 02:02:42 +02:00
Nikita Tsarev
024e10a5df JBR-7426: Fix cancelling press-and-hold causing some future key events being swallowed
(cherry picked from commit a07d5e4a60)
2025-06-11 02:02:42 +02:00
bourgesl
cba02f1a86 JBR-7460: fixed (macos) MTLTexturePool GC implementation to release texture memory more promptly (regular young GC freeing not reused textures since 15s) + unified API with new generic AccelTexturePool (C) to be shared with the coming vulkan pipeline (linux)
(cherry picked from commit ea12ccdf5e)
2025-06-11 02:02:41 +02:00
Dmitrii Morskii
beead11bdc JBR-6772 handled case with adding new timers after VM was suspended
(cherry picked from commit 1dd81b186b)
2025-06-11 02:02:41 +02:00
Maxim Kartashёv
08d92b7b6f JBR-5956 Provide more details on assertion failure
Use JNU_RUNTIME_ASSERT(env, cond, msg) defined in jni_util.h
to crash JVM when 'cond' is not true with the given message
and source location information in the fatal error log.

(cherry picked from commit fd9bf2c37a)
2025-06-11 02:02:41 +02:00
Sergey Shelomentsev
76d4d63787 Update jbr-api version to 1.0.2
(cherry picked from commit 9c4a2ac50a)
2025-06-11 02:02:41 +02:00
Stanislav Dombrovsky
f0715c3449 Fix rendering of HTML list dots + better vertical align for them.
(cherry picked from commit fa4a404533ba1ef638fe523adc74391aee8a3ebf)

(cherry picked from commit 9f079c66e9)
(cherry picked from commit baf2f0b73f)
2025-06-11 02:02:41 +02:00
Nikita Tsarev
536ad970bd JBR-6588: JBR API for inspecting certain properties of KeyEvents
(cherry picked from commit cf2abf34d7)
2025-06-11 02:02:41 +02:00
Nikita Tsarev
f5d55dfdad JBR-7449: Fix press-and-hold cancel keys not being swallowed by JBR
(cherry picked from commit a0dbdff2b0)
2025-06-11 02:02:41 +02:00
Alexey Ushakov
11b5802dab JBR-6545 java/awt/Mixing/AWT_Mixing/JProgressPaneOverlapping.java fails by time out (sun.java2d.metal.MTLLayer.blitTexture)
Moved test frame by some offset to avoid interaction with mac menu bar

(cherry picked from commit 7d3688ab93)
2025-06-11 02:02:41 +02:00
Artem Bochkarev
50eaa7c614 JBR-5405: supported BufImgSurfaceData
(cherry picked from commit 3c2d26f834)
2025-06-11 02:02:41 +02:00
Maxim Kartashev
eeb7fb78b0 JBR-6830 Poor performance with KDE Plasma 6 X11
Use -Dwatch.desktop.geometry=false as a workaround until the KWin issue
is fixed

(cherry picked from commit d90f0e524b)
2025-06-11 02:02:41 +02:00
Artem Bochkarev
a874e1d83d JBR-4430 Fixed execution permissions on Linux
(cherry picked from commit f3896017f0)
2025-06-11 02:02:41 +02:00
Vitaly Provodin
50810271dc update exclude list on results of 21.0.3_b517.1 test runs
(cherry picked from commit 88a92ef655)
2025-06-11 02:02:41 +02:00
Vitaly Provodin
e8fbcba638 Update README.md
(cherry picked from commit 4d2ddff1f8)
2025-06-11 02:02:41 +02:00
bourgesl
22017f5dbc JBR-4530: make opengl & metal handle colorMatching on non-SRGB profile consistently (controlled by the system property 'sun.java2d.osx.colorMatching') + updated MacOSLayerColorTest to test color matching setting on OpenGL & Metal pipelines
(cherry picked from commit 2db47e604e)
2025-06-11 02:02:41 +02:00
Vitaly Provodin
0763350f64 Update README.md
(cherry picked from commit 2edeae7740)
2025-06-11 02:02:41 +02:00
Vitaly Provodin
30d1e45c89 JBR-6696: fix drawableId usage + revert PrinterJob changes (non-appkit thread)
(cherry picked from commit 5229c513e3)
2025-06-11 02:02:40 +02:00
Vitaly Provodin
fb711eb1b8 Update README.md
(cherry picked from commit c6583bd7fc)
2025-06-11 02:02:40 +02:00
Vitaly Provodin
cbe131d8d1 Update README.md
(cherry picked from commit db562b31b0)
2025-06-11 02:02:40 +02:00
bourgesl
1714f940e8 JBR-6696: added MTLContext CVDisplayLink checks, improved MTLLayer drawable lifecycle, hardened appkit main thread usage with ThreadUtilities instrumentation to monitor all performOnMainThread usages and report high latency tasks in LWCToolkit platform logger (use system property 'sun.awt.mac.mainThreadLatency=xx' in milliseconds), fixed few MainThread violations (PrinterView init)
(cherry picked from commit 975b4b8cc9)
2025-06-11 02:02:40 +02:00
Alexey Ushakov
eb2b3dcffc JBR-5063 macOS: SIGILL at [libsystem_kernel] __kill in java.lang.IllegalStateException: Error - unable to initialize Metal after recreation of graphics device. Cannot load metal library...
Add fallback to MTLCreateSystemDefaultDevice for main display

(cherry picked from commit e523e30250)
2025-06-11 02:02:40 +02:00
Nikita Tsarev
9a9a59b44b JBR-6764: Add null check on hostAdapterLocator
(cherry picked from commit 7396316337)
2025-06-11 02:02:40 +02:00
Sergey Shelomentsev
f5c55d1202 JBR-4912 test moved from JBR repository
(cherry picked from commit 4732942427)
2025-06-11 02:02:40 +02:00
Nikita Provotorov
58a89dc7e9 JBR-7157: Alt+Shift+Enter sends KEY_TYPED Event.
JBR-7336 Any keyboard shortcut with Alt produces a Windows system sound.

* X11 Linux part: disable posting KEY_TYPED events for VK_ENTER if any modifier except { Shift, Control, Lock, Mode Switch (a.k.a. AltGr), NumLock } is being pressed.
* Windows part: begin ignoring WM_SYSCHAR messages as MSDN instructs.
* Add a regression test.

(cherry picked from commit d732718ef7)
2025-06-11 02:02:40 +02:00
Nikita Tsarev
cc49a3c9a4 JBR-6764: Work around IMEs breaking on macOS due to macOS JavaRuntimeSupport not reporting the correct locale in IMEs once after application startup
(cherry picked from commit d982095f1c)
2025-06-11 02:02:40 +02:00
Vitaly Provodin
0f42ec6495 Update README.md
(cherry picked from commit ca6ad3d091)
2025-06-11 02:02:40 +02:00
Artem Bochkarev
679f3e76e8 JBR-5405: implementation of direct raster loading for VolatileImage
(cherry picked from commit d963035445)
2025-06-11 02:02:40 +02:00
Vitaly Provodin
dd15c037ab update exclude list on results of 21.0.3_b479 test runs
(cherry picked from commit 3c65d18f2e)
2025-06-11 02:02:40 +02:00
bourgesl
4033e0a248 JBR-7170: fixed NPE if peer is null
(cherry picked from commit a786741193)
2025-06-11 02:02:40 +02:00
Sergey Shelomentsev
ed159b41a7 Set jbr-api version to 1.0.0
(cherry picked from commit fa825aee1d)
2025-06-11 02:02:40 +02:00
Nikita Tsarev
22285ca13a JBR-7133: JBR API for IME replacement range on macOS
(cherry picked from commit b807d0f946)
2025-06-11 02:02:39 +02:00
Vitaly Provodin
c305636fa2 update exclude lists removing lines related to fixed issues
(cherry picked from commit 4526475115)
2025-06-11 02:02:39 +02:00
Vitaly Provodin
4ba6cbc459 Update README.md
(cherry picked from commit 48e2248486)
2025-06-11 02:02:39 +02:00
Maxim Kartashev
97b3269b4d JBR-5761 Make error printing more robust during early stages of VM initialization
(cherry picked from commit 84d95894e4)
2025-06-11 02:02:39 +02:00
bourgesl
2f68e327cd JBR-7170: added explicit @available for addPresentedHandler()
(cherry picked from commit 7973a4cff4)
2025-06-11 02:02:39 +02:00
bourgesl
0d0f57a6a1 JBR-7170: implement FPS counters for metal using callbacks from MTLLayer presentHandler
(cherry picked from commit cf06dcc383)
2025-06-11 02:02:39 +02:00
Nikita Gubarkov
f57f2f84db JBR-5615 add sun.java2d.logDisplays VM option
It prints to stdout whenever display configuration is changed.

(cherry picked from commit 8eec3188c6)
2025-06-11 02:02:39 +02:00
Nikita Gubarkov
35da003ed9 JBR-8602 Migrate JBR API backend to Classfile API 2025-06-11 02:02:39 +02:00
Nikita Gubarkov
f8970e054a JBR-6357 JBR API v3
JBR API frontend is moved into a separate repository.
Rewritten proxy generation, bridges removed, invokedynamic is used instead.
Mapping is now specified using annotations.
Support for extension methods.
Support for arrays and generics.
Added JBR API implementation version.

JBR-7232 Refactor deriveFontWithFeatures & JBRFileDialog JBR API

(cherry picked from commit a4804efa96)
2025-06-11 02:02:39 +02:00
Roman Shevchenko
51b1dc7afa JBR-7194: extension-based filters in native file dialogs
(cherry picked from commit cf5d136b3e)
2025-06-11 02:02:39 +02:00
Nikita Tsarev
247524e97e JBR-7134: Fix InputMethodTests on macOS
(cherry picked from commit 7a970238af)
2025-06-11 02:02:39 +02:00
Vitaly Provodin
823654ff20 Update README.md
(cherry picked from commit 6514818b3b)
2025-06-11 02:02:39 +02:00
Dmitrii Morskii
d166d0fc45 JBR-7128 Use the correct WmSize event type for JFrame moved to another monitor
author: Sergei Tachenov
(cherry picked from commit 01f1c7e15d)
2025-06-11 02:02:39 +02:00
Vitaly Provodin
a7409040ff Update README.md
(cherry picked from commit 6242827cd1)
2025-06-11 02:02:39 +02:00
Vitaly Provodin
f8e1cd97af update exclude list on results of 21.0.3_b453.2 test runs
(cherry picked from commit 1bc34d2a51)
2025-06-11 02:02:38 +02:00
Sergey Shelomentsev
a7bb04226c JBR-7117 Set initial display mode after test execution
(cherry picked from commit e4530745c2)
2025-06-11 02:02:38 +02:00
Vitaly Provodin
73df1629d8 Update README.md
(cherry picked from commit 0e705dc638)
2025-06-11 02:02:38 +02:00
Maxim Kartashev
d46c4cf938 JBR-7028 Implement FPS counter on Linux
Use -Dawt.window.counters to enable.
To output counters per second to stdout/stderr,
use -Dawt.window.counters=stdout or =stderr.

A counter by the name swing.RepaintManager.updateWindows
is always available for Swing applications, but it does not
accurately correspond to frames per second.

Toolkit-dependent counters provide much better accuracy.
On Wayland with memory buffers as the backend two are available:
java2d.native.frames - frames delivered to the Wayland server
java2d.native.framesDropped - fully formed frames that were not
delivered to the Wayland server

(cherry picked from commit 872e73ed1e)
2025-06-11 02:02:38 +02:00
Vitaly Provodin
1d4c5bcc62 Update README.md
(cherry picked from commit 9ace20e1e1)
2025-06-11 02:02:38 +02:00
Dmitry Drobotov
fdd8875850 JBR-6808 Don't create AccessibleJTreeNode for the tree root if it's not visible
* This fixes an issue with AccessibleJTreeNode#getBounds, which adjusts the node's bounds according to the parent node. For nodes whose parent is the invisible root, getBounds was returning null, and it caused issues with assistive technology like macOS Accessibility Zoom.
* Additionally, NVDA will now report correct tree depth levels because the root node won't add to the levels count (JDK-8249806).

(cherry picked from commit f7c47bf3cf)
(cherry picked from commit e785e9e7c9)
2025-06-11 02:02:38 +02:00
Vitaly Provodin
2ae0183c84 Update README.md
(cherry picked from commit a66b19eb93)
2025-06-11 02:02:38 +02:00
Vitaly Provodin
b98f32774b Update README.md
(cherry picked from commit 68a09733c8)
2025-06-11 02:02:38 +02:00
Vitaly Provodin
1123ebc09b update exclude list on results of 21.0.3_b446.1 test runs
(cherry picked from commit a0edd1e725)
2025-06-11 02:02:38 +02:00
Nikita Provotorov
22e687a839 JBR-6456 Sudden keyboard death on Linux using iBus.
Add a workaround for the iBus's bug which leads to the issue.

(cherry picked from commit b8e9dbf8c9)
(cherry picked from commit 7355948065)
2025-06-11 02:02:38 +02:00
Nikita Tsarev
7e08ae25fb JBR-7119: respect replacementRange in IME events on macOS
(cherry picked from commit 09c31a6242)
2025-06-11 02:02:38 +02:00
Dmitrii Morskii
7538785572 JBR-6376: implement detecting of OS theme on linux
(cherry picked from commit d8aaa3da47)
2025-06-11 02:02:38 +02:00
Dmitrii Morskii
dc43fdf5fb Revert "JBR-6372: implement detecting of OS theme on linux"
This reverts commit a657e4e2cbce139f2c5b53c7fb5f30d81f99e311.

(cherry picked from commit c626c9f220)
2025-06-11 02:02:38 +02:00
Nikita Gubarkov
44fb102414 JBR-7046 Tolerate subpixelResolution=0 in Metal and OGL
(cherry picked from commit 28d0f00899)
2025-06-11 02:02:38 +02:00
Maxim Kartashev
071732f7c9 JBR-5611 Window header is visible but body not on Linux Ubuntu with external display
(cherry picked from commit 96494dd000)
2025-06-11 02:02:37 +02:00
Nikita Gubarkov
026f669340 JBR-7020 Reorder LCD glyph cache freeing and validation
1. As we started committing the command buffer on glyph cache flush, this invalidates the current encoder. We need to `MTLTR_ValidateGlyphCache` after the flush, not before.
2. There's no reason to maintain separate glyph cache invalidation logic for this singe case (which is a no-op in reality), so just free the cache instead.

(cherry picked from commit 891a9c6c52)
2025-06-11 02:02:37 +02:00
Nikita Tsarev
410833af81 Disable flappy KeyCodesTest assertions, see JBR-6888
(cherry picked from commit 7f5dd368e3)
2025-06-11 02:02:37 +02:00
Sergei Tachenov
11c6e25413 JBR-6984 Fix BoxLayout/NPECheckRequests test
It was initially written and tested on Linux, but it turns out that
on other systems validate() can be called in between init() and start()
calls, which would break the test even though BoxLayout isn't broken.

(cherry picked from commit 6cc237583b)
2025-06-11 02:02:37 +02:00
Ajit Ghaisas
2608ac769f update exclude list on results of main.2176 test runs
(cherry picked from commit 82a97445bd)
2025-06-11 02:02:37 +02:00
Vitaly Provodin
255638eab3 introduce jbMuslProblemList.txt exclude list
(cherry picked from commit 17c6238051)
2025-06-11 02:02:37 +02:00
Vitaly Provodin
1b022a56b6 update exclude list on results of 21.0.2_b427.6 test runs
(cherry picked from commit e768c854cf)
2025-06-11 02:02:37 +02:00
Sergei Tachenov
265a6be380 JBR-6771 BoxLayout throws mysterious NPEs due to previous exceptions
The checkRequests method only does layout initialization
if it isn't initialized already. However, when an exception
is thrown during the initialization, the layout may end up
in a half-initialized state.

Fix this by using the field that is initialized the last to check
if the layout is initialized. If that field is null, it may mean
that the layout isn't initialized or that the last attempt
failed midway. Then we try again. This attempt can,
of course, break for the same reason as the previous one,
but in that case we'll at least get a stack trace pointing
to a real cause of the error and not some mysterious NPE
that seems to be impossible from the logic.

The bug is that if we add a component that throws an exception
in one of its methods called by BoxLayout, then the layout may
end up in a half-initialized state that would mistakenly be considered
fully initialized. Then it would try to access some fields
and throw NPE with a stack trace that tells exactly nothing
about what went wrong and where.

This test checks for the presence of this bug by adding a broken
component to a BoxLayout and then un-breaking this component
and checking that an exception is thrown even though the component
is no longer broken.

(cherry picked from commit 8f5eb72836)
2025-06-11 02:02:37 +02:00
Maxim Kartashev
1bd201c3b9 JBR-6769 Make it possible to get info whether IDE is running in a virtual env
Added system property intellij.os.virtualization with possible values
"none", "Xen", "KVM", "VMWare", "HyperV"

(cherry picked from commit 92e4311f13)
2025-06-11 02:02:37 +02:00
Nikita Gubarkov
c60b817eed JBR-6927 Safe asynchronous destruction of Metal graphics config.
(cherry picked from commit eee433fe5e)
2025-06-11 02:02:37 +02:00
Nikita Gubarkov
dcd7e74980 Fix Windows AWT compilation errors
Frame, Window, FileDialog, CustomTitleBar

(cherry picked from commit 2ada4a575b)
2025-06-11 02:02:37 +02:00
Vitaly Provodin
e800201979 Update README.md
(cherry picked from commit 0ea55b1641)
2025-06-11 02:02:37 +02:00
Vitaly Provodin
c00ccb182e JBR-6639 Docker images for JBR/JCEF testing
(cherry picked from commit 1342899218)
2025-06-11 02:02:37 +02:00
Vitaly Provodin
4ec66c5cee JBR-6915 add the option -w into mkimages scripts
(cherry picked from commit 56bb878275)
2025-06-11 02:02:37 +02:00
Alexey Ushakov
77e4e8805f JBR-6911 IDE crashes (EXC_BAD_ACCESS) after disconnecting the secondary display if a markdown file is opened (macOS Sonoma 14.4.1)
Corrected invalid usage of dealloc method, fixed memory leaks.

(cherry picked from commit 8697cfb660)
2025-06-11 02:02:36 +02:00
Dmitrii Morskii
77819c34d9 JBR-6171 removing deadlock related to calling getCurrentServerTime
(cherry picked from commit 5fa4617d38)
2025-06-11 02:02:36 +02:00
Vitaly Provodin
2b79bd0da8 update exclude list on results of 21.0.2_b417.1 test runs
(cherry picked from commit b77ac8db98)
2025-06-11 02:02:36 +02:00
Dmitrii Morskii
3b2053ca85 JBR-6372: implement detecting of OS theme on linux
(cherry picked from commit 1d47383016)
2025-06-11 02:02:36 +02:00
Vitaly Provodin
ab77a950c1 JBR-1668: minor fixes - temporary fix for compilation issue SystemHotkey.m:74:29: error: format string is not a string literal
(cherry picked from commit b6234f5aa7)
2025-06-11 02:02:36 +02:00
Nikita Gubarkov
a3098a0f64 JBR-6723 Deal with integer overflow in DrawGlyphList with enabled subpixelResolution
(cherry picked from commit 8b34ae396c)
2025-06-11 02:02:36 +02:00
Vitaly Provodin
4e7bf68efe Update README.md
(cherry picked from commit bdae8e43fb)
2025-06-11 02:02:36 +02:00
Nikita Provotorov
0cd6a8e870 JBR-3112 Linux: Last character issue with Korean.
- Ignores the IM text returned from XmbLookupString/XwcLookupString if the KeyPress event which XmbResetIC was called with was synthetic and the first after a call of XmbResetIC/XwcResetIC.
- Only for the new mode introduced in JBR-2460 (-Djb.awt.newXimClient.preferBelowTheSpot=true): cancel text composing on each mouse press, so that preedit text stops following the caret if it's moving in response to mouse clicks.

(cherry picked from commit 43a9a3a17a)
(cherry picked from commit 156e5d9b65)
(cherry picked from commit 59f0ca804f)
2025-06-11 02:02:36 +02:00
Dmitrii Morskii
0b5bcf4d09 JBR-6541 Added ability to get supported features and stylistic sets for font
(cherry picked from commit 170e743a13)
2025-06-11 02:02:36 +02:00
Nikita Tsarev
62b5b36a22 increase delay in InputMethodTest
(cherry picked from commit 8048ea52f7)
2025-06-11 02:02:36 +02:00
Nikita Tsarev
2ddeb7009e JBR-6704: Fix extra IME events when a ctrl shortcut causes window focus switch [macOS]
(cherry picked from commit 4d851790cd)
2025-06-11 02:02:36 +02:00
Nikita Tsarev
bce697de6f JBR-6331: Fix some memory safety issues in macOS keyboards
(cherry picked from commit 0f9ba8771f)
2025-06-11 02:02:36 +02:00
Nikita Tsarev
5d2dc18638 JBR-6028: Check before attempting to switch to a layout that might not exist in KeyCodesTest
(cherry picked from commit 421dd1fa69)
2025-06-11 02:02:36 +02:00
Nikita Tsarev
ba3d41584e InputMethodTest: fix certain IMEs not being added properly
(cherry picked from commit 621a5e37d6)
2025-06-11 02:02:36 +02:00
Nikita Tsarev
1ef33032ea JBR-5379: Ignore input events only on permament focus loss
(cherry picked from commit ca8aebd211)
2025-06-11 02:02:36 +02:00
Nikita Tsarev
b789ba864b JBR-5630: vmoption to change dead key reporting behavior on macOS
(cherry picked from commit aeb6569d4c)
2025-06-11 02:02:35 +02:00
Nikita Tsarev
5fad788a2f JBR-5469: Fix NextAppWinKey behavior with certain keys
(cherry picked from commit 9a1d6d1813)
2025-06-11 02:02:35 +02:00
Nikita Tsarev
a8ad9f2718 JBR-5558: macOS keyboard rewrite 2
(cherry picked from commit 81f3819f4e)
2025-06-11 02:02:35 +02:00
Nikita Tsarev
f80d643023 JBR-5295: Fix wrong keycodes for non-letter keys that lack a corresponding VK_ constant on macOS
(cherry picked from commit 3c42e56d93)
2025-06-11 02:02:35 +02:00
Nikita Tsarev
fa198d8d99 JBR-5254: Fix Caps Lock not working properly on certain Chinese IMs
with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit be64a4f3d0)
2025-06-11 02:02:35 +02:00
Nikita Tsarev
8ccb7aea85 Revert "8230926: [macosx] Two apostrophes are entered instead of one with "U.S. International - PC" layout"
This reverts commit 5049cad2b0.

After JBR-5173 this workaround is no longer necessary

(cherry picked from commit fbb7ba8c0b)
2025-06-11 02:02:35 +02:00
Nikita Tsarev
c13316f4e6 JBR-5233 Setup/teardown necessary keyboard layouts in macOS keyboard tests
(cherry picked from commit 1fa48463f2)
2025-06-11 02:02:35 +02:00
Nikita Tsarev
43e3ab6118 JBR-5173 macOS keyboard support rewrite
with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 88c281a243)
2025-06-11 02:02:35 +02:00
Nikita Tsarev
73afa2f83d Revert "macOS national keyboard support"
This reverts commit 21bffd06bc.

(cherry picked from commit 7806ef7ff3)
2025-06-11 02:02:35 +02:00
Nikita Provotorov
a576e03113 JBR-5107, JBR-5114: SIGILL/OOM from Java_sun_lwawt_macosx_LWCToolkit_getKeyboardLayoutNativeId.
A theoretical fix, it should:
- Catch any NSException (as it was initially expected);
- Probably fix possible memory leaks (by moving the layoutId var inside autoreleasepool).

(cherry picked from commit ae9520ce4f)
2025-06-11 02:02:35 +02:00
Nikita Tsarev
943fda664d JBR-4990: Undo changes to ExtendedKeyCodes
(cherry picked from commit 823086623e)
2025-06-11 02:02:35 +02:00
Nikita Tsarev
6419135098 JBR-3860: Fix shortcut behavior when Shift is the only modifier
(cherry picked from commit e419730031)
2025-06-11 02:02:35 +02:00
Nikita Tsarev
3583f102ae JBR-4990: Fix regression tests for national keyboard layouts on macOS
(cherry picked from commit 5835150f63)
2025-06-11 02:02:35 +02:00
Vitaly Provodin
fef03ca073 update exclude list on results of 21.0.2_b393.7 test runs
(cherry picked from commit a396e62035)
2025-06-11 02:02:35 +02:00
Nikita Gubarkov
64f64fad46 JBR-6723 flush vertex cache and command buffer before freeing glyph cache. (#334)
(cherry picked from commit 1faccf3995)
2025-06-11 02:02:34 +02:00
Alexey Ushakov
41d3293ccb JBR-6785 wsl: update build scripts for linux target
Added explicit platform target

(cherry picked from commit 3b96e66202)
2025-06-11 02:02:34 +02:00
Vitaly Provodin
5d8a2ec71a Update README.md
(cherry picked from commit 74b00b6c2f)
2025-06-11 02:02:34 +02:00
Vitaly Provodin
819ba3c0a8 Update README.md
(cherry picked from commit 163ce4ecce)
2025-06-11 02:02:34 +02:00
Maxim Kartashev
4a724be158 JBR-6742 Record resident set size in JVM fatal error log
(cherry picked from commit 5cc72b464b)
2025-06-11 02:02:34 +02:00
Alexey Ushakov
34bf1bb915 JBR-6522 macOS: SIGSEGV at [libawt_lwawt.dylib+0x8eaa8] MTLGC_DestroyMTLGraphicsConfig
Fix of MT access to shared data in MTLGraphicsConfigInfo

(cherry picked from commit ecc46c6004)
2025-06-11 02:02:34 +02:00
Dmitry Drobotov
5423b81314 JBR-6593 Fix UI freezes with JAWS announcements
* Execute AccessibleAnnouncer.nativeAnnounce on a background thread on Windows to fix UI freezes. IntelliJ calls this method from EDT, but it doesn't need to run on EDT because on Windows it simply calls screen readers API without interacting with UI components. Additionally, when using a background thread, the JAWS SayString method, which previously could have been running for multiple seconds, is now executed immediately as expected, but the root cause of previous delays is unclear.
* In JawsAnnouncer, initialize COM library with the multithreaded model to allow executing it from different threads. Now COM is initialized and uninitialized on every call of the method as required by the [documentation](https://learn.microsoft.com/en-us/windows/win32/learnwin32/initializing-the-com-library): "Each thread that uses a COM interface must make a separate call to this function. For every successful call to CoInitializeEx, you must call CoUninitialize before the thread exits". IJawsApi COM object is still static and reused by different threads, which is allowed with a multithreaded concurrency model. It shouldn't cause issues because it has no state and only forwards calls to JAWS.

(cherry picked from commit 8cc4cd5cfd)
(cherry picked from commit d7d8d9b8e4)
(cherry picked from commit 8bfd24f89f)
2025-06-11 02:02:34 +02:00
Vitaly Provodin
d53385dc08 update exclude list linux-x86 failures
(cherry picked from commit 264bcf41f9)
2025-06-11 02:02:34 +02:00
Vitaly Provodin
e78625f839 update exclude list on results of 22_b2075 test runs
(cherry picked from commit 37a71238b2)
2025-06-11 02:02:34 +02:00
Vitaly Provodin
2cfa7a0228 update exclude list - remove failures no having tickets
(cherry picked from commit 4d11023858)
2025-06-11 02:02:34 +02:00
Nikita Provotorov
3b9c4dd1f7 JBR-3697: Letter-based command mode actions are not triggered when using Chinese input method.
Fixes different platform-specific issues with disabling/enabling input methods support via java.awt.Component#enableInputMethods(boolean):
* Windows: disabling used to require to deactivate and then activate back the app window to be performed completely ;
* macOS: disabling used to leave the input method window visible (however, it wasn't affecting the input) ;
* Linux: with fcitx5 IMF (may not be reproduced with iBus) disabling and then enabling back the input method support used to reset the used input source (keyboard layout) to a default one. It's done via disabling the current XIM when the input method support is disabled instead of disposing it .

(cherry picked from commit 2933ea89f0)

The patch also contains the fix for "JBR-6711: java/awt/LightweightDispatcher/LWDispatcherMemoryLeakTest.java: JButton JPanel not collected."

It unsets its references to tracked components thus not preventing GC from collecting them.

(cherry picked from commit e9aab98a6c)
(cherry picked from commit 13284aa508)
2025-06-11 02:02:34 +02:00
Dmitry Drobotov
e3e5f307cc JBR-6325 Implement keyboard focus tracking for macOS Accessibility Zoom
* Call UAZoomChangeFocus function when the keyboard focus is changed or when an accessible selection event is fired. Zoom viewport fill follow the accessible frame of the newly focused component, and if it has a selected child, its frame will be passed as part that needs to be highlighted.
* Fix an exception in ComboBoxAccessibility.accessibilitySelectedChildren when its selection is nil. This happens when a combo box doesn't have a selected item, and it this case Zoom wouldn't be able to follow the combo box location.
* Move the native handler of CAccessibility.focusChanged method from the legacy JavaComponentAccessibility to the new CommonComponentAccessibility class. It calls a class method (like a static method in Java), so there is no difference in which specific class it's located, but it allows to write the new code in the appropriate class.

(cherry picked from commit 75b06421ff)
(cherry picked from commit d0f47ced65)
2025-06-11 02:02:34 +02:00
Vitaly Provodin
5168b47f48 Update README.md
(cherry picked from commit b93b6a39fc)
2025-06-11 02:02:34 +02:00
Dmitrii Morskii
bc2a1b146f JBR-5500 Handled situation of processing WM_ENDSESSION in process of closing application
(cherry picked from commit c87b70ad46)
2025-06-11 02:02:34 +02:00
Vitaly Provodin
98c447ee64 Update README.md
(cherry picked from commit 588d57f140)
2025-06-11 02:02:34 +02:00
Dmitry Drobotov
efeb77c9e6 JBR-6472 Add default value in CAccessibility.isComboBoxEditable to avoid NPE
(cherry picked from commit 93937603b3)
(cherry picked from commit 6a70aebb6b)
2025-06-11 02:02:33 +02:00
Alexey Ushakov
c381bd818c JBR-6612 Provide standard scripts for performance measurements
run_rp.sh - additional checks

(cherry picked from commit e1cf099c09)
2025-06-11 02:02:33 +02:00
Maxim Kartashev
b90cc5c8a1 JBR-6246 Do not overwrite CDS archives after created with jlink
(cherry picked from commit 457e760872)
2025-06-11 02:02:33 +02:00
Alexey Ushakov
8207fcd375 JBR-6612 Provide standard scripts for performance measurements
Initial implementation for linux and macOS

(cherry picked from commit fe09bf671b)
2025-06-11 02:02:33 +02:00
Nikita Tsarev
d163480483 JBR-6297: Don't check for NSInputManager wantsToHandleMouseEvents in mouseDown by default
(cherry picked from commit c08268def6)
2025-06-11 02:02:33 +02:00
Maxim Kartashev
fb6721668a Update README.md with up-to-date build instructions
(cherry picked from commit 695d0a0577)
2025-06-11 02:02:33 +02:00
Vitaly Provodin
d7a96dfc2c Update README.md
(cherry picked from commit 22f4dd6d4a)
2025-06-11 02:02:33 +02:00
Vitaly Provodin
a1c4ffb3c6 Update README.md
(cherry picked from commit c6cc4d76c1)
2025-06-11 02:02:33 +02:00
Alexey Ushakov
4584126bcc JBR-6522 macOS: SIGSEGV at [libawt_lwawt.dylib+0x8eaa8] MTLGC_DestroyMTLGraphicsConfig
Performing flush of pending rendering operation before destroying MTLGraphicsConfig

(cherry picked from commit b25bd3ac13)
2025-06-11 02:02:33 +02:00
Nikita Gubarkov
efdaf033d1 JBR-4618 Force window size update after display reconfiguration
- Re-create all GraphicsDevices on displayChanged()

(cherry picked from commit a59d4903b2)
2025-06-11 02:02:33 +02:00
Dmitrii Morskii
2618281147 JBR-6671 added option 'freetype.font.rendering'
(cherry picked from commit a24c5bbcdb)
2025-06-11 02:02:33 +02:00
Dmitrii Morskii
f5f16cb2f6 Revert "JBR-6346 update Inter font version"
This reverts commit 7712e529330674b83e39c8e81701db32436d42dc.

(cherry picked from commit 1752433479)
2025-06-11 02:02:33 +02:00
bourgesl
8b0a9e0757 Revert "JBR-6522: ensure thread-safety in MTLGC_DestroyMTLGraphicsConfig (pthread_mutex_t)"
This reverts commit e7e3638c52.

(cherry picked from commit a2ee33a45a)
2025-06-11 02:02:33 +02:00
bourgesl
0d90d2d9b8 JBR-6522: ensure thread-safety in MTLGC_DestroyMTLGraphicsConfig (pthread_mutex_t)
(cherry picked from commit 3ddc59a433)
2025-06-11 02:02:33 +02:00
Vitaly Provodin
31e840e110 JBR-6649 add synchronization for creating UI
(cherry picked from commit 9618df8e14)
2025-06-11 02:02:32 +02:00
Nikita Gubarkov
b50208947f JBR-6651 Exclude keycap emoji from EmojiVariation test.
(cherry picked from commit bb1926d974)
2025-06-11 02:02:32 +02:00
Vitaly Provodin
2073d7c14d update exclude list on results of 22_b2014 test runs
(cherry picked from commit 99eb375cfd)
2025-06-11 02:02:32 +02:00
Dmitrii Morskii
033c4cf69d JBR-6346 update Inter font version
(cherry picked from commit 30820c33ba)
2025-06-11 02:02:32 +02:00
Vitaly Provodin
6ee28a519d Update README.md
(cherry picked from commit 4fef254b44)
2025-06-11 02:02:32 +02:00
Vitaly Provodin
291ad52dff remove resolved issues from exclude list
(cherry picked from commit 1bdef4e67a)
2025-06-11 02:02:32 +02:00
Vitaly Provodin
41c1c5cd8d Update README.md
(cherry picked from commit 888e8bda45)
2025-06-11 02:02:32 +02:00
Dmitrii Morskii
e2fa75574d JBR-6604 supported case when fonts directory is missing
(cherry picked from commit a622888816)
2025-06-11 02:02:32 +02:00
Aleksey Shipilev
bc48e492e5 update exclude list on results of main.2003 test runs
(cherry picked from commit 2f441c0a3b)
2025-06-11 02:02:32 +02:00
Vitaly Provodin
cee132c44d JBR-6591 specify values for the configure options --with-vendor-url and --with-vendor-bug-url
(cherry picked from commit b7f236be6b)
2025-06-11 02:02:32 +02:00
Dmitry Batrak
34e372acd4 JBR-6449 Introduce FontMetricsAccessor into JBR API
JBRE-MR-368

(cherry picked from commits f0d5a907ac, 5befaea6af, ea2c4bfc83, 04601189604827c115a5a3b36aa268ba5c39ef3dб 20468cf28b)

(cherry picked from commit bb67fc186a)
2025-06-11 02:02:32 +02:00
Vitaly Provodin
9ec8193cae JBR-6558 synchronize drawing and the test checking
(cherry picked from commit a8f38d8682)
2025-06-11 02:02:32 +02:00
Vitaly Provodin
2ced2cc7bb JBR-6556 add saving screenshots for analysis of test failures
(cherry picked from commit 9330ab5416)
2025-06-11 02:02:32 +02:00
Vitaly Provodin
06739bd46a update exclude list on results of 21.0.1_b334 test runs
(cherry picked from commit f4c811c548)
2025-06-11 02:02:32 +02:00
Dmitrii
3d85e67bf9 JBR-3098 move repaintPeer event from AppKit thread to EDT on macos
(cherry picked from commit 11d3e5414f)
2025-06-11 02:02:31 +02:00
Nikita Gubarkov
4b77711042 JBR-6264 Improved coordinate conversion in XWayland mode
(cherry picked from commit 9c96ecd2f7)
2025-06-11 02:02:31 +02:00
bourgesl
57241dc01b JBR-6505: removed extra setNeedDisplay() in startRedrawIfNeeded() to restore JavaDraw performance (more frames rendered than real vsync FPS)
(cherry picked from commit d046741a56)
2025-06-11 02:02:31 +02:00
Vitaly Provodin
043f6c4ac0 update exclude list on results of 21.0.1_b331.1 test runs
(cherry picked from commit 4d755ad656)
2025-06-11 02:02:31 +02:00
Vitaly Provodin
64df376ff9 JBR-5863 add verbose mode thata saves the captured image
(cherry picked from commit b83c0ddca7)
2025-06-11 02:02:31 +02:00
Vitaly Provodin
78a916620c JBR-6493 add jtreg test
(cherry picked from commit 96ee046fdc)
2025-06-11 02:02:31 +02:00
Vitaly Provodin
447f5c004d update exclude list on results of 23_b1960 test runs
(cherry picked from commit f36606576d)
2025-06-11 02:02:31 +02:00
Dmitrii Morskii
2c0a93e6d5 Revert "JBR-6346 update Inter font version"
This reverts commit 9aa690a94e.

(cherry picked from commit c97c8eb5fd)
2025-06-11 02:02:31 +02:00
bourgesl
3b81162717 JBR-6241: RenderPerf 23.12: remove older RenderPerfTest in src
(cherry picked from commit eeae9a1cb2)
2025-06-11 02:02:31 +02:00
Vitaly Provodin
aa38232b16 JBR-6454 add synchronization at disposing windows
(cherry picked from commit 48bc9affc9)
2025-06-11 02:02:31 +02:00
bourgesl
56791509ba JBR-6377: fixed MTLLayer.redrawCount = 1 to avoid extra redraws with multiple windows
(cherry picked from commit 52610b9bf2)
2025-06-11 02:02:31 +02:00
Maxim Kartashev
b084913604 JBR-6340 Popups displayed shifted after moving IDE to another monitor via shortcut with auto-maximize enabled in Mutter
Windows no longer change their "native" size when moved between monitors
with different scale on Linux. Use -Dresize.with.scale=true to revert
that.

(cherry picked from commit 637d67cbfe)
2025-06-11 02:02:31 +02:00
Nikita Gubarkov
541b65f177 JBR-5837 retrieve up-to-date default screen device in FullscreenWindowProps test.
Calling setDisplayMode() or setFullScreenWindow() may cause display reconfiguration.

(cherry picked from commit 5e26eb9730)
2025-06-11 02:02:31 +02:00
Alexey Ushakov
6ae6d40aeb JBR-6433 Rounded corners of popups disappear after a while
Removed opacity from CAMetalLayer for layers with rounded corners

(cherry picked from commit e9bf36f41a)
2025-06-11 02:02:31 +02:00
Alexey Ushakov
c1cf7ac5d4 JBR-5621 Test failures with -Dsun.java2d.metal.displaySync=false
Created intermediate buffer in the MTLLayer
Implemented frame separation of window updates for AWT and Swing
Remove frame delays as they greatly affect throughput
Fixed test/jdk/sun/java2d/GdiRendering/ClipShapeRendering.java
Resolved crash on multi-GPU systems

(cherry picked from commit 20bf935c82)
2025-06-11 02:02:30 +02:00
Dmitrii Morskii
af780bd3e9 JBR-6346 update Inter font version
(cherry picked from commit 37ac0f2c3d)
2025-06-11 02:02:30 +02:00
Nikita Provotorov
ee82f4150e JBR-4687: Japanese IME input window hides what is being typed.
Uses CFS_EXCLUDE instead of CFS_CANDIDATEPOS in the ::ImmSetCandidateWindow() native API, which is more powerful and allows to take into account the issue's case.

(cherry picked from commit 0afe6c37bb)
(cherry picked from commit fa3d03b373)
2025-06-11 02:02:30 +02:00
Vitaly Provodin
99d07bdcb3 JBR-6404 synchronize drawing and the test checking
(cherry picked from commit e763bb96ea)
2025-06-11 02:02:30 +02:00
Vitaly Provodin
1a498054f6 JBR-3902 create jbr_all test group
(cherry picked from commit 104bd3086a)
2025-06-11 02:02:30 +02:00
Maxim Kartashev
201456cc7d JBR-6002 Linux: maximized window goes fullscreen after being moved between monitors
(cherry picked from commit 83c4c0364698f5bfb682d715bbe4ac70d50f11b3)
(cherry picked from commit 41dde53a30)
2025-06-11 02:02:30 +02:00
ngubarkov
130b45941a JBR-5605 ignore empty client area when syncing bounds in XDecoratedPeer.
(cherry picked from commit d2301edbd0de04747817a2d382f587056d954627)
(cherry picked from commit b694ce0e9a)
2025-06-11 02:02:30 +02:00
ngubarkov
eb5afac0a4 JBR-5438 Fix window bounds in XWM#setShellResizable
(cherry picked from commit 0aee99ac703f3b360277293e6e7a2e1aadfaba33)
(cherry picked from commit 637e8e473e)
2025-06-11 02:02:30 +02:00
ngubarkov
08f213c2cd JBR-5265 Workaround incorrect position of content window in queryXLocation.
(cherry picked from commit 26684fd4c761dcd2a4c93673d7732095a2050c9b)
(cherry picked from commit 4f44486d15)
2025-06-11 02:02:30 +02:00
ngubarkov
4d4fcb08c3 JBR-5417 Fix flickering in multi-monitor setups on Linux.
(cherry picked from commit 9b813e21c361e9e4b97c52bdd8eccef0030a7763)
(cherry picked from commit d0fa8194dd)
2025-06-11 02:02:30 +02:00
Dmitry Batrak
7915538fe1 JBR-5095 Incorrect initial window's location under GNOME
(cherry picked from commit 6995ce47fd)

with fix for JBR-5189 Can't exit fullscreen mode on ubuntu 22.10

(cherry picked from commit b933660cf1)
(cherry picked from commit f4ea24e18d8e6f4cb0420e30344a5cd3f000c021)
(cherry picked from commit 0ee3854a3a)
2025-06-11 02:02:30 +02:00
Sergey Shelomentsev
4badd4f2ce JBR-6354 fix custom title bar tests to avoid failure in MacOS 14 fullscreen mode
- moved common logic to a separate part
- moved parts of tests to swing package

(cherry picked from commit 80b6e4ba8cad4c19b0f306ccd64dad9c085a8bab)
(cherry picked from commit 22d1e57928)
2025-06-11 02:02:30 +02:00
Nikita Provotorov
a734b7cd1b JBR-6125: macOS14 java/awt/Window/Grab/GrabTest.java Frame can't be focused.
Fixes a data race in the test.

(cherry picked from commit ca5562225a)
(cherry picked from commit 1ba73c8aaf430ca4c6e8302d1bcee8681aa8584d)
(cherry picked from commit cfbb5e642e)
2025-06-11 02:02:30 +02:00
Vitaly Provodin
69a3bde4c8 update exclude list on results of 22_b1930 test runs
(cherry picked from commit def4d8ad64e4b1fea76ace0d9014c1a063e44891)
(cherry picked from commit 32327c3f64)
2025-06-11 02:02:30 +02:00
Vladimir Kharitonov
77f3e4af26 RDCT-766 add libwayland-cursor.so to ResolveSymbolsTestMinEnv
(cherry picked from commit 9626cc17447b96e8b4a16908f349e682525e3090)
(cherry picked from commit 09d1ab6ca20b51a46dad120ac044346bb2a8d48e)
(cherry picked from commit b3d3fc5bc0)
2025-06-11 02:02:29 +02:00
Vladimir Kharitonov
93a3a4d634 JBR-6272 add resolve symbols tests
(cherry picked from commit a4acdf005c53b1765ad356a740d4569db70e8b02)
(cherry picked from commit 9178b241d5d706c7628d5ebfac0fff8b54029b97)
(cherry picked from commit 262cccdd23)
2025-06-11 02:02:29 +02:00
Vitaly Provodin
120098fef8 JBR-6246 add (re)generating cds archives at jlink step
(cherry picked from commit 5f1b08c70d)
2025-06-11 02:02:29 +02:00
Nikita Gubarkov
c263c653af Emoji PR sync (experimental)
- Removed font fallback hacks.
- Changed composite font glyph code encoding scheme, refactored to use Font2D instead of PhysicalFont.
- New Emoji logical font type with 2 underlying physical fonts.
- Removed getGlyphVectorOutline - it's unused and broken.
- Got rid of charsToGlyphs[NS] boilerplate.
- Moved emoji tests to separate directory.

(cherry picked from commit 485bdd1d1a)
2025-06-11 02:02:29 +02:00
Sergey Shelomentsev
6d1ea5cc79 Don't trigger workflow on push
(cherry picked from commit d900720a03)
2025-06-11 02:02:29 +02:00
Dmitrii Morskii
4fa05cd889 JBR-5724: fixed serialization and backward compatibility of Font
(cherry picked from commit 120cac9145)
2025-06-11 02:02:29 +02:00
Alexander Lobas
e09af8de7d JBR-4834 JBR-5139 Rounded corners on Mac OS and Windows: support custom border color
(cherry picked from commit 936f47d811)
2025-06-11 02:02:29 +02:00
Dmitrii Morskii
fb9eca0342 JBR-6044 handle absence of fontConfig library in setupRenderingFontHints
(cherry picked from commit 6d41e07ffa)
2025-06-11 02:02:29 +02:00
Dmitrii Morskii
15df1d9d7f JBR-6041 started using correct type inside FcPatternGetValueFuncType
(cherry picked from commit fc2b096811)
2025-06-11 02:02:29 +02:00
Dmitrii Morskii
d21c65d8a8 JBR-6018 removed incorrect test testFeaturesZeroFrac
(cherry picked from commit e387761828)
2025-06-11 02:02:29 +02:00
Dmitrii
c6b1374952 JBR-5502: optimize stringWidth & charsWidth methods of FontDesignMetrics
(cherry picked from commit b9eb40284f)
2025-06-11 02:02:29 +02:00
Dmitrii Morskii
dab1beafea JBR-5844: fixed other part of issue. Added missing implementation of native methods in fontconfigmanager
(cherry picked from commit dbd70b4401)
2025-06-11 02:02:29 +02:00
Alexey Ushakov
630d655a77 8311917: MAP_FAILED definition seems to be obsolete in src/java.desktop/unix/native/common/awt/fontpath.c
Reviewed-by: prr
(cherry picked from commit f2b83e89a0)
2025-06-11 02:02:29 +02:00
Dmitrii Morskii
5b9098153c JBR-5844: fix case with non-scalable face
(cherry picked from commit 490080a315)
2025-06-11 02:02:29 +02:00
Dmitrii Morskii
6d038c90ae JBR-5804: refactoring of freetypeScaler and moving fontconfig's logic in separate file
(cherry picked from commit 4700386a2e)
2025-06-11 02:02:28 +02:00
Dmitrii
38b8c7ed97 JBR-5246 add OpenType's features support
(cherry picked from commit a2900b0bd9)
2025-06-11 02:02:28 +02:00
Dmitry Batrak
3bd27e2a50 JBR-5751 java/awt/Focus/RowToleranceTransitivityTest.java: Focus got stuck while traversing.
(cherry picked from commit d56b4b045d)
2025-06-11 02:02:28 +02:00
Vitaly Provodin
f6beeff9b0 JBR-5286 make windows-aarch64 building script identical to the same script in jbr17
(cherry picked from commit a451d19108)
2025-06-11 02:02:28 +02:00
Vitaly Provodin
c82f6297cf update jetbrains.api hash and API version
(cherry picked from commit 2a53bf894c)
2025-06-11 02:02:28 +02:00
Vitaly Provodin
137390d573 Revert "JBR-5724: fixed serialization and backward compatibility of Font"
This reverts commit c5cc5b4dedbdf73871f14db92afaac15fd985d86.

(cherry picked from commit 34ed77394f)
2025-06-11 02:02:28 +02:00
Vitaly Provodin
b05f4b7977 JBR-6246 add default CDS archives into jbrsdk distributions
(cherry picked from commit f103a46a4d)
2025-06-11 02:02:28 +02:00
Dmitry Drobotov
3ab31f14f3 JBR-4479 Add text caret tracking for macOS Accessibility Zoom
(cherry picked from commit 0dfbf34b37)
(cherry picked from commit 29ce00912d)
2025-06-11 02:02:28 +02:00
Dmitry Drobotov
3a0d87ee18 JBR-6194 Fix VoiceOver reading old JComboBox value after changing it
1. Remove `value == nil` check in ComboBoxAccessiblity.accessibilityValue to fix the issue with not updated value of combo box. With `value == nil` check, the value was not reassigned on every get request of `accessibilityValue`, but only on get `accessibilitySelectedChildren`. When changing focus by Tab, only get `accessibilityValue` is called, and because `value` is already not nil, an old value was returned.

2. Set combo box role to NSAccessibilityPopUpButtonRole if it's not editable. Setting role to popup button fixes the bug when combo box value was not updated when using VO cursor navigation. Native MacOS non-editable combo boxes and non-editable HTML <select> elements also have the "popup button" role instead of "combo box", so the role should become more clear. Popup button role additionally enables opening the combo box menu with VO+Space shortcut, and changes VO instructions to be more appropriate when combo box is focused.

3. Add test for VoiceOver-specific issues of JComboBox.

(cherry picked from commit 8982db51d7)
(cherry picked from commit aebfb1439e)
2025-06-11 02:02:28 +02:00
Vitaly Provodin
045475881a Update README.md
(cherry picked from commit 053f3acae4)
2025-06-11 02:02:28 +02:00
Maxim Kartashev
eca96838dd JBR-6220 javax/swing/GraphicsConfigNotifier/StalePreferredSize.java became failing by time out on Linux
(cherry picked from commit 3f78590707)
2025-06-11 02:02:28 +02:00
Maxim Kartashev
19b44e41d1 JBR-6142 Impossible to move/resize IDE window after restart if several projects were initially opened on secondary monitor
Announce to Mutter that we are "client-decorated" when a Frame is
undecorated by setting _GTK_FRAME_EXTENTS to all zeroes.
This prevents Mutter from applying certain harmful heuristics.

(cherry picked from commit c5a34ea526)
2025-06-11 02:02:28 +02:00
Maxim Kartashev
a073be849b JBR-5971 Wayland: support WindowMove JBR API
Updated the XToolkit implementation to match API changes required for
WLToolkit

(cherry picked from commit 7492c11138)
2025-06-11 02:02:28 +02:00
Maxim Kartashev
6e742b88d6 JBR-5777 isWindowMoveSupported() doesn't work with non-default GraphicsEnvironment
Co-authored-by: Nikita Gubarkov <nikita.gubarkov@jetbrains.com>
(cherry picked from commit 4496757a35)
2025-06-11 02:02:28 +02:00
Maxim Kartashev
0e059ca896 JBR-5637 Linux: implement window position change with WM help
Introduced JBR.isWindowMoveSupported() and
JBR.getWindowMove().startMovingTogetherWithMouse()

(cherry picked from commit 747bc94e8f)
2025-06-11 02:02:27 +02:00
Maxim Kartashev
26ef3b6476 JBR-5084 Add ability to log additional data to jstack output
The data can be provided via this JBR API call:
JBR.getJstack().includeInfoFrom(Supplier<String>)

(cherry picked from commit 5244ec31f9)
2025-06-11 02:02:27 +02:00
Alexander Lobas
13e2692582 JBR-5546 Iterating open windows with cmd backtick on Mac forces minimized windows to un-minimize
(cherry picked from commit ffb74e32a0)
2025-06-11 02:02:27 +02:00
Alexander Lobas
40c26ab50e JBR-5478 IDEA window doesn't fit the screen properly on turning off/on an external monitor
(cherry picked from commit 24930c2624)
2025-06-11 02:02:27 +02:00
Alexander Lobas
d8f336e47c JBR-5384 New UI: window header is hard to resize on the top edge, top/right corner
(cherry picked from commit c4dd01c027)
2025-06-11 02:02:27 +02:00
Alexander Lobas
5457220ade JBR-5174 Opening project as tabs in Mac OS (version2)
JBR-5023 Configure TabbingIdentifier during create native window
JBR-5256 IDEA window resizes to zero height when exit full-screen mode with new window controls enabled
JBR-5197 Window control buttons are not visible in full-screen mode in dark themes when IDE window is focused
JBR-5175 jb/java/awt/Window/FullScreenTwoFrames.java: -[AWTWindow resetWindowFullScreeControls]: unrecognized selector sent to instance 0x60000232d5f0
JBR-5499 Window control buttons bugfix
JBR-4462 BigSur: project tab does not gain focus when click it after focusing another app

(cherry picked from commit 4aa2061ab6)
2025-06-11 02:02:27 +02:00
Dmitry Batrak
79b6787b79 JBR-5300 Change source code and test files to use GPL license
fix copyright profile in generated IDE project

(cherry picked from commit 43ebbe3cd1)
(cherry picked from commit 39d49c5abe)
2025-06-11 02:02:27 +02:00
Nikita Gubarkov
636709cf5c JBR-5124 Rewrite custom decorations support
JBR API v0.0.8
Added new WindowDecorations API, deprecated old CustomWindowDecoration.

JBR-4641 JBR-4630 Fix client area calculation with custom decorations on Windows.

- Window insets are rounded up, which causes visible & unusable border in fullscreen on some scales, round down instead.

- Clipping in Swing components sometimes cuts what it shouldn't, fixed.

(cherry picked from commit 03d850e722)
2025-06-11 02:02:27 +02:00
Vitaly Provodin
8b5b4ecf9c update exclude list on results of 21.0.1_b293.1 test runs
(cherry picked from commit a247590ca0)
2025-06-11 02:02:27 +02:00
Nikita Provotorov
938e864124 JBR-6282: java/awt/TextArea/TextAreaEditing/TextAreaEditing.java intermittently fails due to deadlock.
Makes the test invoke any UI-operation on EDT only (since AWT doesn't guarantee thread-safety of UI operations, see more at https://mail.openjdk.org/pipermail/client-libs-dev/2023-November/016172.html).

(cherry picked from commit 8dbb889509)
(cherry picked from commit 559ec0c370)
2025-06-11 02:02:27 +02:00
Maxim Kartashev
0172f6536e JBR-6291 runtime/cds/appcds/dynamicArchive/TestDynamicDumpAtOom.java: Attempting to acquire lock OOMEStacks_lock/safepoint out of order
(cherry picked from commit c8c8881be4)
2025-06-11 02:02:27 +02:00
Alexander Lobas
ea36653c24 JBR-5409 "No Print Service Found" Error when saving to PDF
(cherry picked from commit 9c9859ba1a)
2025-06-11 02:02:27 +02:00
Alexey Ushakov
e6471eb26f JBR-6281 Remove MTLEvent sync from Metal rendering code
Removed sync code

(cherry picked from commit 660d97005c)
2025-06-11 02:02:27 +02:00
Nikita Provotorov
122e6e644b JBR-2460: Wrong position of input window and no input preview with fcitx and ubuntu 13.04.
This patch makes the fix of JBR-1573 (which caused JBR-4394) disabled by default, because it's incompatible with the native below-the-spot mode (a.k.a. over-the-spot in the X11's terminology).

(cherry picked from commit 3fe2a97aa0)
(cherry picked from commit fc3ce96788)
2025-06-11 02:02:27 +02:00
Nikita Provotorov
0404ea257b JBR-2460: Wrong position of input window and no input preview with fcitx and ubuntu 13.04.
- introduces and integrates jbNewXimClient: a new implementation of XIC creation routine (it's mostly refactoring and generalizing of AWT's existed code). Enabled by default and can be disabled via a new system property -Djb.awt.newXimClient.enabled=false ;
- introduces support of the X11's native over-the-spot input method style (it's almost the same as AWT's below-the-spot mode, but the input method's windows are drawn externally, not by AWT). Enabled by default and can be disabled via a new system property -Djb.awt.newXimClient.enabled=false. Doesn't work if -Djb.awt.newXimClient.enabled=false is set ;
- introduces sun.awt.X11.XInputMethod.ClientComponentCaretPositionTracker class that tracks all kind of events for the current client component that can lead to the caret position changing ;
- makes the XInputMethod class to update the input window's position (whenever the ClientComponentCaretPositionTracker discovers that's necessary) by setting the X11's XNSpotLocation property .

Check out the branch nprovotorov/backups/JBR-2460_wrong-position-of-input-window-and-no-input-preview for more granular patches.

(cherry picked from commit c57030a2ef)
(cherry picked from commit 56d9759667)
2025-06-11 02:02:26 +02:00
Maxim Kartashev
66950711fa JBR-6193 Impossible to resize snapped IDE when native header is turned off
Drop the maximized state right before the resize operation for
undecorated windows.

Also fixes setExtendedState() to work when changing snapped window's state
(MAXIMIZED_HORIZ or MAXIMIZED_VERT) to NORMAL.

(cherry picked from commit a9a227c5ab)
2025-06-11 02:02:26 +02:00
Nikita Provotorov
80f12317d6 JBR-5980: Pasting from clipboard not working reliably in Windows.
(also contains the fix of JBR-6267 Image retreived from the Clipboard is not the same image that was set to the Clipboard)

- Adds a way to disable caching of the data placed into the clipboard. The behavior is controlled by the system property "awt.windows.clipboard.cache.disabled" (=false by default) ;
- Whenever the app gets focus additionally checks if another app has modified the clipboard. The behavior is controlled by the system property "awt.windows.clipboard.extraOwnershipChecksEnabled" (=true by default) .

(cherry picked from commit e6f4a25b1a)
2025-06-11 02:02:26 +02:00
Nikita Provotorov
3d28e23bd2 JBR-5980: Pasting from clipboard not working reliably in Windows.
Marks the native flag AwtClipboard::isGettingOwnership as volatile and adds memory barriers around it to avoid inconsistencies of CPU caches.

(cherry picked from commit 51d2b31b28)
2025-06-11 02:02:26 +02:00
Vitaly Provodin
f729d701f3 JBR-6255 improve calculation JDK_BUILD_NUMBER
(cherry picked from commit 186d1c3229)
2025-06-11 02:02:26 +02:00
Nikita Gubarkov
33f3e1459a JBR-5274 recreate CGraphicsDevice if it was changed.
- AWT code heavily relies on reference comparison when updating graphics devices & configurations, so we need to actually re-create CGraphicsDevice if it was changed.

- Also do not rely on graphicsConfig.getDefaultTransform() when firing `graphicsContextScaleTransform` property change, as graphics devices are mutable and returned default transform may change over time, e.g. when device is invalidated.

(cherry picked from commit f9ad92a71c)
2025-06-11 02:02:26 +02:00
Alexey Ushakov
be2ca74135 JBR-5025 Reduce latency during display reconfiguration in Metal
Moved metal load library checks to CGraphicsEnvironment

(cherry picked from commit eeee663bb4)
2025-06-11 02:02:26 +02:00
Alexey Ushakov
2320928c93 JBR-4666 java.lang.InternalError: Error - unable to initialize Metal after recreation of graphics device.
Reverted fix of the JRE-359 (CGraphicsEnvironment.getDefaultScreenDevice() returns null)
Logged exception after first attempt to create graphics device

(cherry picked from commit 345fd320c7)
2025-06-11 02:02:26 +02:00
Alexey Ushakov
b327a105cc JBR-4588 macOS: SIGILL at [libsystem_kernel] __kill in CCE: class sun.java2d.opengl.CGLGraphicsConfig cannot be cast to class sun.java2d.metal.MTLGraphicsConfig
Prevent fall back to OpenGL if Metal has been used before
Added more diagnostics.

(cherry picked from commit 4002007cc2)
2025-06-11 02:02:26 +02:00
Vitaly Provodin
95e6ea0421 Update README.md
(cherry picked from commit 74f354be28)
2025-06-11 02:02:26 +02:00
Vladimir Kharitonov
73295b842f JBR-6239 sign frameworks in cef_server.app
(cherry picked from commit 8f6ae7a89c)
2025-06-11 02:02:26 +02:00
Maxim Kartashev
a85a97fed4 JBR-4020 Test ObsoleteFlagErrorMessage fails after +IgnoreUnrecognizedVMOptions has become the default
(cherry picked from commit ae5963a094)
(cherry picked from commit 5b27cdbd14)
2025-06-11 02:02:26 +02:00
Maxim Kartashev
2c6f239b6f JBR-5722 vmTestbase/vm/gc/compact/Compact_TwoFields_InternedStrings: SIGSEGV at Symbol::as_klass_external_name(char*, int)
Do not use print_native_stack() when recording OOME stacks as it is
designed to be used only in the context of a fatal error reporting where
induced crashes are tolerated.

(cherry picked from commit 6a87945cc5)
2025-06-11 02:02:26 +02:00
Alexey Ushakov
02f913938c JBR-5741 broken build in main because of hotspot changes (JDK-8309613)
Added missing parameter

(cherry picked from commit c4c6d022f8)
2025-06-11 02:02:26 +02:00
Maxim Kartashev
60800fe53d JBR-5480 Include more information in OOME crash reports
(cherry picked from commit 44f8dc85da)
2025-06-11 02:02:26 +02:00
Maxim Kartashev
8b8202c519 JBR-5466 jb/hotspot/JNIRefsInCrashLog.java: 'hs_err_42.txt' missing from stdout/stderr
(cherry picked from commit e511c26794)
2025-06-11 02:02:25 +02:00
Maxim Kartashev
1dbc13835e JBR-5431 Include memory used by JNI references into crash reports
(cherry picked from commit 9a6eb0b730)
2025-06-11 02:02:25 +02:00
Vitaly Provodin
a6f5cdf9de Update README.md
(cherry picked from commit 66c66543bb)
2025-06-11 02:02:25 +02:00
bourgesl
2ae8886c5f JBR-5638: improved renderer performance for simple rectangular area (see BBoxAATileGenerator), added new statistics in Renderer
(cherry picked from commit dd4f818488)
2025-06-11 02:02:25 +02:00
Nikita Tsarev
e5e2d47acc JBR-6215: Override XToolkit's default nonintuitive behavior when translating F13-F24 keys
(cherry picked from commit 413b679eda)
2025-06-11 02:02:25 +02:00
Konstantin Bulenkov
3a1003131c JBR-6214 [fwp jbr21] IDEA-299292 Use Inter semibold instead of Inter bold
Replaced Inter bold with semi-bold fonts

(cherry picked from commit 1ca726da46)
2025-06-11 02:02:25 +02:00
Nikita Gubarkov
03b34d98b9 JBR-6208 Extended glyph cache for Metal
(cherry picked from commit 6878613df0)
2025-06-11 02:02:25 +02:00
Vitaly Provodin
966f9516e2 JBR-6181 add Linux executables with bundled FreeType
(cherry picked from commit 12449b3de5)
2025-06-11 02:02:25 +02:00
Vitaly Provodin
a3c7dd1bcf Update README.md
(cherry picked from commit cff858e253)
2025-06-11 02:02:25 +02:00
Alexey Ushakov
37d53dd324 JBR-4983 MacOS Ventura - External monitor lagging
Restored REDRAW_INC to 2. Enabled the fix by default only for M2 and spans displays property enabled (Displays have separate spaces OFF)

(cherry picked from commit 19728e911b)
2025-06-11 02:02:25 +02:00
Dmitrii Morskii
922bb09769 JBR-6135 removed dependence on process reading TTF in fixed size chunks
(cherry picked from commit 7c4721fa68)
2025-06-11 02:02:25 +02:00
Alexey Ushakov
4c8c87d1a3 JBR-6132 Crash in [MTLLayer blitTexture] when MTL_DEBUG_LAYER enabled
Blit operation should not be performed on textures with MTLTextureUsageRenderTarget only, so changing framebufferOnly to NO

(cherry picked from commit 5fb47ffc78)
2025-06-11 02:02:25 +02:00
Vitaly Provodin
3c1432f0bc Update README.md
(cherry picked from commit 7d1bcef8cd)
2025-06-11 02:02:25 +02:00
Nikita Provotorov
e56c74274c JBR-5984: IM's candidate window is placed under popup windows.
- Implements the optional method [NSTextInputClient windowLevel] to tell the macOS IM subsystem correct level of the window;
- Adds a regression test ImWindowIsPlacedUnderPopup5984.java.

(cherry picked from commit 5a91aae9c2)
(cherry picked from commit 2f310561ba)
2025-06-11 02:02:25 +02:00
Vitaly Provodin
2178f3f201 JBR-6130 add VK_TAB release action
(cherry picked from commit e16990eb93)
2025-06-11 02:02:24 +02:00
Alexey Ushakov
c15b9f4597 JBR-4983 MacOS Ventura - External monitor lagging
Added extra redraw request

(cherry picked from commit bd436709f5)
2025-06-11 02:02:24 +02:00
ghostflyby
6b55329397 JBR-6124 Fix macOS services writing text back to textfield
(cherry picked from commit 51bde60b42)
2025-06-11 02:02:24 +02:00
Sergey Shelomentsev
a9ede19b8c exclude FocusTraversalOrderTest
(cherry picked from commit f7004afdb1)
2025-06-11 02:02:24 +02:00
Sergey Shelomentsev
4bc946fc79 JBR-6060 add focus traversal order test
(cherry picked from commit 40dec50c3a)
2025-06-11 02:02:24 +02:00
Nikita Gubarkov
4b65576d9e JBR-6016 doPrivileged for JBR API internal services.
(cherry picked from commit 06290bfd1e)
2025-06-11 02:02:24 +02:00
Vitaly Provodin
8beead8501 JBR-6008 Update JetBrains Mono fonts to v2.304
(cherry picked from commit 676a270ac1)
2025-06-11 02:02:24 +02:00
Vitaly Provodin
1d120a7c94 Update README.md
(cherry picked from commit 0400cd7f9b)
2025-06-11 02:02:24 +02:00
Dmitry Batrak
d55fd96bb0 JBR-3353 Sibling popup window is shown below dialog on macOS
(cherry picked from commit 4c6f3e4510)
(cherry picked from commit 73678a99d5)
2025-06-11 02:02:24 +02:00
Dmitry Batrak
052d2d576f JBR-5953 If hieroglyph typing isn't finalised, focusing another component inserts the composed text there
(cherry picked from commit 5dedf0e367)
2025-06-11 02:02:24 +02:00
Dmitry Batrak
6da0935dce JBR-5946 Allow to disable painting of composed text in Swing text components using TextLayout.draw
(cherry picked from commit 3ac357417b)
2025-06-11 02:02:24 +02:00
Dmitry Batrak
9b3cf42106 JBR-5823 IDEA crashes when '-Dmain.thread.as.edt=true' vmoption is set and VoiceOver is enabled
done as part of JBR-4993 Support using 'main' thread as EDT on macOS

(cherry picked from commit 55598693c3)
(cherry picked from commit c7b9f1aa68)
2025-06-11 02:02:24 +02:00
ngubarkov
da537e86bf JBR-5240 Fix XToolkit#getScreenInsets in Xinerama mode.
(cherry picked from commit 5df3fc666d)
2025-06-11 02:02:24 +02:00
ngubarkov
cbad864e16 JBR-5316 Fix fractional scaling HIDPI.
(cherry picked from commit acb62617d7)
2025-06-11 02:02:24 +02:00
Nikita Gubarkov
d4d1523c45 JBR-5186 Make MouseInfo.getPointerInfo more robust
Do not search for the containing monitor in MouseInfo.getPointerInfo, this must be handled by peers (yes, this goes against the spec of MouseInfoPeer.fillPointWithCoords).

JBR-5268 Fix coordinates conversion in XMouseInfoPeer.fillPointWithCoords

(cherry picked from commit ae135f2126)
2025-06-11 02:02:23 +02:00
Nikita Gubarkov
e07c2f3a7a IDEA-141456 Multimonitor HIDPI support for Linux
(cherry picked from commit 980c18ae92)
2025-06-11 02:02:23 +02:00
Dmitrii Morskii
8d237ac15c JBR-5724: fixed serialization and backward compatibility of Font
(cherry picked from commit e3da733724)
2025-06-11 02:02:23 +02:00
Dmitrii Morskii
f7f60a8f94 JBR-5259: fixed Canvas mispositioning after dragging JFrame to a monitor with different scale
(cherry picked from commit de62b80ef2)
2025-06-11 02:02:23 +02:00
Vitaly Provodin
7ff7dab9d0 Update README.md
(cherry picked from commit b438d74f39)
2025-06-11 02:02:23 +02:00
Maxim Kartashev
c7802d2468 JBR-5815 javax/swing/AbstractButton/6711682/bug6711682.java: Row #2 checkbox is not selected
Fixed the test to use proper cell coordinates when clicking.

(cherry picked from commit ed01142e8b)
2025-06-11 02:02:23 +02:00
Alexey Ushakov
d12e877a63 JBR-5807 java/awt/Frame/FrameVisible/FrameContentAppearanceTest.java: Failed: OpenGL 26 image rendering failure(s)
Added synchronisation for rendering and appearance

(cherry picked from commit d02635f65b)
2025-06-11 02:02:23 +02:00
bourgesl
dd9c069690 JBR-5625: disable color-matching (colorspace = nil) in MTLLayer by default (see new system property 'sun.java2d.metal.colorMatching=true/false') + added new MetalLayerColorTest
Use CGColorSpaceCopyName() available since macOS 10.6 in MTLLayer

Use sun.java2d.metal.colorMatching=true by default (current metal behaviour)

(cherry picked from commit ec5c99bfb6)
2025-06-11 02:02:23 +02:00
Nikita Provotorov
1d4ebea877 JBR-5762 Sometimes naturally generated MOUSE_DRAGGED events don't contain the pressed button's modifier.
Enforce keeping the pressed button in the modifiers for MOUSE_DRAGGED events. This is under a (default enabled) system property "awt.mac.enforceMouseModifiersForMouseDragged".

(cherry picked from commit fb12990a98)
(cherry picked from commit 6a972e8ca7)
2025-06-11 02:02:23 +02:00
Dmitrii Morskii
5d064c91bd JBR-5548 fix BadSerializationTest
(cherry picked from commit 90d867d08b)
2025-06-11 02:02:23 +02:00
Vitaly Provodin
2d4ba293e0 Update README.md
(cherry picked from commit 8efb8ded38)
2025-06-11 02:02:23 +02:00
Sergey Shelomentsev
705cffa8df JBR-5746 wait for menu visibility of fail the test
add mouse events logging

(cherry picked from commit 5a05bd2046)
2025-06-11 02:02:23 +02:00
Dmitry Batrak
6a905fa676 JBR-5720 Wrong modifiers are reported for mouse middle and right buttons' release/clicked events
(cherry picked from commit afa0283f16)
2025-06-11 02:02:23 +02:00
Dmitry Batrak
66ddc007a2 JBR-5684 Focus state is broken after closing of modal dialog in an inactive application
(cherry picked from commit 2f2fe7a11c)
2025-06-11 02:02:23 +02:00
Vitaly Provodin
091f30aac8 update exclude list
(cherry picked from commit 36f380d4b4)
2025-06-11 02:02:23 +02:00
Vitaly Provodin
6981706c78 Update README.md
(cherry picked from commit b4071ba08d)
2025-06-11 02:02:22 +02:00
Alexey Ushakov
5331720bd5 JBR-5151 Test failures caused by -Dsun.java2d.metal.displaySync=false
Removed display sync from window layer, provide layer content updates only when necessary

(cherry picked from commit 77cb9bcec0)
2025-06-11 02:02:22 +02:00
Dmitrii Morskii
a6e04d85f8 JBR-1775: improved logic for choosing newer font between system and bundled ones
(cherry picked from commit 41cbdf720c)
2025-06-11 02:02:22 +02:00
Sergey Shelomentsev
0558471cda JBR-2870 add resression test for JPopupMenu
- verify that the popup menu is usable if overlaps WM's dock panel of the bottom of screen

(cherry picked from commit 962eb42ed2)
2025-06-11 02:02:22 +02:00
Vitaly Provodin
ba83f185d8 Update README.md
(cherry picked from commit 15fdca4193)
2025-06-11 02:02:22 +02:00
Alexey Ushakov
acbbdea02d JBR-5693 Debug build failure in main branch
Corrected printf format and muted unused-function option for keycode_cache.c

(cherry picked from commit 87a01c930d)
2025-06-11 02:02:22 +02:00
Alexey Ushakov
f5afb61c88 JBR-5704 displaySyncOFF: javax/swing/JDialog/Transparency/TransparencyTest.java: JDialog transparency lost upon iconify/deiconify sequence
Corrected startRedraw method to call setNeedsDisplay in displaySync=false mode

(cherry picked from commit 0ddd7e8301)
2025-06-11 02:02:22 +02:00
Sergey Shelomentsev
3746d50a5f JBR-5670 restore initial display mode after test execution
restore original display mode

(cherry picked from commit d098ad1f77)
2025-06-11 02:02:22 +02:00
Sergey Shelomentsev
da12fa64bc JBR-4880 Fix DeadKeySystemAssertionDialog to avoid receiving key event out of the window
(cherry picked from commit 5467dea09b)
2025-06-11 02:02:22 +02:00
Vladislav Rassokhin
0fd018c3a3 JBR-5600 Reduce noise in signing scripts output
(cherry picked from commit bc145d39be)
2025-06-11 02:02:22 +02:00
Vladislav Rassokhin
c0611ab801 JBR-5600 Sign frameworks as whole, verify framework signature before full app sign
(cherry picked from commit 2fecc58be2)
2025-06-11 02:02:22 +02:00
Nikita Provotorov
f14db03f93 JBR-5668: The implementation of a11y announcing for macOS crashes with -Xcheck:jni.
- Create a global reference of the passed to EDT accessible object (the local reference) to use it in the AppKit thread ;
- Enable -Xcheck:jni in the tests ;
- Make the tests handle the problematic case .

(cherry picked from commit cba981df4b)
(cherry picked from commit f3a038c849)
2025-06-11 02:02:22 +02:00
Vladislav Rassokhin
48949b7e97 tools/mac/scripts: minor improvements
* don't move into itself
* use `PKG_NAME` variable instead of `${APP_NAME}.pkg`
* cleanup sign.sh
* add `SCRIPT_VERBOSE` env variable to control `set -x`

(cherry picked from commit 28514c3d00)
2025-06-11 02:02:22 +02:00
Vladislav Rassokhin
7ffeb385b9 JBR-5600 Staple .pkg with signature
(cherry picked from commit 6555023fd3)
2025-06-11 02:02:22 +02:00
Vladislav Rassokhin
01199b7585 JBR-5600 Notarize macOS binaries using notarytool
(cherry picked from commit 7916ed31b7)
2025-06-11 02:02:21 +02:00
Vladislav Rassokhin
f729ad755c JBR-5600 Sign macOS binaries using jet-sign
(cherry picked from commit 95ef69df13)
2025-06-11 02:02:21 +02:00
Sergey Shelomentsev
e41419a5f8 JBR-5579 Update mouse location checks, set window always on top for ActionListenerTest
(cherry picked from commit b867b1c395)
2025-06-11 02:02:21 +02:00
Sergey Shelomentsev
562e7833ae JBR-5551 update hit tests on custom title bar
- set windows always on top
- verify mouse location before clicking

(cherry picked from commit 005de74127)
2025-06-11 02:02:21 +02:00
Sergey Shelomentsev
b30bf7b9b8 JBR-5577 fix MouseEventsOnClientArea test
- add Swing/AWT specific Task runners
- split MouseEventsOnClientArea to separate AWT/Swing tests
- use CountDownLatch for tracking mouse events

(cherry picked from commit c6a43fe84f)
2025-06-11 02:02:21 +02:00
Sergey Shelomentsev
e3a9e8e193 remove jb/java/awt/Window/ZOrderOnModalDialogActivation.java
(cherry picked from commit 9b6037dee3)
2025-06-11 02:02:21 +02:00
Sergey Shelomentsev
6d058a2f5d JBR-4494 pass ui scale options for child process
(cherry picked from commit e32e657c55)
2025-06-11 02:02:21 +02:00
Maxim Kartashev
84efe23e4f JBR-5656 Builds of JDK 21 are reproducible by default
(cherry picked from commit 0d663a139acf3d5cdb19b33494ab9f6273c4ebfa)
(cherry picked from commit f086917fa7)
2025-06-11 02:02:21 +02:00
bourgesl
099de4d326 JBR-5651: Improved MTLVertexCache to merge consecutive full-tiles ie use 1 larger quad instead of many quads per row, full-tile is only using 1x1 pixel (full), applied to color, gradient & texture paints + fixed clang warnings
(cherry picked from commit 6de22f0db9)
2025-06-11 02:02:21 +02:00
Alexey Ushakov
a92df33815 JBR-5649 Flickering in multi-monitor configuration
Provided corrected initial value for currentDisplayID

(cherry picked from commit c0f779b7e6)
2025-06-11 02:02:21 +02:00
Vitaly Provodin
068d0e358e JBR-5627 add regression test AsyncProfilerRunnerTest
(cherry picked from commit ce37138a4a)
2025-06-11 02:02:21 +02:00
Maxim Kartashev
e378f5adc2 JBR-5631 Refactor Dockerfile for x64 builds
(cherry picked from commit 3bb93255e9)
2025-06-11 02:02:21 +02:00
Vitaly Provodin
5efcfb7e5e JBR-5603 build aarch64 Linux from arm64v8/centos:7 and check glibc to be not higher 2.17
(cherry picked from commit f6be01d68c)
2025-06-11 02:02:21 +02:00
Alexey Ushakov
c3443e8594 JBR-5580 J2DBench: ~15% drop performance  because of non optimal synchronization in metal (MBP 16'' x64)
Replaced NSMutableArray with NSMutableSet, removed unnecessary __block modifier.

(cherry picked from commit fd940831a2)
2025-06-11 02:02:21 +02:00
Sergey Shelomentsev
64ef01c905 update a11y exclude list
(cherry picked from commit 5641f7141f)
2025-06-11 02:02:21 +02:00
Alexey Ushakov
e831cceecf JBR-5580 J2DBench: ~15% drop performance because of non optimal synchronization in metal (MBP 16'' x64)
Removed NSLock and moved all operations to the AppKit thread

(cherry picked from commit e2fcfaf249)
2025-06-11 02:02:20 +02:00
bourgesl
cddd823874 JBR-5170: improved color maskFill performance: using a new MaskColorBuffer and a specific shader (vert_txt_col)
fix crash in J2DDemo with advanced paints + artefacts with texture background

(cherry picked from commit 2fc32d6082)
2025-06-11 02:02:20 +02:00
Alexey Ushakov
57ba1ec815 JBR-5559 SwingMark performance drop after removing additional command queue
Added command queue and provided synchronization between the command queues

(cherry picked from commit 6b76f79eee)
2025-06-11 02:02:20 +02:00
Nikita Provotorov
603aff540b JBR-5536: Crash on macOS bad JNI lookup in Java_sun_swing_AccessibleAnnouncer_nativeAnnounce
Stop using the JNIEnv instance bound to EDT in the AppKit thread.

(cherry picked from commit 0f49341f4d)
(cherry picked from commit cdca8e74b7)
2025-06-11 02:02:20 +02:00
Alexey Ushakov
d74b895b9e JBR-4883 macOS: SIGSEGV at MTLVertexCache_FlushGlyphVertexCache
Use separate glyph cache for each MTLContext instance. Refactored MTLGlyphCache

(cherry picked from commit 845a30560e)
2025-06-11 02:02:20 +02:00
Alexey Ushakov
247b89d2d3 JBR-5193 Do not use extra commandQueue in metal pipeline
Removed extra command queue

(cherry picked from commit a235903851)
2025-06-11 02:02:20 +02:00
Alexey Ushakov
0dec1c35d2 JBR-4959 [macOS Ventura] Screen flickering after OS update when IDE is full screen
This includes displaySync changes as well as fixes for JBR-5157 and JBR-5321.

(cherry picked from commit e7df6f3745)
2025-06-11 02:02:20 +02:00
Vitaly Provodin
eb6c33da35 Update README.md
(cherry picked from commit aa1d64ca93)
2025-06-11 02:02:20 +02:00
Maxim Kartashev
335bbba07c jb/branchdiff.py is a lot faster
(cherry picked from commit 5c3726555d)
2025-06-11 02:02:20 +02:00
Sergey Shelomentsev
4220f89916 JBR-5505 update exclude list for a11y testing on Windows
(cherry picked from commit 12330ba916)
2025-06-11 02:02:20 +02:00
Sergey Shelomentsev
b3f28ce58b JBR-5397 update exclude list for a11y testing on MacOS
(cherry picked from commit 688b16a796)
2025-06-11 02:02:20 +02:00
Sergey Shelomentsev
b382530cb8 JBR-5441 fix wait for idle
(cherry picked from commit 8b5945f834)
2025-06-11 02:02:20 +02:00
Maxim Kartashev
b9431d864d jb/branchdiff.py to warn if it can't differentiate between commits
(cherry picked from commit 3504702f9c)
2025-06-11 02:02:20 +02:00
Sergey Shelomentsev
b9bec05edd JBR-5440 fix calculations for double click location
(cherry picked from commit e468d39869)
2025-06-11 02:02:20 +02:00
Artem Bochkarev
1daf6d0079 JBR-5426 write JCEF version info inside release file
(cherry picked from commit 59701eefa3)
2025-06-11 02:02:20 +02:00
Maxim Kartashev
a9455fbe12 JBR-5445 JBRApiTest test fails on development builds
(cherry picked from commit d9d941f9c5)
2025-06-11 02:02:19 +02:00
Sergey Shelomentsev
b1bd04c66e JBR-5433 add typing latency text for JTextArea
(cherry picked from commit c6706f1794)
2025-06-11 02:02:19 +02:00
Vitaly Provodin
7956399a50 JBR-5432 increase setAutoDelay for Robot
(cherry picked from commit 17b10df182)
2025-06-11 02:02:19 +02:00
Maxim Kartashev
4c11d7cd5d JBR-5230 Wanted: an ability to use Unix Domain sockets with overridden default NIO file system
(cherry picked from commit 946a7ca9ec)
2025-06-11 02:02:19 +02:00
Sergey Shelomentsev
f218f06e7c fixup! JBR-4875 set proper OS to run ComboBoxTransparentTittleBarTest
(cherry picked from commit 611dcc6475)
2025-06-11 02:02:19 +02:00
Sergey Shelomentsev
dc6cd95cfe fix controls width calculation
(cherry picked from commit b88d26c9dd)
2025-06-11 02:02:19 +02:00
Sergey Shelomentsev
08518e938e split ActionListenerTest
(cherry picked from commit 36f13b0158)
2025-06-11 02:02:19 +02:00
Sergey Shelomentsev
44799de60e JBR-5345 native controls detection and scale fixes
(cherry picked from commit e191789794)
2025-06-11 02:02:19 +02:00
Maxim Kartashev
4fec421d1a README.md: spelled out JBR distinctive features
(cherry picked from commit 51e9900c8b)
2025-06-11 02:02:19 +02:00
Vitaly Provodin
9ba14cffd4 update exclude list on results of 21_b28.1 test runs
(cherry picked from commit 4619c5ed7f)
2025-06-11 02:02:19 +02:00
Alexey Ushakov
1c466c75ee JBR-5330 Blank Welcome screen after moving to another display
Initialize currentDisplayID on AWTWindow creation

(cherry picked from commit c5ea4e48ac)
2025-06-11 02:02:19 +02:00
Nikita Tsarev
0486b881a2 JBR-5369: Update failing tests list in response to macOS keyboard support rewrite
(cherry picked from commit a9313e2d06)
2025-06-11 02:02:19 +02:00
Vitaly Provodin
c799af3e09 Update README.md
(cherry picked from commit ed3d57cf10)
2025-06-11 02:02:19 +02:00
Vitaly Provodin
13d0122318 update exclude list on results of 21_b24.2 test runs
(cherry picked from commit 3276006be9)
2025-06-11 02:02:19 +02:00
Vitaly Provodin
ba2f88da29 Update README.md
(cherry picked from commit 552fa7c32e)
2025-06-11 02:02:19 +02:00
Sergey Shelomentsev
6c9bec00da JBR-5350 Separate test for Mac OS
(cherry picked from commit dc4a094f03)
2025-06-11 02:02:18 +02:00
Sergey Shelomentsev
948d7d973b JBR-5346 run MaximizedCustomDecorationsTest on windows/mac only
(cherry picked from commit c47b6f4880)
2025-06-11 02:02:18 +02:00
Sergey Shelomentsev
db6193c5cd JBR-5350 fix FrameNativeControlTest checks on MacOS
(cherry picked from commit f8f1c8625e)
2025-06-11 02:02:18 +02:00
Sergey Shelomentsev
428703fce9 JBR-5344 fix incorrectly specified VM options
(cherry picked from commit 2f101dbf8a)
2025-06-11 02:02:18 +02:00
Vitaly Provodin
62b76fb170 Update README.md
(cherry picked from commit 952295b14d)
2025-06-11 02:02:18 +02:00
Vitaly Provodin
c92ee65abc update exclude list on results of 17.0.6_b855.1 test runs
(cherry picked from commit b018988c02)
2025-06-11 02:02:18 +02:00
Sergey Shelomentsev
d284296c39 JBR-5313 fix broken custom decoration tests on Windows
(cherry picked from commit c6e21bdbad)
2025-06-11 02:02:18 +02:00
Sergey Shelomentsev
e70d831437 JBR-5253 Use new JBR API for custom decorations
(cherry picked from commit fdead3d90a)
2025-06-11 02:02:18 +02:00
Vitaly Provodin
6c429e8d9c JBR-5300 move jbr-api.jar into test artefact
(cherry picked from commit f199d6c98a)
2025-06-11 02:02:18 +02:00
Vitaly Provodin
42918ddf62 update exclude list on results of 17.0.6_b837.3 test runs
(cherry picked from commit 415267181c)
2025-06-11 02:02:18 +02:00
Maxim Kartashev
580bf57dc5 JBR-4544 Enable OpenGL pipeline by default for Wayland sessions
The OpenGL pipeline is enabled only if all of the following is true:
- WAYLAND is detected,
- VMWare virtualization is detected,
- rendering pipeline is not a software one (llvmpipe).
As a side effect, a system property 'jbr.virtualization.information'
is set to the value of detected virtualization type. The value is the
same as provided by JFR.

(cherry picked from commit f6acd65d32)
2025-06-11 02:02:18 +02:00
Sergey Shelomentsev
4500b3febe set version for building jbr-api
(cherry picked from commit 6a0113fd07)
2025-06-11 02:02:18 +02:00
Sergey Shelomentsev
7d8afa8708 get rid of build-jbr-api scripts
(cherry picked from commit 1c8496e757)
2025-06-11 02:02:18 +02:00
Vitaly Provodin
bf1d2e45c7 clean up exclude lists
(cherry picked from commit de6d9f328f)
2025-06-11 02:02:18 +02:00
Sergey Shelomentsev
68042ae6d3 JBR-5194 add regressions tests for custom decorations support
with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 5fc82006c4)
2025-06-11 02:02:18 +02:00
Sergey Shelomentsev
6a2483680e build jbr-api as a part of bundle build
(cherry picked from commit 45efe7fdd5)
2025-06-11 02:02:17 +02:00
Vitaly Provodin
855bdac191 Update README.md
(cherry picked from commit dd24017389)
2025-06-11 02:02:17 +02:00
Vitaly Provodin
078d9578ec Update README.md
(cherry picked from commit 45d7501c9f)
2025-06-11 02:02:17 +02:00
Artem Semenov
22d515f994 JBR-5289 If the label has the role of a hyperlink, VO still pronounces it as plain text (#215)
(cherry picked from commit 675ca2f02e)
2025-06-11 02:02:17 +02:00
Alexey Ushakov
a54dc82e57 JBR-5279 restore saving jbr native symbols bin/server/jvm.pdb
(cherry picked from commit 887b9dbcac)
2025-06-11 02:02:17 +02:00
Sergey Shelomentsev
4b71ab0e08 JBR-4875 update test to use new JBR API window custom decorations
(cherry picked from commit df92d71389)
2025-06-11 02:02:17 +02:00
Vitaly Provodin
21a1735d6b Update README.md
(cherry picked from commit 373482ffc4)
2025-06-11 02:02:17 +02:00
Artem Semenov
277723d587 JBR-5269 Announcement priorities not set correctly (#214)
(cherry picked from commit c34aa6fc6f)
2025-06-11 02:02:17 +02:00
Vitaly Provodin
cd5aabd869 Update README.md
(cherry picked from commit 3631c19265)
2025-06-11 02:02:17 +02:00
Artem Semenov
3614c3a376 JBR-5248 exception in accessible announcing
(cherry picked from commit a4e0f6018f)
2025-06-11 02:02:17 +02:00
Vitaly Provodin
18a6e76141 update exclude list on results of 21_b9 test runs
(cherry picked from commit 9f04c32c10)
2025-06-11 02:02:17 +02:00
Vitaly Provodin
3352caf232 JBR-5217 enable NVDA support in Windows builds
(cherry picked from commit afc5710f21)
2025-06-11 02:02:17 +02:00
Vitaly Provodin
f5cdab1f9a Update README.md
(cherry picked from commit df4fd03fba)
2025-06-11 02:02:17 +02:00
AMPivovarov
cb1af0c5dd JBR-5213 JBR API v0.0.9 - add GraphicsUtils (#208)
* relax type constraints in BltBufferStrategy.getDrawGraphics

(cherry picked from commit 715b615d88)
2025-06-11 02:02:17 +02:00
Artem Semenov
10e18ddbcf JBR-5221 Add announcing to JBRAPI
(cherry picked from commit 7189d50b76)
2025-06-11 02:02:16 +02:00
Vitaly Provodin
41063a52f1 update exclude list on results of 21_b8 test runs
(cherry picked from commit 17d5e3895b)
2025-06-11 02:02:16 +02:00
Artem Semenov
5a92f9805a JBR-4170 Implement API for announcing
(cherry picked from commit d7f14bf793)
2025-06-11 02:02:16 +02:00
Vitaly Provodin
5a1e674c43 update exclude list on results of 21_b7 test runs
(cherry picked from commit e40cdc800e)
2025-06-11 02:02:16 +02:00
Vitaly Provodin
1c72619d03 update exclude list on results of stability checking runs due to 8253184
(cherry picked from commit 166924f5ed)
2025-06-11 02:02:16 +02:00
Artem Bochkarev
f866e829f4 JBR-3575 use flag processEvents in LWCToolkit.invokeAndWait
(cherry picked from commit dcf9ff3315)
2025-06-11 02:02:16 +02:00
Vitaly Provodin
2b1099a9f0 exclude several tests from runs on machines with enabled VoiceOver
(cherry picked from commit 8040e574e4)
2025-06-11 02:02:16 +02:00
Anton Tarasov
ddce79d6b6 JBR-4355 javax/swing/GraphicsConfigNotifier/StalePreferredSize.java: # C [libobjc.A.dylib+0x90ff] objc_release+0x1f
(cherry picked from commit c0b2b59d4a)
(cherry picked from commit 0691a5230c)
2025-06-11 02:02:16 +02:00
Anton Tarasov
7ae1873f38 JBR-4362 [mac] system menu opens with duplicated items
(cherry picked from commit e32defe49d)
(cherry picked from commit 2d1e14f01d)
2025-06-11 02:02:16 +02:00
Anton Tarasov
d8932914c0 JBR-4328 remove LWCToolkit.unsafeNonblockingExecute
(cherry picked from commit 9a3f31a6c4)
(cherry picked from commit f9a02266a0)
2025-06-11 02:02:16 +02:00
Anton Tarasov
0e2e858821 JBR-4134 PyCharm is slow and unusable on MacBook Pro with M1
(cherry picked from commit 36190505f5)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit cebc6ed818)
2025-06-11 02:02:16 +02:00
Anton Tarasov
bffe3d6ba8 JBR-4284 Sub items of main menu options are not displayed
A regression of JBR-4208 LWCToolkit.invokeAndWait should not stuck on invocation loss

(cherry picked from commit c464e4748e)
(cherry picked from commit 42d07c4f0c)
2025-06-11 02:02:16 +02:00
Anton Tarasov
aea2597cb5 JBR-4119 UI freezes at sun.lwawt.macosx.CAccessibility.getChildrenAndRoles
(cherry picked from commit 6ba79774d8)
(cherry picked from commit e1623dc301)
2025-06-11 02:02:16 +02:00
Anton Tarasov
5b8baca365 JBR-4106 PyCharm hangs with 100% CPU usage on one core
with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 9deef18d46)
2025-06-11 02:02:16 +02:00
Anton Tarasov
99a3257ac0 JBR-4208 LWCToolkit.invokeAndWait should not stuck on invocation loss
including JBR-4543 (NPE: IdeEventQueue.lambda$getNextEvent$0)

(cherry picked from commit b16d847947)
2025-06-11 02:02:16 +02:00
Anton Tarasov
17582098fa JBR-3413 use timeout in CAccessibility.invokeAndWait
(cherry picked from commit e7009db076)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit bd9d4cf182)
2025-06-11 02:02:15 +02:00
Vitaly Provodin
23a4f5283c update exclude list on results of 21_b1447 test runs
(cherry picked from commit 3502c53a16)
2025-06-11 02:02:15 +02:00
Vitaly Provodin
41cf4dab8c Update README.md
(cherry picked from commit fcbfb32b13)
2025-06-11 02:02:15 +02:00
Vitaly Provodin
9ae05c9d22 update exclude list on results of main.1441 test runs
(cherry picked from commit 7194b34979)
2025-06-11 02:02:15 +02:00
Alexey Ushakov
f480a23163 JBR-5112 Large bold square whitespaces after waking up the laptop / connecting display
Clear primary surface data of VolatileSurfaceManager on display change event

(cherry picked from commit de708896a6)
2025-06-11 02:02:15 +02:00
Artem Semenov
046021f348 JBR-5118 VoiceOver does not speak the label associated with the combobox (#194)
JBR-5118 VoiceOver does not speak the label associated with the combobox

(cherry picked from commit b6fc471cd0)
2025-06-11 02:02:15 +02:00
Artem Semenov
b184123cd1 JBR-4235 Context menu not readable after opening on Mac OS
(cherry picked from commit 83d6b20711)
2025-06-11 02:02:15 +02:00
Artem Semenov
81dc510b75 JBR-4012 On Idea Vo often speeks selected element of tables, lists, and trees.
(cherry picked from commit 47783c1c85)
2025-06-11 02:02:15 +02:00
Artem Semenov
63d82a2dc8 JBR-3868 Combobox list is not voiced of VoiceOver
(cherry picked from commit 1f777d72ea)
2025-06-11 02:02:15 +02:00
Alexey Ushakov
faca7f71c2 JBR-5041 macOS: SIGSEGV at [libawt_lwawt] getRenderEncoder:(dstOps == NULL)
Protected code from using NULL dstOps

(cherry picked from commit 44c76b8b99)
2025-06-11 02:02:15 +02:00
Alexey Ushakov
0bdd9cf778 JBR-4856 macOS: SIGSEGV at [libawt_lwawt] MTLTR_DrawGlyphList
Clear glyph caches after switching contexts. Keep encoders in sync with graphics devices. Minor refactoring

(cherry picked from commit e2ed6bf8dd)
2025-06-11 02:02:15 +02:00
Dmitry Batrak
bc2ba3fbff JBR-5109 New frame doesn't get focused sometimes if it's shown right after popup is closed
(cherry picked from commit 693d317c0c)
(cherry picked from commit 6a153c09a8)
2025-06-11 02:02:15 +02:00
Vitaly Provodin
0da08e837d Update README.md
(cherry picked from commit 0a469f5069)
2025-06-11 02:02:15 +02:00
Alexey Ushakov
7f25352f59 JBR-4959 [macOS Ventura] Screen flickering after OS update when IDE is full screen
Replace multiple CHANGE_SCREEN notifications fired around the same time with just one

Also, fix of JBR-5073 [Double-Monitor] java/awt/Window/LocationAtScreenCorner/LocationAtScreenCorner.java: Wrong location

Added check for nil displayID of the window

(cherry picked from commit cd6ca71ea8)

(cherry picked from commit 3f5ad0610a)

(cherry picked from commit 6a834fb5e7)

JBR-4959 [macOS Ventura] Screen flickering after OS update when IDE is full screen

Do not fire deliverChangeBackingProperties notification for the view if there is no change between layer and window scales. Also, do not fire displayChanged for display profile only changes.

(cherry picked from commit 87c092d4ec)
2025-06-11 02:02:15 +02:00
Nikita Provotorov
d9b75ae690 JBR-5075: macOS: KEY_PRESSED event for "Cmd N" is not emitted if used as a JMenuItem accelerator and apple.laf.useScreenMenuBar=true.
- Improves the fix of JBR-3544 to allow "Cmd N" and "Ctrl N" to reach AWT if they're actually the ones which were pressed.
- Adds a regression test.

(cherry picked from commit 61a1b70d73)
(cherry picked from commit c3f068760d)
2025-06-11 02:02:15 +02:00
Victor Kropp
ebefb1c3db Update README.md
Mention Toolbox App in the list of applications built on JetBrains Runtime.

(cherry picked from commit cfa9789515)
(cherry picked from commit acc1a29a25)
2025-06-11 02:02:14 +02:00
Nikita Provotorov
b77a88c925 Update README.md
Replaced jbr-dev to main and other minor fixes.

(cherry picked from commit 91bea99984)
2025-06-11 02:02:14 +02:00
Vitaly Provodin
bb936bf270 update exclude list on results of 17.0.5_b721.3 test runs
(cherry picked from commit 652e397e29)
2025-06-11 02:02:14 +02:00
Vitaly Provodin
3760b64683 update exclude list on results of 17.0.5_b712.2 test runs
(cherry picked from commit ef68a82141)
2025-06-11 02:02:14 +02:00
Vitaly Provodin
2d84da6adb JBR-4956 reduce width of screenshot by one pixel to exclude caret
(cherry picked from commit dd36d60415)
2025-06-11 02:02:14 +02:00
ngubarkov
175d63590f JBR-4840 cache screen resolution in XToolkit
(cherry picked from commit b0c0a6ff75)
2025-06-11 02:02:14 +02:00
Dmitry Batrak
83b4567bdd JBR-5045 Invisible component can break focus cycle
(cherry picked from commit 0f57a27879)
(cherry picked from commit 8309d820fd)
2025-06-11 02:02:14 +02:00
Vitaly Provodin
9ec607a37b Update README.md
(cherry picked from commit 1fb0b4f098)
2025-06-11 02:02:14 +02:00
Vitaly Provodin
7e0fbd7bab Update README.md
(cherry picked from commit a8862ab989)
2025-06-11 02:02:14 +02:00
Vitaly Provodin
1cecfbe0e2 update exclude list on results of 17.0.5_b691.6 test runs
(cherry picked from commit 668a433320)
2025-06-11 02:02:14 +02:00
Vitaly Provodin
59832a3cb3 Update README.md
(cherry picked from commit 2cdd0386c3)
2025-06-11 02:02:14 +02:00
Dmitry Batrak
bd5f677a57 JBR-4988 Transient Z-order violations on macOS
(cherry picked from commit bcba97511c)
(cherry picked from commit 3ff06e954d)
2025-06-11 02:02:14 +02:00
Vitaly Provodin
f82929f57c JBR-4947 update alpine x64 image up to 3.14
(cherry picked from commit 88f2d7010f)
2025-06-11 02:02:14 +02:00
Vitaly Provodin
642561e879 update exclude list on results of 17.0.5_b469.67 test runs
(cherry picked from commit 5ab3a9bf5f)
2025-06-11 02:02:14 +02:00
Vitaly Provodin
23bf69decf Update README.md
(cherry picked from commit 61d47b2fd3)
2025-06-11 02:02:14 +02:00
Alexey Ushakov
05a646ab4c JBR-4950 src\java.desktop\windows\native\libawt\windows\awt_FileDialog.cpp: warning C4267: '+=': conversion from 'size_t' to 'UINT', possible loss of data
Added casts to resolve warnings

(cherry picked from commit f5c1a03bf5)
2025-06-11 02:02:13 +02:00
Vitaly Provodin
ed42ec11d6 update Commit and Full testing exclude list on results of jbr17.668 test runs
(cherry picked from commit e7e823a0a3)
2025-06-11 02:02:13 +02:00
Maxim Kartashev
2beaa0eae7 JBR-4951 In function 'convert_to_java_array': error: comparison of integer expressions of different signedness
(cherry picked from commit 4293e2832c)
2025-06-11 02:02:13 +02:00
Vitaly Provodin
670aa4230b JBR-4089 add modules sun.awt sun.awt.image sun.java2d
(cherry picked from commit 2cae8fb09c)
2025-06-11 02:02:13 +02:00
Vitaly Provodin
05a9a67106 update exclude list for Commit testing
(cherry picked from commit c037eec3ac)
2025-06-11 02:02:13 +02:00
Vitaly Provodin
b90c7a6604 exclude tests failing because of JBR-4933, JBR-4934
(cherry picked from commit 6f78d1b02c)
2025-06-11 02:02:13 +02:00
Alexey Ushakov
597e2c1fde JBR-4731 SIGILL caused by NPE Cannot invoke "java.awt.GraphicsConfiguration.getDevice()" because "config" is null
Handled null device in platform window

(cherry picked from commit 9e52c15ec7)
2025-06-11 02:02:13 +02:00
Maxim Kartashev
851fe1769d Move JBR README.md to .github/
(cherry picked from commit b69b12f489)
2025-06-11 02:02:13 +02:00
Svyatoslav Vlasov
b017a3cb61 Add ProjectorUtils to jbr-api (#181)
* Add ProjectorUtils to jbr-api

Co-authored-by: Sviatoslav Vlasov <Sviatoslav.Vlasov@jetbrains.com>
(cherry picked from commit c8ccc83a6e)
2025-06-11 02:02:13 +02:00
Nikita Tsarev
72b27ffd03 JBR-3941 Make apple.awt.captureNextAppWinKey default to false
(cherry picked from commit ea29fc8942)
2025-06-11 02:02:13 +02:00
Vitaly Provodin
61dc1a8094 JBR-4912 jb/java/api/frontend/CustomTitleBarDoubleClick.java intermittently throws java.awt.AWTError
(cherry picked from commit ff7ca451fe)
2025-06-11 02:02:13 +02:00
Maxim Kartashev
876cdb383c exclude java/awt/dnd/AcceptDropMultipleTimes/AcceptDropMultipleTimes.java due to JBR-4880 on windows
(cherry picked from commit 2d98733ab5)
2025-06-11 02:02:13 +02:00
Alexey Ushakov
969dacacd2 JBR-4710 macOS: SIGSEGV at sun.java2d.metal.MTLLayer.blitTexture
Added check for disposed texture in the MTLLayer

(cherry picked from commit c27d8a7c5e)
2025-06-11 02:02:13 +02:00
Nikita Gubarkov
aa5c860c50 JBR-4890 Fix variation selectors font fallback on macOS
If font for a given variation selector not found, try without variation selector

(cherry picked from commit 7505b502d7)
2025-06-11 02:02:13 +02:00
Artem Bochkarev
cb51e17854 JBR-4907 remove custom view for osx system menu items
Just revert "JBR-3131: support custom view for system menu items"

(cherry picked from commit 548345c202)
2025-06-11 02:02:12 +02:00
Vitaly Provodin
67c5e0c072 exclude java/awt/FullScreen/AltTabCrashTest/AltTabCrashTest.java due to JBR-4905 on windows&linux
(cherry picked from commit 8150b0e5e7)
2025-06-11 02:02:12 +02:00
Alexey Ushakov
b72abb896f JBR-4897 Reconnecting multiscreen monitor displays blank IDE
Handled NSWindowDidChangeScreenNotification, resolved race condition in window peer displayChanged listener

(cherry picked from commit 1e697c8623)
2025-06-11 02:02:12 +02:00
Vitaly Provodin
712552066f exclude jb/java/jcef/HandleJSQueryTest3314.sh due to JBR-4866 on linux
(cherry picked from commit d619e3320a)
2025-06-11 02:02:12 +02:00
Vitaly Provodin
d5a30f7053 exclude some tests due to JBR-4880 on windows
(cherry picked from commit 1a9fb2cfa2)
2025-06-11 02:02:12 +02:00
Vitaly Provodin
4ea576f808 exclude javax/swing/JInternalFrame/8020708/bug8020708.java due to JBR-4879 on windows
(cherry picked from commit 85ba459fae)
2025-06-11 02:02:12 +02:00
Vitaly Provodin
875f0e9208 exclude java/awt tests which do not close child processes/windows
(cherry picked from commit 3cf2b36323)
2025-06-11 02:02:12 +02:00
Vitaly Provodin
a08114fa46 exclude java/awt/FullScreen/NoResizeEventOnDMChangeTest/NoResizeEventOnDMChangeTest.java and java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java due to 7188711 on linux-all
j

(cherry picked from commit 0b3f6caedd)
2025-06-11 02:02:12 +02:00
Maxim Kartashev
8c54b4e35b JBR-4877 WARNING: JNI local refs: 33, exceeds capacity: 32
(cherry picked from commit a10770c49d)
2025-06-11 02:02:12 +02:00
Artem Bochkarev
3f86ad81cc JBR-4876 remove test duplicates
Since next jcef tests were moved into junit suite (inside jcef repository):
 HandleJSQueryTest
 JCEFStartupTest
 LoadPageWithoutUI
 MouseEventAfterHideAndShowBrowserTest
 MouseEventScenario
 MouseEventTest

(cherry picked from commit bd1d06d0bc)
2025-06-11 02:02:12 +02:00
Vitaly Provodin
af46133929 JBR-4875 jb/javax/swing/JComboBox/ComboBoxTransparentTittleBarTest.java checks dragging JFrame with Combobox
(cherry picked from commit 8d5472c900)
2025-06-11 02:02:12 +02:00
Dmitry Batrak
976d47b49d JBR-4871 Closed project leaked via KeyboardFocusManager#newFocusOwner
(cherry picked from commit 50c0ce58d3)
(cherry picked from commit 46a0f0d75b)
2025-06-11 02:02:12 +02:00
Maxim Kartashev
15219afb9f JBR-4839 Report if wrong shared library is detected at run time
(cherry picked from commit e8c1913562)
2025-06-11 02:02:12 +02:00
Maxim Kartashev
047c690004 JBR-4848 Cannot invoke "javax.swing.JTextField.getCaret()" because the return value of "java.lang.ref.WeakReference.get()" is null
(cherry picked from commit 7fae4cd2d1)
2025-06-11 02:02:12 +02:00
Alexey Ushakov
1600cc07da JBR-4590 macOS: SIGSEGV at [libawt_lwawt] MTLTR_DrawGlyphList
Invalidate glyph cache cell info after switching MTLContext

(cherry picked from commit 664528713e)
2025-06-11 02:02:12 +02:00
Nikita Gubarkov
a3b920196b JBR-4815 force hinting for non-antialiased text
(cherry picked from commit 6c3517ae9d)
2025-06-11 02:02:11 +02:00
Maxim Kartashev
555014299f jb/branchdiff.py script to help with release branches
(cherry picked from commit a03f10e9b7)
2025-06-11 02:02:11 +02:00
Nikita Gubarkov
325e49e9bf JBR-3677 check AppleActionOnDoubleClick property for custom window decorations on macOS
with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit d71c4b3950)
2025-06-11 02:02:11 +02:00
Alexander Lobas
5aea037014 JBR-4787 Rounded corners for native windows
with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 5b4dd9e1ce)
2025-06-11 02:02:11 +02:00
Vitaly Provodin
9657f6667b updated JTreg exclude list
(cherry picked from commit 03fba5ebf2)
2025-06-11 02:02:11 +02:00
Alexey Ushakov
8177c82a00 JBR-4696 macOS: NPE in -[AWTView viewDidChangeBackingProperties]
Added null pointer checks

(cherry picked from commit b0374bdccf)
2025-06-11 02:02:11 +02:00
MonoBot
87671b69c8 JBR-4809 Update the bundled JetBrains Mono font version
Fonts release 2.242

(cherry picked from commit 641424a3e3)
(cherry picked from commit ab5066f90f)
2025-06-11 02:02:11 +02:00
Alexey Ushakov
f13f098387 JBR-4680 idea window flickers while changing the screen brightness
Update insets in separate notification

(cherry picked from commit e7936d9958)
2025-06-11 02:02:11 +02:00
Maxim Kartashev
1bb667ba1a JBR-4562 JBR-4610 Generate hs_err file on SIGABRT
Supported on Linux and MacOS only.
Controlled by -Djbr.catch.SIGABRT=true option; off by default.

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 987ce225b9)
2025-06-11 02:02:11 +02:00
Maxim Kartashev
091e3d6cc5 JBR-4626 MacOS aarch64: SIGSEGV at RenderCache.get / ScaledBlit.getFromCache
Avoid C2-compiled loop crashes by replacing the handcrafted MRU cache
with a more modern LinkedHashMap-based one.

(cherry picked from commit 2f63acf3eb)
2025-06-11 02:02:11 +02:00
Nikita Gubarkov
042465aec8 Allow registering multiple implementations for JBR API services
This greatly reduces boilerplate when dealing with platform-specific code, one can specify multiple target implementation classes, one per platform. First found will be used.

Also added JBRApi.ServiceNotAvailableException to give services ability to validate any custom condition they want.

(cherry picked from commit 02cf2548d5)
2025-06-11 02:02:11 +02:00
Denis Fokin
fc74e9e19f JBR-4788 "Activate window by mouse hover" Windows option isn't supported by JBR 17
backport JBR-1991 (Focus problems in Windows with X-Mouse style focus) from JBR 11

(cherry picked from commit c8ad353f45)
(cherry picked from commit a52ed88377)
(cherry picked from commit 37c6d0b417)
2025-06-11 02:02:11 +02:00
Alexey Ushakov
15e40cc24a JBR-4784 Extra allocations of MTLRenderPipelineDescriptor affects performance in metal pipeline
Remove extra allocations

(cherry picked from commit e1fe3a3807)
2025-06-11 02:02:11 +02:00
Alexey Ushakov
b143367283 JBR-4774 macOS: SIGILL at [libsystem_kernel] __kill in NPE / VolatileSurfaceManager.displayChanged / __displaycb_handle_block_invoke
Guarded against multiple displayChanged() notifications

(cherry picked from commit 165c9aa3aa)
2025-06-11 02:02:11 +02:00
Dmitry Batrak
6d50b82e1f JBR-4782 Synergy keyboard/mouse input: window disabled after bringing IntelliJ into focus
(cherry picked from commit f863a14b19)
(cherry picked from commit 34ec3053ab)
2025-06-11 02:02:10 +02:00
Alexey Ushakov
3ddc35d9db JBR-4363 Changes in fonts rendering between JBR11 and JBR17
Do not use hinting for generating outlines

(cherry picked from commit 7bb3a76942)
2025-06-11 02:02:10 +02:00
Alexey Ushakov
e7d33990bb JBR-3100 Exception in NSApplicationAWT: java.lang.NullPointerException at java.desktop/sun.lwawt.LWComponentPeer.windowToLocal
Added null check

(cherry picked from commit 0c23ef45ba)
2025-06-11 02:02:10 +02:00
Alexey Ushakov
c917611929 JBR-4774 macOS: SIGILL at [libsystem_kernel] __kill in NPE / VolatileSurfaceManager.displayChanged / __displaycb_handle_block_invoke
Added null check

(cherry picked from commit 73f025e9e5)
2025-06-11 02:02:10 +02:00
Alexey Ushakov
915cd903a4 JBR-3102 Exception in NSApplicationAWT: Invalid parameter not satisfying: !isnan(newOrigin.y)
Handled NAN values with some defaults

(cherry picked from commit f1aed3db71)
2025-06-11 02:02:10 +02:00
Vladislav Rassokhin
d474906d92 JBR-4263 Improve check_jbr_size.sh
* Fix shellcheck inspections
* Don't silently fail if TOKEN is incorrect

(cherry picked from commit e0ab03ce52)
2025-06-11 02:02:10 +02:00
Maxim Kartashev
76fd194227 JBR API v0.0.4
JBR-4746 Added jetbrains.api.verifyBytecode VM option for generated bytecode verification

JBR-4753 Added JBR API for custom desktop actions

Added jetbrains.api.verbose system property for easier JBR API troubleshooting

Also fixed dependency scanning optimization by allowing search in known proxy interfaces outside com.jetbrains

JBR-3511 Way to customize implementation of java.awt.Desktop.browse()

Provided Desktop.setDesktopActionsHandler() and DesktopActionsHandler
interface, which methods will be invoked instead of the standard actions
provided that DesktopActionsHandler.isSupported() is true for the
corresponding action.

(cherry picked from commit 92b84906df)
2025-06-11 02:02:10 +02:00
Maxim Kartashev
154f607a81 JBR-3101 Exception in NSApplicationAWT: java.lang.NullPointerException at java.desktop/sun.lwawt.macosx.CPlatformComponent.setBounds
After CPlatformComponent.setBounds() was changed to allow for platformWindow.getPeer() == null, a few exceptions appeared that suggest platformWindow can also be null. This commit safeguards against this situation as well.

It seems that this can only be the case if the instance is created from outside of JDK, so Objects.requireNonNull() may help to catch the perpetrator.

(cherry picked from commit 5da08dcd3a)
2025-06-11 02:02:10 +02:00
Dmitry Batrak
5b7e45e9c6 JBR-4720 Focus state is broken after certain operations when VoiceOver is enabled
(cherry picked from commit dc1b49b5a6)
(cherry picked from commit 51df5fbf67)
2025-06-11 02:02:10 +02:00
Dmitry Batrak
226392a5a8 JBR-4673 Focus moves to another application on file dialog closing
(cherry picked from commit 7468974488)
(cherry picked from commit 72a74312b7)
2025-06-11 02:02:10 +02:00
Dmitry Batrak
814073dc18 JBR-4665 Focus 'jitter' on window showing in WSLg
(cherry picked from commit 9b32c2a577)
(cherry picked from commit 2952a2eeb4)
2025-06-11 02:02:10 +02:00
Nikita Gubarkov
ab7019ef8b JBR-2523 JBR-2917 Fix emoji, ZWJ and font fallback
Implement rendering of colored outlines and bitmap glyphs in OutlineTextRenderer
Add Segoe UI Emoji to font fallback on Windows
Require layout for some emoji-related unicodes
Fix variation selectors and ZWJ

(cherry picked from commit 53059331b1)
2025-06-11 02:02:10 +02:00
Alexey Ushakov
9d0f4af170 JBR-2210 IDEA fails to start (JVM crashes) when using the -Dfile.encoding=UTF-8in IDEA's vmoptions file
Returning devanagari subset back for ja.UTF-8 to get non-null font name from WFontConfiguration.getTextComponentFontName(). It is a regression from JDK-8208179.

(cherry picked from commit b51254a975)
(cherry picked from commit 0588b3a885)
2025-06-11 02:02:10 +02:00
Dmitry Batrak
3541a01b6f JBR-1987 Korean/Thai characters not printed properly in annotation tooltip (e.g. spellchecker)
This changes the fonts JDK uses for font fallback on Windows. These used to be DokChampa (for Thai) and Batang/Gulim/Gulim (for Korean).
Those fonts are not available by default on Windows 10, user needs to install supplementary font language packs to get them.
Now the following fonts will be used - Tahoma (for Thai) and Malgun Gothic (for Korean). They are available by default
on Windows 7, 8 and 10.

port from JBR 11 to JBR 15 (cherry picked from commit 850653192b)

cherry picked from commit 2bf43a57ab

Kept only Thai-related changes - Korean-related issues are now fixed in OpenJDK as per JDK-8190907

(cherry picked from commit 56139b5800)
2025-06-11 02:02:10 +02:00
artem.bochkarev
2841f7c165 JBR-4581 JCEF tests fail due to compilation errors
The problem was in commit "JBR-4512 windows: include pdb-files into jbrsdk": rsync can replace file lib/modules.
rsync is replaced with cp

(cherry picked from commit 6cd310aaa8)
2025-06-11 02:02:09 +02:00
Vitaly Provodin
4959ada7a1 exclude sun/java2d/DirectX/RenderingToCachedGraphicsTest/RenderingToCachedGraphicsTest.java on linux-all due to 8252812
(cherry picked from commit 336230c628)
2025-06-11 02:02:09 +02:00
Vitaly Provodin
e7c065e024 exclude sanity/client/SwingSet/src/ColorChooserDemoTest.java on windows-all due to 8278582
(cherry picked from commit 07e8b19419)
2025-06-11 02:02:09 +02:00
Alexey Ushakov
024e95adf0 JBR-4636 Some JWindow tests failed due to wrong scaling
Take into account custom scale via sun.java2d.uiScale

(cherry picked from commit 5a91de055f)
2025-06-11 02:02:09 +02:00
Nikita Gubarkov
dbf6fb0f10 8289189: Fix ./configure on WSL1
(cherry picked from commit 617ed45c5c)
2025-06-11 02:02:09 +02:00
Alexey Ushakov
09e2e2b35f JBR-4619 Window content scale wrong after disconnecting external display / waking OS from sleep
Use viewDidChangeBackingProperties notification to adjust a window layer scale

(cherry picked from commit abb34d2295)
2025-06-11 02:02:09 +02:00
Vitaly Provodin
77d475b5c9 exclude vmTestbase/vm/jit/LongTransitions due to 8271615 on macOS
(cherry picked from commit 66e8a68de9)
2025-06-11 02:02:09 +02:00
Maxim Kartashev
c67db07b20 JBR-4602 Unexpected NoSuchFileException running Rider test
This reverts commits for JBR-3680, JBR-4118, and JBR-4485.

(cherry picked from commit 5a165aa533)
2025-06-11 02:02:09 +02:00
Nikita Gubarkov
fa030c6374 JBR-4373 Add mapping for .NewYork-* and .SFArabic-* system fonts
(cherry picked from commit e34f1abedc)
2025-06-11 02:02:09 +02:00
Alexander Lobas
f57ccfbda3 JBR-4563 Rounded corners for native Window on Mac OS (#156)
* JBR-4563 Rounded corners for native Window on Mac OS

(cherry picked from commit 740a086a00)
2025-06-11 02:02:09 +02:00
Alexander Lobas
3c49e6d85a JBR-4563 Rounded corners for native Window on Mac OS
(cherry picked from commit 4aecaafa7c)
2025-06-11 02:02:09 +02:00
Alexander Lobas
5f49f14633 JBR-4305 (#119)
* IDEA-283934 Top panel (toolbar, Editor tabs) hides under the Mac menu in full-screen mode

* IDEA-283934 Top panel (toolbar, Editor tabs) hides under the Mac menu in full-screen mode

* JBR-4305 IDEA-283934 Top panel (toolbar, Editor tabs) hides under the Mac menu in full-screen mode

* JBR-4305 IDEA-283934 Top panel (toolbar, Editor tabs) hides under the Mac menu in full-screen mode

(cherry picked from commit e91239081a)
2025-06-11 02:02:09 +02:00
Alexey Ushakov
634bfc50da JBR-4591 macOS: SIGILL at [libsystem_kernel] __kill in -[__NSMallocBlock__ removeFromSuperview]: unrecognized selector sent to instance
Verified if windowDragView is present

(cherry picked from commit c45d897c4b)
2025-06-11 02:02:09 +02:00
Artem Bochkarev
ae68706bb4 JBR-4475: fixed browsers numeration in test
theoretically it can cause 2 requests with the same query_id: "cef_query_2" (when first browser finishes loading after the creation of second one)

(cherry picked from commit e95de19533)
2025-06-11 02:02:09 +02:00
Artem Bochkarev
9bcb662ec4 JBR-4456: fixed HandleJSQueryTest
first invocation of dispatch(WindowEvent.WINDOW_CLOSING) calls System.exit() internally (because of setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE))

(cherry picked from commit 0f9afa7fbc)
2025-06-11 02:02:09 +02:00
Vitaly Provodin
7664fff59f exclude javax/swing/JToolBar/4529206/bug4529206.java due to 8288707 on linux
(cherry picked from commit 8bc1905696)
2025-06-11 02:02:08 +02:00
Maxim Kartashev
da8d3ed555 JBR-3101 Exception in NSApplicationAWT: java.lang.NullPointerException at java.desktop/sun.lwawt.macosx.CPlatformComponent.setBounds
CWarningWindow doesn't have a peer, so accomodated for that in
CPlatformComponent.setBounds().

(cherry picked from commit f098902457)
2025-06-11 02:02:08 +02:00
Maxim Kartashev
6795fc4b2d JBR-4485 Windows: EXCEPTION_ACCESS_VIOLATION at sun.nio.fs.WindowsDirectoryStream$WindowsDirectoryIterator.readNextEntry
As a precaution, range-check the offset returned by WinAPI before
using it to read raw memory with Unsafe.

(cherry picked from commit cfc743741a)
2025-06-11 02:02:08 +02:00
Vitaly Provodin
6f0725f91c JBR-4570 improve synchronization and increase waiting time
(cherry picked from commit d7b11a1925)
2025-06-11 02:02:08 +02:00
Dmitry Batrak
1f0fa44a31 JBR-4552 Windows revert back after initial move/resize in Cygwin/X
(cherry picked from commit 6dc194e089)
(cherry picked from commit 9c2eccb07c)
2025-06-11 02:02:08 +02:00
Manuel Unterhofer
cbbd29c4d3 FL-11598 Fix accidental reset of window configuration for custom decoration on macOS
This also aligns the handling of the style mask with how the other settings are applied: It uses a client property now. This property is now also applied directly on peer initialization so that there is no need to re-apply, and the window directly appears in the correct configuration.

(cherry picked from commit 4f254fac9d)
2025-06-11 02:02:08 +02:00
Nikita Provotorov
e52df86957 JBR-4394, IDEA-246833: refactoring and blocking the fix of JBR-1573 to recreate IMs and ICs during preediting.
(cherry picked from commits 7a36587db8d3d5a63c5691243cd5bf56733c06e6, 321a4a3f83)

(cherry picked from commit be5f54fc99)
2025-06-11 02:02:08 +02:00
Nikita Provotorov
ac93628239 JBR-4394, IDEA-246833: fixup of JBR-2444.
(cherry picked from commit ef262dc8bb)
(cherry picked from commit b026461771)
2025-06-11 02:02:08 +02:00
Dmitry Batrak
bc7c56fc8d JBR-4537 Popup windows shown for a background window cause app icon to blink in taskbar on KDE
(cherry picked from commit 704ffcc0ee)
2025-06-11 02:02:08 +02:00
Dmitry Batrak
8c83c27cd3 JBR-4535 Popup windows disappear on mouse hover when 'Focus strictly under mouse' policy is used in KDE
(cherry picked from commit a70a83e7fe)
2025-06-11 02:02:08 +02:00
Alexey Ushakov
8cb65b21c3 JBR-3828 restore details for Java exceptions in crash dumps handled by ObjC
Added exception.toString() to jbr_err_* log

(cherry picked from commit 478bd6cdd7)

Added java stack of the exception to jbr_err_* log

(cherry picked from commit e97f728e93)

Also return the static string "OutOfMemoryError" in case of that
exception has been thrown in order to avoid crashing while reporting an
exception in an out-of-memory situation.

(cherry picked from commit b64f2a86ad)
2025-06-11 02:02:08 +02:00
Vitaly Provodin
da334b4676 exclude jb/java/awt/Window/ZOrderOnModalDialogActivation.java from S2 runs on Windows and Linux
(cherry picked from commit c1cb686198)
2025-06-11 02:02:08 +02:00
Vitaly Provodin
68219fb7e7 exclude javax/swing/plaf/nimbus/TestNimbusOverride.java on windows due to 8253184
(cherry picked from commit 5c6f2241db)
2025-06-11 02:02:08 +02:00
Vitaly Provodin
d16ea983f6 exclude java/awt/Graphics2D/DrawString/DrawRotatedStringUsingRotatedFont.java on linux-aarch64 only due to 8266283
(cherry picked from commit cc5f59a5ed)
2025-06-11 02:02:08 +02:00
Artem Bochkarev
aa12f08a48 JBR-4473: fixed native part of SystemHotkeyReader
(cherry picked from commit 4d96436851)
2025-06-11 02:02:08 +02:00
Dmitry Batrak
1c214498f4 JBR-1740 Menu remains open when application loses focus
(cherry picked from commit f987d22cd2)
(cherry picked from commit 4a7913c9e6)
2025-06-11 02:02:07 +02:00
Vitaly Provodin
bb86dcd6ae exclude Frame/RestoreToOppositeScreen/RestoreToOppositeScreen.java from S2 runs due to 8286840
(cherry picked from commit 811db62fec)
2025-06-11 02:02:07 +02:00
Vitaly Provodin
52c5e518fe exclude java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java due to 8282232
(cherry picked from commit 17d6d1047e)
2025-06-11 02:02:07 +02:00
Maxim Kartashev
ba2c69fe60 JBR-4471 Linux: popup appears on wrong screen after desktop scale change
When screen scale changes, the cached screen bounds must be explicitly
updated. Call resetBoundsCache() whenever X11GraphicsDevice.scale has
changed.

(cherry picked from commit 1bb3b2fa32)
2025-06-11 02:02:07 +02:00
Manuel Unterhofer
4a66d9b8ce Merge fullscreen handlers for transparent title bar into existing ones
(cherry picked from commit a992612585)
2025-06-11 02:02:07 +02:00
Manuel Unterhofer
43aba50a8c FL-11420 Fix view hierarchy restoration for full-screen mode on macOS
(cherry picked from commit f708ad2c57)
2025-06-11 02:02:07 +02:00
Nikita Gubarkov
2e628575ad JBR-4364 Port macOS native file dialog patches
IDEA-146669 Enable Mac native file dialogs
IDEA-159507 Mac native dialogs: multiple open dialogs are possible
JBR-1784 File dialogs aren't themed on macOS
JBR-1752 Floating windows overlap modal dialogs
JBR-2005: don't set appearance of file chooser if OSX version < 10.14
JBR-4546 Focus is not returned back to IDE after closing "Open" dialog

(cherry picked from commit e5646125e4)
2025-06-11 02:02:07 +02:00
Dmitry Batrak
3ec97edb65 JBR-4463 Activating app-modal dialog brings all app windows to front
(cherry picked from commit 2b05925276)

includes fix for JBR-4642 regression: "focus follows mouse" broken for modals, I need to click into them

(cherry picked from commits c55bf03680, ec748f84fb)

includes fix for JBR-4957 regression: "Modal dialog is hidden by sibling popup on Linux"

(cherry picked from commit ea8da3cbe5)

includes fix for JBR-4968: jb/java/awt/Window/ModalDialogAndPopup.java intermittently fails by TimeoutException

(cherry picked from commit 2e9ab0cb06)
(cherry picked from commit 72b9219964)
2025-06-11 02:02:07 +02:00
Maxim Kartashev
35e16be15e JBR-4464 Error building latest jbr-dev after JDK-8285730
(cherry picked from commit 8b0ae02f8d)
2025-06-11 02:02:07 +02:00
Maxim Kartashev
c48270882d JBR-4118 NIO methods fail on Google Drive's virtual volume
If NtQueryDirectoryFile() failed with STATUS_INVALID_PARAMETER,
try again asking for less information with the FileDirectoryInformation
option as "information class". This option works on a mounted
Google Drive, but it doesn't provide file ids, which speed
up file listing. So it is used only as a fall-back solution.

(cherry picked from commit 82693aa985)
(cherry picked from commit 732a5c9ad6)
2025-06-11 02:02:07 +02:00
Maxim Kartashev
9e73687417 JBR-3680 Cherry-pick Google's NIO patches to get faster file listing
Fix regression introduced by Google's NIO patches:
- do not attempt to get the next entry after the directory stream has
been closed already,
- fix FaultyFileSystem that is used in StreamTest.java to throw
the right exception even when getFileAttributeView() is used instead of
readAttributes(),
- removed unnecessary type cast that caused a compilation warning.

Added a test for walking a directory with a non-latin name.

(cherry picked from commit 152a4e886d)
(cherry picked from commit f5638a96b9)
2025-06-11 02:02:07 +02:00
Renaud Paquay
41246fb1c5 JBR-3680 Improve performance of WindowsDirectoryStream
Use `NtQueryDirectoryInformation` instead of `FindFirst/FindNext` to
retrieve the list of entries of a directory.

`NtQueryDirectionInformation` has 2 main benefits over
`FindFist`/`FindNext`:

* Performance is about 40% faster

* Each retrieved entry retrieved contains a 64-bit `FileId` in addition
  to the usual attributes, ensuring that returned `java.nio.Path`
  instances hold onto a `BasicFileAttributes` instance that exposes a
  non-null `java.nio.file.attribute.BasicFileAttributes.fileKey()`.

This change also requires creating a new WindowsFileKey class, similar
to UnixFileKey class, so that
`java.nio.file.attribute.BasicFileAttributes.fileKey()` can return an
Object instance that can be used to compare files for equality.

With this change, the Windows implementation of Files.walkFileTree is
about 40% faster when the FOLLOW_LINKS option is not used, and about
2.5x faster when the FOLLOW_LINKS option is used.

When the FOLLOW_LINKS option is used, most calls to
`Files.isSameFile`, which is expensive as it requires 2 file I/O
operations, are avoided because the Path entries returned by the
new WindowsDirectoryStream implementation now contain a non-null
BasicFileAttributes.fileKey(). The remaining calls to
`Files.isSameFile` are performed when Files.walkFileTree need
to compare the initial directory with other entries.

Change-Id: Id79d89d477a6d5dcf151c63a9d6072c6f7ef43b2

(AKA JBR-3680 Cherry-pick Google's NIO patches to get faster file listing)

(cherry picked from commit 7c2d7541ba)
(cherry picked from commit 7a4078bf29)
2025-06-11 02:02:07 +02:00
Dmitry Batrak
ba8043add9 JBR-1518 JBR 11 does not support chain of popups on Linux
(cherry picked from commit 849356ee01)
(cherry picked from commit b85be77543)
2025-06-11 02:02:07 +02:00
Dmitry Batrak
9967c20bd8 JBR-4306 Robot doesn't work as expected in some cases on macOS
(cherry picked from commits 7d69734465, 0f33031484, 3b5ded0d02)

(cherry picked from commit 4557795f2e)
2025-06-11 02:02:07 +02:00
Ryan Osial
e4a6f86b26 Cache results of font-config pattern search for reuse
(cherry picked from commit 432f637904)
(cherry picked from commit 17bc232f6f)
(cherry picked from commit ee3a5cdda9)
2025-06-11 02:02:06 +02:00
Maxim Kartashev
b24e8e8617 JBR-3948 Linux: SIGSEGV at [libawt_xawt] Java_sun_awt_X11_XInputMethod_createXICNative
The crashes begin with the call to getDefaultConfig() in
createStatusWindow() returning garbage. With 8280468 fixed, there aren't
many reasons left for it to do so; it must be that the argument to the
call (the screen number) is out of range.

This change eliminates the possibilities to get an absolutely incorrect
screen number by checking the return values of several Xlib functions,
which, when fail, will leave their outgoing arguments uninitialized.
This, in turn, can lead to reading some random memory resulting in
equally random screen number that is later being fed to
getDefaultConfig().

Although on modern systems with Xinerama there should really be no
screen other than zero, as the last resort, this number is also
range-checked in getDefaultConfig() itself.

(cherry picked from commit dec75d7601)
2025-06-11 02:02:06 +02:00
Anton Tarasov
f76c46e065 JBR-4389 [update_1] IDEA UI font becomes too large after disconnecting the external monitor / sleep
(cherry picked from commit 74c977e942)
2025-06-11 02:02:06 +02:00
Anton Tarasov
7f69958c56 JBR-4389 IDEA UI font becomes too large after disconnecting the external monitor / sleep
(cherry picked from commit 1288c65208)
2025-06-11 02:02:06 +02:00
Dmitry Batrak
8ecab57144 remove duplicate bundled JetBrains Mono bold italic font
following JBR-4402

(cherry picked from commit b7e5d3cfcf)
(cherry picked from commit ac765d3d2c)
2025-06-11 02:02:06 +02:00
Dmitry Batrak
8fd0dbab07 JBR-4402 The wrong text is rendered in editor
(cherry picked from commit 8c1de95991)
2025-06-11 02:02:06 +02:00
Vitaly Provodin
1eae6ee4a6 JBR-4297 add a regression test
(cherry picked from commit 8e94fff6aa)
(cherry picked from commit 8eb5ce4b34)
2025-06-11 02:02:06 +02:00
Konstantin Bulenkov
9bc4e600a1 Update JetBrains Mono font to 2.225
(cherry picked from commit 84c7519c7e)
2025-06-11 02:02:06 +02:00
Alexey Ushakov
00b875f0dc JBR-4363 Changes in fonts rendering between JBR11 and JBR17
Resolved merge artifact after applying IDEA-57233 fix

(cherry picked from commit 0e2c16e0f0)
2025-06-11 02:02:06 +02:00
Alexey Ushakov
d49c834ca1 JBR-3843 IDE text is misaligned vertically when using Consolas font
Use usWinAscent/usWinDescent for metrics on Windows

(cherry picked from commit 4aed6ab51d)
2025-06-11 02:02:06 +02:00
Alexey Ushakov
4ff36a0d63 JBR-1110 [JDK11] java/awt/font/Outline/OutlineInvarianceTest.java: Failed for font java.awt.Font[family=Dialog,name=MS Gothic,style=bold,size=30]
Replaced FT_LOAD_NO_HINTING mode for non AA rendering with FT_LOAD_TARGET_LIGHT

(cherry picked from commit 3368768244)
(cherry picked from commit 62b8fd828f)
2025-06-11 02:02:06 +02:00
Alexey Ushakov
227fa38c0e JBR-2000 RM 2019.3.1 font rendering regression, normal text is heavier
Added -Djava2d.font.loadFontConfig=bundled to force loading bundled font.conf

(cherry picked from commit 788e078f64)
(cherry picked from commit 052b5d72a2)
2025-06-11 02:02:06 +02:00
Dmitry Batrak
6a675a822f JBR-4346 [Xfce] Windows are moved unexpectedly between workspaces when modal dialog is shown
(cherry picked from commits ad299f1e74, 800220af16)

(cherry picked from commit d0a2903730)
2025-06-11 02:02:06 +02:00
Alexey Ushakov
d148586836 JBR-3827 SIGILL at [libsystem_kernel] __kill in Java Exception at -[CDragSource convertData:]
Added check for drag source

(cherry picked from commit a2b6100b57)
2025-06-11 02:02:06 +02:00
Alexey Ushakov
c65a8401f6 JBR-3366 SIGILL at [libsystem_kernel] __kill in NSWindowStyleMaskFullScreen cleared on a window outside of a full screen transition
Wrapped the native exception and added logging

JBR-4882 Unable to exit fullscreen mode after Presentation mode was entered (and exited) on macOS

(cherry picked from commit d57e8b631b)
(cherry picked from commit 5bfbdd28f2)
2025-06-11 02:02:05 +02:00
Alexey Ushakov
70616b3828 JBR-3365 SIGILL at [libsystem_kernel] __kill in java.lang.RuntimeException: Failed to convert, no screen / primaryScreen
Wrapped the native exception and added logging

(cherry picked from commit 6b8308d149)
2025-06-11 02:02:05 +02:00
Dmitry Batrak
678bba9bac JBR-3751 Window content isn't rendered with some window managers on Linux
(cherry picked from commit 8d22e4dcb0)

includes fix for JBR-5046 Incorrect initial window's location in Xfce

(cherry picked from commits 234e705134, 02bc54f864)

includes fix for JBR-5458 Exception at dialog closing

(cherry picked from commit acde759572)
(cherry picked from commit c138965be0)
2025-06-11 02:02:05 +02:00
Vitaly Provodin
8f692860f7 JBR-4294 split desktop tests to more groups for Commit testing
(cherry picked from commit e2360b07b9)
2025-06-11 02:02:05 +02:00
Dmitry Batrak
0e1b8eb246 JBR-4281 Window losing focus isn't detected in some cases on macOS
(cherry picked from commit 363650bbf4)

with JBR-4638 Regression: Unable to enter emoji in editor via Emoji & Symbols on macOS

(cherry picked from commit 8b9a00915d)

with JBR-4652 With multiple projects open non-fullscreen, right-click on Dock icon to select the project from the context menu doesn't switch to that project

(cherry picked from commit e34677587d)

with JBR-5134 Input methods can't be dynamically disabled on a focused JComponent

(cherry picked from commit 0a3f4b206d)
(cherry picked from commit 0307ccab3b)
2025-06-11 02:02:05 +02:00
greg
99c2f9c943 macOS: add methods to setup transparent titlebar with custom height (#100)
* macOS: add methods to setup transparent titlebar with custom height

* make windowTransparentTitleBarHeight CPlatfromWindow property

* add windowTransparentTitleBarHeight test

* Prevent mouseUp events on the transparent header on macOS when the window is being dragged

Co-authored-by: Manuel Unterhofer <manuel.unterhofer@jetbrains.com>

Custom macOS window decorations via JBR API

JBR-4460 Fix window drag with custom decorations on macOS

JBR-4553 Add logging to setUpTransparentTitleBar and resetTitleBar

(cherry picked from commit f5552eed4d)
2025-06-11 02:02:05 +02:00
Denis Fokin
f995317a88 JBR-4038 [JBR17] Force Touch events are not supported on macOS
Added missing files and handlers from JBR11

(cherry picked from commit 0a82277650)
2025-06-11 02:02:05 +02:00
Alexey Ushakov
b21e3b4241 JBR-3901 jbr-dev compile problem
Added transient keyword

(cherry picked from commit 8bd487eca9)
2025-06-11 02:02:05 +02:00
Alexander Lobas
c4bdf7dcd3 JBR-2893 Big Sur: Add support of opening project as tabs IDEA-257932 Big Sur: IDEA hangs after closing a project tab after exiting and entering full screen
Converted JNF to JNIUtilites

(cherry picked from commit f02e31a440)
(cherry-picked from commit a84736ebcc)
(cherry picked from commit e33f506e48)
2025-06-11 02:02:05 +02:00
Dmitry Batrak
3614ccdf1f JBR-3676 WINDOW_ACTIVATED/DEACTIVATED events sent to a frame when child window closes on macOS
(cherry-picked from commit 824f9ebec3)

(cherry picked from commit 41b9f9cf1c)
2025-06-11 02:02:05 +02:00
Dmitry Batrak
e7643f986f JBR-3611, JBR-3633, JBR-3666, JBR-3663, JBR-3671, JBR-3673, JBR-4181, JBR-4186, JBR-4893 Interoperability with macOS desktop spaces
(cherry-picked from commits 43fdd6cd26, 75335543f2, a156c6b9bf, 9fdc75969b, 1dcc612a81, 93588d0738, 94a3885bbe, c040e05703, 67b6cd871f, 9040fd56cd, 6349b86b7f)

(cherry picked from commit 4fb4d51b89)
2025-06-11 02:02:05 +02:00
Dmitry Batrak
b733b0f2e2 refactor nativeCreateNSWindow call wrapping
as part of JBR-3017

(cherry picked from commit eeef67a335)
(cherry picked from commit 1bb0bf3f82)
2025-06-11 02:02:05 +02:00
Dmitry Batrak
f0ae1c9e38 remove excessive wrapping with AccessController (AWTThreading does it internally now)
as part of JBR-3017

(cherry picked from commit f1dd523ba8)
(cherry picked from commit f2449217c1)
2025-06-11 02:02:05 +02:00
Dmitry Batrak
f9f9eec7df JBR-2971 Log more information about window creation and property changes
(cherry picked from commit 9d86b4d235)
(cherry picked from commit e93eeba9c2)
2025-06-11 02:02:05 +02:00
Dmitry Batrak
1139531026 JBR-2533 Popup is not focused on click when switching from another application on macOS
(cherry picked from commits d9ff151211, 67b174dc8c, 72b0add80c, 21af1eba85, 2f1d317d87, 6dd334f9f0, cd863bac0d, 010f6fc951, 25e087d269, parts of 7d5ac56b6c, cd6dd5c3cf, e8bbd8ffdd, abfc3e2e79, 50933cd23e)

with fix for JBR-3640 (java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java: window Open button lost focus when it should not) and JBR-3979 (Focus is not transferred to parent window)

with fix for JBR-5300 Change source code and test files to use GPL license

with fix for JBR-2651 jb/java/awt/Focus/PopupIncomingFocusTest.java intermittently fails by java.util.concurrent.TimeoutException

(cherry picked from commit 56795d5d06)
2025-06-11 02:02:05 +02:00
Nikita Provotorov
2ceb8c1899 JBR-4271: JBR17 and dev built without --with-vendor-name parameter have invalid value of the java.vm.vendor property.
Changes the default JBR's vendor from "Oracle Corporation" to "JetBrains s.r.o.".

(cherry picked from commit 0cb7b4565c)
(cherry picked from commit 62b01f9f56)
2025-06-11 02:02:04 +02:00
Nikita Gubarkov
e3102ba9d4 JBR API v0.0.3
JBR-4228 report HTMINBUTTON, HTMAXBUTTON, HTCLOSE, HTMENU, HTCAPTION targets via JBR API & handle corresponding non-client mouse events for windows with custom decoration

(cherry picked from commit cacbbdc041)
2025-06-11 02:02:04 +02:00
Alexey Ushakov
77e5f1f62c JBR-4224 java/awt/image/VolatileImage/GradientPaints.java: Number of mismatches (300000) exceeds limit (54000) with tolerance=5
Updated reg test to handle contentLost event

(cherry picked from commit e6dc0c5b8f)
2025-06-11 02:02:04 +02:00
Vitaly Provodin
c74131c10e exclude javax/swing/border/TestTitledBorderLeak.java on windows due to 8213531
(cherry picked from commit c32cf1fe07)
2025-06-11 02:02:04 +02:00
Ivan Lopatin
debbdd76e7 Scale2: exclude java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java due to 8279190 on macosx-all
(cherry picked from commit 58854d5467)
2025-06-11 02:02:04 +02:00
Nikita Provotorov
5652a05117 JBR-3299: The test /jb/sun/awt/macos/NationalLayoutTest/Layout_ABC.java fails on MacOS.
Fixes the Layout_*.java tests by giving them to know the <Ctrl + key> combinations can generate KEY_TYPED event.

(cherry picked from commit eae5198b20)
(cherry picked from commit 072ae64f96)
2025-06-11 02:02:04 +02:00
Vitaly Provodin
db6cbfe74c exclude java/awt/Frame/FrameSetSizeStressTest/FrameSetSizeStressTest.java on Wayland
sun/security/pkcs11/Signature/TestDSAKeyLength.java                                 8279941 linux-all

(cherry picked from commit ddd0a7409d)
2025-06-11 02:02:04 +02:00
Alexey Ushakov
2200599d4d JBR-4112 macOS: SIGILL at [libsystem_kernel] __kill in OOME: Java heap space at java.awt.image.DataBufferInt.<init>
Reg test update: replace management api with jfr

(cherry picked from commit 5a0d365094)
2025-06-11 02:02:04 +02:00
Nikita Provotorov
69e19b5e59 JBR-4207, IDEA-287559: IDEA incorrectly handles AltGr key modifier.
This commit reverts the fix of JDK-8041928 and disables its regression tests.

(cherry picked from commit ba5209ec06)
(cherry picked from commit 19b7745ce3)
2025-06-11 02:02:04 +02:00
Nikita Provotorov
ffc9ca77d0 JBR-4207, IDEA-287559: IDEA incorrectly handles AltGr key modifier.
Renames the test AltGrMustGenerateAltGrModifierTest3838.java to AltGrMustGenerateAltGrModifierTest4207.java.

(cherry picked from commit ed60a9c2bd)
(cherry picked from commit cbacbf6d4e)
2025-06-11 02:02:04 +02:00
Vitaly Provodin
049fe4a8e2 exclude sun/security/pkcs11/Signature/TestDSAKeyLength.java on Ubuntu 21.04 due to 8279941
(cherry picked from commit c3d8e648a6)
2025-06-11 02:02:04 +02:00
Anton Tarasov
07c5ac5155 JBR-4204 provide an option to disable a11y support on macOS
(cherry picked from commit ee3c56abdc)
(cherry picked from commit e2419baf87)
2025-06-11 02:02:04 +02:00
Vitaly Provodin
bb26950ce6 exclude two swing tests on Windows due to JBR-4197
(cherry picked from commit 3a99f6b99d)
2025-06-11 02:02:04 +02:00
Alexey Ushakov
b57141dbb7 JBR-4112 macOS: SIGILL at [libsystem_kernel] __kill in OOME: Java heap space at java.awt.image.DataBufferInt.<init>
Removed double allocation of surface data

(cherry picked from commit 041285b65c)
2025-06-11 02:02:04 +02:00
Alexey Ushakov
63e6604a7b JBR-4187 java/awt/GraphicsDevice/DisplayModes/UnknownRefrshRateTest.java.UnknownRefrshRateTest fails on mac
Constrained display modes count used by the test

(cherry picked from commit d757e23958)
2025-06-11 02:02:04 +02:00
Alexey Ushakov
f63a4e63af JBR-4177 libc++abi: terminating with uncaught exception of type NSException
Added check for AppContext

(cherry picked from commit 54c83d2ef6)
2025-06-11 02:02:03 +02:00
Alexey Ushakov
6f87d009ab JBR-4174 java/awt/FullScreen/FullScreenInsets/FullScreenInsets.java fails on mac aarch64
Hide cursor to fix OGL&Metal Robot issue (it reads cursor image). Added tolerance to fix Metal Robot inaccuracy.

(cherry picked from commit a66693cc92)
2025-06-11 02:02:03 +02:00
Artem Semenov
4e06f8fd12 JBR-4167 [JCK] AccassibleJTree tests fail on Ubuntu
(cherry picked from commit 40e8687667)
2025-06-11 02:02:03 +02:00
Alexey Ushakov
b2be10f54d JBR-4164 IDEs cannot be launched via launch configuration
Moved execution of displayChanged() to EDT

(cherry picked from commit b6f91a9c10)
2025-06-11 02:02:03 +02:00
Vitaly Provodin
8bcbcd7bf9 JBR-4169 add jdk.javadoc into JBR
(cherry picked from commit 861742faf1)
2025-06-11 02:02:03 +02:00
Alexey Ushakov
23b89814da JBR-4150 IDE regularly locks up at sun.lwawt.macosx.LWCToolkit.getScreenInsets
Restored caching screen insets. Added handling of dock resize.

(cherry picked from commit e3d7c52e93)
2025-06-11 02:02:03 +02:00
Vitaly Provodin
477fd6c46b exclude java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java on Wayland configs due to 8279256
(cherry picked from commit 9d17b66630)
2025-06-11 02:02:03 +02:00
Vitaly Provodin
e6c71a59aa exclude java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java on Scale2 configs due to 8279190
(cherry picked from commit 0949bd7a8a)
2025-06-11 02:02:03 +02:00
Vitaly Provodin
44f043b817 exclude java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java due to 827361
(cherry picked from commit b98807e58f)
2025-06-11 02:02:03 +02:00
Vitaly Provodin
ac4aa153c2 add exclude list for Wayland failures
(cherry picked from commit 2b7bdfe3d5)
2025-06-11 02:02:03 +02:00
Vitaly Provodin
de58ad3063 exclude javax/swing/plaf/basic/BasicComboPopup/JComboBoxPopupLocation /JComboBoxPopupLocation.java on macOS due to 8194945
(cherry picked from commit 86f21becde)
2025-06-11 02:02:03 +02:00
Vitaly Provodin
bec8ff1938 exclude sun/java2d/SunGraphics2D/EmptyClipRenderingTest.java on windows due to 8144029
(cherry picked from commit f3f6365d05)
2025-06-11 02:02:03 +02:00
Maxim Kartashev
6280b57fcc JBR-3948 Linux: SIGSEGV at [libawt_xawt] Java_sun_awt_X11_XInputMethod_createXICNative
The problem: the crashes occur in createStatusWindow() when calls like
adata->AwtColorMatch() end up going to 0x0 pc or some random inaccessible
memory. The only reason for that seems to be the
getDefaultConfig(screen) returning either NULL or garbage. That, in turn, probably
happens because of the wrong screen number provided. Before JBR-3623 was
fixed, awt_numScreens could've changed between the time the screen
number was chosen and the getDefaultConfig() call. After JBR-3623 was
fixed, this change is protected with the AWT lock, which this code
holds.
The fix: obtain the screen number via the Xlib API rather than the
ad-hoc loop though the root windows and return NULL if
getDefaultConfig() doesn't return useable data.

(cherry picked from commit 3d23e8d6a5)
(cherry picked from commit 924f5bab8a)
2025-06-11 02:02:03 +02:00
Vitaly Provodin
be452f5531 add exclude list for Scale2 test runs
(cherry picked from commit 45ddfe3353)
2025-06-11 02:02:03 +02:00
Vitaly Provodin
e7dbff6b5d exclude java/awt/SplashScreen/MultiResolutionSplash/MultiResolutionSplashTest.java due to 8134231
(cherry picked from commit defd9f66a7)
2025-06-11 02:02:02 +02:00
Alexey Ushakov
fe48ba343e JBR-3773 M1 java/awt/Window/WindowAppearanceTest/WindowAppearanceTest.java: : Incorrect color java.awt.Color[r=75,g=74,b=72]at (140,5)
Added more variants of colors for unfocused and focused titles

(cherry picked from commit 93e508a98f)
2025-06-11 02:02:02 +02:00
Artem Semenov
e3b6160ded JBR-3775 Optimize the algorithm for obtaining tree elements
(cherry picked from commit 01dbe66b3e)
2025-06-11 02:02:02 +02:00
Nikita Gubarkov
593555b1b4 JBR API v0.0.2
Added file dialog customization via JBR API & fixed bugs in windows common item dialog

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 45c562e366)
2025-06-11 02:02:02 +02:00
Vitaly Provodin
444bc6ca35 JBR-3931 add the module jdk.unsupported.desktop into jbr
(cherry picked from commit 32def2fd42)
(cherry picked from commit d8fd2c9664)
2025-06-11 02:02:02 +02:00
Alexey Ushakov
8627fd158e JBR-4111 [JBR17] Make possible to select files and directories independently
Implemented apple.awt.fileDialogForFiles property

(cherry picked from commit 67ea24d06e)
2025-06-11 02:02:02 +02:00
Vitaly Provodin
0960376d6b enable fixed tests to regular runs
(cherry picked from commit ae87bdb09a)
2025-06-11 02:02:02 +02:00
Vitaly Provodin
e8559d09c6 exclude javax/swing tests on mac-aarch64 due to 8277816
(cherry picked from commit a39f9150c3)
2025-06-11 02:02:02 +02:00
Aleksandr Veselov
c6e13ab4da JBR-4107 A11y: macOS - wrong frame position if window is not on primary screen
(cherry picked from commit 6006b52f33)
2025-06-11 02:02:02 +02:00
Alexey Ushakov
8d286490f7 JBR-4060 [JBR17+Metal] Flickering on button's shadow
Removed unnecessary global flag. Optimized mask cache texture clearing code.

(cherry picked from commit 4496acc610)
2025-06-11 02:02:02 +02:00
Alexey Ushakov
aa28bbc3a8 JBR-3954 Transparent text color rendering (needed for experimental UI)
Performed conversion from ARGB_PRE to ARGB in the grayscale text shader

(cherry picked from commit 8339ec581f)
2025-06-11 02:02:02 +02:00
Alexey Ushakov
6366ff46e9 JBR-3872 [JBR17+Metal] Wrong color for scrollbars and inlay hints
Corrected typo in setTxtUniforms and fixed alpha blending in frag_gmc_text shader

(cherry picked from commit 3276a2f8ea)
2025-06-11 02:02:02 +02:00
Alexey Ushakov
f22a43c232 JBR-3820 Gamma correction for grayscale text in Metal rendering pipeline
Implemented gamma correction using the same approach that we did for OGL grayscale text rendering (OGLTextRenderer.c)
Optimized shader performance

(cherry picked from commit 5b290231ac)
2025-06-11 02:02:02 +02:00
Alexey Ushakov
ce3f303ac9 JBR-4104 jbr-dev compilation failure
Corrected suppress warnings

(cherry picked from commit 3ff69f1653)
2025-06-11 02:02:02 +02:00
Dmitry Batrak
5425caa60b JBR-4084 Default font '. AppleSystemUIFont' does not have bold weight on Chinese characters
(cherry picked from commit 4fde082d53)
(cherry picked from commit dc1806aa60)
2025-06-11 02:02:02 +02:00
Maxim Kartashev
a0fd3425f5 JBR-3899 SIGSEGV at [libjvm] _ZN23JfrNetworkInterfaceName11on_rotationEv
Prevent JfrNetworkInterfaceName::on_rotation() to dereference a
potentially NULL pointer.

(cherry picked from commit b2a9372d70)
(cherry picked from commit 23ca382acc)
2025-06-11 02:02:01 +02:00
Dmitry Batrak
3754e2e6ad JBR-4021 Unexpected focus event order on window showing
(cherry picked from commit 2a398ebb24)

includes fix for JBR-4131 Popup doesn't get focus if created from context menu

(cherry picked from commit 685562aafc)
(cherry picked from commit bb25c734db)
2025-06-11 02:02:01 +02:00
Maxim Kartashev
9cf80839cf JBR-3923 Internal Error in c1_Instruction.cpp
Make C1 hotspot compiler bail out during CFG construction if there's a
cycle in the graph that isn't a natural loop and that has led to an
unexpected state of stack/locals like missing a phi function.

This is a temporary measure that lets hotspot continue working
even after encountering such bytecode patterns. The full solution
will probably involve more sophisticated CFG checks.

(cherry picked from commit aa0b61cb75)
(cherry picked from commit f7a8581991)
2025-06-11 02:02:01 +02:00
Vitaly Provodin
083abab030 exclude tests spontaneously creating windows during test execution
(cherry picked from commit 0dc17f51ed)
2025-06-11 02:02:01 +02:00
Maxim Kartashev
d433b33a35 JBR-2755 IDE UI became slow via remote X Server connection from Windows
When XGetImage() calls become slow in a remote X11 session, fake
XGetImage() with client-side XCreateImage() that is filled with some
background color. The color is chosen from several top left corner
pixels of the "slow" images obtained with XGetImage().

This feature activates in a remote X11 session only and is
controlled with -Dremote.x11.workaround={true|false|auto}.

(cherry picked from commit 99e8557c5b)
2025-06-11 02:02:01 +02:00
Alexey Ushakov
c898859282 JBR-3924 CMD+Tilda does not switch app windows
Introduced vm property to disable capturing of next app window shortcut

(cherry picked from commit 15c52c44ee)
2025-06-11 02:02:01 +02:00
Nikita Gubarkov
9fc96fd652 JBR-2917 Added emoji support for Windows
JBR-3951 Pass real glyph type from native code instead of guessing it by rowBytes & width

(cherry picked from commit 1a7a1db798)
2025-06-11 02:02:01 +02:00
Pavel
a6ffee38f2 JBR-3926 make AwtComponent transparent for hit events by default
* JBR-3926 make AwtComponent transparent for hit events by default

* [WIP] pass hittest event to frame only if custom decoration is enabled and frame ready to handle it
(cherry picked from commit c0e26ff5d5)
(cherry picked from commit e7a31e309e)
2025-06-11 02:02:01 +02:00
Maxim Kartashev
9cf69575de JBR-3896 Abysmally slow input and UI performance since upgrade to IU-213.4928.7 from previous 2021.3 EAP version
The slowness was the result of XWM.getInsetsFromExtents() repeated
attempts to acquire frame extents from a property that under Sway is
simply unavailable. Each attempt added at least 20ms to every re-draw.

Prior to (repeatedly) checking for NET_FRAME_EXTENTS property of a
window, check that the property is supported by the window manager.

(cherry picked from commit b40cc1c791)
(cherry picked from commit dc29a24175)
2025-06-11 02:02:01 +02:00
Dmitry Batrak
376511112e log LWCToolkit invokeAndWait requests
as part of JBR-3017, to make investigation of similar issues simpler in the future

(cherry-picked from commit a7fd723e43)

(cherry picked from commit d8ca0763a5)
2025-06-11 02:02:01 +02:00
Alexey Ushakov
e2baf66897 JRE-202 Deadlock in CGLGraphicsConfig.getCGLConfigInfo
Added processing system events while waiting for OGLRenderQueue.lock
Moved getCGLConfigInfo logic execution to AppKit thread so, awt lock is
 taken on one thread

(cherry picked from commit d1c8bf03e1bd41cb075aa73cc39558103af7fe1a)
(cherry picked from commit 6bf9f31986be64acf3755b34568802f9960a66ec)
(cherry picked from commit 4e21d67e0369bffac45662c63699b39946218a7a)
(cherry picked from commit 62b62e33cf)
2025-06-11 02:02:01 +02:00
Alexey Ushakov
f61d6e08a6 JRE-193 UI freeze and 12/second thread dumps
Moved CStrikeDisposer dispose code to AppKit

(cherry picked from commit 28774d6878)
(cherry picked from commit 7cfc13be5c)
2025-06-11 02:02:01 +02:00
Alexander Lobas
ec2fb23452 JBR-3660 PhpStorm 2021.2 crashes on selecting iCloud Drive directory in Open dialog
(cherry picked from commit f5434bcaaf)
(cherry picked from commit 58f6991df8)
2025-06-11 02:02:01 +02:00
Alexander Lobas
53490ccff3 JBR-3629 SIGILL at [libsystem_kernel] __kill NPE at com.intellij.openapi.options.SchemeImportUtil$1.isFileSelectable / -[CFileDialog askFilenameFilter:]
(cherry picked from commit 86c13ecaed)
(cherry picked from commit adf18476b9)
2025-06-11 02:02:01 +02:00
Alexander Lobas
1f82ffe77a JBR-3443 Native file dialog on OSX enable filename filter by VM option
(cherry-picked from commit f10e324538)

(cherry picked from commit 7ad92e4703)
2025-06-11 02:02:00 +02:00
Alexander Lobas
c37319ad77 JBR-3442 Native file dialog on OSX (for open file) doesn't allow pasting path
(cherry-picked from commit 7d8cc524ca)

(cherry picked from commit 5aca0df07c)
2025-06-11 02:02:00 +02:00
Maxim Kartashev
5bd74af16d Revert "JBR-2755 IDE UI became slow via remote X Server connection from Windows"
This reverts commit cd9138844da770ae60806fd7dbc1e85c773882a8.

(cherry picked from commit ec6f644c12)
2025-06-11 02:02:00 +02:00
Konstantin Aleev
9943b338ae fix memory leaks in AccessibleJTree
(cherry picked from commit 561a7b8def)
(cherry picked from commit 6aa0951e7f)
2025-06-11 02:02:00 +02:00
Maxim Kartashev
aae650cec0 JBR-3835 Cropped messages in all Message Dialogs in Idea on Ubuntu 18.04.5 LTS with swing alerts enabled
The _NET_FRAME_EXTENTS property that is used to obtain the initial
insets of a dialog window does not immediately get its value and may be
returned as 0 if queried too soon after the window creation.

In order to avoid (incorrect) guessing of dialog's insets, make 3
attempts at getting the insets with a small but increasing pause
in between them.

(cherry picked from commit 8134ec069d)
2025-06-11 02:02:00 +02:00
Maxim Kartashev
3277a0c652 Revert "JBR-3835 Cropped messages in all Message Dialogs in Idea on Ubuntu 18.04.5 LTS with swing alerts enabled"
This reverts commit 8e7aed70976ec0f90c736d86b9cd3e9cf09ff6d4.

(cherry picked from commit 502a08cafb)
2025-06-11 02:02:00 +02:00
Nikita Provotorov
a11f215ee2 JBR-3838 AltGr on Polish keyboard triggers Ctrl+Alt shortcut.
Add regression test.

(cherry picked from commit 8df43eef4b)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 0763e18e1b)
2025-06-11 02:02:00 +02:00
Maxim Kartashev
fed1b1a620 JBR-3835 Cropped messages in all Message Dialogs in Idea on Ubuntu 18.04.5 LTS with swing alerts enabled
The _NET_FRAME_EXTENTS property that is used to obtain the initial
insets of a dialog window does not immediately get its value and may be
returned as 0 if queried too soon after the window creation.

In order to avoid (incorrect) guessing of dialog's insets, add an
artificial delay if getInsets() is called too soon.

(cherry picked from commit d358fcc774)
2025-06-11 02:02:00 +02:00
Alexey Ushakov
6d791e519b JBR-3820 Gamma correction for grayscale text in Metal rendering pipeline
Added regression test to compare OGL and Metal text rendering

(cherry picked from commit 1ef2bce278)
2025-06-11 02:02:00 +02:00
Artem Bochkarev
a266524fe5 JBR-1762: request focus of immediate parent when dispose popup
because requesting focus for frame-parent causes to close whole popup chain

(cherry picked from commit 7a2ccfc521)

JBR-1762: fixed review comments

(cherry picked from commit 0efbe5d9b9)
(cherry picked from commit e539e4d29c)
2025-06-11 02:02:00 +02:00
Dmitry Batrak
1457e16161 JBR-2759 Typeahead issue on Linux
(cherry picked from commits 76bdaf1131, b20c56ff3e, c9609330f2, a170b4e4ae)

(cherry picked from commit 281e6abf47)
2025-06-11 02:02:00 +02:00
Artem Bochkarev
2082a880a0 JBR-1762: request focus of immediate parent when dispose popup
because requesting focus for frame-parent causes to close whole popup chain

(cherry picked from commit 7a2ccfc521)

JBR-1762: fixed review comments

(cherry picked from commit 0efbe5d9b9)
(cherry picked from commit 614eea4fd3)
2025-06-11 02:02:00 +02:00
Renaud Paquay
450f60e7dd Add BasicWithKeyFileAttributeView interface
This new interface is similar to `BasicFileAttributeView` except it
gives implementations a hint that the fileKey() should be acquired
even at some performance cost.

`FileTreeWalker` uses this new interface to request a file key
in addition to regular file attributes so that file equality can
be efficiently performed when checking for loops during file
tree traversal.

This makes `FileTreeWalker` about 2x faster when traversing non
trivial file system trees with the FOLLOW_LINKS option.

Change-Id: I8de047c8fc241dbab9ad57c5e361118a3a94893d

(AKA JBR-3680 Cherry-pick Google's NIO patches to get faster file listing)

(cherry picked from commit 6d1c3f06c4)
(cherry picked from commit c5ac3d69ba)
2025-06-11 02:02:00 +02:00
Ivan Migalev
ab109f723b JBR-3785: don't touch the active keyboard layout on input method activation / deactivation.
origin PR: github.com/JetBrains/JetBrainsRuntime/pull/78.

(cherry picked from commit 2f772fd1a2)
(cherry picked from commit c96000f501)
2025-06-11 02:02:00 +02:00
Dmitry Batrak
4af835be6a JBR-3779 Unexpected Alt+Tab behaviour for Java frames on Cinnamon DE
(cherry picked from commit 0bf13985d5)
(cherry picked from commit 3853438e52)
2025-06-11 02:01:59 +02:00
Maxim Kartashev
3881aae0d5 JBR-3772 java/beans/PropertyEditor/TestFontClass.java: access denied ("java.util.PropertyPermission" "sun.awt.x11.trace" "read")
Instead of using System.getProperty() directly, wrap the call into
GetPropertyAction and use AccessController to execute it.

(cherry picked from commit 4fefc6244b)
2025-06-11 02:01:59 +02:00
Dmitry Batrak
fb11537119 JBR-3504 a11y focus is set on the wrong element when opening popups
(cherry-picked from commit a69e12e0d2)

(cherry picked from commit e06081f5ab)
2025-06-11 02:01:59 +02:00
Maxim Kartashev
29e9764871 JBR-3665 Typing is slow in remote X session
Only call XGetKeyboardMapping() once for all valid codes and cache the
resulting table. Use the cache on the subsequent calls to
keycodeToKeysym().

(cherry picked from commit 0ae3056c25)
2025-06-11 02:01:59 +02:00
Maxim Kartashev
c34dabcb1d JBR-2273 JBR musl port
Detect if we're running on a musl-based system by checking for the presence
of the libgcompat.so glibc compatibility library in the process' map.
If so, java is re-started with LD_LIBRARY_PATH set to point to the right
directory with libjvm.so. This works around the problem with the musl
dynamic library loader.

(based on commit 13a904ddb5)

(cherry picked from commit 51b5fe1b0c)
2025-06-11 02:01:59 +02:00
Alexey Ushakov
160e1af6f3 Added support for otf into the build scripts. Updated prebuild maps.
Applied code from jbr-dev

(cherry picked from commit 9c23814897)
2025-06-11 02:01:59 +02:00
Konstantin Bulenkov
4b653322a5 bundle Inter font
(cherry picked from commit 9f54e5ce48)
2025-06-11 02:01:59 +02:00
Maxim Kartashev
e2724df31b JBR-3664 Logging for communications with X server
Introduced logging controlled with -Dsun.awt.x11.trace.
Currently, only looks at the AWT lock and reports methods holding it
sorted by average hold time.

(based on commit 792a58ea0e)
(based on commit 770b4dc9c1)

(cherry picked from commit 1ec3990980)
2025-06-11 02:01:59 +02:00
Dmitry Batrak
4c96862058 JBR-3726 Modal windows 'disappear' on minimize in KDE
(cherry picked from commits d9baf2d9db, 9c2841028f, 5c4fd9ceaf, f0ed32fca4)

(cherry picked from commit 21a64a69e4)
2025-06-11 02:01:59 +02:00
Maxim Kartashev
3eccdf3482 JBR-3542 Fix -Xcheck:jni warnings
Fixes warnings coming from JBR-specific code in addition to those fixed
by 8269223.

(cherry picked from commit b2aa21b742)
2025-06-11 02:01:59 +02:00
Dmitry Batrak
f565a89149 JBR-3706 Toggling full screen mode for two frames doesn't work on macOS if invoked without delay
(cherry picked from commit 28cfc4815f)
(cherry picked from commit ec4f29297e)
2025-06-11 02:01:59 +02:00
Dmitry Batrak
22a7cc7887 JBR-3686 Background window steals focus when converted to full screen on macOS
(cherry-picked from commit 07a5b9672e)

with fix for JBR-6436 crash in jb/java/awt/Focus/FullScreenFocusStealing.java and jb/java/awt/Window/FullScreenTwoFrames.java

(cherry picked from commit 98b3ac5221)

with fix for JBR-6569 macOS: SIGILL at [libsystem_kernel] __kill in This decoder will only decode classes that adopt NSSecureCoding. Class 'AWTView' does not adopt it.

(cherry picked from commit 7af653070f)
(cherry picked from commit db11bf6776)
2025-06-11 02:01:59 +02:00
Dmitry Batrak
b03528e5e9 JBR-3662, JBR-3672 Focus jumps to another project tab after closing modal dialog
(cherry picked from commit bfd01081c3, 2a71dc5981)
(cherry picked from commit 3fc47af69e)
2025-06-11 02:01:59 +02:00
Nikita Gubarkov
84d00a77f6 JBR-3648 Replace CacheCellInfo usages with MTLCacheCellInfo in metal rendering code
(cherry picked from commit 7a94f7ea07)
2025-06-11 02:01:59 +02:00
Dmitry Batrak
6588e45e36 JBR-3642 java/awt/Window/8159168/SetShapeTest.java fails on macOS-x64 & macOS-aarch64
make sure jb/java/awt/Focus/Typeahead* tests still pass

includes fixes for JBR-3786 javax/swing/plaf/aqua/CustomComboBoxFocusTest.java fails on MacOS by timeout
(cherry picked from commit f5c5388fb5)

and JBR-4113 java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.java fails by time out on macOS

(cherry picked from commit d8d4c55a61)
(cherry picked from commit 9f6fa55673)
2025-06-11 02:01:59 +02:00
Anton Tarasov
281788e9b0 JBR-1834 [linux] runtime hidpi switch is broken
(cherry picked from commit eaa04303a7)
(cherry picked from commit 2df217d6fe)
2025-06-11 02:01:58 +02:00
Anton Tarasov
451b084e2c JBR-1429 Scale is huge due to GDK_SCALE
(cherry-picked from commit 1c3477df2e)

(cherry picked from commit 3ac8aeea3d)
2025-06-11 02:01:58 +02:00
Anton Tarasov
5c96b4f417 JBR-1365 force IDE-managed HiDPI on Linux for fractional scales
(cherry picked from commit f092ff3962)
(cherry picked from commit ae72b9e01d)
2025-06-11 02:01:58 +02:00
Anton Tarasov
1d81bc9f4c Allow HiDPI mode on Linux
(cherry picked from commit e192da4f83)
2025-06-11 02:01:58 +02:00
Anton Tarasov
0e45962cfe JRE-489 -Dswing.bufferPerWindow is fractional scale unfriendly
(cherry picked from commit 67fb7a274c)
2025-06-11 02:01:58 +02:00
Anton Tarasov
21067253ef JRE-310 check for Windows8.1 when enabling ui scale
Was "don't fallback on fractional scale" in JBSDK9.

(cherry picked from commit 28dfae88e6)
2025-06-11 02:01:58 +02:00
Vitaly.Provodin
4613e1a861 add 32-sizes for native data types
(cherry picked from commit 3a79870da8)
(cherry picked from commit 15f6d3290b)
2025-06-11 02:01:58 +02:00
Nikita Gubarkov
74c1ff0f79 Added JBR-specific .idea project files
(cherry picked from commit 6b34834621)
2025-06-11 02:01:58 +02:00
Alexey Ushakov
a634e43650 JBR-3344 "Exit Full Screen" action doesn't work, the only way is mouse click on window's native "green" button.
Restored JBR-1931 fix partially reverted by JBR-1718

(cherry picked from commit c0be778e20)
(cherry picked from commit dbe6f4490f)
2025-06-11 02:01:58 +02:00
Anton Tarasov
378d863175 JBR-3337 jb/java/jcef/HandleJSQueryTest3314.sh: fails on macOS-aarch64 with "JS Query was not handled in 2nd opened browser"
(cherry picked from commit 8678f41971)
(cherry picked from commit d2260dd67c)
2025-06-11 02:01:58 +02:00
Anton Tarasov
ea2af55fa6 JBR-3545 Window.setMinimumSize does not respect DPI scaling
(cherry picked from commit 9b4f72ad18)
(cherry picked from commit f3f87f5f27)
2025-06-11 02:01:58 +02:00
Denis Fokin
62213a7b41 JRE-408 JBR-3515 fix NullPointerException in MetalRootPaneUI.installWindowListeners
(cherry picked from commit 584d554af529cff445b0f09bc2d57be55e138b7a)
(cherry picked from commit 6a42bb54bd)
(cherry picked from commit 1bf4975a43)
2025-06-11 02:01:58 +02:00
Elena Sayapina
3f0429cb7e JBR-2657 [TESTBUG] ChainOfPopupsFocusTest misbehaving on Windows
- changed open popup shortcut from Ctrl+N to Ctrl+M, so no new explorer windows appear if desktop gets focused by error
- added a click on the main test frame, so it gets focus when running from background cygwin process on Windows, otherwise it just flashes on the taskbar

(cherry picked from commit eda8e4d50e)
(cherry picked from commit 1c729008ce)
2025-06-11 02:01:58 +02:00
Denis Konoplev
368bdd065a EA-252361: Check window for null
(cherry picked from commit 23a7dbd486)
(cherry picked from commit aa4d6f14dc)
2025-06-11 02:01:58 +02:00
Artem Bochkarev
4955e33aa0 JBR-3131: support custom view for system menu items
(cherry picked from commit 78d509ac0f)
(cherry picked from commit ca05fefb28)
2025-06-11 02:01:58 +02:00
Artem Bochkarev
5a6d621d4e JBR-3127: set NSWindowAllowsImplicitFullScreen=NO
fixed JBR-3127 Modal dialogs invoked from modal or floating dialogs are opened in full screen

(cherry picked from commit 0b8ff1a7e6)

JBR-3127: add possibility to load NSJavaVirtualMachine

JavaVM framework is deprecated but this class is still checked by AppKit, see https://youtrack.jetbrains.com/issue/JBR-3127#focus=Comments-27-4684465.0-0

(cherry picked from commit be6a2c4f0c)
(cherry picked from commit d690d68315)
2025-06-11 02:01:57 +02:00
Nikita Gubarkov
3459cc3c6f JBR-3376 Added check for -1 glyph info pointer in OGLTextRenderer.c
(cherry picked from commit 40ea728335)
2025-06-11 02:01:57 +02:00
Dmitry Batrak
f697421b63 JBR-3024 Popups are shown with 1x1 size sometimes
test case only

(cherry picked part of commit ee298f5287)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit b7d165e486)
2025-06-11 02:01:57 +02:00
Vitaly Provodin
8823169597 JBR-3314 add regression test
(cherry picked from commit c81adfed61)
(cherry picked from commit e4c3db3a2c)
2025-06-11 02:01:57 +02:00
Ivan Migalev
437679c0c5 JBR-3227 Reload type of required native file dialogs each time a file dialog is requested
(cherry picked from commit 26dd87ab7c)
(cherry picked from commit 847d757a76)
2025-06-11 02:01:57 +02:00
Ivan Migalev
e420975041 JBR-3068 Update path selector behavior when sun.awt.windows.useCommonItemDialog is enabled
(cherry picked from commit 442bb7eecc)
(cherry picked from commit 6177142c3a)
2025-06-11 02:01:57 +02:00
Alexey Ushakov
61cb3d4fb9 JBR-2996 M1 warnings: CoreText note: Client requested name “.SFCompact-Black”, it will get Times-Roman rather than the intended font
Cached system fonts family names

(cherry picked from commit 56629e4c90)
(cherry picked from commit 998e7b685a)
2025-06-11 02:01:57 +02:00
Alexey Ushakov
038ecc37b2 JBR-3023 Gray idea frame after project open with ide.mac.transparentTitleBarAppearance.
Initiate move/resize event on first appearance of window having FULL_WINDOW_CONTENT property set

(cherry picked from commit a6ea081ba2)
(cherry picked from commit dd6877af04)
2025-06-11 02:01:57 +02:00
Dmitry Batrak
72fd06ae80 JBR-3017 Focus issue in presence of third-party accessibility tool
use the new invocation approach for 'makeKeyAndOrderFront' as well, as it can also cause synchronous back-calls to accessibility subsystem, and change the global call order unexpectedly

this commit fixes TypeaheadSetVisibleTest and TypeaheadToFrontTest, when they are run with AltTab active

Guard against possible deadlocks, if UI-related methods are invoked not on EDT.
Sample deadlock scenario:
* Application thread attempts to show the window, this involves calling CWrapper.NSWindow.makeKeyAndOrderFront under AWT tree lock, which blocks till 'makeKeyAndOrderFront' completes on AppKit thread
* AppKit thread, while executing 'makeKeyAndOrderFront' performs 'back-call' to CAccessibility.getFocusOwner, which waits for execution on EDT
* EDT performs some activity requiring AWT tree lock (e.g. processing of PaintEvent)

(cherry picked from commits e3aaff5db4, 09941119e1)

(cherry picked from commit 513767dce6)
2025-06-11 02:01:57 +02:00
Dmitry Batrak
a3d48aa185 JBR-3072 Deadlock on nested dialog hiding
(cherry picked from commits 99242748ee, ad1595b5c2)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 9eacb21298)
2025-06-11 02:01:57 +02:00
Dmitry Batrak
f3372ae608 fix occasional freezes of JBR-3017 reproducer after the fix
(cherry picked from commit 7e6db54f77)
(cherry picked from commit 2b7f78f50e)
2025-06-11 02:01:57 +02:00
Dmitry Batrak
9fd5df347d JBR-2819 Create API to determine typographic family/subfamily for available fonts
(cherry picked from commit 89e519a4ef)
(cherry picked from commit 21129ca270)
2025-06-11 02:01:57 +02:00
Nikita Gubarkov
57fc6747f9 JBR-2924 Do not try to create native italic font when we're going to make it fake italic
(cherry picked from commit cf05cb1a19)
2025-06-11 02:01:57 +02:00
Nikita Gubarkov
c1928f77db JBR-3982 Fixed non-antialiased text rendering on macOS
JBR-3269 Disabled subpixel antialiasing for macOS Mojave and newer

(cherry picked from commit e10f69072e)
2025-06-11 02:01:57 +02:00
Dmitry Batrak
c505b66186 JBR-3017 Focus issue in presence of third-party accessibility tool
(cherry picked from commit 88ead5d9e3)
(cherry picked from commit 97753f15b6)
2025-06-11 02:01:56 +02:00
Vitaly Provodin
cf956cffaa JBR-1718 add a regression test
(cherry picked from commit 84ff4eab21)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 6b02027600)
2025-06-11 02:01:56 +02:00
Elena Sayapina
a53261b04f JBR-2890 [TESTUPDATE] Enable jcef tests on macOS aarch64 platform
(cherry picked from commit 1714d7b627)
(cherry picked from commit 54e74d75d0)
2025-06-11 02:01:56 +02:00
Nikita Gubarkov
05336748d9 Added JBR API
with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 2ce0a876c5)
2025-06-11 02:01:56 +02:00
Artem Bochkarev
74627c1f95 JBR-2562: fixed invokation of parent method
(cherry picked from commit 93cbab2f2d)

JBR-2562: suppress exceptions from [NSWindow _changeJustMain]

temporary workaround to prevent crashes

(cherry picked from commit dd055b5970)
(cherry picked from commit 55eba1d802)
2025-06-11 02:01:56 +02:00
Mikhail Grishchenko
172ae1a7c7 JBR-2890 Disable jcef tests on 32-bit and aarch64 platforms
(cherry picked from commit d34d6528fe)
(cherry picked from commit 793add3ff1)
2025-06-11 02:01:56 +02:00
Alexey Ushakov
a349f5d594 JBR-2879 Big Sur: Opening project in new window results in opening project in another tab
Disabled Tabbing mode for all NSWindows

(cherry picked from commit 8cb0377a31)
(cherry picked from commit 545eddda9f)
2025-06-11 02:01:56 +02:00
Nikita Gubarkov
a8ea9420e9 JBR-2910 Implemented extended glyph cache for macOS
JBR-3976 Fixed text spacing & emoji scaling on macOS

JBR-3638 Adjust subpixel glyph positions for correct rounding in CStrike#getGlyphImageBounds

(cherry picked from commit 4590e49b61)
2025-06-11 02:01:56 +02:00
Alexey Ushakov
1c3ab0a0ac JBR-2617 Text with opacity renders black
Implemented alpha blending in grayscale text rendering (UX-1320)
Corrected bright text thickness (smooth on), bright and dark text thickness (smooth off)
Added JVM properties for fine tuning

(cherry picked from commit c30306f779)
(cherry picked from commit c95adeb8f2)
(cherry picked from commit 269c9580fb)
(cherry picked from commit 55c7be5fe9)
(cherry picked from commit e28ff71e97)
(cherry picked from commit 6fb9aaf291)
2025-06-11 02:01:56 +02:00
Alexey Ushakov
7d7276f854 JBR-2521 Ugly font in all 2020.2 EAPs on macOS
Provide gamma correction for both light and dark text

(cherry picked from commit 5953202a7e)
(cherry picked from commit 1b426cc66c)
2025-06-11 02:01:56 +02:00
Alexey Ushakov
9237305574 JBR-2591 Repainting is broken (was: Icons in tree list widgets became dark)
Save current blend mode before cached grayscale rendering

(cherry picked from commit 7beb75ccec)
(cherry picked from commit ed52fde57d)
(cherry picked from commit 1a46cd70af)
2025-06-11 02:01:56 +02:00
Alexey Ushakov
6cea68cb89 JBR-1986 Enabling fractional metrics causes visual artifacts in font rendering on macOS 10.14+
Disable subpixel positioning for macOS 10.13+ if legacy LCD rendering is disabled

(cherry picked from commit dbd24232e4)
(cherry picked from commit 9fbf990e83)
2025-06-11 02:01:56 +02:00
Vitaly Provodin
923208faf0 exclude bug7154030 on macosx-aarch64 due to 8268284
(cherry picked from commit 253f1246e5)
2025-06-11 02:01:56 +02:00
Vitaly Provodin
a6cfae2004 exclude SharedMemoryPixmapsTest on macosx-all due to 8221451
(cherry picked from commit d929111f7a)
2025-06-11 02:01:56 +02:00
Vyacheslav Moklev
27eab85b6e JBR-2442 fix memory leak of fileBuffer
fix was suggested by Nikita Gubarkov

(cherry picked from commit a166fb65e1)
2025-06-11 02:01:56 +02:00
Sergey Malenkov
2243293b58 EA-235126 - CME: HighlightableComponent.getPreferredSize
(cherry picked from commit 523d80cafd)
(cherry picked from commit 31c4452397)
2025-06-11 02:01:55 +02:00
Kirill Kirichenko
10995458f1 JBR-2667 Post review: rename win.darkTheme.on to win.lightTheme.on and reversed the logic
(cherry picked from commit eeab5252e6)
(cherry picked from commit b539e1d0de)
2025-06-11 02:01:55 +02:00
Kirill Kirichenko
3ebfda1ea8 JBR-2667 Add new AWT desktop property for light/dark theme detection on Windows 10
(cherry picked from commit 0e4ad056dd)
(cherry picked from commit e5dfcc4417)
2025-06-11 02:01:55 +02:00
Alexey Ushakov
68437a276e JBR-2593 Wide ligatures not rendered in Grayscale mode
Added missing flush of cached vertices

(cherry picked from commit ad409b4370)
(cherry picked from commit bf011ac521)
2025-06-11 02:01:55 +02:00
Nikita Gubarkov
364164e709 JBR-2910 Implemented extended glyph cache for Linux
(cherry picked from commit d488f716e7)
2025-06-11 02:01:55 +02:00
Nikita Gubarkov
250b489434 JBR-2910 Implemented extended glyph cache for Windows
(cherry picked from commit 7f75d75933)
2025-06-11 02:01:55 +02:00
Nikita Gubarkov
fb4a460326 JBR-2614 Fixed LCD glyph width to include both left & right padding, so that rowBytes = width * 3
(cherry picked from commit afb52a160d)
2025-06-11 02:01:55 +02:00
Alexey Ushakov
57411f0a31 JBR-2463 Font rendering problem on macOS Mojave
Use adjusted advances for glyphs

(cherry picked from commit 1af5dd4aae)
(cherry picked from commit bd6dae9ddf)
2025-06-11 02:01:55 +02:00
Denis Konoplev
cf77f0d048 JBR-3544: Generate popup invoked instead of New in this directory.
- A fix
- A regression test (cherry picked from commit 7995574c09)

(cherry picked from commit 01915e4224)
2025-06-11 02:01:55 +02:00
Vitaly Provodin
d0bdc8b088 JBR-2545 Clean up the list of ignored Render tests
(cherry picked from commit f7b4c42e1d)
(cherry picked from commit 32b8d67527)
2025-06-11 02:01:55 +02:00
Jayathirth D V
f0bd610f07 8241490: Add large text performance tests in RenderPerfTest
(cherry picked from commit 803ee2f2b5)
(cherry picked from commit bbe57208d2)
2025-06-11 02:01:55 +02:00
Alexey Ushakov
a70ff94a77 8230657: Create fine grained render perf test for metal pipeline
Converted gradle JUnit test to plain java for ant and gnumake

To run the tests:
cd src/demo/share/java2d/RenderPerfTest

ant run
or
java -jar dist/RenderPerfTest.jar
or
java -jar dist/RenderPerfTest.jar testWhiteTextBubblesGray

(cherry picked from commit 356121b18f)
(cherry picked from commit 8bd8d2d132)
(cherry picked from commit 448aad87bc)
2025-06-11 02:01:55 +02:00
Konstantin Bulenkov
b0cd64ea80 Update FiraCode to 5.2
(cherry picked from commit 71e2a8d8ad)
(cherry picked from commit 0582e90d58)
2025-06-11 02:01:55 +02:00
Alexey Ushakov
4686120ff5 JBR-1929 Improve rendering of San Francisco font of macOS Catalina
Reverting gamma correction because of rendering artifacts in the light theme

This reverts commit 5016db51

(cherry picked from commit c1d644a004)
(cherry picked from commit ade5b22a83)
2025-06-11 02:01:55 +02:00
Alexey Ushakov
c511695d35 JBR-1929 Improve rendering of San Francisco font of macOS Catalina
Added gamma correction to match grayscale rendering with subpixel one

(cherry picked from commit 5016db518a)
(cherry picked from commit b15896e838)
2025-06-11 02:01:54 +02:00
Alexey Ushakov
536b545950 JBR-2463 Font rendering problem on macOS Mojave
Use adjusted advances for glyphs

(cherry picked from commit 1af5dd4aae)
(cherry picked from commit df670fc276)
2025-06-11 02:01:54 +02:00
Anton Tarasov
6f8ad1638b revert: JBR-1434 "New file dialog" popup remains above all windows on switching application
java.awt.peer.WindowPeer.isLightweightDialog() method does not exist.

(cherry picked from commit 7d8aeaf7de)
(cherry picked from commit e233ff9b94)
2025-06-11 02:01:54 +02:00
Anton Tarasov
2bb141e2e8 JBR-2872 improve: JBR-2866 JCEF: Markdown editor steals focus from a different frame
(cherry picked from commit bad748e3d0)
(cherry picked from commit ef2a05eac1)
2025-06-11 02:01:54 +02:00
Anton Tarasov
6f55c57a4f JBR-2866 JCEF: Markdown editor steals focus from a different frame
with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 6d852e3252)
2025-06-11 02:01:54 +02:00
Anton Tarasov
7e8bc17739 JBR-2645 enable CefBrowser.close(true) in jcef reg tests
(cherry picked from commit 492c217125)
(cherry picked from commit 8975bde92c)
2025-06-11 02:01:54 +02:00
Anton Tarasov
2444fcdced JBR-2259 WebSite isn't loaded with .loadUrl method if browser isn't shown in UI
(cherry picked from commit 57bbddf071)
(cherry picked from commit 94b56fdeb5)
2025-06-11 02:01:54 +02:00
Anton Tarasov
573f08c4d1 JBR-2557 use com.jetbrains.cef.JCefAppConfig in JCEF tests
(cherry picked from commit e30a309f92)
(cherry picked from commit 441ee96ec5)
2025-06-11 02:01:54 +02:00
Anton Tarasov
940a9723b4 JBR-2489 Git branch operations (switch to another branch, rebase) sometimes crash WebStorm 202.5428.27
(cherry picked from commit 81d2156fb1)
(cherry picked from commit 01299cb102)
2025-06-11 02:01:54 +02:00
Anton Tarasov
437f8fc4c4 JBR-2282 [jcef] update to JCEF/80.0.4+g74f7b0c+chromium-80.0.3987.122
(cherry picked from commit a5adc725df)
(cherry picked from commit fcf31daa22)
2025-06-11 02:01:54 +02:00
Anton Tarasov
4ed988fee0 JBR-2305 jcef: jb/java/jcef/JCEFStartupTest.java throws java.lang.ExceptionInInitializerError
(cherry picked from commit f0385f01ec)
(cherry picked from commit c7d407e0a6)
2025-06-11 02:01:54 +02:00
Anton Tarasov
2febae23a0 JBR-2306 jcef: jb/java/jcef/JCEFStartupTest.java unexpectedly exits with the exit code: 0
(cherry picked from commit ff7d7bd43c)
(cherry picked from commit d72901625f)
2025-06-11 02:01:54 +02:00
Anton Tarasov
1111c8f34e JBR-2299 [mac] jcef requests for "chromium safe storage" keychain access
(cherry picked from commit dd1334a352)
(cherry picked from commit 2ebe5709c0)
2025-06-11 02:01:54 +02:00
Anton Tarasov
f07190c2aa JBR-2222 Crash during closing IDE
(cherry picked from commit d0c367b31f)
(cherry picked from commit bf36d7873b)
2025-06-11 02:01:54 +02:00
Anton Tarasov
13bd630b75 JBR-2287 [jcef] add CefBrowser wrapper to jtreg tests
(cherry picked from commit fa961d1769)
(cherry picked from commit 74ccb86095)
2025-06-11 02:01:54 +02:00
Anton Tarasov
83df2aae58 JBR-2169 AWTThreading: remove tracked invocation event from completion listener
(cherry picked from commit a855f3b835)
(cherry picked from commit c54371231c)
2025-06-11 02:01:53 +02:00
Anton Tarasov
686c8a35d2 JBR-2159 Native crash in thread AWT-EventQueue-0 when trying to push commit
(cherry picked from commit bba297b4a4)
(cherry picked from commit 38b9cf19c0)
2025-06-11 02:01:53 +02:00
Anton Tarasov
921299da3a JBR-2148 JCEF: JBR bundle has invalid app structure
(cherry picked from commit f45f84d7ed)
(cherry picked from commit b610a7c4f9)
2025-06-11 02:01:53 +02:00
Anton Tarasov
e838d07959 JBR-2146 improve InvokeOnToolkitHelper to cover more generic case
(cherry picked from commit 37db252ad7)
2025-06-11 02:01:53 +02:00
Anton Tarasov
73c11efa2c JBR-2139 Idea freeze on dynamic plugin unloading
(cherry picked from commit e57bae4f66)
(cherry picked from commit 647f198b17)
2025-06-11 02:01:53 +02:00
Anton Tarasov
ecf8d7b06c JBR-2099 jb/java/jcef/JCEFStartupTest.java fails on Windows, Linux
(cherry picked from commit 3dfb0aa16a)
(cherry picked from commit 3750608e62)
2025-06-11 02:01:53 +02:00
Anton Tarasov
2d409b1f7a JBR-2093 create reg test for JCEF startup
(cherry picked from commit e8c2761f5b)
(cherry picked from commit 17cfb8e0d8)
2025-06-11 02:01:53 +02:00
Anton Tarasov
750e3d1ef5 JBR-2082 Revealing taskbar does not work when "Automatically hide the taskbar"
(cherry picked from commit b31a41fb2f)
(cherry picked from commit d2d4e58c13)
2025-06-11 02:01:53 +02:00
Mikhail Grishchenko
f6e96b539c JBR-2639, JBR-2412 [jcef] Tests that checks mouse events
JBR-2412 [windows] mouse listener does not work for jcef

(cherry picked from commit 66ad6472ae)
(cherry picked from commit 04246aac57)
(cherry picked from commit b7cde4fd05)
(cherry picked from commit d325b98b54)
2025-06-11 02:01:53 +02:00
Mikhail Grishchenko
ea1c4cea25 JBR-2639 [win] jcef does not recognize vertical mouse wheel events
added regression test

(cherry picked from commit e8e4741bb0)
(cherry picked from commit 8428d1c853)
2025-06-11 02:01:53 +02:00
Mikhail Grishchenko
d7c0b1238c JBR-2412 [windows] mouse listener does not work for jcef
added regression test

(cherry picked from commit d1479872f2)
(cherry picked from commit 9e5032e328)
2025-06-11 02:01:53 +02:00
Elena Sayapina
07daf9d631 JBR-2630 Typing speed in IDE editor was dropped after switching to 11.0.8
Introduced sun.awt.osx.RobotSafeDelayMillis property to control macOS specific safe delay for Robot methods.
50 ms safe delay was initially hardcoded in 3862142d (JDK-8242174: [macos] The NestedModelessDialogTest test make the macOS unstable) which affected performance tests execution.

(cherry picked from commit 5f691bb788)
(cherry picked from commit cfc90ce2c5)
2025-06-11 02:01:53 +02:00
Mikhail Grishchenko
5321bf764b JBR-2430 [jcef] Added Regression test
Checks that JS Query is handled in 2nd opened browser

(cherry picked from commit 404ff84565)

Refactoring + changed EDT awaiting method

(cherry picked from commit dc24658b31)
(cherry picked from commit f191726147)
2025-06-11 02:01:53 +02:00
Vitaly Provodin
1280aef483 exclude the new printer test 8262731
(cherry picked from commit c5ff1e3025)
2025-06-11 02:01:53 +02:00
Alexey Ushakov
b41a2e6125 JBR-2419 Improve performance of CStrike.getNativeGlyphOutlineBounds
Do not pass the result via java object. Use more straight api.

(cherry picked from commit 9f91fe91f5)
(cherry picked from commit c0fd2daf5c)
(cherry picked from commit 1bfd5ad21c)
2025-06-11 02:01:53 +02:00
Alexey Ushakov
0ce0832585 JBR-2382 Provide detailed stack trace in crash dumps for unhandled ObjC exceptions
Used user home dir for jbr_err files. Removed logging with reportException method

(cherry picked from commit 2c8cdb221b)

JBR-2382 Provide detailed stack trace in crash dumps for unhandled ObjC exceptions

Used process workdir for jbr_err files. Added one more logging to reportException method

(cherry picked from commit 95a47810d5)

JBR-2382 Provide detailed stack trace in crash dumps for unhandled ObjC exceptions

Generate jbr_err_pidXX.log file with detailed stack trace of the exception

(cherry picked from commit 4c42f75021)
(cherry picked from commit 9ed5cac63d)
2025-06-11 02:01:52 +02:00
Artem Bochkarev
790d9cec61 JBR-2253: unset LD_PRELOAD just after VM loaded
workaround for JBR-2253 Preload libjsig.so to fix JNA crashes

(cherry picked from commit 127a2deddf)
(cherry picked from commit 915f700d26)
2025-06-11 02:01:52 +02:00
Kirill Kirichenko
1cfec6014c JBR-1874 Cursor not changing from 'default' to 'text'. Additional fix after reopening.
(cherry picked from commit 5a29d4ade9)
(cherry picked from commit da44860f22)
2025-06-11 02:01:52 +02:00
Elena Sayapina
9ad6044ad6 JBR-2585 [TESTBUG] TouchScreenEvent tests affect tests simulating mouse actions
- added workaround for JBR-2585
- added README.md about manual test run
- made an update to close LinuxTouchScreenDevice properly
- added an error exit from linux shell script if sudo password is empty or chown fails

(cherry picked from commit 4deb3bbe61)
(cherry picked from commit a13b014719)
2025-06-11 02:01:52 +02:00
Elena Sayapina
f3c13014ee IDEA-165950 [TESTUPDATE] National keyboard layouts support
Update regression test after the following commits:

02fad83c: Remove public constants from KeyEvent
f4227faf: Impossible to assign cmd+ß shortcuts
(cherry picked from commit 264802cf4b)
(cherry picked from commit 679b5d8cd3)
2025-06-11 02:01:52 +02:00
Elena Sayapina
f0e94bb07c JBR-2328 [TESTBUG] Regression test java/awt/keyboard/AllKeyCode/AllKeyCode.java is not correct
(cherry picked from commit 861f73c393)
(cherry picked from commit bfab6a9364)
(cherry picked from commit e9fa7a0882)
(cherry picked from commit a199826fae)
2025-06-11 02:01:52 +02:00
Mikhail Grishchenko
ff182c9843 JBR-2259 WebSite isn't loaded with .loadUrl method if browser isn't shown in UI
Added reproducer

(cherry picked from commit e875bf72c9)
(cherry picked from commit 9aa75b7679)
2025-06-11 02:01:52 +02:00
Denis Konoplev
6cd9fa3614 JBR-2490 Add option to work with Surface Pen
(cherry picked from commit 5acc7680a1)
(cherry picked from commit b604023cef)
2025-06-11 02:01:52 +02:00
Denis Konoplev
56b15c6df3 JBR-2669: set unicode for both keyCode and extendedKeyCode
(cherry picked from commit ba3f14c83a)
(cherry picked from commit 544176fbce)
2025-06-11 02:01:52 +02:00
Denis Konoplev
01134b382a JBR-2554: Proper unicode values in KeyEvent.keyCode
(cherry picked from commit 703d77a927)
(cherry picked from commit 63bdac9bbf)
2025-06-11 02:01:52 +02:00
Denis Konoplev
d67faa4ab1 JBR-215: Remove SystemInfo
(cherry picked from commit 9adf77a512)
(cherry picked from commit 6a6761d365)
2025-06-11 02:01:52 +02:00
Denis Konoplev
41e4b0af0a JBR-215: Separate LatinNonAlphaNumKeycodes option
(cherry picked from commit caf366f6f3)
(cherry picked from commit ed143f6d73)
2025-06-11 02:01:52 +02:00
Denis Konoplev
d4b79f88c4 JBR-215: Windows non-alphanumeric shortcuts
(cherry picked from commit 4f60efebe2)
(cherry picked from commit b5fd23e498)
2025-06-11 02:01:52 +02:00
Denis Konoplev
02787c34ee JBR-2280: Fix regression. Mode compatible with old option.
(cherry picked from commit a3e3c23cb1)
(cherry picked from commit 8c15ab819c)
2025-06-11 02:01:52 +02:00
Denis Fokin
b0fbdf3c6e macOS national keyboard support
(cherry picked from commit 83356eb0bb)
(cherry picked from commit c8a36e1804)
2025-06-11 02:01:52 +02:00
Nikita Gubarkov
98d291aa06 JBR-6387 Revert "8315701: [macos] Regression: KeyEvent has different keycode on different keyboard layouts"
(cherry picked from commit efd4acd419)
2025-06-11 02:01:51 +02:00
Sergey Malenkov
9d4ff29477 JBR-1929 FractionalMetricsSupport
(cherry picked from commit bbdc159762)
(cherry picked from commit 9fad8b07f1)
2025-06-11 02:01:51 +02:00
Mikhail Grishchenko
c3073acdd4 JBR-2256 JEditorPane with test/html type and zero margins is not shown
Updated reproducer

(cherry picked from commit 529a188b8b)

JBR-2256 JEditorPane with test/html type and zero margins is not shown

Added reproducer

(cherry picked from commit 41578a40b5)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 775801a875)
2025-06-11 02:01:51 +02:00
Mikhail Grishchenko
a3e2cb47b7 JBR-2210 IDEA fails to start (JVM crashes) when using the -Dfile.encoding=UTF-8in IDEA's vmoptions file
Added regression test

(cherry picked from commit 4e1f5a43b3)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit f7cf514da2)
2025-06-11 02:01:51 +02:00
Mikhail Grishchenko
b0c67bcd92 JBR-1414 [Test] downscale frames to run on low-dpi screens
(cherry picked from commit b46e74fe6f)
(cherry picked from commit 844b3e1d5f)
2025-06-11 02:01:51 +02:00
Elena Sayapina
c1e2e67cca JBR-1905 [TESBUG] java/awt/TextArea/DisposeTest/TestDispose.java: frame is not disposed
- java/awt/TextArea/DisposeTest/TestDispose.java, java/awt/TextField/DisposeTest/TestDispose.java: fixed test frame disposal
- java/awt/Frame/DisposeStressTest/DisposeStressTest.java: decreased test timeout from 2h to 10 min, added minor diagnostic logging

(cherry picked from commit 7f025f4e16)
(cherry picked from commit dda7f3d871)
(cherry picked from commit bc09aadadb)
(cherry picked from commit 0905abecf5)
2025-06-11 02:01:51 +02:00
Alexey Ushakov
415761e60a JBR-2135 Use CoreText api to select the font with the most recent version
Added a property to force loading bundled fonts: -Djava2d.font.noVersionCheck=true

(cherry picked from commit cbb148dff4)
(cherry picked from commit db7e53e67d)
2025-06-11 02:01:51 +02:00
Alexey Ushakov
530c3ba13b JBR-2137 JetBrainsMono fonts update to v1.0.3
(cherry picked from commit a6e441828a)
(cherry picked from commit b25c90ba53)
2025-06-11 02:01:51 +02:00
Mikhail Grishchenko
d4a47f0230 JBR-1414: Added regression test for dnd with HiDPI scaling
(cherry picked from commit 1f4ab12fbb)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit ba00bacb9f)
2025-06-11 02:01:51 +02:00
Elena Sayapina
dac74e6caa JBR-2041 [TEST] Added new regression test (Touchscreen devices support)
(cherry picked from commit 2d587b3728)
(cherry picked from commit 92606f2c7f)
(cherry picked from commit 05af375909)
(cherry picked from commit 0f895bf1b2)
(cherry picked from commit 08aa0852b7)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 9bd62fade9)
2025-06-11 02:01:51 +02:00
Konstantin Bulenkov
068aa8996d Update JetBrains Mono to 1.0.2
(cherry picked from commit 6f4a13e46f)
(cherry picked from commit b14bfd3ac9)
2025-06-11 02:01:51 +02:00
Ivan Migalev
80fe35874b Extract the DWM colorization parameters from registry (JBR-2070)
(cherry picked from commit 0330cab60b)
(cherry picked from commit 6525a8b70d)
2025-06-11 02:01:51 +02:00
Ivan Migalev
4d881718f8 Refresh desktop properties on WM_DWMCOLORIZATIONCOLORCHANGED (JBR-2070)
(cherry picked from commit 06086f4a7e)
(cherry picked from commit afd04d7c5b)
2025-06-11 02:01:51 +02:00
Ivan Migalev
e65ef4d574 Fix a possible resource leak in ColorizationColorAffectsBorders
(cherry picked from commit 0c911b6ffe)
(cherry picked from commit ffbaf5e1d1)
2025-06-11 02:01:51 +02:00
Elena Sayapina
9ac9cabed4 JBR-2086 JetBrainsMono fonts update to v1.0.1
(cherry picked from commit a4b373e631)
(cherry picked from commit 462fef3916)
2025-06-11 02:01:50 +02:00
Konstantin Bulenkov
de098c34ba JetBrains Mono 1.0
(cherry picked from commit d514f7a982)
(cherry picked from commit 56ee3ef459)
2025-06-11 02:01:50 +02:00
Denis Konoplev
944230c54b JBR-3444: Return NullSurfaceData when gc == null
(cherry picked from commit 01ad15e61c)
(cherry picked from commit 2a7a828ec8)
2025-06-11 02:01:50 +02:00
Denis Konoplev
acc2edc74d JBR-1995: Last character issue with korean
Fix for JTextComponent

(cherry picked from commit a7c8b0b535)
(cherry picked from commit 48410e5865)
2025-06-11 02:01:50 +02:00
Denis Konoplev
5e566ef0d4 JBR-2891: Post PhaseEvents in the begin and end of Magnify and Rotate
(cherry picked from commit c811c295c2)
(cherry picked from commit fe18b612dc)
2025-06-11 02:01:50 +02:00
Denis Konoplev
17227d3529 JBR-2444: Turn on IM workaround by default
(cherry picked from commit 15c4ce1d3e)
(cherry picked from commit fe0c4e5b9e)
2025-06-11 02:01:50 +02:00
Denis Konoplev
aa5c14b21b Fix build: add import & fix jwhen
(cherry picked from commit 3551c2a4c0)
2025-06-11 02:01:50 +02:00
Denis Konoplev
ed88857c04 JBR-2795: Add explicit conversion
(cherry picked from commit bf3e1c0c31)
(cherry picked from commit 5f07df3034)
2025-06-11 02:01:50 +02:00
Denis Konoplev
11f8effaec IDEA-237231: Correct signarute mask
(cherry picked from commit 6974131eec)
(cherry picked from commit af2154f8b1)
2025-06-11 02:01:50 +02:00
Denis Konoplev
5ed55c0366 IDEA-237231: Possible fix for pen interraction
(cherry picked from commit 33a8c95d39)
(cherry picked from commit 58fbc3f800)
2025-06-11 02:01:50 +02:00
Denis Konoplev
776192990a JBR-2041: Project view tap fix, recovery? constants & logging
(cherry picked from commit 1e904db3b0)
(cherry picked from commit 5c62dbdbca)
2025-06-11 02:01:50 +02:00
Denis Konoplev
1a5a49e93e IDEA-229135: Fling animation stop on tap
(cherry picked from commit 7ce0f79561)
(cherry picked from commit 01f0f774b4)
2025-06-11 02:01:50 +02:00
Denis Konoplev
6c32b52357 Windows touch screen support
(cherry picked from commit cab3f28907)
(cherry picked from commit ce0e4aff62)
2025-06-11 02:01:50 +02:00
Denis Konoplev
d0458c56e0 Turn off multitouch
(cherry picked from commit a2576ffa9a)
(cherry picked from commit 41eaa75d27)
2025-06-11 02:01:50 +02:00
Denis Konoplev
d5e6b448ad Check XInput extension && touch inertia
(cherry picked from commit cca7fb97f4)
(cherry picked from commit edcb7310d3)
2025-06-11 02:01:50 +02:00
Denis Konoplev
50993a342d Touch scroll handling
(cherry picked from commit 6dcec3dc31)
(cherry picked from commit c585901afe)
2025-06-11 02:01:49 +02:00
Denis Konoplev
f17de2e840 XI2 Constants
(cherry picked from commit 588cd6ee73)
(cherry picked from commit 2e4a8ba10b)
2025-06-11 02:01:49 +02:00
Denis Konoplev
b9e67830ce XLibWrapper XI2 functions
(cherry picked from commit d6bd1bfa2b)
(cherry picked from commit 7edf395b3b)
2025-06-11 02:01:49 +02:00
Denis Konoplev
80e0a5deea X11 native get put double
(cherry picked from commit f101bc1108)
(cherry picked from commit 344fe36ceb)
2025-06-11 02:01:49 +02:00
Denis Konoplev
22d54ebbd4 Native data types
(cherry picked from commit 9504574dbb)
(cherry picked from commit 5967b3f41b)
2025-06-11 02:01:49 +02:00
Denis Konoplev
9103ceca3b XI2 headers in xlib wrapper generator
(cherry picked from commit ef108067a1)
(cherry picked from commit 1397389026)
2025-06-11 02:01:49 +02:00
Denis Konoplev
398f464fdb Revert "Turn off multitouch"
This reverts commit 90ea3bf57e4c687e9d9bf0a37f2f64c82a81f4eb.

(cherry picked from commit b154b46eb0)
2025-06-11 02:01:49 +02:00
Denis Konoplev
038a8f3213 Turn off multitouch
(cherry picked from commit a2576ffa9a)
(cherry picked from commit 960e154377)
2025-06-11 02:01:49 +02:00
Alexey Ushakov
80c658c955 JBR-1962 Allow to change font config
Replaced several privileged blocks with just one

(cherry picked from commit faa8d3d258)
(cherry picked from commit 2ffadb5f9a)
2025-06-11 02:01:49 +02:00
Vitaly Provodin
76b47894a3 JBR-572: Regression test on the crash caused by the fix
(cherry picked from commit 6cc380ffb5)
(cherry picked from commit 958e25ed21)
(cherry picked from commit a7de601d5f)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 32a3948437)
2025-06-11 02:01:49 +02:00
Dennis Ushakov
c8f8705ef6 JBR-1863, JBR-1868 correct advances on Catalina
(cherry picked from commit bff05a1a97)
2025-06-11 02:01:49 +02:00
Dennis Ushakov
5469fb179b JBR-1850: on macOS fonts should be sorted by weight to ensure proper population of the families
(cherry picked from commit 59974ca04c)
2025-06-11 02:01:49 +02:00
Dennis Ushakov
49b1177494 faster font family loading & lazy font family population
1. NSFont.familyName is faster than loading allFamilyNames
2. Prebuilt list of system fonts
3. Cleanup San Francisco family loading
4. Avoid calling expensive native getWidth on font when creating font family, load styles only when they would be used.

(cherry picked from commit db44a8c70e)
2025-06-11 02:01:49 +02:00
Dennis Ushakov
52b8405e3d JBR-1756 use CoreText for all font rendering on Catalina
(cherry picked from commit a4f42cd091)
2025-06-11 02:01:49 +02:00
Nikita Gubarkov
e35fcf3530 JBR-410 Added emoji support for Linux
(cherry picked from commit a98fac2c53)
2025-06-11 02:01:49 +02:00
Alexey Ushakov
60b8ce0e6d JBR-1997 JetBrainsMono fonts update to v0.22
(cherry picked from commit 41f4fddd34)
(cherry picked from commit f5302a02f4)
(cherry picked from commit 5d7fd2e1e5)
(cherry picked from commit 6d27bc749b)
2025-06-11 02:01:48 +02:00
Anton Tarasov
ff8f95aa23 JRE-729 [windows] unreasonable IME activity consumes CPU
(cherry picked from commit caf8462e09)
2025-06-11 02:01:48 +02:00
Dmitry Batrak
5f65c66b33 JBR-3119 Application's panel in KDE taskbar blinks when popup window is shown
this re-fixes JBR-2934 in a different way

(cherry picked from commit 63134e091b)
(cherry picked from commit d805bf045f)
2025-06-11 02:01:48 +02:00
Dmitry Batrak
98a4fa80bf JBR-3038 Unexpected windows z-order change on workspace switch
(cherry picked from commit ddda860f42)
(cherry picked from commit f4b23f8be1)
2025-06-11 02:01:48 +02:00
Dmitry Batrak
43b344f881 JBR-3035 The Confirm Exit pop-up window remains hidden behind a window of another application
(cherry picked from commit 470c3bd1b5)
(cherry picked from commit 64e4203555)
2025-06-11 02:01:48 +02:00
Dmitry Batrak
c537191570 JBR-2934 Serious usability issue with GoLand 2020.3 caused by JBR
(cherry picked from commit 95be4351d4)
(cherry picked from commit 79d0b926b2)
2025-06-11 02:01:48 +02:00
Dmitry Batrak
c46bdcd5e5 JBR-2977 Opening a recent project in a new window doesn't bring this window to the front
(cherry picked from commit 2d9fb9e7b8)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 27f390cf9a)
2025-06-11 02:01:48 +02:00
Dmitry Batrak
4623f869d3 JBR-2698 setAutoRequestFocus(false) breaks focus logic under i3 window manager on Linux
(cherry picked from commit ebcdeb7d80)
(cherry picked from commit 6d26292983)
2025-06-11 02:01:48 +02:00
Dmitry Batrak
e6adbb7c3c JBR-2696 Log focus API invocations with stack traces
(cherry picked from commits 0f038754e5, a507cab6d3)

(cherry picked from commit a494c76a27)
2025-06-11 02:01:48 +02:00
Dmitry Batrak
cb2967f246 JBR-2496 Prevent JVM stealing focus from other applications on Linux (JBR-2497, JBR-2499, JBR-2503, JBR-2652)
(cherry picked from commits 87525d1d2a, 66381f0dec, 8a789e04e9, 665ebc5d47, 98a9219c23)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 42aad68ab4)
2025-06-11 02:01:48 +02:00
Alexey Ushakov
113ebe983d JBR-3509 Extend JDK-8267521 (Post JEP 411 refactoring: maximum covering > 50K) to JBR specific changes
Marked all the usages of SecurityManager related api

(cherry picked from commit a783b841ac)
2025-06-11 02:01:48 +02:00
Artem Bochkarev
a8c28a286a JBR-1851: check NSArray length
and make more exception-safe
and minor optimization for logging (cache jobjects)

(cherry picked from commit 5839539379)
(cherry picked from commit 23a3321d6d)
2025-06-11 02:01:48 +02:00
Artem Bochkarev
b3942ced24 JBR-1841: allow deferred disabling of InputMethods-support
(cherry picked from commit 969255904b)
(cherry picked from commit f8513bcad9)
2025-06-11 02:01:48 +02:00
Artem Bochkarev
60e3554f0d JBR-1668: add hardcoded default values for preferences node NSServicesStatus
(cherry picked from commit 8445f53d85)
(cherry picked from commit 2e3a5fe508)
2025-06-11 02:01:48 +02:00
Artem Bochkarev
0cfffe2766 JBR-1515: obtain shortcut from OS to check inside AWTView.performKeyEquivalent
(cherry picked from commit 30d479fbd4)

JBR-4899 Activate Previous Window doesn't work sometimes

(cherry picked from commit 63cb726f3c)
(cherry picked from commit ddeeb4c813)
2025-06-11 02:01:47 +02:00
Artem Bochkarev
da84598b66 JBR-1668: add hardcoded descriptions of system actions
and minor fixes

fix memory management

(cherry picked from commit 15f7368309)
(cherry picked from commit 5aec21a5cd)
2025-06-11 02:01:47 +02:00
Elena Sayapina
f5db13c5e6 JBR-1417 [TEST] Added new regression test (JBR 11 does not support chain of popups)
(cherry picked from commit 41e89505be)
(cherry picked from commit 9fe5c778d9)
(cherry picked from commit 6ea9530d9f)
(cherry picked from commit d757108517)
(cherry picked from commit b99c1e7b5c)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 9745d7d7dc)
2025-06-11 02:01:47 +02:00
Alexey Ushakov
aae6aec19d JBR-1690 Bundle new fonts
Test correction
Restored RenderUtil.java
Removed obsolete golden images
(cherry picked from commits:
aa13c8b4ea
943b1472c7
cab6dd5087
7997c7a5ee
cab6dd5087
7997c7a5ee
d3731df79d)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit a9a049709c)
2025-06-11 02:01:47 +02:00
Dmitry Batrak
fe0cba4b66 IDEA-257525 Unable to show Chinese when using IDEA mac ARM version
The proposed solution is to use a 'normal' font as a base for 'San Francisco' font fallback.
Most of its fallback components/candidates (provided by the OS) are expected to be normal
fonts as well, and so the resulting coverage of Unicode character repertoire should be much better.

(cherry picked from commits 9b7113a6cf, 92b00d50b5, 53489fab27)

(cherry picked from commit 7b14db7f6b)
2025-06-11 02:01:47 +02:00
Dmitry Batrak
98fc1fa102 JRE-469 Console with emoji output becomes slow
The fix consists of two parts:
* Making CCharToGlyphMapper remember that a particular character cannot be displayed (isn't mapped to glyph with given font). Checking this repeatedly in native code is very slow.
* Make CCompositeGlyphMapper remember the results of char-to-glyph mapping, this was missing in previous implementation. This reuses caching code in CompositeGlyphMapper, extending the range of characters for which the results are cached to include Supplementary Multilingual Plane (most emoji characters belong to it).

port commit 4e0ccde2 from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commit 394e055ae6)

cherry picked from commit 0db7e948af

(cherry picked from commit 7721393e5b)
2025-06-11 02:01:47 +02:00
Dmitry Batrak
810ab8f4cc reimplement JDK-7162125 to fix JDK-8147002
port commit ba38e5c4 from JBR 9

port from JBR 11 to JBR 15(cherry picked from commit a949f9d220)

cherry-picked from commit f309844f75

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit f9942d50a8)
2025-06-11 02:01:47 +02:00
Artem Bochkarev
b710a64bde JBR-1771: fixed compilation errors (macosx-x86_64-normal-server-fastdebug)
(cherry picked from commit 1acada7cac)
(cherry picked from commit c1751ca98d)
2025-06-11 02:01:47 +02:00
Artem Bochkarev
00f9038acf JBR-1668: minor fixes
fixed review comments

(cherry picked from commit 9dbcf194c9)
(cherry picked from commit 8276f81a13)
2025-06-11 02:01:47 +02:00
Vitaly Provodin
e919720871 JBR-1618: fixed misprint, added saving screenshots in case of failure
(cherry picked from commit e4a3889cf0)
(cherry picked from commit 3959ac1680)
2025-06-11 02:01:47 +02:00
Alexey Ushakov
6d31bd0fc9 JBR-1624 Fonts rendering is broken in the 2019.2 EAP (Fira Code)
Corrected lookup for bold fonts

(cherry picked from commit 114b8af38f)
(cherry picked from commit fa0816c404)
2025-06-11 02:01:47 +02:00
Alexey Ushakov
a709f0e3d2 JBR-1399 Improve font discovery and loading by introducing font cache
Added unit test

(cherry picked from commit b4f5bf8bd3)
(cherry picked from commit a0eb49776a)
2025-06-11 02:01:47 +02:00
Elena Sayapina
15c2992c84 IDEA-165950 [TEST] Added new regression test (National keyboard layouts support)
(cherry picked from commit 0900a705bc)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 0981cb572a)
2025-06-11 02:01:47 +02:00
Artem Bochkarev
f57f3a2916 JBR-1668: read system keyboard shortcuts
initial support for OS X

(cherry picked from commit 6bbe7102e2)
(cherry picked from commit ccd8116bf3)
2025-06-11 02:01:47 +02:00
Artem Bochkarev
3607050a5a JBR-1573: restore current input context after cleanup
(cherry picked from commit b7acd7f6f6)
(cherry picked from commit 9dbdd24cc3)
2025-06-11 02:01:47 +02:00
Alexey Ushakov
96ac7127d2 JBR-1624 Fonts rendering is broken in the 2019.2 EAP (Fira Code)
Restored old behaviour of registerFontsInDir as it does not affect idea bundled fonts

(cherry picked from commit cef29e8100)
(cherry picked from commit e3a1cdae23)
2025-06-11 02:01:46 +02:00
Alexey Ushakov
f29151efbd JBR-1874 Cursor not changing from 'default' to 'text'
Prevent OS from changing cursor

(cherry picked from commit 94a4eb7002)
(cherry picked from commit c640e06d25)
2025-06-11 02:01:46 +02:00
Alexey Ushakov
4600219967 JBR-1778 Font in editor incorrect (always italics)
Added -it pattern into italic detection code
Added some more patterns to bold and italic detection code
'Anka/Coder' font support

(cherry picked from commit 5119eeee12)
(cherry picked from commit ec241e4a0a)
(cherry picked from commit 251068294e)
(cherry picked from commit 08ae9ff034)
(cherry picked from commit b472b89fba)
2025-06-11 02:01:46 +02:00
Alexey Ushakov
bd542800a0 JBR-1699 Use platform font rendering for bundled fonts on MacOS
Use different family for specific font faces. Refactoring

JBR-3071 Remove naming workaround for Fira Code

(cherry picked from commits c423003bd4, aee4b48d20)

(cherry picked from commit 8838b708be)
2025-06-11 02:01:46 +02:00
Alexey Ushakov
a7867a2bd6 JBR-1624 Fonts rendering is broken in the 2019.2 EAP (Fira Code)
Lower priority for idea bundled fonts to pickup platform ones
(if installed)

(cherry picked from commit e838103a24)
(cherry picked from commit 181c757ebe)
2025-06-11 02:01:46 +02:00
Alexey Ushakov
297aec8556 JBR-1885 JetBrainsMono fonts update to v0.19
Updated the fonts to v0.19. Bundled italic fonts

(cherry picked from commit 7f032e3fe7)
(cherry picked from commit a7b4c9449a)
(cherry picked from commit 9c9cea0871)
2025-06-11 02:01:46 +02:00
Alexey Ushakov
02522282e6 JBR-1624 Fonts rendering is broken in the 2019.2 EAP (Fira Code)
Lower priority for idea bundled fonts to pickup platform ones
(if installed)

(cherry picked from commit e838103a24)
(cherry picked from commit 517bd6d449)
2025-06-11 02:01:46 +02:00
Alexey Ushakov
781dce265a JBR-1699 Use platform font rendering for bundled fonts on MacOS
Used CFont instead of TrueTypeFont for bundled fonts on mac
Use different family for specific font faces. Refactoring

(cherry picked from commit 8c86ad3e96)
(cherry picked from commit c423003bd4)
(cherry picked from commit bcae402dc8)
(cherry picked from commit e53374aab3)
2025-06-11 02:01:46 +02:00
Alexey Ushakov
849747ae23 JBR-1690 Bundle new fonts
Update family name for JetBrainsMono-Thin

(cherry picked from commit 0d2326ff34)
(cherry picked from commit 83843f9124)
(cherry picked from commit 2a2e1cfb36)
(cherry picked from commit 76abb69262)
(cherry picked from commit 1350ceb04b)
2025-06-11 02:01:46 +02:00
Alexey Ushakov
4e88a85b81 JBR-1645 javax/swing/JTextArea/TestTabSize.java: Tab width calculation wrong
Corrected idea font filter

(cherry picked from commit 62f9d1f46a)
(cherry picked from commit 3dab43f987)
2025-06-11 02:01:46 +02:00
Artem Bochkarev
81262c1e0d JBR-1573: workaround for 'Sudden keyboard death on Ubuntu 18'
recreate instance of system InputMethod when starts filter all events

(cherry picked from commit 3ad94911af)

(cherry picked from commit c8533a1219)
(cherry picked from commit 42c5f07276)
2025-06-11 02:01:46 +02:00
Alexey Ushakov
64c108963a JBR-1399 Improve font discovery and loading by introducing font cache
Bundle IDEA fonts to improve startup performance

(cherry picked from commit 350a3fdef3)
(cherry picked from commit 4ad45a0c84)
2025-06-11 02:01:46 +02:00
Artem Bochkarev
b1993a25d3 JBR-1541: activate menu in completion handler of modal dialog
(cherry picked from commit e57384c1d6)
(cherry picked from commit b38f01f5e4)
2025-06-11 02:01:46 +02:00
Alexey Ushakov
67f890ed5d JBR-1314 Font difference in pycharm 2019.1 on Ubuntu
Removed disabling hints on MAX_FCSIZE_LTL_DISABLED font size

(cherry picked from commit 2b99dfed40)
(cherry picked from commit 4cf33c4d27)
2025-06-11 02:01:46 +02:00
Alexey Ushakov
03db555ed4 JBR-1412 [fwp to JBR11] JBR-1393 RubyMine is hanging after log in (macOS)
Modified version of JBR8 fix

(cherry picked from commit 434166fe63)
(cherry picked from commit db7cdf1d90)
2025-06-11 02:01:45 +02:00
Alexey Ushakov
66cd1b8c8d JBR-1394 JBR11 does not support LCD text on Mac
Enable LCD rendering for transparent destinations

(cherry picked from commit 207c6b92ff)
(cherry picked from commit 2254451953)
2025-06-11 02:01:45 +02:00
Elena Sayapina
8f7a0f42ec JBR-1372: [TESTBUG] JDialog1054.java, MoveFocusShortcutTest.java regression tests need update
(cherry picked from commit a5948894bf)
(cherry picked from commit dcc2be2a53)
2025-06-11 02:01:45 +02:00
Maxim Kartashev
642f6c607d JBR-2755 IDE UI became slow via remote X Server connection from Windows
When XGetImage() calls become slow in a remote X11 session, fake
XGetImage() with client-side XCreateImage() that is filled with some
background color. The color is chosen from several top left corner
pixels of the "slow" images obtained with XGetImage().

This feature activates in a remote X11 session only and is
controlled with -Dremote.x11.workaround={true|false|auto}.

(cherry picked from commit 76decaa4ef)
2025-06-11 02:01:45 +02:00
Vyacheslav Moklev
db4b949746 Fix const pointer after JDK-8225032 fix
(cherry picked from commit dc3ae1cafa)
2025-06-11 02:01:45 +02:00
Vyacheslav Moklev
91c1c441bf Fix compilation on windows platform: awt_ole.h must be included before awt.h
(cherry picked from commit 6fdcfedd0e)
2025-06-11 02:01:45 +02:00
Vyacheslav Moklev
b31f8e0bd3 JBR-1269 Common Item Dialog does not appear on Alt+Tab or click in windows toolbar
JBR-1270 Common Item Dialog does not have an icon

Select a proper window handle

(cherry picked from commit 92fb89e3e3)
2025-06-11 02:01:45 +02:00
Vyacheslav Moklev
9a2a428c1c JBR-1271 Wrong parent of native windows dialogs
Set a proper parent to a dialog window

(cherry picked from commit 803ba97361)
2025-06-11 02:01:45 +02:00
Vyacheslav Moklev
6e0394fb2a JBR-1273 Common Item Dialog does not open when wrong path to directory is passed
Handle set directory / set file properly

(cherry picked from commit b96492f7de)
2025-06-11 02:01:45 +02:00
Vyacheslav Moklev
7bdf04f5e1 JBR-1274 Common Item Dialog sometimes crash the process
Prevent from freeing memory with CoTaskMemFree twice

(cherry picked from commit 8e5e04a798)
2025-06-11 02:01:45 +02:00
Vyacheslav Moklev
bbee467314 JBR-1257 CommonItemDialog modal window has no owner
Fix modality for Common Item Dialog

squash! JBR-1257 CommonItemDialog modal window has no owner

JBR-2478 java/awt/Modal/FileDialog/FileDialogNonModal7Test.java: DummyButton on Dialog did not gain focus when clicked

revert part of JBR-1271, that's related to 'old' file dialogs

(cherry picked from commit 8bc4787c11)
2025-06-11 02:01:45 +02:00
Vyacheslav Moklev
9a553a4ee8 JBR-1258 CommonItemDialog ignores directory to open
Fix parsing of directory path / file path

(cherry picked from commit b09a8aace1)
2025-06-11 02:01:45 +02:00
Vyacheslav Moklev
788b869331 JRE-1216 Implement Windows native file dialogs with the new Common Item Dialog API
Add implementation of file dialogs with the new Common Items Dialog API

(cherry picked from commit e2fb4ced09)
2025-06-11 02:01:45 +02:00
Alexey Ushakov
2211e068ba JBR-1144 [JDK11] [macos] Held down key is not deleted when press backspace after accent menu popup (Mojave)
Handled both Delete and ForwardDelete keys

(cherry picked from commit e3ba0bd651)
(cherry picked from commit 64cabb0dc7)
2025-06-11 02:01:45 +02:00
Alexey Ushakov
2685dcb3fc JBR-1144 [JDK11] [macos] Held down key is not deleted when press backspace after accent menu popup (Mojave)
Handled backspace separately

(cherry picked from commit 81916a92af)
(cherry picked from commit 60ae63de08)
2025-06-11 02:01:44 +02:00
Elena Sayapina
558ace3145 JBR-1102: [TESTBUG] java/awt/Paint/ComponentIsNotDrawnAfterRemoveAddTest/ComponentIsNotDrawnAfterRemoveAddTest.java: 'paint' method of 60 components was not called
(cherry picked from commit dc7abebe17)
(cherry picked from commit c8d631a142)
(cherry picked from commit a133cd791e)
2025-06-11 02:01:44 +02:00
Elena Sayapina
cfe11552d4 JBR-998: [TEST] Added new regression test (Input freezes after MacOS key-selector on Mojave)
(cherry picked from commit 3d898a8024)
(cherry picked from commit f368f0f101)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 362b7d402d)
2025-06-11 02:01:44 +02:00
Elena Sayapina
6613d6c222 JBR-318: [TEST] Added new regression test (Cmd+` doesn't work after update to JDK 152_*)
(cherry picked from commit 0be0a018b5)
(cherry picked from commit 5bb4c2a1d6)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 7fa8aa1568)
2025-06-11 02:01:44 +02:00
Elena Sayapina
755e436934 JBR-1054: [TEST] Added new regression test (Weird non-modal dialog above modal dialog behaviour)
(cherry picked from commit b808be6a6a)
(cherry picked from commit 48b7dd874f)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit a39264214b)
2025-06-11 02:01:44 +02:00
Vitaly Provodin
dd1253029a JRE-1117 J2DBench: introduced result reader for TC's charts (follow up)
separated printing values fo TC charts and values for comparisons

(cherry picked from commit bbdbe17e2a)
(cherry picked from commit 3e5dcf6aeb)
2025-06-11 02:01:44 +02:00
Vitaly Provodin
17a37b2649 JRE-1117 J2DBench: introduced result reader for TC's charts
(cherry picked from commit 422fa59643)
(cherry picked from commit 43b5f7f8b0)
2025-06-11 02:01:44 +02:00
Alexey Ushakov
4f0db0928a JRE-60 Editor font is distorted on Kubuntu Linux 16.04 with HiDPI
Override FC_HINT_SLIGHT only for small font sizes

(cherry picked from commit 0e1d23c807)
(cherry picked from commit 56e10e7d27)
2025-06-11 02:01:44 +02:00
Alexey Ushakov
d720d49b59 JRE-471 Crash on macOS Sierra after Sleep
Replaced [NSScreen screens] 'objectAtIndex' with 'firstObject' to get nil instead of NSRangeException. Added nil checks

(cherry picked from commit d6b98511262055c01522d9ec8024253af7e91564)
(cherry picked from commit cef970e1ba)
(cherry picked from commit 9f34bb4ee4)
2025-06-11 02:01:44 +02:00
Alexey Ushakov
50993cbc4c JRE-608 J2DBench metrics: up to 20x degradation
Increased rendering queue buffer up to 6.4 MB

(cherry picked from commit 9ef00f00a7fb6e14835393f8d3944157c6800727)
(cherry picked from commit 2a61e9e997a880a60c5acb361849205170501b91)
(cherry picked from commit 68ca9f00ded004c970b94bd047a04b9f09237047)
(cherry picked from commit 2fe5289178)
(cherry picked from commit 560a65654e)
2025-06-11 02:01:44 +02:00
Alexey Ushakov
98e38cd730 JRE-1028 fwport(9): JRE-1008 Do not use LCD shader on macOS 10.14+ in font rendering
Disable LCD text shader on macOS 10.14+ if LCD rendering is not explicitly specified

(cherry picked from commit dffea9d701)
(cherry picked from commit 1628d6120e)
2025-06-11 02:01:44 +02:00
Konstantin Bulenkov
87c19c2e77 update icons
(cherry picked from commit dfe387ff5037deda29d8d522cba6cc5370796ff4)
(cherry picked from commit de1e4a9d71)
(cherry picked from commit 0b33efa7d1)
2025-06-11 02:01:44 +02:00
Vitaly Provodin
9cfb38e2c9 Update README.md
(cherry picked from commit eacef38934)
2025-06-11 02:01:44 +02:00
Vitaly Provodin
ca81891780 Regression test on https://bugs.openjdk.java.net/browse/JDK-8139176
JBR-5008 remove extra file jb/java/awt/font/DrawTest.java from colliding group

(cherry picked from commit 6f1c0a6)
(cherry picked from commit 63130fd461)

add regression test on https://bugs.openjdk.java.net/browse/JDK-8139176

(cherry picked from commit 380c17456c)

(cherry picked from commit 6f1c0a6)
(cherry picked from commit 63130fd461)
(cherry picked from commit 33bbc7d54d)
2025-06-11 02:01:44 +02:00
Vitaly Provodin
afbc437bf8 not for upstream: added disposing frames in order to provide the test with the chance on the second run
(cherry picked from commit 8170635)
(cherry picked from commit 7fc924f065)
(cherry picked from commit a2f9387697)
2025-06-11 02:01:44 +02:00
Vitaly Provodin
6e765a1434 JRE-9: added regression test
(cherry picked from commit 4ffb665)
(cherry picked from commit 00a29ad129)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 05ad949ded)
2025-06-11 02:01:43 +02:00
Sergey Malenkov
d7c8ab0410 JRE-100 Scroll with inertia (Mac os) should only work in the initial component
(cherry picked from commit e79502c708)
(cherry picked from commit 223a74bfeb)
2025-06-11 02:01:43 +02:00
Sergey Malenkov
80917c0341 IDEA-161965 ignore dragged event that does not change mouse location Sierra is more sensit
(cherry picked from commit ef490fa465)
(cherry picked from commit 3722edc9f2)
2025-06-11 02:01:43 +02:00
Dmitry Batrak
b8788acf90 JBR-3339 Window requests focus on horizontal scroll (on Linux)
(cherry picked from commit 8d74e8e30b)
(cherry picked from commit 88edabdd60)
2025-06-11 02:01:43 +02:00
Anton Tarasov
32f6a271df JRE-166 [macOS] deadlock with JFXPanel
(cherry picked from commit a9dbb6990fac0c659297487a261ba9170e5fb3ad)

(cherry picked from commit 8a44e1bb37)
(cherry picked from commit 9a280dc79e)
2025-06-11 02:01:43 +02:00
Alexey Ushakov
4965d65028 8265445: Introduce the new client property for mac: apple.awt.windowAppearance
Implemented apple.awt.windowAppearance client property

(cherry picked from commit ba60f7bd8f)
2025-06-11 02:01:43 +02:00
Anton Tarasov
2488718632 JBR-3306 jbr-dev warnings: incompatible pointer to integer conversion returning 'void *' from a function with result type 'jlong'
(cherry picked from commit 046409cd7f)
2025-06-11 02:01:43 +02:00
Dmitry Batrak
30d0163fb1 JBR-2498 Fix unexpected window raising under Mutter WM
re-implement the fix, so that ChildAlwaysOnTopTest isn't failing

(cherry picked from commit bf826251fa)
2025-06-11 02:01:43 +02:00
Alexey Ushakov
0951da634e JBR-3327 [jbr-dev] Adjust mac window appearance according to AppleInterfaceStyle property
Set window appearance according to AppleInterfaceStyle default

(cherry picked from commit ffe5b5a504)
2025-06-11 02:01:43 +02:00
Alexey Ushakov
7be09fd22a JRE-238 [736] java.awt.AWTError: access denied ("java.lang.RuntimePermission" "canInvokeInSystemThreadGroup")
Moved task execution on AppKit to the privileged block. Minor refactoring

(cherry picked from commit 5dbb88471115c9e4a536ae37d0e6794de9e5ac9c)
(cherry picked from commit fd2f9a1166)
2025-06-11 02:01:43 +02:00
Alexey Ushakov
f077efa9bf JRE-359 CGraphicsEnvironment.getDefaultScreenDevice() returns null
Moved CG api calls to AppKit thread

(cherry picked from commit fd0210f035199e8612097a2c1d42b90cfd2111f8)
(cherry picked from commit 5e99e376d9dfe477401121878704630c3c13f9f7)

(cherry picked from commit 6d73b25130)
(cherry picked from commit 9519ac1e6e)
2025-06-11 02:01:43 +02:00
Dmitry Batrak
a0f4d4a980 JBR-2973 Copy/Move dialog not in the focus on drag-n-drop to Project Tool window from external application
(cherry picked from commit 20fe78b650)
(cherry picked from commit 9f6b9baaa8)
2025-06-11 02:01:43 +02:00
Alexey Ushakov
5a19a795b6 JRE-444 CPlatformWindow.nativeGetTopmostPlatformWindowUnderMouse is slow
Replaced number of CGWindowListCopyWindowInfo for each window layer with [NSWindow windowNumberAtPoint: belowWindowWithWindowNumber:]

(cherry picked from commit 2a143af4d62340acdfd9c94d876f684385febbc8)
(cherry picked from commit 6fc369e8bf)
(cherry picked from commit 91b0084667)
2025-06-11 02:01:43 +02:00
Alexey Ushakov
c724ad9a9f JRE-482 Java_sun_font_CStrike_getNativeGlyphOutline takes too much time in scrolling
Replaced glyph outlines with bounding boxes for glyph boundaries calculation for most common usages. Also, skipped unnecessary OGL flushes in OGL rendering queue

(cherry picked from commit c58dc052af48887338a38beb0c721eddca3af481)
(cherry picked from commit 7f6be7cfb907bbf1c3572b911df5690fa3039fde)
(cherry picked from commit c68913d82c0ba4b4c509179123f0a4bf7971f857)
(cherry picked from commit 9cfa04c93ad416a8177d9e7ca410850bd3ff880f)
(cherry picked from commit 0e930841704e4e98ecc0c888b144245e74218799)
(cherry picked from commit 8ffc190fbdb059d5a24842115c0bc3ade8b351b9)
(cherry picked from commit 0f7c26186a)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit e20819c77b)
2025-06-11 02:01:43 +02:00
Alexey Ushakov
f76d9fe3d8 JBR-3316 Reimplement CThreading functionality on top of OpenJDK17 sourcebase
Adopted CThreading related code to OpenJDK17 source base

(cherry picked from commit 5dfb30ae68b2c54d58c98a9195709c031f823581)
(cherry picked from commit 94163bd69f64616836523e81567aa1141480d841)
(cherry picked from commit baca50b430)
2025-06-11 02:01:43 +02:00
Alexey Ushakov
be7b916514 JBR-3304 jbr-dev warnings: 'getPhysFontName' defined but not used [-Werror=unused-function]
Removed unused code

(cherry picked from commit 6781f2646f)
2025-06-11 02:01:42 +02:00
Vitaly Provodin
c13768d86b exclude javax/swing/JTabbedPane/4624207/bug4624207.java failing on windows due to 8197552
(cherry picked from commit 3f8f2e8928)
2025-06-11 02:01:42 +02:00
Alexey Ushakov
27de60f75e JRE-366 Add support for Awesome WM
Added detection of Awesome WM and handled similar to Sawfish WM

(cherry picked from commit 6742077ed198975949af567e8ef543f853397351)
(cherry picked from commit 2847be73c6)
(cherry picked from commit 916a2ab66f)
2025-06-11 02:01:42 +02:00
Alexey Ushakov
c73ef0d937 JRE-353 Fedora 25 + XMonad rendering issues
Added support for Xmonad WM

(cherry picked from commit c690c3c7fdf1390e6b1a8d388ff752a09391ae3c)
(cherry picked from commit 6851dc3441)
(cherry picked from commit e290bf8a0c)
2025-06-11 02:01:42 +02:00
Denis Konoplev
de4c9cfde9 8264143: Change uint8_t to unsigned char
(cherry picked from commit 9d01b82f64)
2025-06-11 02:01:42 +02:00
Dmitry Batrak
c7b383deac JBR-3255 Applying 'incline' transform might change character's advance
(cherry picked from commit b37f7cfdb1)
(cherry picked from commit 2bd6c80390)
2025-06-11 02:01:42 +02:00
Dmitry Batrak
ece4bd7ee4 JBR-3215 'deriveFont(float)' can return a different font (not just change the size)
(cherry picked from commit 8eafcaab24)
(cherry picked from commit 3f4065786d)
2025-06-11 02:01:42 +02:00
Dmitry Batrak
71e7449045 JBR-3157 Maximized window with custom decorations isn't focused on showing
(cherry picked from commit 62b04983f2)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit e4f68d461c)
2025-06-11 02:01:42 +02:00
Dmitry Batrak
a05daf53f7 JBR-1752 Floating windows overlap modal dialogs
(cherry picked from commit 0161050077)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 8b2f0315d1)
2025-06-11 02:01:42 +02:00
Dmitry Batrak
c6b6c870ce JBR-3054 Focus is not returned to frame after closing of second-level popup on Windows
(cherry picked from commit 0c2b6e1c04)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 8c6ecf33f1)
2025-06-11 02:01:42 +02:00
Dmitry Batrak
72dbc2a11e JBR-2702 Tooltips display through other applications on hover
(cherry picked from commits 11732c2469, 0ed7deabaa)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit cc952f4053)
2025-06-11 02:01:42 +02:00
Dmitry Batrak
782a002dce added RobotSmokeTest
this test failing in jtreg launch most probably indicates either some problem with the environment (e.g. some windows left open from previously launched processes) or with java.awt.Robot implementation

(cherry picked from commit 1d525a2d2f)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 9c3043a557)
2025-06-11 02:01:42 +02:00
Dmitry Batrak
92ebab52a6 JBR-2847 Always dispatch KEY_TYPED event to the same component as KEY_PRESSED event
also fixes JBR-2834, IDEA-254466, IDEA-254466
squashed with fixes for JBR-3291, JBR-3307, JBR-3598

(cherry picked from commits e94f6057a4, ba6b9c085e, 2ccf6b65a7, 3b0708af7d, 3674766d65)

(cherry picked from commit d7383ededb)
2025-06-11 02:01:42 +02:00
Dmitry Batrak
ecc2afd21f JBR-2712 Typeahead mechanism doesn't work on Windows
(cherry picked from commits 1a9838082e, f5b6222835, acd7e3b2da, cd6dd5c3cf8556f97f3113cb7d615a92393b57bf(partially), e8bbd8ffdd90f57cd12d7d7e89188be97ee4be0b(partially), 37901295e1, cafb374afc, 12034dcf61)

includes fix for JBR-4974 jb/java/awt/Focus/ModalDialogFromMenuTest.java intermittently clicks at tittle bar

Pause before getting the coordinates of the component to be clicked on,
not right before the click itself.

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 7855e07658)
2025-06-11 02:01:42 +02:00
Denis Konoplev
c10c020a2e 8264143: Lanai: RenderPerfTest.BgrSwBlitImage has artefacts on apple M1
Add stdint include to fix x64 build

(cherry picked from commit 0dc04385a3)
2025-06-11 02:01:41 +02:00
Dmitry Batrak
291b5e2ec4 JBR-2498 Fix unexpected window raising under Mutter WM
(cherry picked from commit 73b45fb899)
(cherry picked from commit bc8dec8fc1)
2025-06-11 02:01:41 +02:00
Dmitry Batrak
2fb2a22756 JBR-2248 Support text wrapping in a <pre> tag in JEditorPane
port from JBR 11 to JBR 15 (cherry picked from commit ff2e915371)

cherry picked from commit 6a30c56138

(cherry picked from commit add6c7e2c9)
2025-06-11 02:01:41 +02:00
Dmitry Batrak
c2645cc2a4 JBR-2234 Support CSS setting overflow-wrap:anywhere in JEditorPane
port from JBR 11 to JBR 15 (cherry picked from commits b6583d0a71, 6003abc15f)

cherry picked from commit 93ad4f06dd

also includes JBR-4006 [JCK] javax.swing.text.html.CSS$Attribute.OVERFLOW_WRAP field breaks public API
(cherry picked from commit f20a3d8679)
and JBR-4007 [JCK] javax.swing.text.GlyphView.calcBreakSpots method breaks public API
(cherry picked from commit 1002eff4f3)
(cherry picked from commit f603f9e837)
2025-06-11 02:01:41 +02:00
Dmitry Batrak
5df5586451 JBR-2050 Issue with keycap emojis
port from JBR 11 to JBR 15 (cherry picked from commit ae91e1d7f1)

cherry picked from commit d3018a1837

(cherry picked from commit 17afbc7882)
2025-06-11 02:01:41 +02:00
Dmitry Batrak
4fc130cecb JBR-1714 Italic text is displayed using incorrect glyphs on Windows
port from JBR 11 to JBR 15 (cherry picked from commits 46e4cdfcbd, 9cc5cbc99b)

cherry picked from commit 6769b27e53

(cherry picked from commit eccee72823)
2025-06-11 02:01:41 +02:00
Dmitry Batrak
a5c971bbb7 JBR-1689 Incorrect painting of long strings on linux
port from JBR 11 to JBR 15 (cherry picked from commits e12c1d6f0d, 0429e74e9d)

cherry picked from commit e43cfd198f

(cherry picked from commit 0b3c19d1c4)
2025-06-11 02:01:41 +02:00
Dmitry Batrak
48c4631e5b JBR-1248 Exception caused by broken font
port from JBR 11 to JBR 15 (cherry picked from commit 4efa7eab3e)

cherry picked from commit 6e1c514c6c

(cherry picked from commit 452fbf01a5)
2025-06-11 02:01:41 +02:00
Dmitry Batrak
66aba3fb54 JBR-1245 [JDK 11] There are different letter spacings in some controls
port from JBR 11 to JBR 15 (cherry picked from commit a26b70568a)

cherry picked from commit e2637199e9

(cherry picked from commit ca316d6bc0)
2025-06-11 02:01:41 +02:00
Dmitry Batrak
8815aef7d4 JRE-927 Unexpected wrapping of bidirectional text in JEditorPane on HiDPI screens
port commit 11a5a4a2 from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commit 65a5e450d5)

cherry picked from commit 47ff31ae82

(cherry picked from commit c4426e7ff2)
2025-06-11 02:01:41 +02:00
Dmitry Batrak
a63b1d69d4 JRE-774 Don't paste BOM from clipboard on Mac
port commit ea9b75b3 from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commit c6fed2cf58)

cherry picked from commit a5e25d1ef9

(cherry picked from commit a105a6e802)
2025-06-11 02:01:41 +02:00
Dmitry Batrak
bede7da571 JRE-847 Box drawing characters have different widths with Monospaced font on Windows
port commit 778cef18 from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commit 9caaac4a5a)

cherry picked from commit eea293f4a4

(cherry picked from commit 7b9b29493d)
2025-06-11 02:01:41 +02:00
Dmitry Batrak
f16ac5a525 JRE-748 Strange dots with fractional metrics turned on
port commit 82e7c82d from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commit e9bd5f5dad)

cherry picked from commit e0475e9ba2

(cherry picked from commit 714ba79a84)
2025-06-11 02:01:41 +02:00
Dmitry Batrak
4c825c6d11 JRE-593 Wrong italic font rendering for Source Code Pro
port commit 1f6bd200 from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commit 32ce109355)

cherry picked from commit 087ff34c2e

(cherry picked from commit 86fa2a9c9b)
2025-06-11 02:01:41 +02:00
Dmitry Batrak
9f8c6aad5a JRE-430 Font fallback sometimes doesn't work in Swing text components
port commit fc8003ad from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commit 5b814d6b34)

cherry picked from commits b871188f44, 0a9f16dc90, 9cc82c39d9

(cherry picked from commit df8821d745)
2025-06-11 02:01:41 +02:00
Alexey Ushakov
68b065ae58 JRE-303 2017.1.1 update breaks linux fonts
Corrected rendering hints for Non-AA text rendering

(cherry picked from commit b923aa7a0729a10ea47d3438622d659fbead44c9)
(cherry picked from commit b6bdd04e41)
(cherry picked from commit 8b12cf08ee)
2025-06-11 02:01:40 +02:00
Alexey Ushakov
7fa62359fa JRE-205 Font is wrong and without anti aliasing in 2017.1 EAP
Added property to disable bundled font config:
  java2d.font.loadFontConf=false
Do not load custom font.conf by default

Moved hints adjusting logic from code to bundled font.conf file
Applied correction only for regular fonts with platform sizes less than 12
Some fonts are not corrected at all: Consolas, Noto Sans Mono
Used family name instead of physical one in requests to Fontconfig
Removed redundant call to FcConfigBuildFonts
Added privileged access to the properties (JRE-235,JRE-235)

(cherry picked from commit 4d4c915047077ebd966b0e3be056566d56ba11a4)
(cherry picked from commit 9d6f325f72482405264852f3ee2636f5fedaeaf0)
(cherry picked from commit e7e3372bf8db539c0f6bc85db9f1093f8fa4c380)
(cherry picked from commit 3e724caed2f199be50d25d1ecb20b7819c86be2e)
(cherry picked from commit d372b35963c096a32331b05b257e26841ace5d94)
(cherry picked from commit 18a5f5de03eb107f89dca138a44b9aab2151235c)
(cherry picked from commit 9ba320efef0539f75aa93fd1b5dd80266c954d0a)
(cherry picked from commit b8c38f419972af61291953f7f452c1698f7a1624)
(cherry picked from commit debba0128e200be60adc9a339d5985590ef4e230)
(cherry picked from commit 2fa17b1bd7d6524e4b5fa4d0b3ce2bf02a8fcc78)
(cherry picked from commit 09b4f61db0d4f5beea0e16ce9136c99e2185c10b)
(cherry picked from commit 3b6782dd742f9c74a9535145db2f9f7ffaccf7c8)
(cherry picked from commit f1b68149528c13a22fa64468c130b1405bf3d081)
(cherry picked from commit db5cf5a2b9cb454630fb86783c2d58cd5446cba6)
(cherry picked from commit 32140948578bc3c2a0c5f8adb537660421efe5e7)
(cherry picked from commit b978e3d0b131ed642774c5a14a649e13f764c20b)

(cherry picked from commit c75c1ef8b2)

(cherry picked from commit a29f19e6a2)
(cherry picked from commit c38c46744f)
2025-06-11 02:01:40 +02:00
Dmitry Batrak
1c6fccaefa an option to disable native rendering for rotated text (following JRE-19)
port commit ccc1ded6 from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commit 72fb9ff7c4)

cherry picked from commit a5bd092449

(cherry picked from commit 52ebd26933)
2025-06-11 02:01:40 +02:00
Dmitry Batrak
7130323aaf JRE-11 Support text rendering via DirectWrite API on Windows
(cherry picked from commit 6605d4a525)
2025-06-11 02:01:40 +02:00
Dmitry Batrak
2d8e1d2f1b IDEA-150876 OpenJDK fonts for toolwindow names look worse than Oracles's
don't apply FreeType-returned glyph advance for rotated glyphs rendered by GDI

This seems to produce a better looking text (more evenly spaced). Fractional metrics won't be respected by this code, but we can address this later if needed.

port commits c9debd5e, ed78cd00, 4c7e1619, 7aa0429c, 7bd6c17c from JBR 9

port from JBR 11 to JBR 15 (cherry picked from commits d6b588bdab, dbc15fb84e)

cherry picked from commit 2c0d6150d0

(cherry picked from commit 12f2233f94)
2025-06-11 02:01:40 +02:00
Vitaly Provodin
4d397341a5 JRE-186 added regression test (Modal dialogs (Messages) shouldn't popup IDEA when another application is active)
(cherry picked from commit 236bd38d1b)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 45b52492a9)
2025-06-11 02:01:40 +02:00
Vitaly Provodin
07fed34200 JRE-269 added regression (JLabel doesn't scale <code>text</code> HTML fragments.)
(cherry picked from commit 1f4ad38d23)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit b2f584b10a)
2025-06-11 02:01:40 +02:00
Alexey Ushakov
6219054e29 JRE-307 Wrong dpi reported on Wayland
(cherry picked from commit 15693661cc)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit ae4c4c017d)
2025-06-11 02:01:40 +02:00
Vitaly Provodin
4533c39c87 JRE-392 added regression (Tip of the day is not hidden while another modal window is shown)
(cherry picked from commit c7b0ac686f)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit e8e81b7509)
2025-06-11 02:01:40 +02:00
Vitaly Provodin
a56cf8ac15 JRE-394 added regression test (System getenv doesn't return env var set in JNI code)
(cherry picked from commit 3a7b3c67b0)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 7439fd115a)
2025-06-11 02:01:40 +02:00
Vitaly Provodin
e5f1d1f4dc JRE-401 added regression test (AppCode freezes during autocomplete and other operations)
(cherry picked from commit cb4453b1d1)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit dde86b1e6c)
2025-06-11 02:01:40 +02:00
Vitaly Provodin
c8ddc02cb6 JRE-422 added new regression test (AWTView deliverJavaMouseEvent leaks jEvent)
(cherry picked from commit 37dc13c603)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit a5e094dd07)
2025-06-11 02:01:40 +02:00
Vitaly Provodin
ec9b8c6fb7 JRE-430 added new regression test (Font fallback sometimes doesn't work in Swing text components)
(cherry picked from commit d04debc847)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 5a47f2a66c)
2025-06-11 02:01:40 +02:00
Vitaly Provodin
f65b43a304 JRE-457 added new regression test (OGLTR_DisableGlyphModeState is slow)
(cherry picked from commit 3a43f4557f)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit f534b029e2)
2025-06-11 02:01:40 +02:00
Vitaly Provodin
bb5a1a874a JRE-458 added new regression test (Insufficient and inconsistent permissions on some files in Linux build)
(cherry picked from commit 82adbe9c25)
(cherry picked from commit 15998f29c1)
2025-06-11 02:01:40 +02:00
Vitaly Provodin
07cd08a28a JRE-467 added new regression test (Wrong rendering of variation sequences)
(cherry picked from commit 0026095202)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 1d0be02755)
2025-06-11 02:01:39 +02:00
Vitaly Provodin
1fa7d61e5b JRE-468 added new regression test (Idea freezes on project loading)
(cherry picked from commit 1ce8c3ce82)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 0200338c3c)
2025-06-11 02:01:39 +02:00
Vitaly Provodin
ff0f3ad79c JRE-501 added new regression test (Live resize is jerky for heavy java applications on Mac)
(cherry picked from commit c4a1277c1b)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 39bd5023d4)
2025-06-11 02:01:39 +02:00
Vitaly Provodin
8f4dd3ee6f JRE-638 added new regression test (enable unlimited cryptographic policy by default)
(cherry picked from commit 4a14c6f15a)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 4643b6a354)
2025-06-11 02:01:39 +02:00
Vitaly Provodin
daf9de4bd7 JRE-705 added new regression test (Z-order of child windows is broken on Mac OS)
(cherry picked from commit 82cd480619)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 84c0444389)
2025-06-11 02:01:39 +02:00
Vitaly Provodin
7ee6490d93 JRE-624 CThreading isAppKit() fails to detect main app thread if it was renamed
(cherry picked from commit c8f248a936)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 9aa93e5907)
2025-06-11 02:01:39 +02:00
Alexey Ushakov
5005994f06 IDEA-166173 IntelliJ freezes when returning from sleep
Fixed deadlock by removing unnecessary getScreenResolution call

(cherry picked from commit cec93cf1fd)
(cherry picked from commit 0d37ce45c8)
2025-06-11 02:01:39 +02:00
Alexey Ushakov
5f42640919 Added missing fontconfig defines
(cherry picked from commit 2ac273a456)
(cherry picked from commit d922d7dfaf)
2025-06-11 02:01:39 +02:00
Alexey Ushakov
bc0487caac JRE-43 Font.getFamily() does not work in headless mode
Removed unused code

(cherry picked from commit 5b523f049e)
(cherry picked from commit 3535055ecd)
2025-06-11 02:01:39 +02:00
Alexey Ushakov
e983465b43 JRE-43 Font.getFamily() does not work in headless mode
Bundled Droid fonts to fallback in headless mode

(cherry picked from commit 5b523f049e)
(cherry picked from commit b65e0d7cb7)
2025-06-11 02:01:39 +02:00
Alexey Ushakov
54a23de675 JRE-15 Greyscale text is too dark comparing with subpixel AA
Adjusted default value for greyscale text rendering in freetype

(cherry picked from commit f80497c4f0)
(cherry picked from commit 67e3b05916)
2025-06-11 02:01:39 +02:00
Alexey Ushakov
eb21c750de IDEA-155347 On Ubuntu with High DPI tooltip font is too thick when the tooltip is fading in and out
Handled missing FC_RGBA_NONE value

(cherry picked from commit 44fcbdabf8)
(cherry picked from commit a9ca78b413)
2025-06-11 02:01:39 +02:00
Alexey Ushakov
4679c4f012 IDEA-149882 Issue with fonts in Ubuntu 12.04
Provided fallback to default font rendering settings if libfontconfig unable to
match font pattern

(cherry picked from commit d93a5f1598)
(cherry picked from commit ebaea7e146)
2025-06-11 02:01:39 +02:00
Alexey Ushakov
8790e6e1fe IDEA-151619 CLion EAP fails to start with missing symbol: FT_Library_setLcdFilter
Skip FT_Library_setLcdFilter call if the symbol is not there
Cache negative FT_Library_setLcdFilter symbol lookup result
Used RTLD_DEFAULT handler for process symbols lookup

(cherry picked from commit e6f0055704)
(cherry picked from commit dfbc7d7cc2)
2025-06-11 02:01:39 +02:00
Alexey Ushakov
e717dcb4a5 JRE-29 fontconfig lib crashes CLion on OSX
Disabled fontconfig usage on OSX

(cherry picked from commit 431e14429c)
(cherry picked from commit 534d184416)
2025-06-11 02:01:38 +02:00
Vitaly Provodin
cd0ee9dfef exclude tests spontaneously creating windows during test execution
(cherry picked from commit bd278194b9)
2025-06-11 02:01:38 +02:00
Alexey Ushakov
d980cf2411 JRE-48 built-in jre renders fonts abnormally heavier (normal text looks bold) than the oracle jre
Disable FT_LOAD_TARGET_LIGHT for fonts with FC_AUTOHINT=false (this target implicitly enables  FC_AUTOHINT)
Reused setupLoadRenderFlags for all rendering cases

(cherry picked from commit f3f2667a4c)
(cherry picked from commit e5a81a300f)
2025-06-11 02:01:38 +02:00
Alexey Ushakov
aa9d972eac Added logging for freetypeScaler via env variable OPENJDK_LOG_FFS=yes
and for screen resolution in freetypeScaler

(cherry picked from commit 091d74a791)
(cherry picked from commit 7243173610)
2025-06-11 02:01:38 +02:00
Alexey Ushakov
a6f913cf04 JRE-34 IDE Crashes During Startup
Added validation of dpi settings coming from xserver

(cherry picked from commit b1c49c3b27)
(cherry picked from commit 3e57837094)
2025-06-11 02:01:38 +02:00
Anton Tarasov
2ea5a7f23a JBR-2031 [mac] jcef deadlocks with a11y on start
(cherry picked from commit 4f44b37f08)
(cherry picked from commit 8a4a781393)
2025-06-11 02:01:38 +02:00
Alexey Ushakov
80efa8fe6d JRE-1083 [JDK11] Test com/sun/java/accessibility/util/8051626/Bug8051626.java fails on macOS on JB JDK11b
Wrapped SelectorPerformer invocation into privileged action

(cherry picked from commit 48e7b547ae)
(cherry picked from commit e420b10a4a)
2025-06-11 02:01:38 +02:00
Anton Tarasov
31f23bc41a JBR-2019 provide getWindowHandle method for jcef
(cherry picked from commit 7ae706b629)
(cherry picked from commit d0b855df14)
2025-06-11 02:01:38 +02:00
Anton Tarasov
dc8e2c6702 JBR-1976 [jcef] need mouse-transparent window on Windows
(cherry picked from commit b60fac96b4)
(cherry picked from commit e68503823b)
2025-06-11 02:01:38 +02:00
Anton Tarasov
fb4f30fefc JBR-1824 export NSWindow::setIgnoresMouseEvents to java internal API
(cherry picked from commit 4399dc382c)
(cherry picked from commit 99d8964d90)
2025-06-11 02:01:38 +02:00
Anton Tarasov
a11bae4f2f JBR-1802 com/sun/java/accessibility/util/8051626/Bug8051626.java: access denied ("java.lang.RuntimePermission" "getClassLoader")
(cherry picked from commit eae772aca9)
(cherry picked from commit d944e5907a)
2025-06-11 02:01:38 +02:00
Anton Tarasov
a70de7b34a JBR-1795 Project opened from Welcome screen goes to backgound after loading
(cherry picked from commit 322526458a)
(cherry picked from commit 2ee33311dd)
2025-06-11 02:01:38 +02:00
Anton Tarasov
3281313645 JBR-1609 Jupyter Notebook eventually causes IDEA to become unresponsive on Mac OSX
(cherry picked from commit 8ae0be8eb6)
(cherry picked from commit 812158fb5b)
2025-06-11 02:01:38 +02:00
Anton Tarasov
b33fd53c95 JBR-1786 Weird white border for IDE window
(cherry picked from commit 4b09614a0e)
(cherry picked from commit 8366197c01)
2025-06-11 02:01:38 +02:00
Vyacheslav Moklev
b2200a5605 JBR-1552 Invalid screen bounds in full screen mode
Check is window is not in undecorated state

(cherry picked from commit 5547701e2c)
(cherry picked from commit d5fa62913e)
2025-06-11 02:01:38 +02:00
Vyacheslav Moklev
98969fddc1 JBR-1509 Client area size is wrong in Borderless mode
Fix client area size

(cherry picked from commit 00d32e58dc)
(cherry picked from commit f78449b302)
2025-06-11 02:01:37 +02:00
Anton Tarasov
481538ea5a JBR-1770 [windows] frame does not open as maximized
(cherry picked from commit d9dfc3c6c5)
(cherry picked from commit 7525d41946)
2025-06-11 02:01:37 +02:00
Anton Tarasov
d4e70efe88 JBR-1693 difficult to input Japanese text with "Fast" Key Repeat
(cherry picked from commit 12de3e287e)
(cherry picked from commit bfa95fd66e)
2025-06-11 02:01:37 +02:00
Anton Tarasov
545ae69979 JBR-1669 IDE-managed HiDPI mode is broken
(cherry picked from commit 461b0b5cd4)
(cherry picked from commit 3049d42f8c)
2025-06-11 02:01:37 +02:00
Anton Tarasov
a5e6d9d177 JBR-1650 propagate custom decoration title bar height to native
(cherry picked from commit f6fc65d014)
(cherry picked from commit 34032b2ced)
2025-06-11 02:01:37 +02:00
Anton Tarasov
cfdb476d49 JBR-1629 Maximized window cut at the right and bottom
(cherry picked from commit 9e768377db)
(cherry picked from commit 0532e6c2aa)
2025-06-11 02:01:37 +02:00
Anton Tarasov
151a675528 JBR-1492 Not able to start Intellij Idea 2017.2.5 with modified vmoptions
(cherry picked from commit e7ca6db66b)
(cherry picked from commit 88694a6148)
2025-06-11 02:01:37 +02:00
Anton Tarasov
f1b102803a JBR-1427 pycharm jupyter preview stuck and no response when click on preview.
(cherry picked from commit 1746b04686)
(cherry picked from commit 3c3c2ffa90)
2025-06-11 02:01:37 +02:00
Anton Tarasov
a48ff100e3 IDEA-210154 Borderless UI: Top frame of IDEA window is blue
(cherry picked from commit 2dd4163bc4)
(cherry picked from commit 2f4e023df0)
2025-06-11 02:01:37 +02:00
Anton Tarasov
b5c9d4a8fa JBR-1351 Borderless UI: Bold frame around IDEA window appears on non-HiDPI display
(cherry picked from commit 06d35de069)
(cherry picked from commit 0bfcc28a7a)
2025-06-11 02:01:37 +02:00
Anton Tarasov
48977c1031 JBR-1313 wrong insets for non-resizable custom-decorated frame
(cherry picked from commit 9179718cb6)
(cherry picked from commit 05f934ea20)
2025-06-11 02:01:37 +02:00
Anton Tarasov
2ee83b2e71 JBR-1293 do not modify client bounds when custom-decorated frame is set undecorated
(cherry picked from commit cb188edaab)
(cherry picked from commit 2cecea407d)
2025-06-11 02:01:37 +02:00
Anton Tarasov
787503bc57 JBR-1278 allow native border and shadow for custom decoration mode
(cherry picked from commit ec106a58a3)
2025-06-11 02:01:37 +02:00
Anton Tarasov
3b0411f0fe JRE-1232 forwardport: JRE-1228 support custom frame decoration
(cherry picked from commit d2820524a1)
(cherry picked from commit 1ebd6a000b)
2025-06-11 02:01:37 +02:00
Anton Tarasov
a7e9cf797f JRE-1162 [jdk11] support on-the-fly DPI change on linux
(cherry picked from commit c06c4c69d3)
(cherry picked from commit 5138201282)
2025-06-11 02:01:37 +02:00
Anton Tarasov
e79233d580 JRE-1142 [jdk11] hidpi is not detected since Ubuntu 18.04
(cherry picked from commit be4f8c0d9d)
(cherry picked from commit 96b07c6c65)
2025-06-11 02:01:36 +02:00
Anton Tarasov
1d06958b3e JRE-1111 [JDK11] java/beans/Beans/TypoInBeanDescription.java crashes at libawt_xawt.so+0x4a30d
(cherry picked from commit b89e6aed0b)
(cherry picked from commit 924b6a8bb7)
2025-06-11 02:01:36 +02:00
Anton Tarasov
6319d11e39 fix JNI_OnUnload definition
(cherry picked from the commit  3571e39071)

(cherry picked from commit 1019d8f0f2)
(cherry picked from commit 4fae6cb785)
2025-06-11 02:01:36 +02:00
Anton Tarasov
cf8824967d JRE-981 IM workaround does not work anymore
forward port of 2d7c29b in JetBrains/jdk8u_jdk

(cherry picked from commit f3ccc53e02)
(cherry picked from commit 362eaede04)
2025-06-11 02:01:36 +02:00
Anton Tarasov
d2b36f1cd4 JRE-938 [windows] Frame.setMaximizedBounds not hidpi-aware
(cherry picked from commit cc97899923320e1fa17f5e44975c4a0f0ba51014)
(cherry picked from commit ccfe65be7f)
(cherry picked from commit b86054beb6)
2025-06-11 02:01:36 +02:00
Anton Tarasov
c68d28592b JRE-907 macOS: add ability to check for scaled display mode
(cherry picked from commit e496262aa1)
(cherry picked from commit e07eaabe47)
2025-06-11 02:01:36 +02:00
Anton Tarasov
70248f94cd JRE-934 Diff viewer errors are not visible on HiDPI Linux
(cherry picked from commit 641a09dd52)
(cherry picked from commit c37bfae963)
2025-06-11 02:01:36 +02:00
Anton Tarasov
afd7e30030 [jdk9] HiDPI scale is not detected on some linux desktops
(cherry picked from commit 9279d80110)
(cherry picked from commit 57f7da037b)
2025-06-11 02:01:36 +02:00
Anton Tarasov
96f0f30755 JRE-681 [windows] direct drawing into frame graphics may have wrong translate
(cherry picked from commit 6ea1d45fd1)
(cherry picked from commit 60bb53f919)
2025-06-11 02:01:36 +02:00
Anton Tarasov
b573112d5d Read org.gnome.desktop.interface/scaling-factor
(cherry picked from commit 277357ae73)
(cherry picked from commit d4f290861b)
2025-06-11 02:01:36 +02:00
Anton Tarasov
78e8435bc4 Revert "8239894: Xserver crashes when the wrong high refresh rate is used"
This code is needed for "Read org.gnome.desktop.interface/scaling-factor".
Keep it until "JDK-8260270 Implement the HiDPI scale factor reading" is fixed.

This reverts commit a7c2ebc7

(cherry picked from commit a249b989e1)
2025-06-11 02:01:36 +02:00
Anton Tarasov
98ade1474f Do not scale base font in HiDPI mode on Linux
(cherry picked from commit 6fb2c36529)
(cherry picked from commit b2e47f1be3)
2025-06-11 02:01:36 +02:00
Anton Tarasov
c0d11cfda5 JRE-772 swing returns incorrect FRC when AA is off
(cherry picked from commit a161897d908aa10da6306c06452c5d6317fed2f0)
(cherry picked from commit 2bf5a7ca5c)
(cherry picked from commit 2caa4e3c14)
2025-06-11 02:01:36 +02:00
Anton Tarasov
fb3687813d JRE-681 [windows] direct drawing into frame graphics may have wrong translate
(cherry picked from commit ab6dee4c1fc453ad3cb5adb69fc243e550d184ae)

(cherry picked from commit 6ea1d45fd1)
(cherry picked from commit 556d3c5905)
2025-06-11 02:01:36 +02:00
Anton Tarasov
c89764a118 JRE-665 Navigate Class/File/Symbol, Find in Path popup windows don't pick characters from input method
(cherry picked from commit 676f305b2b3b278e305bd4d9bde4269f27b3d676)
(cherry picked from commit 6ce31e0a32)
(cherry picked from commit b327688b89)
2025-06-11 02:01:35 +02:00
Anton Tarasov
e6aa6e3eb7 JRE-616 [linux] notify when dpi correction factor is applied to fonts
(cherry picked from commit f57d41f3118bfd773c99ce32d58cfae16931be6a)
(cherry picked from commit 6246abc72f)
(cherry picked from commit 717349c595)
2025-06-11 02:01:35 +02:00
Anton Tarasov
7445156147 JRE-612 [windows] icon in frame title is not dpi-aware
(cherry picked from commit dec04385177a2abb677add909d3b94f94c62a14e)

(cherry picked from commit 38466cbab0)
(cherry picked from commit 81662b38f5)
2025-06-11 02:01:35 +02:00
Anton Tarasov
44e087c58b JRE-604 [fps] frame's client area is one pixel beneath frame's borders
Adopted.

(cherry picked from commit ef2870ee38)
(cherry picked from commit 021c8d8b7b)
2025-06-11 02:01:35 +02:00
Anton Tarasov
52f2097b96 JRE-596 [windows] popup positioning is broken with JRE-573
Adopted: moved to AwtWindow::Reshape

(cherry picked from commit c5cc28d85d)
(cherry picked from commit 496c7d90d2)
2025-06-11 02:01:35 +02:00
Anton Tarasov
a6db2fd577 JRE-577 Goland 18 displays out of memory
(cherry picked from commit 2daaf21e420d4af15d3b1bfeb3f896074bea1e61)

(cherry picked from commit 9ea2011948)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit b6b83ff41f)
2025-06-11 02:01:35 +02:00
Anton Tarasov
bd74ceb930 JRE-573 [windows] window client area bounds mismatch
Apply only WmEraseBkgnd

(cherry picked from commit afa68f7ad6440303c6417be3f675b1c4644b6014)

(cherry picked from commit 0651b45e13)
(cherry picked from commit cfeb8ba435)
2025-06-11 02:01:35 +02:00
Anton Tarasov
a0c12e4748 JRE-382 Three AWT-tests become hanging starting since master-875
(cherry picked from commit 7d492101db8fcbb3d285fd8e9669f74b0e0fce8f)
(cherry picked from commit b965f85c1b)
(cherry picked from commit 5b61c2f72a)
2025-06-11 02:01:35 +02:00
Anton Tarasov
572f751163 JRE-373 [macos] nativeCreateNSWindow deadlocks with a11y
(cherry picked from commit 72c77a992bbf1b95b82ffc08cb2f4f3bc36b3657)

(cherry picked from commit aa09fa2c85)
(cherry picked from commit 9b32557ad4)
2025-06-11 02:01:35 +02:00
Anton Tarasov
1c9bf23a52 IDEA-172422 Popup at the wrong place on the second monitor (new hidpi)
Adopted: moved to AwtWindow::Reshape

(cherry picked from commit 11a0911d65)
(cherry picked from commit 4c8e3a54b3)
2025-06-11 02:01:35 +02:00
Anton Tarasov
fdb4813fd5 JRE-309 [windows] on-screen position of a component is not pixel-perfect in user space in JRE-HiDPI mode
Adopted: moved to AwtWindow::Reshape

(cherry picked from commit 985908cf10)
(cherry picked from commit f9ff12884e)
2025-06-11 02:01:35 +02:00
Anton Tarasov
650064a728 JRE-269 JLabel doesn't scale <code>text</code> HTML fragments.
(cherry picked from commit 9ef72b6c3a477e4225f9b98e30fa9190613520e4)
(cherry picked from commit c17bc728ee)
(cherry picked from commit 99735071ff)
2025-06-11 02:01:35 +02:00
Anton Tarasov
f3cbc24eb7 JRE-225 [macos] IDEA hangs on attempt to call getDefaultScreenDevice() from EDT
(cherry picked from commit 76aba25)

(cherry picked from commit df11dcc97bb5556ac5d0299b773a512b4f0bb5bb)
(cherry picked from commit aeea6c1ca3)
(cherry picked from commit 3fbb520b07)
2025-06-11 02:01:35 +02:00
Anton Tarasov
f3ae784a13 JRE-210 JEditorPane may return wrong preferred size as it moves b/w monitors of different scale
(cherry picked from commit 6c3087e6bda32ae9b095e069d8bea614502f5c03)
(cherry picked from commit adb3a4be16)

with fix for JBR-5300 Change source code and test files to use GPL license

(cherry picked from commit 5b987c7a94)
2025-06-11 02:01:35 +02:00
Anton Tarasov
697529ae0a JRE-119 [suppress updateGC() for WFileDialogPeer/WPrintDialogPeer]
updateGC() is called from WWindowPeer.<init> though it's not applicable to the named dialogs
as they don't have native AwtWindow peer required for the method.

(cherry picked from commit 72ed9f653177e273b811cfe70c2dba102a8636e4)
(cherry picked from commit cec49aaa38)
(cherry picked from commit a279dd9e1c)
2025-06-11 02:01:35 +02:00
Anton Tarasov
68b709034e JRE-119 [Dynamically set DPI-awareness level to enable backward compatible HiDPI behavior]
Adopted: rely on java.manifest

(cherry picked from commit d00cfa4dc62a14a4cf89df9d4c4899970c9fc9e8)

Adopted

(cherry picked from commit 60be76b725)
(cherry picked from commit 8ec82c766b)
2025-06-11 02:01:34 +02:00
Anton Tarasov
8ef2cd372d JRE-119 [ask if ui scale is enabled natively]
(cherry picked from commit 801f45875fd8699edcbda5896210cec191062261)
(cherry picked from commit 20edebdefa)
(cherry picked from commit 9ac3479114)
2025-06-11 02:01:34 +02:00
Anton Tarasov
2325612e9c IDEA-153474 let JDK detect Xft.dpi value on non-GTK Linux DEs
Use the GTK method:

https://developer.gnome.org/gobject/stable/gobject-The-Base-Object-Type.html#g-object-get

to retrieve "gtk-xft-dpi" integer property of the X settings.

Add the property to JDK's GtkEngine & gtk2-interface.
Then read the property via GtkEngine from GTK LaF when "gnome.Xft/dpi" is undefined. It's assumed GTK LaF is forcedly installed.

(cherry picked from commit e05fc391ae0a3cc389e836441f882c0cf6ab3b99)
(cherry picked from commit fd615a5b45)
(cherry picked from commit adc80251ad)
2025-06-11 02:01:34 +02:00
Anton Tarasov
7c3894dc2a IDEA-148854: AppCode crashes randomly every 15 mins or so
(cherry picked from commit 02f9a5fbb4924ff67c8a04c15e490acfcc750003)
(cherry picked from commit b8f4b4a9ed)
(cherry picked from commit b3961bee9d)
2025-06-11 02:01:34 +02:00
Vitaly Provodin
337ed98c1e updated JTreg exclude list
(cherry picked from commit 418fb32e7f)
2025-06-11 02:01:34 +02:00
Alexey Ushakov
f328ceed62 IDEA-57233, IDEA-152816, IDEA-152454 Editor font antialising/appearance problems on Linux
Used desktop DPI instead of hard-coded 72
Compensated increased glyph bitmap size by adjusting font size
Added LCD filter for sub-pixel rendering
Use fontconfig library to provide right rendering options for fonts
Corrected sizes passed to fontconfig library and hinting disabling policy
Added logging and versioned fontconfig lib loading
Resolved font rendering problem in lenses
fix text rendering issues (text cutoff and incorrect rendering in editor fragment components)
FcMatchFont-type pattern substitutions shouldn't be invoked before specific font is selected - it can apply unrelated rules
port commit e21cd635 from JBR 9
partially rollback JBR-363 fix, to apply corresponding change from OpenJDK 12

(cherry picked from commit 5d704a963b)
(cherry picked from commit 3d7ac30072)
(cherry picked from commit 0456745afb)
(cherry picked from commit 3d7ac30072)
(cherry picked from commit 4c8351fecf)
(cherry picked from commit 5faebc73d5)
(cherry picked from commit d1ed8ab118)
(cherry picked from commit 20487c7515)
2025-06-11 02:01:34 +02:00
Vitaly Provodin
22795d7c9b JBR-3398 remove the Experimental AOT and JIT Compiler (JEP 410)
(cherry picked from commit df63a5e6ad)
2025-06-11 02:01:34 +02:00
Alexey Ushakov
53d620f1cf JBR-2807: JDK15: update modules.list to resolve jbr build failure
removed nashorn modules

(cherry picked from commit c56a18eaf9)
2025-06-11 02:01:34 +02:00
Vitaly Provodin
4dd3282bfd JBR-2130 remove module jdk.pack
(cherry picked from commit 9acab72161)
2025-06-11 02:01:34 +02:00
Vitaly Provodin
8844e58629 JBR-4810 add VERSION_PATCH into version number string
(cherry picked from commit 401a12b6b9)
2025-06-11 02:01:34 +02:00
Vitaly Provodin
bff10c74a8 JBR-4754 make root directory with the same name as archive name
(cherry picked from commit 97a17c9a36)
2025-06-11 02:01:34 +02:00
Nikita Provotorov
226baf0929 JBR-2074 Windows 10 AArch64 support: make the build scripts use custom build-jdk.
(cherry picked from commit 3d9869c702)
2025-06-11 02:01:34 +02:00
Nikita Provotorov
3873946d45 JBR-2074 Windows 10 AArch64 support: build fixes.
(cherry picked from commit a873008261)
2025-06-11 02:01:34 +02:00
Vitaly Provodin
91e2294a56 JBR-4567 replace comma with point in RenderPerf scores
(cherry picked from commit 5b91efd8c0)
2025-06-11 02:01:34 +02:00
Vitaly Provodin
97a8efcdad JBR-4520 set file permissions after signing
(cherry picked from commit 64259b866c)
2025-06-11 02:01:34 +02:00
Vitaly Provodin
7324bda0d4 JBR-4512 windows: include pdb-files into jbrsdk
(cherry picked from commit 606ad057d3)
2025-06-11 02:01:33 +02:00
Vitaly Provodin
36948ea038 JBR-4087 add version info into the name of root directory in JBR tar.gz-distributions
(cherry picked from commit 45eeae64ee)
2025-06-11 02:01:33 +02:00
Vitaly Provodin
f399252683 JBR-4511 remove --disable options from configure mac-aarch64 builds & unify configure for x64 and aarch64
(cherry picked from commit b387b2213e)
2025-06-11 02:01:33 +02:00
Maxim Kartashev
e71d454f0c JBR-4064 Windows: update build scripts to produce more deterministic output
Passed the configure script options necessary to enable reproducible builds
on Windows. With this options, the resulting jars are reproducible, but
native executables and libraries aren't.

(cherry picked from commit c1da1fa0d6)
2025-06-11 02:01:33 +02:00
Vladislav Rassokhin
61ce61982a JBR-4451 Make bash scripts safer
(cherry picked from commit 4f048b9790)
2025-06-11 02:01:33 +02:00
Vitaly Provodin
fa862e5da4 JBR-4487 enable Linux 32 builds
(cherry picked from commit 38dbda93d0)
2025-06-11 02:01:33 +02:00
Vitaly Provodin
208bbae0af JBR-4458 enable JBR17 windows 32 bit builds
(cherry picked from commit d3e65953e7)
2025-06-11 02:01:33 +02:00
Vitaly Provodin
4ce1f70706 JBR-4272 generate and save debug symbols for JBR on macos/linux
(cherry picked from commit ef34e66dbf)
2025-06-11 02:01:33 +02:00
Vitaly Provodin
6dc4a67318 JBR-4053 integrate DCEVM patches as usual commits
(cherry picked from commit 45672abcad)
2025-06-11 02:01:33 +02:00
Vitaly Provodin
1f5b5ae8ad JBR-4370 create a test checking all JBR artifacts exist - add exit code
(cherry picked from commit 4dce25a5db)
2025-06-11 02:01:33 +02:00
Nikita Provotorov
933f1b9700 JBR-2074 Windows 10 AArch64 support: add build and pack scripts.
(cherry picked from commit e33c77a615)
2025-06-11 02:01:33 +02:00
Vladimir Kempik
4a34bd189a JBR-4452: Update crash report message with JBR youtrack link
instead of bugreport.java.com

(cherry picked from commit c52914a035)
2025-06-11 02:01:33 +02:00
Vitaly Provodin
56ba3d3aa7 JBR-4437 add sources to JBRSDK distributions for Windows and Linux
(cherry picked from commit 0399594195)
2025-06-11 02:01:33 +02:00
Vitaly Provodin
3ff169101a JBR-4437 add sources to JBRSDK distributions
(cherry picked from commit a13a015597)
2025-06-11 02:01:33 +02:00
Anton Tarasov
d872cb89d8 JBR-3906 JBR for Linux aarch64 with JCEF is missing, is there any support plan?
(cherry picked from commit d47bc61b0e)
2025-06-11 02:01:33 +02:00
Vitaly Provodin
247a7c80ff JBR-4188 add script comparing performance results
add exec permissions && fix misprint in checking if headers exist

move the script comparing performance results from jdk8u_test

(cherry picked from commit 924e7baadd)
2025-06-11 02:01:32 +02:00
Vladimir Kempik
08d14b61c1 JBR-4283: Provide native JBR builds for alpine Linux-aarch64
(cherry picked from commit 925f02d3c5)
2025-06-11 02:01:32 +02:00
Vladimir Kempik
404d5b4bd9 JBR-4242:Provide native JBR builds for alpine Linux
(cherry picked from commit c62e05e7ac)
2025-06-11 02:01:32 +02:00
Maxim Kartashev
a462080b5d JBR-3917 Problem using windows certificate store (trustStoreType=Windows-ROOT not recognized)
(cherry picked from commit 65abc7b029)
2025-06-11 02:01:32 +02:00
Maxim Kartashev
ea17085a25 JBR-4145 Make builds independent from build directory
Supplied the --disable-absolute-path-in-output option to the configure script
when building JBR.

(cherry picked from commit 5aa22bb901)
2025-06-11 02:01:32 +02:00
Vitaly Provodin
7f52558949 JBR-4154 extract version info from sources & JBR-4099 make test-image on jbrsdk_jcef step
(cherry picked from commit f22a76949b)
2025-06-11 02:01:32 +02:00
Vitaly Provodin
67eccb1227 JBR-4067 fix misprint with applying obsolete exclude_jcef_module.patch
(cherry picked from commit 106349f0fe)
2025-06-11 02:01:32 +02:00
Vitaly Provodin
5ccf8ea05b JBR-3756 remove JNF from mac-aarch64 binaries
(cherry picked from commit 011d461c99)
2025-06-11 02:01:32 +02:00
Vitaly Provodin
71703419f5 JBR-4082 create JBR & JBRSDK installer packages
(cherry picked from commit a2e1fe0fa4)
2025-06-11 02:01:32 +02:00
Maxim Kartashev
0a10acfbdc JBR-4061 Specify build user for the build
(cherry picked from commit 66713adb61)
2025-06-11 02:01:32 +02:00
Maxim Kartashev
628535a4a5 JBR-4063 macOS: update build scripts to produce more deterministic output
Make mkimages.sh produce more deterministic .tar.gz archives on MacOS.
NB: build notarization is not in the scope of this change.

(cherry picked from commit e1a1b6814d)
(cherry picked from commit 43f7ebddec)
2025-06-11 02:01:32 +02:00
Maxim Kartashev
ffbdf78d81 JBR-4033 Linux: update build scripts to produce more deterministic output
This commits achieves almost the same build output with the same build
input on Linux. Exceptions are:
- class files timestamps differ in jrt-fs.jar (for all output),
- class files timestamps differ in all the jmod files (for
  jbrsdk...tar.gz).
NB: jbrsdk...test...tar.gz does not need to be deterministic.

This was achieved mainly by
- setting several environment variables (SOURCE_DATE_EPOCH, TZ),
- providing the necessary options to the configure script,
- setting the timestamp of all files that make up the resulting
  archive to SORUCE_DATE_EPOCH and normalizing the list of said
  files before archiving.

(cherry picked from commit ffded82734)
(cherry picked from commit 38ec30a58d)
2025-06-11 02:01:32 +02:00
Maxim Kartashev
f9f856ec8e JBR-4059 Create Dockerfile for building on AArch64 Linux
(cherry picked from commit 249614a30b)
2025-06-11 02:01:32 +02:00
Vitaly Provodin
700b793e8a JBR-3905 add incremental JBR building
(cherry picked from commit 54f28cde44)
2025-06-11 02:01:32 +02:00
Vitaly Provodin
0475fbc43b JBR-3904 fix the image directory name of macos builds
(cherry picked from commit cf13b7c46e)
2025-06-11 02:01:32 +02:00
Vitaly Provodin
f3f01f1d71 configure BOOT_JDK to use JDK 17
(cherry picked from commit d815b82649)
2025-06-11 02:01:31 +02:00
Anton Tarasov
db5740b3af JBR-3655 jbr-dev build fails to find jcef modules on Windows
(cherry picked from commit f63fd1c8ec)
2025-06-11 02:01:31 +02:00
Maxim Kartashev
0b51e3e1db JBR-3645 Tool to support keeping JBR in sync with OpenJDK
(cherry picked from commit 21c43f48cf)
2025-06-11 02:01:31 +02:00
Vitaly Provodin
0740df84ec JBR-3639 add jbrsdk tarballs for dcevm, jcef builds
(cherry picked from commit 0117d49591)
2025-06-11 02:01:31 +02:00
Anton Tarasov
588a7a4e6b JBR-3627 include jmods in jbrsdk bundle for jbr-dev
(cherry picked from commit f54c836685)
2025-06-11 02:01:31 +02:00
Vitaly.Provodin
46ae892294 add dockerfile for x86
(cherry picked from commit 8fb2341ea8)
(cherry picked from commit cfbafa6c73)
2025-06-11 02:01:31 +02:00
Vitaly Provodin
232dabe4de JBR-1505 add jdk.jcmd module into JBR
(cherry picked from commit c40b9c8b9e)
(cherry picked from commit 5362ff99a2)
2025-06-11 02:01:31 +02:00
Vitaly Provodin
ca65d666dc JBR-2957 notarize JBR and JBRSDK as APPL
(cherry picked from commit 0e7f9ce4ca)
(cherry picked from commit 3f4aee8c63)
2025-06-11 02:01:31 +02:00
Vitaly Provodin
7f1ba07ffc JBR-667 add shenandoahgc feature
(cherry picked from commit e15dad04)
(cherry picked from commit 0845bb7308)
2025-06-11 02:01:31 +02:00
Vitaly Provodin
9576ae6f5e configure BOOT_JDK to use JDK 16
(cherry picked from commit 3e34330003)
2025-06-11 02:01:31 +02:00
Anton Tarasov
1c88fe5928 Add build.gradle
(cherry picked from commit 9d01f893b6)
2025-06-11 02:01:31 +02:00
Vitaly Provodin
7986cab352 JBR-3401 enable macos-aarhc64 builds
(cherry picked from commit d2c40f66f8)
2025-06-11 02:01:31 +02:00
Vitaly Provodin
3f9fa09590 JBR-3305 remove the option --disable-warnings-as-errors from configure
(cherry picked from commit 301fcb2df1)
2025-06-11 02:01:31 +02:00
Vitaly Provodin
f24aebf5d9 JBR-2922 add JCEF to jbrsdk binaries
& fix a misprint in get_mods_list

JBR-2922 add JCEF to jbrsdk binaries

& fix a misprint in get_mods_list

(cherry picked from commit 6fa3e775ab)
2025-06-11 02:01:31 +02:00
Vitaly Provodin
af60ec4727 JBR-2912 add JBR 15 builds with DCEVM
(cherry picked from commit 95416c501a)
2025-06-11 02:01:31 +02:00
Vitaly Provodin
e111f552fe JBR-2864 initial commit of DCEVM patches reworked for 15
(cherry picked from commit a592f63537)
2025-06-11 02:01:30 +02:00
Vitaly Provodin
19d0d6fa83 JBR-2812 remove --with-import-modules from configure for aarch64
(cherry picked from commit 49fa98391a)
2025-06-11 02:01:30 +02:00
Anton Tarasov
42eed15d13 JBR-2812 bundle jcef in jmod format instead of modular-sdk
Build test-image with non-jcef build target

(cherry picked from commit 9edee0e476)
2025-06-11 02:01:30 +02:00
Vitaly Provodin
c5fbe2d20d JBR-2787 fix copying jcef files into jbr/jbrsdk binaries
(cherry picked from commit a4269d0907)
2025-06-11 02:01:30 +02:00
Vitaly Provodin
a8cb96c940 JBR-2758 refactor building scripts to apply patches adding required modules instead of excluding
Add jogl and gluegen modules to support jcef osr mode

(cherry picked from commit e2cf692ec5)
2025-06-11 02:01:30 +02:00
Anton Tarasov
1440c3aa3d JBR-2016 add jcef module and export packages to it
(cherry picked from commit cf997f71c6)
(cherry picked from commit cad125e01d)
2025-06-11 02:01:30 +02:00
Vitaly Provodin
2d1ac2f876 JBR-2473 modify building scripts to add dcevm clauses, add git config to docker image
(cherry picked from commit 2620c62848)
(cherry picked from commit d9797240fc)
2025-06-11 02:01:30 +02:00
Vitaly Provodin
3347501c5a JBR-2395 eliminate JavaFX from JBR
(cherry picked from commit cd7e539561)
2025-06-11 02:01:30 +02:00
Vitaly Provodin
35ee9de270 JBR-2409 fix prameters for configure
(cherry picked from commit f309357fba)
2025-06-11 02:01:30 +02:00
Vitaly Provodin
13b7cc85aa JDK14: exclude dependencies on jcef in x86, fastdebug builds
(cherry picked from commit 14e98eaf94)
2025-06-11 02:01:30 +02:00
Vitaly Provodin
5a8cdb247a JBR-2396 fix CONF names
(cherry picked from commit 34cd854326)
2025-06-11 02:01:30 +02:00
Vitaly Provodin
8de9fcfff7 JBR-2394 replace --disable-debug-symbols with --with-native-debug-symbols=none
(cherry picked from commit 79ff0cb7b3)
2025-06-11 02:01:30 +02:00
Vitaly Provodin
ec83bfac20 add exec permitions to configure
(cherry picked from commit bf2e441e09)
2025-06-11 02:01:30 +02:00
Vitaly Provodin
0fa9e94c6e split checkout before building JBR+JFX or JBR+JCEF on two separate commands
(cherry picked from commit b7030bae8e)
2025-06-11 02:01:30 +02:00
Vitaly Provodin
00ad2b6792 change BOOT_JDK, fix target names
(cherry picked from commit 6a778fa6ea)
2025-06-11 02:01:30 +02:00
Vitaly Provodin
d1681cec61 JBR-2291 add vendor info into bundles
(cherry picked from commit 026fcaaf2b)
2025-06-11 02:01:29 +02:00
Vitaly Provodin
b94950806f JBR-2324 address new layout in mac jcef 80.0.4+g74f7b0c+chromium-80.0.3987.122
(cherry picked from commit 6f45378ed9)
2025-06-11 02:01:29 +02:00
Vitaly Provodin
ddc52a4450 JBR-2320 add jdk.attach module into JBR
(cherry picked from commit a1884561bd)
2025-06-11 02:01:29 +02:00
Vitaly Provodin
f483c20873 JBR-2217 provide JCEF-only (no JavaFX) bundle for master/202 branches
(cherry picked from commit d5fef466f4)
2025-06-11 02:01:29 +02:00
Vitaly Provodin
eb611f68c0 JBR-2212 add scripts for linux_x86, linux_aarch64, linux_x64_fastdebug, osx_fastdebug, windows_x86
(cherry picked from commit 211b306949)
2025-06-11 02:01:29 +02:00
Vitaly Provodin
f7564b7a1e JBR-1643 fix intermittent fialures of Windows builds at make/Init.gmk:304
combine images and test-image into one make invocation

(cherry picked from commit ad32f648b5)
2025-06-11 02:01:29 +02:00
Vitaly Provodin
e7acb34ef9 JBR-2181 create two separate JBR bundles with JFX and JFX+JCEF
(cherry picked from commit a26a1dcef0)
2025-06-11 02:01:29 +02:00
Vitaly Provodin
d3f2602387 JBR-2148 modify signapp&build scripts to match to the new layout
(cherry picked from commit 7cdd4cbf4a)
2025-06-11 02:01:29 +02:00
Vitaly Provodin
921638cb1c JBR-2084 modify scripts to sign Contents/MacOS/libjli.dylib as a a normal file
(cherry picked from commit 47ac942dfb)
2025-06-11 02:01:29 +02:00
Vitaly Provodin
365fe329a4 JBR-1821 notarize JBR bundles as a standalone app
(cherry picked from commit 96e733ed79)
2025-06-11 02:01:29 +02:00
Vitaly Provodin
5c384dde9e JBR-2162 move building scripts from TC to JBR repo
(cherry picked from commit 6f4774c0d4)
2025-06-11 02:01:29 +02:00
Anton Tarasov
258a06685b JBR-2016 add jcef module and export some sun.* packages to it
(cherry picked from commit 193da0eff7)
2025-06-11 02:01:29 +02:00
Vitaly Provodin
7489a9cf12 JBR-2014 add jdk.hotspot.agent module to jbr
(cherry picked from commit b352fa1b54)
2025-06-11 02:01:29 +02:00
Vitaly Provodin
8bc80f9018 JBR-1286 add jdk.compiler into JBR
(cherry picked from commit 245db892cd)
2025-06-11 02:01:29 +02:00
Vitaly Provodin
a9e11facd6 JBR-1199 add JBR modules list for jlink
(cherry picked from commit ff8dc6567f)
2025-06-11 02:01:29 +02:00
Vitaly Provodin
11dd9481b9 Update docker script to create jdk15 build env
(cherry picked from commit cd5b1b94e7)
2025-06-11 02:01:28 +02:00
Vitaly Provodin
bf4b23967e JBR-3045 add pressing ESC to close the dialog after test completion
(cherry picked from commit 44d8b28b0b)
(cherry picked from commit c98106b4b0)
2025-06-11 02:01:28 +02:00
Vitaly Provodin
9283496166 JBR-3040 press the button END at the beggining in order to avoid text selection
(cherry picked from commit 1c2bf33db2)
(cherry picked from commit aeab9ef42c)
2025-06-11 02:01:28 +02:00
Vitaly.Provodin
0fb412cbea updated JTreg exclude list
(cherry picked from commit 6d1cee2181)
2025-06-11 02:01:28 +02:00
1360 changed files with 189718 additions and 10210 deletions

264
.github/README.md vendored Normal file
View File

@@ -0,0 +1,264 @@
[![official JetBrains project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
# Welcome to JetBrains Runtime!
JetBrains Runtime is a fork of [OpenJDK](https://github.com/openjdk/jdk) available for Windows, Mac OS X, and Linux.
It supports enhanced class redefinition ([DCEVM](https://ssw.jku.at/dcevm/)),
features optional [JCEF](https://github.com/JetBrains/jcef), a framework for embedding Chromium-based browsers,
includes a number of improvements in font rendering, keyboards support,
windowing/focus subsystems, HiDPI, accessibility, and performance, provides better desktop integration
and bugfixes not yet present in OpenJDK.
> **_NOTE_**: This is a **development** branch that is periodically synchronized with
> the [OpenJDK master](https://github.com/openjdk/jdk/tree/master) branch.
>
Release builds are based on these branches:
* [jbr11](https://github.com/JetBrains/JetBrainsRuntime/tree/jbr11) (JDK 11)
* [jbr17](https://github.com/JetBrains/JetBrainsRuntime/tree/jbr17) (JDK 17)
* [jbr21](https://github.com/JetBrains/JetBrainsRuntime/tree/jbr21) (JDK 21)
Download the latest releases of JetBrains Runtime to use with JetBrains IDEs. The full list
can be found on the [releases page](https://github.com/JetBrains/JetBrainsRuntime/releases).
## Releases based on JDK 21
| IDE Version | Latest JBR | Date Released |
|-------------|---------------------------------------------------------------------------------------------------------|---------------|
| 2025.2 | [21.0.7-b1034.51](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.7b1034.51)| 10-Jun-2025 |
| 2025.1 | [21.0.7-b895.130](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.7b895.130)| 15-May-2025 |
| 2024.3 | [21.0.6-b631.52](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.7b631.52) | 15-May-2025 |
| 2024.2 | [21.0.4-b509.40](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.7b509.40) | 15-May-2025 |
| 2024.1 | [21.0.2-b346.3](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.2b346.3) | 30-Jan-2024 |
## Releases based on JDK 17
| IDE Version | Latest JBR | Date Released |
|-------------|--------------------------------------------------------------------------------------------------------|---------------|
| 2024.2 | [17.0.11-b1312.2](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.11b1312.2) | 18-Jun-2024|
| 2024.1 | [17.0.12-b1207.37](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.12b1207.37) | 15-Oct-2024|
| 2023.3 | [17.0.12-b1087.25](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.12b1087.25) | 02-Sep-2024|
| 2023.2 | [17.0.12-b1000.54](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.12b1000.54) | 02-Sep-2024|
| 2023.1 | [17.0.10-b829.27](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.10b829.27) | 21-Mar-2024 |
| 2022.3 | [17.0.6-b653.34](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.6b653.34) | 28-Feb-2023 |
| 2022.2 | [17.0.6-b469.82](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.6b469.82) | 06-Mar-2023 |
## Releases based on JDK 11
| IDE Version | Latest JBR | Date Released |
|-------------|-------------------------------------------------------------------------------------------------------|---------------|
| 2022.1 | [11_0_16-b2043.64](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr11_0_16b2043.64) | 10-Nov-2022 |
| 2021.3 | [11_0_14_1-b1751.46](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr11_0_14_1b1751.46) | 21-Feb-2022 |
| 2021.2 | [11_0_13-b1504.49](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jb11_0_13-b1504.49) | 15-Nov-2021 |
| 2021.1 | [11.0.11+9-b1341.60](https://github.com/JetBrains/JetBrainsRuntime/issues/171#issuecomment-1248891540)| 15-Jun-2021 |
| 2020.3 | [11_0_10-b1145.115](https://github.com/JetBrains/JetBrainsRuntime/issues/171#issuecomment-1249243977) | 21-Jun-2021 |
## Release Flavours
There are many kinds of JBR bundles available on the [Releases page](https://github.com/JetBrains/JetBrainsRuntime/releases):
| Flavour | Description |
|---------------|---------------------------------------------------------------------------------------------------------------|
| JBR | Contains the Java Runtime Environment (JRE) suitable to _run_ JVM-based programs. |
| JBRSDK | Contains the Software Developmet Kit (SDK) suitable to _develop_ and _run_ JVM-based programs. |
| JBR with JCEF | Contains both JBR and JCEF; this flavour is bundled by default with all IntelliJ IDEs. |
| vanilla | Contains just JBR. |
| fastdebug | The native binaries in this bundle are less optimized and are easier to debug. They also run much slower. |
| FreeType | The bundle includes the freetype library built from sources; normally, the library is provided by the system. |
| Vulkan | The bundle includes experimental Vulkan support. | |
| debug symbols | In addition to the usual contents of the bundle the debug information is also included. |
## Contents
- [Welcome to JetBrains Runtime](#welcome-to-jetbrains-runtime)
- [Why Use JetBrains Runtime?](#why-use-jetbrains-runtime)
- [Products Built on JetBrains Runtime](#products-built-on-jetbrains-runtime)
- [Getting Sources](#getting-sources)
- [macOS, Linux](#macos-linux)
- [Windows](#sources-windows)
- [Configuring the Build Environment](#configuring-the-build-environment)
- [Linux (Docker)](#linux-docker)
- [Ubuntu Linux](#ubuntu-linux)
- [Windows](#build-windows)
- [macOS](#macos)
- [Developing](#developing)
- [Contributing](#contributing)
- [Resources](#resources)
## Why Use JetBrains Runtime?
* **Embedded browser**: JetBrains Runtime includes the Java Chromium Embedded Framework ([JCEF](https://github.com/JetBrains/jcef)), which
enables you to embed a Chromium-based browsers in your JVM-based application.
To use it, [download a build with JCEF](https://github.com/JetBrains/JetBrainsRuntime/releases).
* **Enhanced class re-definition** with the [DCEVM](https://ssw.jku.at/dcevm/) technology that makes it easier to reload
changed code without restarting JVM; this feature needs to be explicitly enabled with `-XX:+AllowEnhancedClassRedefinition`.
* **Better FPS performance** for graphics-intensive applications.
* **Improved font rendering**, **keyboard input** (such as shortcuts and multinational keyboards),
**HiDPI** and **accessibility** support.
* **Robust desktop experience**: GUI-related fixes often reach JetBrains Runtime much earlier than the corresponding version of OpenJDK.
* Additional capabilities that are made available to applications through
[JBR API](https://github.com/JetBrains/JetBrainsRuntimeApi) services such as, for example,
the ability to wrap a native graphics texture into `java.awt.Image`.
## Products Built on JetBrains Runtime
* [Android Studio](https://developer.android.com/studio). The official IDE for Google's Android operating system.
* [CLion](https://www.jetbrains.com/clion/). A cross-platform IDE for C and C++ from JetBrains.
* [DataGrip](https://www.jetbrains.com/datagrip/). The IDE for Databases and SQL from JetBrains.
* [GoLand](https://www.jetbrains.com/go/). The cross-platform Go IDE from JetBrains.
* [IntelliJ IDEA](https://www.jetbrains.com/idea/). The IDE for JVM from JetBrains.
* [JProfiler](https://www.ej-technologies.com/products/jprofiler/overview.html). The Java profiler.
* [PhpStorm](https://www.jetbrains.com/phpstorm/). The PHP IDE from JetBrains.
* [PyCharm](https://www.jetbrains.com/pycharm/). The Python IDE from JetBrains.
* [Rider](https://www.jetbrains.com/rider/). The cross-platform .NET IDE from JetBrains.
* [RubyMine](https://www.jetbrains.com/ruby/). The Ruby and Rails IDE from JetBrains.
* [Toolbox App](https://www.jetbrains.com/toolbox-app/). JetBrains IDE manager.
* [WebStorm](https://www.jetbrains.com/webstorm/). The JavaScript IDE from JetBrains.
* [YourKit](https://www.yourkit.com/). Java and .NET profilers.
## Getting Sources
### macOS, Linux
```
git config --global core.autocrlf input
git clone git@github.com:JetBrains/JetBrainsRuntime.git
```
### Windows
<a name="sources-windows"></a>
```
git config --global core.autocrlf false
git clone git@github.com:JetBrains/JetBrainsRuntime.git
```
## Configuring the Build Environment
Here are quick per-platform instructions for those who can't wait to get started.
Please refer to [OpenJDK build docs](https://openjdk.java.net/groups/build/doc/building.html) for in-depth
coverage of all the details.
> **_TIP:_** To get a preliminary report of what's missing, run `./configure` and check its output.
> It would usually have meaningful advice on how to solve the problem.
### Linux (Docker)
Download an image from [Docker Hub](https://hub.docker.com/repository/docker/jetbrains/runtime/general) related to your architecture:
```
$ docker pull jetbrains/runtime:oraclelinux8_aarch64
```
or
```
$ docker pull jetbrains/runtime:oraclelinux8_x64
```
Create and run a new container from the downloaded image
```
$ docker run -v $JetBrainsRuntime:/JetBrainsRuntime -it jetbrains/runtime:oraclelinux8_[arch]
```
where `$JetBrainsRuntime` is a full path to the directory where the repository was cloned to.
Run these commands in the container:
```
# cd /JetBrainsRuntime
# sh ./configure
# make images
```
### Ubuntu Linux
Install the necessary tools, libraries, and headers with:
```
$ sudo apt-get install autoconf make build-essential libx11-dev libxext-dev libxrender-dev libxtst-dev \
libxt-dev libxrandr-dev libcups2-dev libfontconfig1-dev libasound2-dev libspeechd-dev libwayland-dev \
wayland-protocols libxkbcommon-x11-0
```
Get Java 23 (for instance, [Azul Zulu Builds of OpenJDK 23](https://www.azul.com/downloads/?version=java-23&os=linux&package=jdk#zulu)).
Then run the following:
```
$ cd JetBrainsRuntime
$ git checkout main
$ sh ./configure
$ make images
```
This will build the release configuration under `./build/linux-x86_64-server-release/`.
### Windows
<a name="build-windows"></a>
Install the following:
* [Cygwin x64](http://www.cygwin.com/).
Required packages: `autoconf`, `binutils`, `cpio`, `diffutils`, `file`, `gawk`, `gcc-core`, `make`, `m4`, `unzip`, `zip`.
Install those together with Cygwin.
* [Visual Studio compiler toolset](https://visualstudio.microsoft.com/downloads/).
Install with the desktop development kit, which includes Windows SDK and compilers.
Visual Studio 2019 is supported by default.
* Java 21 (for instance, [Azul Zulu Builds of OpenJDK 21](https://www.azul.com/downloads/?version=java-21-lts&os=windows&package=jdk#zulu)).
If you have problems while configuring, read [Java tips on Cygwin](http://horstmann.com/articles/cygwin-tips.html).
From the command line:
```
"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
"c:\Program_Files\cygwin64\bin\mintty.exe" /bin/bash -l
```
The first command sets up environment variables, the second starts a Cygwin shell with the proper environment.
In the Cygwin shell:
```
$ cd JetBrainsRuntime
$ git checkout main
$ bash configure --with-toolchain-version=2019
$ make images
```
This will build the release configuration under `./build/windows-x86_64-server-release/`.
#### Enable optional NVDA screen reader support
If you want to add support of a11y announcing via [NVDA screen reader](https://www.nvaccess.org/about-nvda/),
you will need to bundle the NVDA Controller Client library.
You can do it with the following steps:
1. Download the NVDA Controller Client library. You can find the link in its official README [here](https://github.com/nvaccess/nvda/blob/master/extras/controllerClient/readme.md)
2. Pass the path to the unpacked package to `configure` via an additional flag `--with-nvdacontrollerclient=<path>`.
The build system will search the required library files under `<path>/<target-arch>`.
#### Disable optional JAWS screen reader support
JBR is built with built-in support of JAWS screen reader.
If you want to disable it, run `configure` with the additional flag `--disable-jaws-client`.
### macOS
Install the following:
* Xcode command line developer tools and `autoconf` via [Homebrew](https://brew.sh/).
* Java 21 (for instance, [Azul Zulu Builds of OpenJDK 21](https://www.azul.com/downloads/?version=java-21-lts&os=macos&package=jdk#zulu)).
From the command line:
```
$ cd JetBrainsRuntime
$ git checkout main
$ sh ./configure
$ make images
```
This will build the release configuration under `./build/macosx-x86_64-server-release/`.
## Developing
You can use [CLion](https://www.jetbrains.com/clion/) to develop native parts of the JetBrains Runtime and
[IntelliJ IDEA](https://www.jetbrains.com/idea/) for the parts written in Java.
Both require projects to be created.
### CLion
Run
```
$ make compile-commands
```
in the git root and open the resulting `build/.../compile_commands.json` file as a project.
Then use `Tools | Compilation Database | Change Project Root` to point to git root of this repository.
See also this detailed step-by-step tutorial for all platforms:
[How to develop OpenJDK with CLion](https://blog.jetbrains.com/clion/2020/03/openjdk-with-clion/).
### IDEA
Run
```
$ sh ./bin/idea.sh
```
in the git root to generate project files (add `--help` for options). If you have multiple
configurations (for example, `release` and `fastdebug`), supply the `--conf <conf_name>` argument.
Then open the git root directory as a project in IDEA.
## Contributing
We are happy to receive your pull requests!
Before you submit one, please sign our [Contributor License Agreement (CLA)](https://www.jetbrains.com/agreements/cla/).
## Resources
* [JetBrains Runtime on GitHub](https://github.com/JetBrains/JetBrainsRuntime).
* [OpenJDK build instructions](https://openjdk.java.net/groups/build/doc/building.html).
* [OpenJDK test instructions](https://htmlpreview.github.io/?https://raw.githubusercontent.com/openjdk/jdk/master/doc/building.html#running-tests).
* [How to develop OpenJDK with CLion](https://blog.jetbrains.com/clion/2020/03/openjdk-with-clion/).

View File

@@ -31,6 +31,7 @@ on:
- master
- pr/*
- jdk*
- main
workflow_dispatch:
inputs:
platforms:

270
.github/workflows/pr.yml vendored Normal file
View File

@@ -0,0 +1,270 @@
#
# Copyright 2000-2023 JetBrains s.r.o.
# 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. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# 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.
#
name: 'Build OpenJDK on pull request'
on:
pull_request:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs:
###
### Determine platforms to include
###
select:
name: 'Select platforms'
runs-on: ubuntu-22.04
outputs:
linux-x64: ${{ steps.include.outputs.linux-x64 }}
linux-x86: ${{ steps.include.outputs.linux-x86 }}
linux-cross-compile: ${{ steps.include.outputs.linux-cross-compile }}
macos-x64: ${{ steps.include.outputs.macos-x64 }}
macos-aarch64: ${{ steps.include.outputs.macos-aarch64 }}
windows-x64: ${{ steps.include.outputs.windows-x64 }}
windows-aarch64: ${{ steps.include.outputs.windows-aarch64 }}
windows-x86: ${{ steps.include.outputs.windows-x86 }}
steps:
# This function must be inlined in main.yml, or we'd be forced to checkout the repo
- name: 'Check what jobs to run'
id: include
run: |
# Determine which platform jobs to run
# Returns 'true' if the input platform list matches any of the platform monikers given as argument,
# 'false' otherwise.
# arg $1: platform name or names to look for
function check_platform() {
if [[ $GITHUB_EVENT_NAME == workflow_dispatch ]]; then
input='${{ github.event.inputs.platforms }}'
elif [[ $GITHUB_EVENT_NAME == push ]]; then
if [[ '${{ !secrets.JDK_SUBMIT_FILTER || startsWith(github.ref, 'refs/heads/submit/') }}' == 'false' ]]; then
# If JDK_SUBMIT_FILTER is set, and this is not a "submit/" branch, don't run anything
>&2 echo 'JDK_SUBMIT_FILTER is set and not a "submit/" branch'
echo 'false'
return
else
input='${{ secrets.JDK_SUBMIT_PLATFORMS }}'
fi
fi
normalized_input="$(echo ,$input, | tr -d ' ')"
if [[ "$normalized_input" == ",," ]]; then
# For an empty input, assume all platforms should run
echo 'true'
return
else
# Check for all acceptable platform names
for part in $* ; do
if echo "$normalized_input" | grep -q -e ",$part," ; then
echo 'true'
return
fi
done
fi
echo 'false'
}
echo "linux-x64=$(check_platform linux-x64 linux x64)" >> $GITHUB_OUTPUT
echo "linux-x86=$(check_platform linux-x86 linux x86)" >> $GITHUB_OUTPUT
echo "linux-x64-variants=$(check_platform linux-x64-variants variants)" >> $GITHUB_OUTPUT
echo "linux-cross-compile=$(check_platform linux-cross-compile cross-compile)" >> $GITHUB_OUTPUT
echo "macos-x64=$(check_platform macos-x64 macos x64)" >> $GITHUB_OUTPUT
echo "macos-aarch64=$(check_platform macos-aarch64 macos aarch64)" >> $GITHUB_OUTPUT
echo "windows-x64=$(check_platform windows-x64 windows x64)" >> $GITHUB_OUTPUT
echo "windows-x86=$(check_platform windows-x86 windows x86)" >> $GITHUB_OUTPUT
echo "windows-aarch64=$(check_platform windows-aarch64 windows aarch64)" >> $GITHUB_OUTPUT
echo "docs=$(check_platform docs)" >> $GITHUB_OUTPUT
###
### Build jobs
###
build-linux-x64:
name: linux-x64
needs: select
uses: ./.github/workflows/build-linux.yml
with:
platform: linux-x64
gcc-major-version: '10'
apt-gcc-version: '10.4.0-4ubuntu1~22.04'
configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }}
# The linux-x64 jdk bundle is used as buildjdk for the cross-compile job
if: needs.select.outputs.linux-x64 == 'true' || needs.select.outputs.linux-cross-compile == 'true'
build-linux-x86:
name: linux-x86
needs: select
uses: ./.github/workflows/build-linux.yml
with:
platform: linux-x86
gcc-major-version: '10'
gcc-package-suffix: '-multilib'
apt-gcc-version: '10.4.0-4ubuntu1~22.04'
apt-architecture: 'i386'
# Some multilib libraries do not have proper inter-dependencies, so we have to
# install their dependencies manually.
apt-extra-packages: 'libfreetype6-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libc6-i386'
extra-conf-options: '--with-target-bits=32'
configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }}
if: needs.select.outputs.linux-x86 == 'true'
build-linux-cross-compile:
name: linux-cross-compile
needs:
- select
- build-linux-x64
uses: ./.github/workflows/build-cross-compile.yml
with:
gcc-major-version: '10'
apt-gcc-version: '10.4.0-4ubuntu1~22.04'
apt-gcc-cross-version: '10.4.0-4ubuntu1~22.04cross1'
configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }}
if: needs.select.outputs.linux-cross-compile == 'true'
build-macos-x64:
name: macos-x64
needs: select
uses: ./.github/workflows/build-macos.yml
with:
platform: macos-x64
xcode-toolset-version: '12.5.1'
configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }}
if: needs.select.outputs.macos-x64 == 'true'
build-macos-aarch64:
name: macos-aarch64
needs: select
uses: ./.github/workflows/build-macos.yml
with:
platform: macos-aarch64
xcode-toolset-version: '12.5.1'
extra-conf-options: '--openjdk-target=aarch64-apple-darwin'
configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }}
if: needs.select.outputs.macos-aarch64 == 'true'
build-windows-x64:
name: windows-x64
needs: select
uses: ./.github/workflows/build-windows.yml
with:
platform: windows-x64
msvc-toolset-version: '14.29'
msvc-toolset-architecture: 'x86.x64'
configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }}
if: needs.select.outputs.windows-x64 == 'true'
build-windows-x86:
name: windows-x86
needs: select
uses: ./.github/workflows/build-windows.yml
with:
platform: windows-x86
msvc-toolset-version: '14.29'
msvc-toolset-architecture: 'x86'
configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }}
if: needs.select.outputs.windows-x86 == 'true'
build-windows-aarch64:
name: windows-aarch64
needs: select
uses: ./.github/workflows/build-windows.yml
with:
platform: windows-aarch64
msvc-toolset-version: '14.29'
msvc-toolset-architecture: 'arm64'
make-target: 'hotspot'
extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin'
configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }}
if: needs.select.outputs.windows-aarch64 == 'true'
build-docs:
name: docs
needs: select
uses: ./.github/workflows/build-linux.yml
with:
platform: linux-x64
debug-levels: '[ "debug" ]'
make-target: 'docs-jdk-bundles'
# Make sure we never try to make full docs, since that would require a
# build JDK, and we do not need the additional testing of the graphs.
extra-conf-options: '--disable-full-docs'
gcc-major-version: '10'
apt-gcc-version: '10.4.0-4ubuntu1~22.04'
configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }}
if: needs.select.outputs.docs == 'true'
# Remove bundles so they are not misconstrued as binary distributions from the JDK project
remove-bundles:
name: 'Remove bundle artifacts'
runs-on: ubuntu-22.04
if: always()
needs:
- build-linux-x64
- build-linux-x86
- build-linux-cross-compile
- build-macos-x64
- build-macos-aarch64
- build-windows-x64
- build-windows-aarch64
- build-windows-x86
steps:
# Hack to get hold of the api environment variables that are only defined for actions
- name: 'Get API configuration'
id: api
uses: actions/github-script@v6
with:
script: 'return { url: process.env["ACTIONS_RUNTIME_URL"], token: process.env["ACTIONS_RUNTIME_TOKEN"] }'
- name: 'Remove bundle artifacts'
run: |
# Find and remove all bundle artifacts
ALL_ARTIFACT_URLS="$(curl -s \
-H 'Accept: application/json;api-version=6.0-preview' \
-H 'Authorization: Bearer ${{ fromJson(steps.api.outputs.result).token }}' \
'${{ fromJson(steps.api.outputs.result).url }}_apis/pipelines/workflows/${{ github.run_id }}/artifacts?api-version=6.0-preview')"
BUNDLE_ARTIFACT_URLS="$(echo "$ALL_ARTIFACT_URLS" | jq -r -c '.value | map(select(.name|startswith("bundles-"))) | .[].url')"
for url in $BUNDLE_ARTIFACT_URLS; do
echo "Removing $url"
curl -s \
-H 'Accept: application/json;api-version=6.0-preview' \
-H 'Authorization: Bearer ${{ fromJson(steps.api.outputs.result).token }}' \
-X DELETE "$url" \
|| echo "Failed to remove bundle"
done

1
.gitignore vendored
View File

@@ -25,3 +25,4 @@ NashornProfile.txt
**/core.[0-9]*
*.rej
*.orig
/jbr-api/

View File

@@ -1,3 +1,5 @@
[![official JetBrains project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
# Welcome to the JDK!
For build instructions please see the

View File

@@ -25,7 +25,26 @@
# Shell script for generating an IDEA project from a given list of modules
usage() {
echo "usage: $0 [-h|--help] [-v|--verbose] [-o|--output <path>] [-c|--conf <conf_name>] [modules]+"
echo "Usage: $0 [-h|--help] [-q|--quiet] [-a|--absolute-paths] [-r|--root <path>] [-o|--output <path>] [-c|--conf <conf_name>] [modules...]"
echo " -h | --help"
echo " -q | --quiet
No stdout output"
echo " -a | --absolute-paths
Use absolute paths to this jdk, so that generated .idea
project files can be moved independently of jdk sources"
echo " -r | --root <path>
Project content root
Default: $TOPLEVEL_DIR"
echo " -o | --output <path>
Where .idea directory with project files will be generated
(e.g. using '-o .' will place project files in './.idea')
Default: same as --root"
echo " -c | --conf <conf_name>
make configuration (release, slowdebug etc)"
echo " [modules...]
Generate project modules for specific java modules
(e.g. 'java.base java.desktop')
Default: all existing modules (java.* and jdk.*)"
exit 1
}
@@ -33,10 +52,13 @@ SCRIPT_DIR=`dirname $0`
#assume TOP is the dir from which the script has been called
TOP=`pwd`
cd $SCRIPT_DIR; SCRIPT_DIR=`pwd`
if [ "x$TOPLEVEL_DIR" = "x" ] ; then
cd .. ; TOPLEVEL_DIR=`pwd`
fi
cd $TOP;
IDEA_OUTPUT=$TOP/.idea
VERBOSE="false"
VERBOSE=true
ABSOLUTE_PATHS=false
CONF_ARG=
while [ $# -gt 0 ]
do
@@ -45,14 +67,24 @@ do
usage
;;
-v | --vebose )
VERBOSE="true"
-q | --quiet )
VERBOSE=false
;;
-a | --absolute-paths )
ABSOLUTE_PATHS=true
;;
-r | --root )
TOPLEVEL_DIR="$2"
shift
;;
-o | --output )
IDEA_OUTPUT=$2/.idea
IDEA_OUTPUT="$2/.idea"
shift
;;
-c | --conf )
CONF_ARG="CONF_NAME=$2"
shift
@@ -69,20 +101,17 @@ do
shift
done
if [ -e $IDEA_OUTPUT ] ; then
rm -r $IDEA_OUTPUT
if [ "x$IDEA_OUTPUT" = "x" ] ; then
IDEA_OUTPUT="$TOPLEVEL_DIR/.idea"
fi
mkdir -p $IDEA_OUTPUT || exit 1
cd $IDEA_OUTPUT; IDEA_OUTPUT=`pwd`
cd "$TOP" ; cd $TOPLEVEL_DIR; TOPLEVEL_DIR=`pwd`
cd "$TOP" ; cd $IDEA_OUTPUT; IDEA_OUTPUT=`pwd`
cd ..; IDEA_OUTPUT_PARENT=`pwd`
cd "$SCRIPT_DIR/.." ; OPENJDK_DIR=`pwd`
if [ "x$TOPLEVEL_DIR" = "x" ] ; then
cd $SCRIPT_DIR/..
TOPLEVEL_DIR=`pwd`
cd $IDEA_OUTPUT
fi
MAKE_DIR="$SCRIPT_DIR/../make"
IDEA_MAKE="$MAKE_DIR/ide/idea/jdk"
IDEA_MAKE="$OPENJDK_DIR/make/ide/idea/jdk"
IDEA_TEMPLATE="$IDEA_MAKE/template"
cp -r "$IDEA_TEMPLATE"/* "$IDEA_OUTPUT"
@@ -94,31 +123,31 @@ if [ -d "$TEMPLATES_OVERRIDE" ] ; then
done
fi
if [ "$VERBOSE" = "true" ] ; then
echo "output dir: $IDEA_OUTPUT"
echo "idea template dir: $IDEA_TEMPLATE"
if [ "$VERBOSE" = true ] ; then
echo "Will generate IDEA project files in \"$IDEA_OUTPUT\" for project \"$TOPLEVEL_DIR\""
fi
cd $TOP ; make idea-gen-config ALLOW=IDEA_OUTPUT,MODULES IDEA_OUTPUT=$IDEA_OUTPUT MODULES="$*" $CONF_ARG || exit 1
cd $TOP ; make idea-gen-config ALLOW=TOPLEVEL_DIR,IDEA_OUTPUT_PARENT,IDEA_OUTPUT,MODULES TOPLEVEL_DIR="$TOPLEVEL_DIR" \
IDEA_OUTPUT_PARENT="$IDEA_OUTPUT_PARENT" IDEA_OUTPUT="$IDEA_OUTPUT" MODULES="$*" $CONF_ARG || exit 1
cd $SCRIPT_DIR
. $IDEA_OUTPUT/env.cfg
# Expect MODULE_ROOTS, MODULE_NAMES, BOOT_JDK & SPEC to be set
if [ "x$MODULE_ROOTS" = "x" ] ; then
echo "FATAL: MODULE_ROOTS is empty" >&2; exit 1
# Expect MODULES, MODULE_NAMES, RELATIVE_PROJECT_DIR, RELATIVE_BUILD_DIR to be set
if [ "xMODULES" = "x" ] ; then
echo "FATAL: MODULES is empty" >&2; exit 1
fi
if [ "x$MODULE_NAMES" = "x" ] ; then
echo "FATAL: MODULE_NAMES is empty" >&2; exit 1
fi
if [ "x$BOOT_JDK" = "x" ] ; then
echo "FATAL: BOOT_JDK is empty" >&2; exit 1
if [ "x$RELATIVE_PROJECT_DIR" = "x" ] ; then
echo "FATAL: RELATIVE_PROJECT_DIR is empty" >&2; exit 1
fi
if [ "x$SPEC" = "x" ] ; then
echo "FATAL: SPEC is empty" >&2; exit 1
if [ "x$RELATIVE_BUILD_DIR" = "x" ] ; then
echo "FATAL: RELATIVE_BUILD_DIR is empty" >&2; exit 1
fi
if [ -d "$TOPLEVEL_DIR/.hg" ] ; then
@@ -129,6 +158,43 @@ if [ -d "$TOPLEVEL_DIR/.git" ] ; then
VCS_TYPE="Git"
fi
if [ "$ABSOLUTE_PATHS" = true ] ; then
if [ "x$PATHTOOL" != "x" ]; then
PROJECT_DIR="`$PATHTOOL -am $OPENJDK_DIR`"
TOPLEVEL_PROJECT_DIR="`$PATHTOOL -am $TOPLEVEL_DIR`"
else
PROJECT_DIR="$OPENJDK_DIR"
TOPLEVEL_PROJECT_DIR="$TOPLEVEL_DIR"
fi
MODULE_DIR="$PROJECT_DIR"
TOPLEVEL_MODULE_DIR="$TOPLEVEL_PROJECT_DIR"
cd "$IDEA_OUTPUT_PARENT" && cd "$RELATIVE_BUILD_DIR" && BUILD_DIR="`pwd`"
CLION_SCRIPT_TOPDIR="$OPENJDK_DIR"
CLION_PROJECT_DIR="$PROJECT_DIR"
else
if [ "$RELATIVE_PROJECT_DIR" = "." ] ; then
PROJECT_DIR=""
else
PROJECT_DIR="/$RELATIVE_PROJECT_DIR"
fi
if [ "$RELATIVE_TOPLEVEL_PROJECT_DIR" = "." ] ; then
TOPLEVEL_PROJECT_DIR=""
else
TOPLEVEL_PROJECT_DIR="/$RELATIVE_TOPLEVEL_PROJECT_DIR"
fi
MODULE_DIR="\$MODULE_DIR\$$PROJECT_DIR"
PROJECT_DIR="\$PROJECT_DIR\$$PROJECT_DIR"
TOPLEVEL_MODULE_DIR="\$MODULE_DIR\$$TOPLEVEL_PROJECT_DIR"
TOPLEVEL_PROJECT_DIR="\$PROJECT_DIR\$$TOPLEVEL_PROJECT_DIR"
BUILD_DIR="\$PROJECT_DIR\$/$RELATIVE_BUILD_DIR"
CLION_SCRIPT_TOPDIR="$CLION_RELATIVE_PROJECT_DIR"
CLION_PROJECT_DIR="\$PROJECT_DIR\$/$CLION_SCRIPT_TOPDIR"
fi
if [ "$VERBOSE" = true ] ; then
echo "Project root: $PROJECT_DIR"
echo "Generating IDEA project files..."
fi
### Replace template variables
NUM_REPLACEMENTS=0
@@ -152,116 +218,106 @@ add_replacement() {
eval TO$NUM_REPLACEMENTS='$2'
}
add_replacement "###PATHTOOL###" "$PATHTOOL"
add_replacement "###CLION_SCRIPT_TOPDIR###" "$CLION_SCRIPT_TOPDIR"
add_replacement "###CLION_PROJECT_DIR###" "$CLION_PROJECT_DIR"
add_replacement "###PROJECT_DIR###" "$PROJECT_DIR"
add_replacement "###MODULE_DIR###" "$MODULE_DIR"
add_replacement "###TOPLEVEL_PROJECT_DIR###" "$TOPLEVEL_PROJECT_DIR"
add_replacement "###TOPLEVEL_MODULE_DIR###" "$TOPLEVEL_MODULE_DIR"
add_replacement "###MODULE_NAMES###" "$MODULE_NAMES"
add_replacement "###VCS_TYPE###" "$VCS_TYPE"
SPEC_DIR=`dirname $SPEC`
if [ "x$CYGPATH" != "x" ]; then
add_replacement "###BUILD_DIR###" "`$CYGPATH -am $SPEC_DIR`"
add_replacement "###IMAGES_DIR###" "`$CYGPATH -am $SPEC_DIR`/images/jdk"
add_replacement "###ROOT_DIR###" "`$CYGPATH -am $TOPLEVEL_DIR`"
add_replacement "###IDEA_DIR###" "`$CYGPATH -am $IDEA_OUTPUT`"
add_replacement "###BUILD_DIR###" "$BUILD_DIR"
add_replacement "###RELATIVE_BUILD_DIR###" "$RELATIVE_BUILD_DIR"
if [ "x$PATHTOOL" != "x" ]; then
add_replacement "###BASH_RUNNER_PREFIX###" "\$PROJECT_DIR\$/.idea/bash.bat"
else
add_replacement "###BASH_RUNNER_PREFIX###" ""
fi
if [ "x$PATHTOOL" != "x" ]; then
if [ "x$JT_HOME" = "x" ]; then
add_replacement "###JTREG_HOME###" ""
else
add_replacement "###JTREG_HOME###" "`$CYGPATH -am $JT_HOME`"
fi
elif [ "x$WSL_DISTRO_NAME" != "x" ]; then
add_replacement "###BUILD_DIR###" "`wslpath -am $SPEC_DIR`"
add_replacement "###IMAGES_DIR###" "`wslpath -am $SPEC_DIR`/images/jdk"
add_replacement "###ROOT_DIR###" "`wslpath -am $TOPLEVEL_DIR`"
add_replacement "###IDEA_DIR###" "`wslpath -am $IDEA_OUTPUT`"
if [ "x$JT_HOME" = "x" ]; then
add_replacement "###JTREG_HOME###" ""
else
add_replacement "###JTREG_HOME###" "`wslpath -am $JT_HOME`"
add_replacement "###JTREG_HOME###" "`$PATHTOOL -am $JT_HOME`"
fi
else
add_replacement "###BUILD_DIR###" "$SPEC_DIR"
add_replacement "###JTREG_HOME###" "$JT_HOME"
add_replacement "###IMAGES_DIR###" "$SPEC_DIR/images/jdk"
add_replacement "###ROOT_DIR###" "$TOPLEVEL_DIR"
add_replacement "###IDEA_DIR###" "$IDEA_OUTPUT"
fi
SOURCE_PREFIX="<sourceFolder url=\"file://"
SOURCE_POSTFIX="\" isTestSource=\"false\" />"
for root in $MODULE_ROOTS; do
if [ "x$CYGPATH" != "x" ]; then
root=`$CYGPATH -am $root`
elif [ "x$WSL_DISTRO_NAME" != "x" ]; then
root=`wslpath -am $root`
fi
SOURCES=$SOURCES" $SOURCE_PREFIX""$root""$SOURCE_POSTFIX"
MODULE_IMLS=""
TEST_MODULE_DEPENDENCIES=""
for module in $MODULE_NAMES; do
MODULE_IMLS="$MODULE_IMLS<module fileurl=\"file://\$PROJECT_DIR$/.idea/$module.iml\" filepath=\"\$PROJECT_DIR$/.idea/$module.iml\" /> "
TEST_MODULE_DEPENDENCIES="$TEST_MODULE_DEPENDENCIES<orderEntry type=\"module\" module-name=\"$module\" scope=\"TEST\" /> "
done
add_replacement "###SOURCE_ROOTS###" "$SOURCES"
add_replacement "###MODULE_IMLS###" "$MODULE_IMLS"
add_replacement "###TEST_MODULE_DEPENDENCIES###" "$TEST_MODULE_DEPENDENCIES"
replace_template_dir "$IDEA_OUTPUT"
### Compile the custom Logger
### Generate module project files
CLASSES=$IDEA_OUTPUT/classes
if [ "$VERBOSE" = true ] ; then
echo "Generating project modules:"
fi
(
DEFAULT_IFS="$IFS"
IFS='#'
for value in $MODULES; do
(
eval "$value"
if [ "$VERBOSE" = true ] ; then
echo " $module"
fi
MAIN_SOURCE_DIRS=""
CONTENT_ROOTS=""
IFS=' '
for dir in $moduleSrcDirs; do
case $dir in
"src/"*) MAIN_SOURCE_DIRS="$MAIN_SOURCE_DIRS <sourceFolder url=\"file://$MODULE_DIR/$dir\" isTestSource=\"false\" />" ;;
*"/support/gensrc/$module") ;; # Exclude generated sources to avoid module-info conflicts, see https://youtrack.jetbrains.com/issue/IDEA-185108
*) CONTENT_ROOTS="$CONTENT_ROOTS <content url=\"file://$MODULE_DIR/$dir\">\
<sourceFolder url=\"file://$MODULE_DIR/$dir\" isTestSource=\"false\" generated=\"true\" /></content>" ;;
esac
done
if [ "x$MAIN_SOURCE_DIRS" != "x" ] ; then
CONTENT_ROOTS="<content url=\"file://$MODULE_DIR/src/$module\">$MAIN_SOURCE_DIRS</content>$CONTENT_ROOTS"
fi
add_replacement "###MODULE_CONTENT_ROOTS###" "$CONTENT_ROOTS"
DEPENDENCIES=""
for dep in $moduleDependencies; do
case $MODULE_NAMES in # Exclude skipped modules from dependencies
*"$dep"*) DEPENDENCIES="$DEPENDENCIES<orderEntry type=\"module\" module-name=\"$dep\" /> "
esac
done
add_replacement "###DEPENDENCIES###" "$DEPENDENCIES"
cp "$IDEA_OUTPUT/module.iml" "$IDEA_OUTPUT/$module.iml"
IFS="$DEFAULT_IFS"
replace_template_file "$IDEA_OUTPUT/$module.iml"
)
done
)
rm "$IDEA_OUTPUT/module.iml"
if [ "x$ANT_HOME" = "x" ] ; then
# try some common locations
if [ -f "/usr/share/ant/lib/ant.jar" ] ; then
ANT_HOME="/usr/share/ant"
### Create shell script runner for Windows
if [ "x$PATHTOOL" != "x" ]; then
echo "@echo off" > "$IDEA_OUTPUT/bash.bat"
if [ "x$WSL_DISTRO_NAME" != "x" ] ; then
echo "wsl -d $WSL_DISTRO_NAME --cd \"%cd%\" -e %*" >> "$IDEA_OUTPUT/bash.bat"
else
try_ant=$(ls /opt/homebrew/Cellar/ant/*/libexec/lib/ant.jar 2> /dev/null | sort -r | head -n 1)
if [ "x$try_ant" != "x" ] ; then
ANT_HOME=$(cd $(dirname $try_ant)/.. && pwd)
else
try_ant=$(ls /usr/local/Cellar/ant/*/libexec/lib/ant.jar 2> /dev/null | sort -r | head -n 1)
if [ "x$try_ant" != "x" ] ; then
ANT_HOME=$(cd $(dirname $try_ant)/.. && pwd)
fi
fi
fi
else
if [ ! -f "$ANT_HOME/lib/ant.jar" ] ; then
echo "FATAL: ANT_HOME is incorrect. Try removing it and use autodetection, or fix the value" >&2; exit 1
echo "$WINENV_ROOT\bin\bash.exe -l -c \"cd %CD:\=/%/ && %*\"" >> "$IDEA_OUTPUT/bash.bat"
fi
fi
if [ "x$ANT_HOME" = "x" ] ; then
echo "FATAL: cannot find ant. Try setting ANT_HOME." >&2; exit 1
fi
CP=$ANT_HOME/lib/ant.jar
rm -rf $CLASSES; mkdir $CLASSES
# If we have a Windows boot JDK, we need a .exe suffix
if [ -e "$BOOT_JDK/bin/java.exe" ] ; then
JAVAC=javac.exe
else
JAVAC=javac
fi
# If we are on WSL, the boot JDK might be either Windows or Linux,
# and we need to use realpath instead of CYGPATH to make javac work on both.
# We need to handle this case first since CYGPATH might be set on WSL.
if [ "x$WSL_DISTRO_NAME" != "x" ]; then
JAVAC_SOURCE_FILE=`realpath --relative-to=./ $IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java`
JAVAC_SOURCE_PATH=`realpath --relative-to=./ $IDEA_OUTPUT/src`
JAVAC_CLASSES=`realpath --relative-to=./ $CLASSES`
ANT_TEMP=`mktemp -d -p ./`
cp $ANT_HOME/lib/ant.jar $ANT_TEMP/ant.jar
JAVAC_CP=$ANT_TEMP/ant.jar
elif [ "x$CYGPATH" != "x" ] ; then ## CYGPATH may be set in env.cfg
JAVAC_SOURCE_FILE=`$CYGPATH -am $IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java`
JAVAC_SOURCE_PATH=`$CYGPATH -am $IDEA_OUTPUT/src`
JAVAC_CLASSES=`$CYGPATH -am $CLASSES`
JAVAC_CP=`$CYGPATH -am $CP`
else
JAVAC_SOURCE_FILE=$IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java
JAVAC_SOURCE_PATH=$IDEA_OUTPUT/src
JAVAC_CLASSES=$CLASSES
JAVAC_CP=$CP
fi
$BOOT_JDK/bin/$JAVAC -d $JAVAC_CLASSES -sourcepath $JAVAC_SOURCE_PATH -cp $JAVAC_CP $JAVAC_SOURCE_FILE
if [ "x$WSL_DISTRO_NAME" != "x" ]; then
rm -rf $ANT_TEMP
fi
if [ "$VERBOSE" = true ] ; then
IDEA_PROJECT_DIR="`dirname $IDEA_OUTPUT`"
if [ "x$PATHTOOL" != "x" ]; then
IDEA_PROJECT_DIR="`$PATHTOOL -am $IDEA_PROJECT_DIR`"
fi
echo "
Now you can open \"$IDEA_PROJECT_DIR\" as IDEA project
You can also run 'bash \"$IDEA_OUTPUT/jdk-clion/update-project.sh\"' to generate Clion project"
fi

0
configure vendored Normal file → Executable file
View File

274
jb/branchdiff.py Executable file
View File

@@ -0,0 +1,274 @@
#!/usr/bin/env python3
import argparse
import os.path
import sys
import subprocess
errors_count = 0
def fatal(msg):
sys.stderr.write(f"[fatal] {msg}\n")
sys.exit(1)
def error(msg):
global errors_count
errors_count += 1
sys.stderr.write(f"[error] {msg}\n")
def verbose(options, *msg):
if options.verbose:
sys.stderr.write(f"[verbose] ")
sys.stderr.write(*msg)
sys.stderr.write('\n')
def first_line(str):
return "" if not str else str.splitlines()[0]
class Options:
def __init__(self):
ap = argparse.ArgumentParser(description="Show commit differences between branches of JBR git repos",
epilog="Example: %(prog)s --from origin/jbr17 --to jbr17.b469 --path "
"src/hotspot --limit 200")
ap.add_argument('--jbr', dest='jbrpath', help='path to JBR git root', required=True)
ap.add_argument('--from', dest='frombranch', help='branch to take commits from', required=True)
ap.add_argument('--to', dest='tobranch', help='branch to apply new commits to', required=True)
ap.add_argument('--path', dest='path', help='limit to changes in this path (relative to git root)')
ap.add_argument('--limit', dest='limit', help='limit to this many log entries in --jdk repo', type=int,
default=-1)
ap.add_argument('--html', dest="ishtml", help="print out HTML rather than plain text", action='store_true')
ap.add_argument('-o', dest="output", help="print the list of missing commits to this file"
" to be used as exclude list later")
ap.add_argument('--exclude', dest='exclude', help='exclude commits listed in the given file '
'(can use edited -o output file as input here)')
ap.add_argument('-v', dest='verbose', help="verbose output", default=False, action='store_true')
args = ap.parse_args()
if not os.path.isdir(args.jbrpath):
fatal(f"{args.jbrpath} not a directory")
if not git_is_available():
fatal("can't run git commands; make sure git is in PATH")
self.frombranch = args.frombranch
self.tobranch = args.tobranch
self.jbrpath = args.jbrpath
self.path = args.path
self.limit = args.limit
self.exclude = args.exclude
self.output = args.output
self.ishtml = args.ishtml
self.verbose = args.verbose
class GitRepo:
def __init__(self, rootpath):
self.rootpath = rootpath
def run_git_cmd(self, git_args):
args = ["git", "-C", self.rootpath]
args.extend(git_args)
# print(f"Runnig git cmd '{' '.join(args)}'")
p = subprocess.run(args, capture_output=True, text=True)
if p.returncode != 0:
fatal(f"git returned non-zero code in {self.rootpath} ({first_line(p.stderr)})")
return p.stdout
def save_git_cmd(self, fname, git_args):
args = ["git", "-C", self.rootpath]
args.extend(git_args)
# print(f"Runnig git cmd '{' '.join(args)}'")
with open(fname, "w") as stdout_file:
p = subprocess.run(args, stdout=stdout_file)
if p.returncode != 0:
fatal(f"git returned non-zero code in {self.rootpath} ({first_line(p.stderr)})")
def current_branch(self):
branch_name = self.run_git_cmd(["branch", "--show-current"]).strip()
return branch_name
def log(self, branch, path=None, limit=None):
cmds = ["log", "--no-decorate", branch]
if limit:
cmds.extend(["-n", str(limit)])
if path:
cmds.append(path)
full_log = self.run_git_cmd(cmds)
return full_log
class Commit:
def __init__(self, lines):
self.sha = lines[0].split()[1]
self.message = ""
self.fullmessage = ""
self.bugid = ""
# Commit message starts after one blank line
read_message = False
for l in lines:
if read_message:
self.fullmessage += l.strip() + "\n"
if not read_message and l == "":
read_message = True
if len(self.fullmessage) > 0:
self.message = first_line(self.fullmessage).strip()
t = self.message.split(' ')
if len(t) > 1:
bugid = t[0]
if bugid.startswith("fixup"):
bugid = t[1]
bugid = bugid.strip(":")
if bugid.startswith("JBR-") or bugid.isnumeric():
self.bugid = bugid
class History:
def __init__(self, log):
log_itr = iter(log.splitlines())
self.commits = []
self.unique_fullmessages = set()
self.duplicates = set()
commit_lines = []
for line in log_itr:
if line.startswith("commit ") and len(commit_lines) > 0:
commit = Commit(commit_lines)
self.add_commit(commit)
commit_lines = []
commit_lines.append(line)
if len(commit_lines) > 0:
commit = Commit(commit_lines)
self.add_commit(commit)
def add_commit(self, commit):
self.commits.append(commit)
if commit.fullmessage in self.unique_fullmessages:
self.duplicates.add(commit.fullmessage)
else:
self.unique_fullmessages.add(commit.fullmessage)
def appears_more_than_once(self, commit):
return commit.fullmessage in self.duplicates
def contains(self, commit):
return commit.fullmessage in self.unique_fullmessages
def size(self):
return len(self.commits)
def print_explanation(options, jbr):
verbose(options, f"Reading history from '{jbr.rootpath}'")
if options.path:
verbose(options, f"\t(only under '{options.path}')")
if options.limit > 0:
verbose(options, f"\t(up to '{options.limit}' commits)")
verbose(options, f"Searching for missing fixes in '{options.tobranch}' compared with '{options.frombranch}'")
def git_is_available():
p = None
try:
p = subprocess.run(["git", "--help"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
except:
pass
return p is not None and p.returncode == 0
def main():
check_python_min_requirements()
options = Options()
jbr = GitRepo(options.jbrpath)
print_explanation(options, jbr)
commits_to_save = []
try:
log_from = jbr.log(options.frombranch, options.path, options.limit)
log_to = jbr.log(options.tobranch, options.path, options.limit)
history_from = History(log_from)
history_to = History(log_to)
verbose(options,
f"Read {history_from.size()} commits from '{options.frombranch}', {history_to.size()} from {options.tobranch}")
exclude_list = []
if options.exclude:
with open(options.exclude, "r") as exclude_file:
l = exclude_file.read().split('\n')
exclude_list = list(filter(lambda line: not line.startswith("#"), l))
warned = set()
for c in history_from.commits:
if c.message:
verbose(options, f"Looking for commit '{c.message}'")
if c.message in exclude_list:
verbose(options, "...nope, in exclude list")
continue
if not history_to.contains(c):
commits_to_save.append(c)
else:
if history_from.appears_more_than_once(c) and c.fullmessage not in warned:
# Not sure which of those seemingly identical commits are present in the target branch
error(f"Commit '{c.message}' appears more than once in branch '{options.frombranch}'. ")
warned.add(c.fullmessage)
except KeyboardInterrupt:
fatal("Interrupted")
print_out_commits(options, commits_to_save)
save_commits_to_file(commits_to_save, options)
if errors_count > 0:
error(f"{errors_count} error(s) generated to stderr. MANUAL CHECK OF COMMITS IS REQUIRED.")
def save_commits_to_file(commits_to_save, options):
if len(commits_to_save) > 0 and options.output:
print()
with open(options.output, "w") as out:
for i, c in enumerate(reversed(commits_to_save)):
print(f"# {c.sha}", file=out)
print(c.message, file=out)
def print_out_commits(options, commits_to_save):
if options.ishtml:
print("<html><body>")
print(f"<p><b>Commits on <code>{options.frombranch}</code>"
f" missing from <code>{options.tobranch}</code></b></p></h1>")
if len(commits_to_save) > 0:
for c in sorted(commits_to_save, key=lambda commit: commit.bugid):
if options.ishtml:
msg = c.message
bugurl = ""
if c.bugid:
if c.bugid.isnumeric():
bugurl = f"https://bugs.openjdk.org/browse/JDK-{c.bugid}"
elif c.bugid.startswith("JBR-"):
bugurl = f"https://youtrack.jetbrains.com/issue/{c.bugid}"
if len(bugurl) > 0:
msg = msg.replace(c.bugid, f"<a href='{bugurl}'>{c.bugid}</a>")
sha = f"<a href='https://jetbrains.team/p/jbre/repositories/jbr/commits?commits={c.sha}'>" \
f"{c.sha[0:8]}</a>"
print(f"<li>{msg} ({sha})</li>")
else:
print(f"{c.message} ({c.sha[0:8]})")
if options.ishtml:
print("</body></html>")
def check_python_min_requirements():
if sys.version_info < (3, 6):
fatal("Minimum version 3.6 is required to run this script")
if __name__ == '__main__':
main()

12
jb/generate-wakefield.sh Executable file
View File

@@ -0,0 +1,12 @@
#!/bin/bash
if [[ -z "$1" ]]; then
SCANNER=wayland-scanner
else
SCANNER="$1"
fi
set -ex
"$SCANNER" client-header src/java.desktop/share/native/libwakefield/protocol/wakefield.xml src/java.desktop/unix/native/libawt_wlawt/wakefield-client-protocol.h
"$SCANNER" private-code src/java.desktop/share/native/libwakefield/protocol/wakefield.xml src/java.desktop/unix/native/libawt_wlawt/wakefield-client-protocol.c

1
jb/jbr-api.version Normal file
View File

@@ -0,0 +1 @@
1.0.2

230
jb/jdkdiff.py Executable file
View File

@@ -0,0 +1,230 @@
#!/usr/bin/env python3
import argparse
import math
import os.path
import sys
import subprocess
def fatal(msg):
sys.stderr.write(f"[fatal] {msg}\n")
sys.exit(1)
def verbose(options, *msg):
if options.verbose:
sys.stdout.write(f"[verbose] ")
sys.stdout.write(*msg)
sys.stdout.write('\n')
def first_line(str):
return "" if not str else str.splitlines()[0]
class Options:
def __init__(self):
ap = argparse.ArgumentParser(description="Show bugfixes differences between JBR and OpenJDK git repos",
epilog="Example: %(prog)s --jdk ./jdk11u/ --jbr ./JetBrainsRuntime/ --path src/hotspot --limit 200")
ap.add_argument('--jdk', dest='jdkpath', help='path to OpenJDK git repo', required=True)
ap.add_argument('--jbr', dest='jbrpath', help='path to JBR git repo', required=True)
ap.add_argument('--path', dest='path', help='limit to changes in this path (relative to git root)')
ap.add_argument('--limit', dest='limit', help='limit to this many log entries in --jdk repo', type=int, default=-1)
ap.add_argument('-o', dest="output_dir", help="save patches to this directory (created if necessary)")
ap.add_argument('-v', dest='verbose', help="verbose output", default=False, action='store_true')
args = ap.parse_args()
if not os.path.isdir(args.jdkpath):
fatal(f"{args.jdkpath} not a directory")
if not os.path.isdir(args.jbrpath):
fatal(f"{args.jbrpath} not a directory")
if not git_is_available():
fatal("can't run git commands; make sure git is in PATH")
self.jdkpath = args.jdkpath
self.jbrpath = args.jbrpath
self.path = args.path
self.limit = args.limit
self.output_dir = args.output_dir
self.verbose = args.verbose
class GitRepo:
def __init__(self, rootpath):
self.rootpath = rootpath
def run_git_cmd(self, git_args):
args = ["git", "-C", self.rootpath]
args.extend(git_args)
# print(f"Runnig git cmd '{' '.join(args)}'")
p = subprocess.run(args, capture_output=True, text=True)
if p.returncode != 0:
fatal(f"git returned non-zero code in {self.rootpath} ({first_line(p.stderr)})")
return p.stdout
def save_git_cmd(self, fname, git_args):
args = ["git", "-C", self.rootpath]
args.extend(git_args)
# print(f"Runnig git cmd '{' '.join(args)}'")
with open(fname, "w") as stdout_file:
p = subprocess.run(args, stdout=stdout_file)
if p.returncode != 0:
fatal(f"git returned non-zero code in {self.rootpath} ({first_line(p.stderr)})")
def current_branch(self):
branch_name = self.run_git_cmd(["branch", "--show-current"]).strip()
return branch_name
def log(self, path=None, limit=None):
cmds = ["log", "--no-decorate"]
if limit:
cmds.extend(["-n", str(limit)])
if path:
cmds.append(path)
full_log = self.run_git_cmd(cmds)
return full_log
class Commit:
def __init__(self, lines):
self.sha = lines[0].split()[1]
self.message = ""
self.bugid = None
# Commit message starts after one blank line
read_message = False
for l in lines:
if read_message:
self.message += l + "\n"
if not read_message and l == "":
read_message = True
if self.message and self.message != "" and ":" in self.message:
maybe_bugid = self.message.split(":")[0].strip()
if 10 >= len(maybe_bugid) >= 4:
self.bugid = maybe_bugid
class History:
def __init__(self, log):
log_itr = iter(log.splitlines())
self.commits = []
commit_lines = []
for line in log_itr:
if line.startswith("commit ") and len(commit_lines) > 0:
commit = Commit(commit_lines)
self.commits.append(commit)
commit_lines = []
commit_lines.append(line)
if len(commit_lines) > 0:
commit = Commit(commit_lines)
self.commits.append(commit)
def contains(self, str):
return any(str in commit.message for commit in self.commits)
def size(self):
return len(self.commits)
def print_explanation(options, jdk, jbr):
verbose(options, f"Reading history from '{jdk.rootpath}' on branch '{jdk.current_branch()}'")
if options.path:
verbose(options, f"\t(only under '{options.path}')")
verbose(options, f"Searching for same fixes in '{jbr.rootpath}' on branch '{jbr.current_branch()}'")
def git_is_available():
p = None
try:
p = subprocess.run(["git", "--help"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
except:
pass
return p is not None and p.returncode == 0
def main():
check_python_min_requirements()
options = Options()
jdk = GitRepo(options.jdkpath)
jbr = GitRepo(options.jbrpath)
print_explanation(options, jdk, jbr)
commits_to_save = []
try:
jdk_log = jdk.log(options.path, options.limit)
jdk_history = History(jdk_log)
jbr_log = jbr.log(options.path)
jbr_history = History(jbr_log)
verbose(options, f"Read {jdk_history.size()} commits in JDK, {jbr_history.size()} in JBR")
for c in jdk_history.commits:
if c.bugid:
verbose(options, f"Looking for bugfix for {c.bugid}")
if not jbr_history.contains(c.bugid):
commits_to_save.append(c)
print(f"[note] Fix for {c.bugid} not found in JBR ({jbr.rootpath})")
print(f" commit {c.sha}")
print(f" {first_line(c.message).strip()}")
except KeyboardInterrupt:
fatal("Interrupted")
if len(commits_to_save) > 0 and options.output_dir:
print()
if not os.path.exists(options.output_dir):
verbose(options, f"Creating output directory {options.output_dir}")
os.makedirs(options.output_dir)
nzeroes = len(str(len(commits_to_save)))
for i, c in enumerate(reversed(commits_to_save)):
fname = os.path.join(options.output_dir, f"{str(i).zfill(nzeroes)}-{c.bugid}.patch")
print(f"[note] {c.bugid} saved as {fname}")
fname = os.path.abspath(fname)
jdk.save_git_cmd(fname, ["format-patch", "-1", c.sha, "--stdout"])
script_fname = os.path.join(options.output_dir, "apply.sh")
with open(script_fname, "w") as script_file:
print(apply_script_code.format(os.path.abspath(jbr.rootpath), os.path.abspath(options.output_dir)),
file=script_file)
print(f"[note] Execute 'bash {script_fname}' to apply patches to {jbr.rootpath}")
def check_python_min_requirements():
if sys.version_info < (3, 6):
fatal("Minimum version 3.6 is required to run this script")
apply_script_code = """
#!/bin/bash
GITROOT={0}
PATCHROOT={1}
cd $PATCHROOT || exit 1
PATCHES=$(find $PATCHROOT -name '*.patch' | sort -n)
for P in $PATCHES; do
git -C $GITROOT am $P
if [ $? != 0 ]; then
mv "$P" "$P.failed"
echo "[ERROR] Patch $P did not apply cleanly. Try applying it manually."
echo "[NOTE] Execute this script to apply the remaining patches."
exit 1
else
mv "$P" "$P.done"
fi
done
echo "[NOTE] Done applying patches; check $PATCHROOT for .patch and .patch.failed to see if all have been applied."
"""
if __name__ == '__main__':
main()

View File

@@ -0,0 +1 @@
JetBrainsRuntime

View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="IssueNavigationConfiguration">
<option name="links">
<list>
<IssueNavigationLink>
<option name="issueRegexp" value="(?:^|\s|\p{Punct})([A-Z]+\-\d+)(?=$|\s|\p{Punct})" />
<option name="linkRegexp" value="https://youtrack.jetbrains.com/issue/$1" />
</IssueNavigationLink>
<IssueNavigationLink>
<option name="issueRegexp" value="(?:^|\s|\p{Punct})(?:JDK-)?(\d{7})(?=$|\s|\p{Punct})" />
<option name="linkRegexp" value="https://bugs.openjdk.java.net/browse/JDK-$1" />
</IssueNavigationLink>
</list>
</option>
</component>
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
</component>
</project>

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/jdk.iml" filepath="$PROJECT_DIR$/.idea/jdk.iml" />
###MODULE_IMLS###
<module fileurl="file://$PROJECT_DIR$/.idea/test.iml" filepath="$PROJECT_DIR$/.idea/test.iml" />
</modules>
</component>
</project>

View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="IssueNavigationConfiguration">
<option name="links">
<list>
<IssueNavigationLink>
<option name="issueRegexp" value="(?:^|\s|\p{Punct})([A-Z]+\-\d+)(?=$|\s|\p{Punct})" />
<option name="linkRegexp" value="https://youtrack.jetbrains.com/issue/$1" />
</IssueNavigationLink>
<IssueNavigationLink>
<option name="issueRegexp" value="(?:^|\s|\p{Punct})(?:JDK-)?(\d{7})(?=$|\s|\p{Punct})" />
<option name="linkRegexp" value="https://bugs.openjdk.java.net/browse/JDK-$1" />
</IssueNavigationLink>
</list>
</option>
</component>
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

View File

@@ -0,0 +1,135 @@
apply plugin: 'java'
import org.gradle.internal.os.OperatingSystem
repositories {
mavenCentral()
}
def test_jvm = {
if (project.hasProperty('jbsdkhome')) {
file(jbsdkhome + (OperatingSystem.current().isWindows()?"/bin/java.exe" : "/bin/java")).absolutePath
} else {
if (OperatingSystem.current().isMacOsX()) {
file('../../../build/macosx-x86_64-normal-server-release/images/jdk-bundle/jdk-11.0.4.jdk/Contents/Home/bin/java').absolutePath
} else if (OperatingSystem.current().isLinux()) {
file('../../../build/linux-x86_64-normal-server-release/images/jdk/bin/java').absolutePath
} else {
file('../../../build/windows-x86_64-normal-server-release/images/jdk/bin/java.exe').absolutePath
}
}
}
dependencies {
testCompile('junit:junit:4.12'){
exclude group: 'org.hamcrest'
}
testCompile 'org.hamcrest:hamcrest-library:1.3'
testCompile 'net.java.dev.jna:jna:4.4.0'
testCompile 'com.twelvemonkeys.imageio:imageio-tiff:3.3.2'
testCompile 'org.apache.commons:commons-lang3:3.0'
}
def jdk_modules = ["java.base", "java.logging", "java.prefs",
"java.se.ee", "java.sql", "java.datatransfer",
"java.management", "java.rmi", "java.security.jgss",
"java.sql.rowset", "java.desktop", "java.management.rmi",
"java.scripting", "java.security.sasl", "java.transaction",
"java.instrument", "java.naming", "java.se",
"java.smartcardio", "java.xml.crypto"]
def jdk_class_dirs = []
jdk_modules.collect(jdk_class_dirs) {
new File("../../../src/" + it + "/share/classes")
}
if (OperatingSystem.current().isMacOsX())
jdk_modules.collect(jdk_class_dirs) {
"../../../src/" + it + "/macosx/classes"
}
else if (OperatingSystem.current().isLinux()) {
jdk_modules.collect(jdk_class_dirs) {
"../../../src/" + it + "/solaris/classes"
}
jdk_modules.collect(jdk_class_dirs) {
"../../../src/" + it + "/unix/classes"
}
} else
jdk_modules.collect(jdk_class_dirs) {
"../../../src/" + it + "/windows/classes"
}
sourceSets.main.java.srcDirs = jdk_class_dirs
sourceSets {
test {
java {
srcDir "../../../test/jdk/jbu"
}
}
}
test.dependsOn.clear()
test.dependsOn tasks.compileTestJava
test {
systemProperty "jb.java2d.metal", "true"
systemProperty "testdata", file('../../../test/jdk/jbu/testdata').absolutePath
// Generate golden images for DroidFontTest and MixedTextTest
// systemProperty "gentestdata", ""
// Enable Java2D logging (https://confluence.jetbrains.com/display/JRE/Java2D+Rendering+Logging)
// systemProperty "sun.java2d.trace", "log"
// systemProperty "sun.java2d.trace", "log,pimpl"
outputs.upToDateWhen { false }
executable = test_jvm()
// Enable async/dtrace profiler
jvmArgs "-XX:+PreserveFramePointer"
// Enable native J2D logging (only in debug build)
// Can be turned on for J2D by adding "#define DEBUG 1" into jdk/src/share/native/sun/java2d/Trace.h
// environment 'J2D_TRACE_LEVEL', '4'
}
def buildDir = project.buildscript.sourceFile.parentFile.parentFile.parentFile.parentFile
def make_cmd = "make"
if (OperatingSystem.current().isWindows()) {
def cyg_make_cmd = new File("c:/cygwin64/bin/make.exe")
if (cyg_make_cmd.exists()) make_cmd = cyg_make_cmd.absolutePath
}
def test_run = false
task make_images {
doLast {
if (!test_run) {
def pb = new ProcessBuilder().command(make_cmd.toString(), "-C", buildDir.absolutePath, "images")
def proc = pb.redirectErrorStream(true).start()
proc.inputStream.eachLine { println it }
assert proc.waitFor() == 0
}
}
}
task make_clean {
doLast {
def pb = new ProcessBuilder().command(make_cmd.toString(), "-C", buildDir.absolutePath, "clean")
def proc = pb.redirectErrorStream(true).start()
proc.inputStream.eachLine { println it }
assert proc.waitFor() == 0
}
}
task run_test {
doLast {
test_run = true
}
}
tasks.cleanTest.dependsOn tasks.run_test
classes.dependsOn.clear()
classes.dependsOn tasks.make_images
tasks.cleanClasses.dependsOn tasks.make_clean

View File

@@ -0,0 +1,54 @@
java.base,
java.compiler,
java.datatransfer,
java.desktop,
java.instrument,
java.logging,
java.management,
java.management.rmi,
java.naming,
java.net.http,
java.prefs,
java.rmi,
java.scripting,
java.se,
java.security.jgss,
java.security.sasl,
java.smartcardio,
java.sql,
java.sql.rowset,
java.transaction.xa,
java.xml,
java.xml.crypto,
jdk.accessibility,
jdk.attach,
jdk.charsets,
jdk.compiler,
jdk.crypto.cryptoki,
jdk.crypto.ec,
jdk.dynalink,
jdk.httpserver,
jdk.internal.ed,
jdk.internal.le,
jdk.internal.vm.ci,
jdk.javadoc,
jdk.jdi,
jdk.jdwp.agent,
jdk.jfr,
jdk.jsobject,
jdk.localedata,
jdk.management,
jdk.management.agent,
jdk.management.jfr,
jdk.naming.dns,
jdk.naming.rmi,
jdk.net,
jdk.sctp,
jdk.security.auth,
jdk.security.jgss,
jdk.unsupported,
jdk.unsupported.desktop,
jdk.xml.dom,
jdk.zipfs,
jdk.hotspot.agent,
jdk.jcmd

View File

@@ -0,0 +1,190 @@
#!/bin/bash
set -euo pipefail
set -x
function check_bundle_type_maketest() {
# check whether last char is 't', if so remove it
if [ "${bundle_type: -1}" == "t" ] && [ "${bundle_type: -2}" != "ft" ]; then
bundle_type="${bundle_type%?}"
do_maketest=1
else
do_maketest=0
fi
}
function getVersionProp() {
grep "^${1}" make/conf/version-numbers.conf | cut -d'=' -f2
}
DISABLE_WARNINGS_AS_ERRORS=""
CONTINUOUS_INTEGRATION=""
while getopts ":iwc?" o; do
case "${o}" in
i) INC_BUILD=1 ;;
w) DISABLE_WARNINGS_AS_ERRORS="--disable-warnings-as-errors" ;;
c) CONTINUOUS_INTEGRATION=1 ;;
esac
done
shift $((OPTIND-1))
if [[ $# -lt 2 ]]; then
echo "Required at least two arguments: build_number bundle_type"
exit 1
fi
build_number=$1
bundle_type=$2
# shellcheck disable=SC2034
architecture=${3:-x64} # aarch64 or x64
check_bundle_type_maketest
VERSION_FEATURE=$(getVersionProp "DEFAULT_VERSION_FEATURE")
VERSION_INTERIM=$(getVersionProp "DEFAULT_VERSION_INTERIM")
VERSION_UPDATE=$(getVersionProp "DEFAULT_VERSION_UPDATE")
VERSION_PATCH=$(getVersionProp "DEFAULT_VERSION_PATCH")
[[ $VERSION_UPDATE = 0 ]] && JBSDK_VERSION="$VERSION_FEATURE" || JBSDK_VERSION="${VERSION_FEATURE}.${VERSION_INTERIM}.${VERSION_UPDATE}"
[[ $VERSION_PATCH = 0 ]] || JBSDK_VERSION="${VERSION_FEATURE}.${VERSION_INTERIM}.${VERSION_UPDATE}.${VERSION_PATCH}"
echo "##teamcity[setParameter name='env.JBSDK_VERSION' value='${JBSDK_VERSION}']"
tag_prefix="jdk-"
OPENJDK_TAG=$(git tag -l | grep "$tag_prefix$JBSDK_VERSION" | grep -v ga | sort -t "-" -k 2 -V -f | tail -n 1)
JDK_BUILD_NUMBER=$(echo $OPENJDK_TAG | awk -F "-|[+]" '{print $3}')
[ -z $JDK_BUILD_NUMBER ] && JDK_BUILD_NUMBER=1
re='^[0-9]+$'
if ! [[ $JDK_BUILD_NUMBER =~ $re ]] ; then
echo "error: JDK_BUILD_NUMBER Not a number: $JDK_BUILD_NUMBER"
JDK_BUILD_NUMBER=1
fi
echo "##teamcity[setParameter name='env.JDK_UPDATE_NUMBER' value='${JDK_BUILD_NUMBER}']"
VENDOR_NAME="JetBrains s.r.o."
VENDOR_VERSION_STRING="JBR-${JBSDK_VERSION}+${JDK_BUILD_NUMBER}-${build_number}"
[ -z "$bundle_type" ] || VENDOR_VERSION_STRING="${VENDOR_VERSION_STRING}-${bundle_type}"
do_reset_changes=0
do_reset_dcevm=0
HEAD_REVISION=0
STATIC_CONF_ARGS=""
common_conf_props_file="jb/project/tools/common/static_conf_args.txt"
if [[ -f "$common_conf_props_file" ]]; then
STATIC_CONF_ARGS=$(<$common_conf_props_file)
fi
OS_NAME=$(uname -s)
# Enable reproducible builds
TZ=UTC
export TZ
SOURCE_DATE_EPOCH="$(git log -1 --pretty=%ct)"
export SOURCE_DATE_EPOCH
COPYRIGHT_YEAR=""
BUILD_TIME=""
TOUCH_TIME=""
REPRODUCIBLE_TAR_OPTS=""
case "$OS_NAME" in
Linux)
COPYRIGHT_YEAR="$(date --utc --date=@$SOURCE_DATE_EPOCH +%Y)"
BUILD_TIME="$(date --utc --date=@$SOURCE_DATE_EPOCH +%F)"
REPRODUCIBLE_TAR_OPTS="--mtime=@$SOURCE_DATE_EPOCH --owner=0 --group=0 --numeric-owner --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime"
;;
CYGWIN*)
COPYRIGHT_YEAR="$(date --utc --date=@$SOURCE_DATE_EPOCH +%Y)"
BUILD_TIME="$(date --utc --date=@$SOURCE_DATE_EPOCH +%F)"
REPRODUCIBLE_TAR_OPTS="--mtime=@$SOURCE_DATE_EPOCH --owner=0 --group=0 --numeric-owner --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime"
;;
Darwin)
COPYRIGHT_YEAR="$(date -u -r $SOURCE_DATE_EPOCH +%Y)"
BUILD_TIME="$(date -u -r $SOURCE_DATE_EPOCH +%F)"
TOUCH_TIME="$(date -u -r $SOURCE_DATE_EPOCH +%Y%m%d%H%M.%S)"
REPRODUCIBLE_TAR_OPTS="--uid 0 --gid 0 --numeric-owner"
;;
esac
WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS="--with-native-debug-symbols=zipped"
if [ "$bundle_type" == "nomodft" ]; then
WITH_BUNDLED_FREETYPE="--with-freetype=bundled"
else
WITH_BUNDLED_FREETYPE=""
fi
REPRODUCIBLE_BUILD_OPTS="--with-source-date=$SOURCE_DATE_EPOCH
--with-hotspot-build-time=$BUILD_TIME
--with-copyright-year=$COPYRIGHT_YEAR
--disable-absolute-paths-in-output
--with-build-user=builduser"
function zip_native_debug_symbols() {
image_bundle_path=$(echo $1 | cut -d"/" -f-4)
jdk_name=$(echo $1 | cut -d"/" -f5)
jbr_diz_name=$2
[ -d "dizfiles" ] && rm -rf dizfiles
mkdir dizfiles
rsync_target="../../../../dizfiles"
[ -z "$jdk_name" ] && rsync_target=$rsync_target"/"$jbr_diz_name
(cd $image_bundle_path && find . -name '*.diz' -exec rsync -R {} $rsync_target \;)
[ ! -z "$jdk_name" ] && mv dizfiles/$jdk_name dizfiles/$jbr_diz_name
(cd dizfiles && find $jbr_diz_name -print0 | COPYFILE_DISABLE=1 \
tar --no-recursion --null -T - -czf ../"$jbr_diz_name".tar.gz) || do_exit $?
}
function do_exit() {
exit_code=$1
[ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
if [ $do_reset_dcevm -eq 1 ]; then
[ ! -z $HEAD_REVISION ] && git reset --hard $HEAD_REVISION
fi
exit "$exit_code"
}
function update_jsdk_mods() {
__jsdk=$1
__jcef_mods=$2
__orig_jsdk_mods=$3
__updated_jsdk_mods=$4
# re-create java.desktop.jmod with updated module-info.class
tmp=.java.desktop.$$.tmp
mkdir "$tmp" || exit $?
"$__jsdk"/bin/jmod extract --dir "$tmp" "$__orig_jsdk_mods"/java.desktop.jmod || exit $?
"$__jsdk"/bin/javac \
--patch-module java.desktop="$__orig_jsdk_mods"/java.desktop.jmod \
--module-path "$__jcef_mods" -d "$tmp"/classes src/java.desktop/share/classes/module-info.java || exit $?
"$__jsdk"/bin/jmod \
create --class-path "$tmp"/classes --config "$tmp"/conf --header-files "$tmp"/include --legal-notice "$tmp"/legal --libs "$tmp"/lib \
java.desktop.jmod || exit $?
mv java.desktop.jmod "$__updated_jsdk_mods" || exit $?
rm -rf "$tmp"
# re-create java.base.jmod with updated hashes
tmp=.java.base.$$.tmp
mkdir "$tmp" || exit $?
hash_modules=$("$__jsdk"/bin/jmod describe "$__orig_jsdk_mods"/java.base.jmod | grep hashes | awk '{print $2}' | tr '\n' '|' | sed s/\|$//) || exit $?
"$__jsdk"/bin/jmod extract --dir "$tmp" "$__orig_jsdk_mods"/java.base.jmod || exit $?
rm "$__updated_jsdk_mods"/java.base.jmod || exit $? # temp exclude from path
"$__jsdk"/bin/jmod \
create --module-path "$__updated_jsdk_mods" --hash-modules "$hash_modules" \
--class-path "$tmp"/classes --cmds "$tmp"/bin --config "$tmp"/conf --header-files "$tmp"/include --legal-notice "$tmp"/legal --libs "$tmp"/lib \
java.base.jmod || exit $?
mv java.base.jmod "$__updated_jsdk_mods" || exit $?
rm -rf "$tmp"
}
function get_mods_list() {
__mods=$1
echo $(ls $__mods) | sed s/\.jmod/,/g | sed s/,$//g | sed s/' '//g
}
function copy_jmods() {
__mods_list=$1
__jmods_from=$2
__jmods_to=$3
mkdir -p $__jmods_to
echo "${__mods_list}," | while read -d, mod; do cp $__jmods_from/$mod.jmod $__jmods_to/; done
}

View File

@@ -0,0 +1,4 @@
--with-vendor-url=https://www.jetbrains.com/
--with-vendor-bug-url=https://youtrack.jetbrains.com/issues/JBR
--with-vendor-vm-bug-url=https://youtrack.jetbrains.com/issues/JBR

View File

@@ -0,0 +1,185 @@
#!/bin/bash
set -euo pipefail
set -x
# The following parameters must be specified:
# build_number - specifies the number of JetBrainsRuntime build
# bundle_type - specifies bundle to be built;possible values:
# <empty> or nomod - the release bundles without any additional modules (jcef)
# jcef - the release bundles with jcef
# fd - the fastdebug bundles which also include the jcef module
#
# This script makes test-image along with JDK images when bundle_type is set to "jcef".
# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
#
# Environment variables:
# JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument
# to configure
# By default JDK_BUILD_NUMBER is set zero
# JCEF_PATH - specifies the path to the directory with JCEF binaries.
# By default JCEF binaries should be located in ./jcef_linux_aarch64
source jb/project/tools/common/scripts/common.sh
JCEF_PATH=${JCEF_PATH:=./jcef_linux_aarch64}
function do_configure {
GTK_SHELL_PATH=/gtk-shell.xml
if [ ! -e $GTK_SHELL_PATH ]; then
echo $GTK_SHELL_PATH" does not exist"
GTK_SHELL_PATH=`pwd`/gtk-shell.xml
if [ ! -e $GTK_SHELL_PATH ]; then
echo $GTK_SHELL_PATH" does not exist"
curl -O https://raw.githubusercontent.com/GNOME/gtk/refs/heads/main/gdk/wayland/protocol/gtk-shell.xml
fi
fi
sh configure \
$WITH_DEBUG_LEVEL \
--with-vendor-name="$VENDOR_NAME" \
--with-vendor-version-string="$VENDOR_VERSION_STRING" \
--with-jvm-features=shenandoahgc \
--with-version-pre= \
--with-version-build="$JDK_BUILD_NUMBER" \
--with-version-opt=b"$build_number" \
--with-boot-jdk="$BOOT_JDK" \
--enable-cds=yes \
--with-gtk-shell1-protocol=$GTK_SHELL_PATH \
--with-vulkan \
$DISABLE_WARNINGS_AS_ERRORS \
$STATIC_CONF_ARGS \
$REPRODUCIBLE_BUILD_OPTS \
$WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
$WITH_BUNDLED_FREETYPE \
|| do_exit $?
}
function is_musl {
libc=$(ldd /bin/ls | grep 'musl' | head -1 | cut -d ' ' -f1)
if [ -z $libc ]; then
# This is not Musl, return 1 == false
return 1
fi
return 0
}
function create_image_bundle {
__bundle_name=$1
__arch_name=$2
__modules_path=$3
__modules=$4
libc_type_suffix=''
fastdebug_infix=''
__cds_opt=''
if is_musl; then libc_type_suffix='musl-' ; fi
__cds_opt="--generate-cds-archive"
[ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
JBR=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}aarch64-${fastdebug_infix}b${build_number}
__root_dir=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}aarch64-${fastdebug_infix:-}b${build_number}
echo Running jlink....
[ -d "$IMAGES_DIR"/"$__root_dir" ] && rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
$JSDK/bin/jlink \
--module-path "$__modules_path" --no-man-pages --compress=2 \
$__cds_opt --add-modules "$__modules" --output "$IMAGES_DIR"/"$__root_dir"
grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> "$IMAGES_DIR"/"$__root_dir"/release
if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__root_dir"/release > release
mv release "$IMAGES_DIR"/"$__root_dir"/release
cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
fi
# jmod does not preserve file permissions (JDK-8173610)
[ -f "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper ] && chmod a+x "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper
[ -f "$IMAGES_DIR"/"$__root_dir"/lib/cef_server ] && chmod a+x "$IMAGES_DIR"/"$__root_dir"/lib/cef_server
echo Creating "$JBR".tar.gz ...
(cd "$IMAGES_DIR" &&
find "$__root_dir" -print0 | LC_ALL=C sort -z | \
tar $REPRODUCIBLE_TAR_OPTS \
--no-recursion --null -T - -cf "$JBR".tar) || do_exit $?
mv "$IMAGES_DIR"/"$JBR".tar ./"$JBR".tar
[ -f "$JBR".tar.gz ] && rm "$JBR.tar.gz"
touch -c -d "@$SOURCE_DATE_EPOCH" "$JBR".tar
gzip "$JBR".tar || do_exit $?
rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
}
WITH_DEBUG_LEVEL="--with-debug-level=release"
RELEASE_NAME=linux-aarch64-server-release
jbr_name_postfix=""
case "$bundle_type" in
"jcef")
do_reset_changes=1
jbr_name_postfix="_${bundle_type}"
do_maketest=1
;;
"nomod" | "")
bundle_type=""
;;
"nomodft" | "")
jbr_name_postfix="_ft"
;;
"fd")
do_reset_changes=1
jbr_name_postfix="_${bundle_type}"
WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
RELEASE_NAME=linux-aarch64-server-fastdebug
;;
esac
if [ -z "${INC_BUILD:-}" ]; then
do_configure || do_exit $?
make clean CONF=$RELEASE_NAME || do_exit $?
fi
make images CONF=$RELEASE_NAME || do_exit $?
IMAGES_DIR=build/$RELEASE_NAME/images
JSDK=$IMAGES_DIR/jdk
JSDK_MODS_DIR=$IMAGES_DIR/jmods
JBRSDK_BUNDLE=jbrsdk
echo Fixing permissions
chmod -R a+r $JSDK
if [ "$bundle_type" == "jcef" ]; then
git apply -p0 < jb/project/tools/patches/add_jcef_module_aarch64.patch || do_exit $?
update_jsdk_mods $JSDK $JCEF_PATH/jmods $JSDK/jmods $JSDK_MODS_DIR || do_exit $?
cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
cat $JCEF_PATH/jcef.version >> $JSDK/release
fi
# create runtime image bundle
modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
# create sdk image bundle
modules=$(cat $JSDK/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\n//g) || do_exit $?
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
fi
create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" $JBRSDK_BUNDLE $JSDK_MODS_DIR "$modules" || do_exit $?
if [ $do_maketest -eq 1 ]; then
JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-linux-${libc_type_suffix}test-aarch64-b${build_number}
echo Creating "$JBRSDK_TEST" ...
[ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
make test-image CONF=$RELEASE_NAME JBR_API_JBR_VERSION=TEST || do_exit $?
tar -pcf "$JBRSDK_TEST".tar -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
[ -f "$JBRSDK_TEST.tar.gz" ] && rm "$JBRSDK_TEST.tar.gz"
gzip "$JBRSDK_TEST".tar || do_exit $?
fi
do_exit 0

View File

@@ -0,0 +1,210 @@
#!/bin/bash
set -euo pipefail
set -x
# The following parameters must be specified:
# build_number - specifies the number of JetBrainsRuntime build
# bundle_type - specifies bundle to be built;possible values:
# <empty> or nomod - the release bundles without any additional modules (jcef)
# jcef - the release bundles with jcef
# fd - the fastdebug bundles which also include the jcef module
#
# This script makes test-image along with JDK images when bundle_type is set to "jcef".
# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
#
# Environment variables:
# JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument
# to configure
# By default JDK_BUILD_NUMBER is set zero
# JCEF_PATH - specifies the path to the directory with JCEF binaries.
# By default JCEF binaries should be located in ./jcef_linux_x64
source jb/project/tools/common/scripts/common.sh
JCEF_PATH=${JCEF_PATH:=./jcef_linux_x64}
function do_configure {
if is_musl; then
LINUX_TARGET=""
else
LINUX_TARGET="\
--build=x86_64-unknown-linux-gnu \
--openjdk-target=x86_64-unknown-linux-gnu"
fi
GTK_SHELL_PATH=/gtk-shell.xml
if [ ! -e $GTK_SHELL_PATH ]; then
echo $GTK_SHELL_PATH" does not exist"
GTK_SHELL_PATH=`pwd`/gtk-shell.xml
if [ ! -e $GTK_SHELL_PATH ]; then
echo $GTK_SHELL_PATH" does not exist"
curl -O https://raw.githubusercontent.com/GNOME/gtk/refs/heads/main/gdk/wayland/protocol/gtk-shell.xml
fi
fi
if [ -n "${JCEF_BUILD_LEGACY:-}" ]; then
WITH_VULKAN=""
else
WITH_VULKAN="--with-vulkan"
fi
sh configure \
$WITH_DEBUG_LEVEL \
--with-vendor-name="$VENDOR_NAME" \
--with-vendor-version-string="$VENDOR_VERSION_STRING" \
--with-jvm-features=shenandoahgc \
--with-version-pre= \
--with-version-build="$JDK_BUILD_NUMBER" \
--with-version-opt=b"$build_number" \
--with-boot-jdk="$BOOT_JDK" \
--enable-cds=yes \
--with-gtk-shell1-protocol=$GTK_SHELL_PATH \
$WITH_VULKAN \
$LINUX_TARGET \
$DISABLE_WARNINGS_AS_ERRORS \
$STATIC_CONF_ARGS \
$REPRODUCIBLE_BUILD_OPTS \
$WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
$WITH_BUNDLED_FREETYPE \
|| do_exit $?
}
function is_musl {
libc=$(ldd /bin/ls | grep 'musl' | head -1 | cut -d ' ' -f1)
if [ -z $libc ]; then
# This is not Musl, return 1 == false
return 1
fi
return 0
}
function create_image_bundle {
__bundle_name=$1
__arch_name=$2
__modules_path=$3
__modules=$4
libc_type_suffix=''
fastdebug_infix=''
__cds_opt=''
if is_musl; then
libc_type_suffix='musl-'
else
LINUX_TARGET="\
--build=x86_64-unknown-linux-gnu \
--openjdk-target=x86_64-unknown-linux-gnu"
fi
__cds_opt="--generate-cds-archive"
[ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
JBR=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x64-${fastdebug_infix}b${build_number}
__root_dir=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x64-${fastdebug_infix:-}b${build_number}
echo Running jlink....
[ -d "$IMAGES_DIR"/"$__root_dir" ] && rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
$JSDK/bin/jlink \
--module-path "$__modules_path" --no-man-pages --compress=2 \
$__cds_opt --add-modules "$__modules" --output "$IMAGES_DIR"/"$__root_dir"
grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> "$IMAGES_DIR"/"$__root_dir"/release
if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__root_dir"/release > release
mv release "$IMAGES_DIR"/"$__root_dir"/release
cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
fi
# jmod does not preserve file permissions (JDK-8173610)
[ -f "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper ] && chmod a+x "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper
if [ ! -n "${JCEF_BUILD_LEGACY:-}" ]; then
[ -f "$IMAGES_DIR"/"$__root_dir"/lib/cef_server ] && chmod a+x "$IMAGES_DIR"/"$__root_dir"/lib/cef_server
fi
echo Creating "$JBR".tar.gz ...
(cd "$IMAGES_DIR" &&
find "$__root_dir" -print0 | LC_ALL=C sort -z | \
tar $REPRODUCIBLE_TAR_OPTS \
--no-recursion --null -T - -cf "$JBR".tar) || do_exit $?
mv "$IMAGES_DIR"/"$JBR".tar ./"$JBR".tar
[ -f "$JBR".tar.gz ] && rm "$JBR.tar.gz"
touch -c -d "@$SOURCE_DATE_EPOCH" "$JBR".tar
gzip "$JBR".tar || do_exit $?
rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
}
WITH_DEBUG_LEVEL="--with-debug-level=release"
RELEASE_NAME=linux-x86_64-server-release
jbr_name_postfix=""
case "$bundle_type" in
"jcef")
do_reset_changes=1
jbr_name_postfix="_${bundle_type}"
jbrsdk_name_postfix="_${bundle_type}"
do_maketest=1
;;
"nomod" | "")
bundle_type=""
jbrsdk_name_postfix="_${bundle_type}"
;;
"nomodft" | "")
jbr_name_postfix="_ft"
jbrsdk_name_postfix="_ft"
;;
"fd")
do_reset_changes=1
jbr_name_postfix="_${bundle_type}"
WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
RELEASE_NAME=linux-x86_64-server-fastdebug
;;
esac
if [ -z "${INC_BUILD:-}" ]; then
do_configure || do_exit $?
make clean CONF=$RELEASE_NAME || do_exit $?
fi
make images CONF=$RELEASE_NAME || do_exit $?
IMAGES_DIR=build/$RELEASE_NAME/images
JSDK=$IMAGES_DIR/jdk
JSDK_MODS_DIR=$IMAGES_DIR/jmods
JBRSDK_BUNDLE=jbrsdk
echo Fixing permissions
chmod -R a+r $JSDK
if [ "$bundle_type" == "jcef" ]; then
git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
update_jsdk_mods $JSDK $JCEF_PATH/jmods $JSDK/jmods $JSDK_MODS_DIR || do_exit $?
cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
cat $JCEF_PATH/jcef.version >> $JSDK/release
fi
# create runtime image bundle
modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
# create sdk image bundle
modules=$(cat $JSDK/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\n//g) || do_exit $?
if [ "$bundle_type" == "jcef" ]|| [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
fi
create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" $JBRSDK_BUNDLE $JSDK_MODS_DIR "$modules" || do_exit $?
if [ $do_maketest -eq 1 ]; then
JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-linux-${libc_type_suffix}test-x64-b${build_number}
echo Creating "$JBRSDK_TEST" ...
[ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
make test-image CONF=$RELEASE_NAME JBR_API_JBR_VERSION=TEST || do_exit $?
tar -pcf "$JBRSDK_TEST".tar -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
[ -f "$JBRSDK_TEST.tar.gz" ] && rm "$JBRSDK_TEST.tar.gz"
gzip "$JBRSDK_TEST".tar || do_exit $?
fi
do_exit 0

View File

@@ -0,0 +1,146 @@
#!/bin/bash
set -euo pipefail
set -x
# The following parameters must be specified:
# build_number - specifies the number of JetBrainsRuntime build
# bundle_type - specifies bundle to be built;possible values:
# <empty> or nomod - the release bundles without any additional modules (jcef)
# jcef - the release bundles with jcef
# fd - the fastdebug bundles which also include the jcef module
#
source jb/project/tools/common/scripts/common.sh
function do_configure {
linux32 bash configure \
$WITH_DEBUG_LEVEL \
--with-vendor-name="$VENDOR_NAME" \
--with-vendor-version-string="$VENDOR_VERSION_STRING" \
--with-jvm-features=shenandoahgc \
--with-version-pre= \
--with-version-build="$JDK_BUILD_NUMBER" \
--with-version-opt=b"$build_number" \
--with-boot-jdk="$BOOT_JDK" \
$STATIC_CONF_ARGS \
--enable-cds=yes \
$DISABLE_WARNINGS_AS_ERRORS \
$REPRODUCIBLE_BUILD_OPTS \
$WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
|| do_exit $?
}
function is_musl {
libc=$(ldd /bin/ls | grep 'musl' | head -1 | cut -d ' ' -f1)
if [ -z $libc ]; then
# This is not Musl, return 1 == false
return 1
fi
return 0
}
function create_image_bundle {
__bundle_name=$1
__arch_name=$2
__modules_path=$3
__modules=$4
libc_type_suffix=''
fastdebug_infix=''
__cds_opt=''
if is_musl; then libc_type_suffix='musl-' ; fi
__cds_opt="--generate-cds-archive"
[ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
JBR=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x86-${fastdebug_infix}b${build_number}
__root_dir=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x86-${fastdebug_infix:-}b${build_number}
echo Running jlink....
[ -d "$IMAGES_DIR"/"$__root_dir" ] && rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
$JSDK/bin/jlink \
--module-path "$__modules_path" --no-man-pages --compress=2 \
$__cds_opt --add-modules "$__modules" --output "$IMAGES_DIR"/"$__root_dir"
grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> "$IMAGES_DIR"/"$__root_dir"/release
if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__root_dir"/release > release
mv release "$IMAGES_DIR"/"$__root_dir"/release
cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
fi
# jmod does not preserve file permissions (JDK-8173610)
[ -f "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper ] && chmod a+x "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper
echo Creating "$JBR".tar.gz ...
(cd "$IMAGES_DIR" &&
find "$__root_dir" -print0 | LC_ALL=C sort -z | \
tar $REPRODUCIBLE_TAR_OPTS \
--no-recursion --null -T - -cf "$JBR".tar) || do_exit $?
mv "$IMAGES_DIR"/"$JBR".tar ./"$JBR".tar
[ -f "$JBR".tar.gz ] && rm "$JBR.tar.gz"
touch -c -d "@$SOURCE_DATE_EPOCH" "$JBR".tar
gzip "$JBR".tar || do_exit $?
rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
}
WITH_DEBUG_LEVEL="--with-debug-level=release"
RELEASE_NAME=linux-x86-server-release
case "$bundle_type" in
"jcef")
echo "not implemented" && do_exit 1
;;
"nomod" | "")
bundle_type=""
;;
"fd")
do_reset_changes=1
WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
RELEASE_NAME=linux-x86-server-fastdebug
;;
esac
if [ -z "${INC_BUILD:-}" ]; then
do_configure || do_exit $?
make clean CONF=$RELEASE_NAME || do_exit $?
fi
make images CONF=$RELEASE_NAME || do_exit $?
IMAGES_DIR=build/$RELEASE_NAME/images
JSDK=$IMAGES_DIR/jdk
JSDK_MODS_DIR=$IMAGES_DIR/jmods
JBRSDK_BUNDLE=jbrsdk
echo Fixing permissions
chmod -R a+r $JSDK
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
jbr_name_postfix="_${bundle_type}"
else
jbr_name_postfix=""
fi
# create runtime image bundle
modules=$(grep -v "jdk.internal.vm" jb/project/tools/common/modules.list | xargs | sed s/" "//g) || do_exit $?
create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
# create sdk image bundle
modules=$(cat $JSDK/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\n//g) || do_exit $?
create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" $JBRSDK_BUNDLE $JSDK_MODS_DIR "$modules" || do_exit $?
if [ $do_maketest -eq 1 ]; then
JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-linux-${libc_type_suffix}test-x86-b${build_number}
echo Creating "$JBRSDK_TEST" ...
[ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
make test-image CONF=$RELEASE_NAME JBR_API_JBR_VERSION=TEST || do_exit $?
tar -pcf "$JBRSDK_TEST".tar -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
[ -f "$JBRSDK_TEST.tar.gz" ] && rm "$JBRSDK_TEST.tar.gz"
gzip "$JBRSDK_TEST".tar || do_exit $?
fi
do_exit 0

View File

@@ -0,0 +1,63 @@
#!/bin/bash
SCRIPT_DIR="$(cd "$(dirname "$0")" >/dev/null && pwd)"
source "$SCRIPT_DIR/jetsign-common.sh" || exit 1
function isMacOsBinary() {
file "$1" | grep -q 'Mach-O'
}
function isSigned() {
codesign --verify "$1" >/dev/null 2>&1 && ! grep -q Signature=adhoc < <(codesign --display --verbose "$1" 2>&1)
}
# last argument is a path to be signed
pathToBeSigned="$(pwd)/${*: -1}"
jetSignArgs=("${@:1:$#-1}")
if [[ ! -f "$pathToBeSigned" ]]; then
echo "$pathToBeSigned is missing or not a file"
exit 1
elif isSigned "$pathToBeSigned" && ! isForced "${jetSignArgs[@]}" ; then
echo "Already signed: $pathToBeSigned"
elif [[ "$JETSIGN_CLIENT" == "null" ]]; then
echo "JetSign client is missing, cannot proceed with signing"
exit 1
elif ! isMacOsBinary "$pathToBeSigned" && [[ "$pathToBeSigned" != *.sit ]] && [[ "$pathToBeSigned" != *.tar.gz ]]; then
echo "$pathToBeSigned won't be signed, assumed not to be a macOS executable"
else
if isMacOsBinary "$pathToBeSigned" && ! isSigned "$pathToBeSigned" ; then
echo "Unsigned macOS binary: $pathToBeSigned"
fi
workDir=$(dirname "$pathToBeSigned")
pathSigned="$workDir/signed/${pathToBeSigned##*/}"
jetSignExtensions=$(jetSignExtensions "${jetSignArgs[@]}")
contentType=$(jetSignContentType "$pathToBeSigned")
(
cd "$workDir" || exit 1
max_attempts=3
attempt=1
while [ $attempt -le $max_attempts ]; do
if "$JETSIGN_CLIENT" -log-format text -max-wait 1m -denoted-content-type "$contentType" -extensions "$jetSignExtensions" "$pathToBeSigned"; then
break
else
if [ $attempt -eq $max_attempts ]; then
echo "Failed to sign after $max_attempts attempts"
exit 1
fi
echo "Attempt $attempt failed, retrying in 5 seconds..."
sleep 5
((attempt++))
fi
done
# SRE-1223 (Codesign removes execute bits in executable files) workaround
chmod "$(stat -f %A "$pathToBeSigned")" "$pathSigned"
if isMacOsBinary "$pathSigned"; then
isSigned "$pathSigned"
fi
rm "$pathToBeSigned"
mv "$pathSigned" "$pathToBeSigned"
rm -rf "$workDir/signed"
)
fi

View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.cs.allow-jit</key>
<true/>
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
<true/>
<key>com.apple.security.cs.allow-dyld-environment-variables</key>
<true/>
<key>com.apple.security.cs.disable-library-validation</key>
<true/>
<key>com.apple.security.cs.disable-executable-page-protection</key>
<true/>
</dict>
</plist>

View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.cs.allow-jit</key>
<false/>
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
<false/>
<key>com.apple.security.cs.allow-dyld-environment-variables</key>
<false/>
<key>com.apple.security.cs.disable-library-validation</key>
<false/>
<key>com.apple.security.cs.disable-executable-page-protection</key>
<false/>
</dict>
</plist>

View File

@@ -0,0 +1,63 @@
#!/bin/bash
set -euo pipefail
function isForced() {
for arg in "$@"; do
if [[ "$arg" == --force ]]; then
return 0
fi
done
return 1
}
function jetSignExtensions() {
args=("$@")
((lastElementIndex=${#args[@]}-1))
for index in "${!args[@]}"; do
arg=${args[$index]}
case "$arg" in
--sign | -s)
echo -n 'mac_codesign_identity='
continue
;;
--entitlements)
echo -n 'mac_codesign_entitlements='
continue
;;
--options=runtime)
echo -n 'mac_codesign_options=runtime'
;;
--force)
echo -n 'mac_codesign_force=true'
;;
--timestamp | --verbose | -v)
continue
;;
*)
echo -n "$arg"
;;
esac
if [[ $index != "$lastElementIndex" ]]; then
echo -n ","
fi
done
}
# See jetbrains.sign.util.FileUtil.contentType
function jetSignContentType() {
case "${1##*/}" in
*.sit)
echo -n 'application/x-mac-app-zip'
;;
*.tar.gz)
echo -n 'application/x-mac-app-targz'
;;
*.pkg)
echo -n 'application/x-mac-pkg'
;;
*)
echo -n 'application/x-mac-app-bin'
;;
esac
}

View File

@@ -0,0 +1,192 @@
#!/bin/bash
set -euo pipefail
set -x
# The following parameters must be specified:
# build_number - specifies the number of JetBrainsRuntime build
# bundle_type - specifies bundle to be built;possible values:
# <empty> or nomod - the release bundles without any additional modules (jcef)
# jcef - the release bundles with jcef
# fd - the fastdebug bundles which also include the jcef module
#
# This script makes test-image along with JDK images when bundle_type is set to "jcef".
# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
#
# Environment variables:
# JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument
# to configure
# By default JDK_BUILD_NUMBER is set zero
# JCEF_PATH - specifies the path to the directory with JCEF binaries.
# By default JCEF binaries should be located in ./jcef_mac
source jb/project/tools/common/scripts/common.sh
JCEF_PATH=${JCEF_PATH:=./jcef_mac}
BOOT_JDK=${BOOT_JDK:=$(/usr/libexec/java_home -v 17)}
XCODE_PATH=${XCODE_PATH:-}
if [ -d "$XCODE_PATH" ]; then
WITH_XCODE_PATH="--with-xcode-path=$XCODE_PATH"
else
if [ -z "${CONTINUOUS_INTEGRATION:-}" ]; then
WITH_XCODE_PATH=""
if [ -n "${XCODE_PATH}" ]; then
echo "XCode not found in the directory: ${XCODE_PATH}"
echo "default XCode will be used"
fi
else
if [ -z "${XCODE_PATH}" ]; then
echo "specify XCode via setting XCODE_PATH"
else
echo "XCode not found in the directory: ${XCODE_PATH}"
fi
do_exit 1
fi
fi
function do_configure {
sh configure \
$WITH_DEBUG_LEVEL \
--with-vendor-name="$VENDOR_NAME" \
--with-vendor-version-string="$VENDOR_VERSION_STRING" \
--with-macosx-bundle-name-base=${VENDOR_VERSION_STRING} \
--with-macosx-bundle-id-base="com.jetbrains.jbr" \
--with-jvm-features=shenandoahgc \
--with-version-pre= \
--with-version-build="$JDK_BUILD_NUMBER" \
--with-version-opt=b"$build_number" \
--with-boot-jdk="$BOOT_JDK" \
--enable-cds=yes \
$DISABLE_WARNINGS_AS_ERRORS \
$STATIC_CONF_ARGS \
$REPRODUCIBLE_BUILD_OPTS \
$WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
$WITH_XCODE_PATH \
|| do_exit $?
}
function create_image_bundle {
__bundle_name=$1
__arch_name=$2
__modules_path=$3
__modules=$4
fastdebug_infix=''
__cds_opt=''
__cds_opt="--generate-cds-archive"
tmp=.bundle.$$.tmp
mkdir "$tmp" || do_exit $?
[ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
JBR=${__bundle_name}-${JBSDK_VERSION}-osx-${architecture}-${fastdebug_infix:-}b${build_number}
__root_dir=${__bundle_name}-${JBSDK_VERSION}-osx-${architecture}-${fastdebug_infix:-}b${build_number}
JRE_CONTENTS=$tmp/$__root_dir/Contents
mkdir -p "$JRE_CONTENTS" || do_exit $?
echo Running jlink...
"$JSDK"/bin/jlink \
--module-path "$__modules_path" --no-man-pages --compress=2 \
$__cds_opt --add-modules "$__modules" --output "$JRE_CONTENTS/Home" || do_exit $?
grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> "$JRE_CONTENTS/Home/release"
if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
sed 's/JBR/JBRSDK/g' $JRE_CONTENTS/Home/release > release
mv release $JRE_CONTENTS/Home/release
cp $IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk/Contents/Home/lib/src.zip $JRE_CONTENTS/Home/lib
copy_jmods "$__modules" "$__modules_path" "$JRE_CONTENTS"/Home/jmods
zip_native_debug_symbols $IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk "${JBR}_diz"
fi
if [ "$bundle_type" == "jcef" ]; then
cat $JCEF_PATH/jcef.version >> "$JRE_CONTENTS/Home/release"
fi
cp -R "$JSDK"/../MacOS "$JRE_CONTENTS"
cp "$JSDK"/../Info.plist "$JRE_CONTENTS"
[ -n "$bundle_type" ] && (cp -a $JCEF_PATH/Frameworks "$JRE_CONTENTS" || do_exit $?)
echo Creating "$JBR".tar.gz ...
# Normalize timestamp
find "$tmp"/"$__root_dir" -print0 | xargs -0 touch -c -h -t "$TOUCH_TIME"
(cd "$tmp" &&
find "$__root_dir" -print0 | LC_ALL=C sort -z | \
COPYFILE_DISABLE=1 tar $REPRODUCIBLE_TAR_OPTS --no-recursion --null -T - \
-czf "$JBR".tar.gz --exclude='*.dSYM' --exclude='man') || do_exit $?
mv "$tmp"/"$JBR".tar.gz "$JBR".tar.gz
rm -rf "$tmp"
}
WITH_DEBUG_LEVEL="--with-debug-level=release"
CONF_ARCHITECTURE=x86_64
if [[ "${architecture}" == *aarch64* ]]; then
CONF_ARCHITECTURE=aarch64
fi
RELEASE_NAME=macosx-${CONF_ARCHITECTURE}-server-release
case "$bundle_type" in
"jcef")
do_reset_changes=1
do_maketest=1
;;
"nomod" | "")
bundle_type=""
;;
"fd")
do_reset_changes=1
WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
RELEASE_NAME=macosx-${CONF_ARCHITECTURE}-server-fastdebug
JBSDK=macosx-${architecture}-server-release
;;
esac
if [ -z "${INC_BUILD:-}" ]; then
do_configure || do_exit $?
make clean CONF=$RELEASE_NAME || do_exit $?
fi
make images CONF=$RELEASE_NAME || do_exit $?
IMAGES_DIR=build/$RELEASE_NAME/images
JSDK=$IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk/Contents/Home
JSDK_MODS_DIR=$IMAGES_DIR/jmods
JBRSDK_BUNDLE=jbrsdk
# test/jdk/jb/java/awt/Focus/FullScreenFocusStealing.java test/jdk/java/awt/color/ICC_ColorSpace/MTTransformReplacedProfile.java test/jdk/java/awt/datatransfer/DataFlavor/DataFlavorRemoteTest.java test/jdk/java/awt/Robot/NonEmptyErrorStream.java
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
if [ "$bundle_type" == "jcef" ]; then
git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
update_jsdk_mods "$JSDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
fi
jbr_name_postfix="_${bundle_type}"
else
jbr_name_postfix=""
fi
# create runtime image bundle
modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
# create sdk image bundle
modules=$(cat "$JSDK"/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\n//g) || do_exit $?
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
fi
create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?
if [ $do_maketest -eq 1 ]; then
JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-osx-test-${architecture}-b${build_number}
echo Creating "$JBRSDK_TEST" ...
[ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
make test-image CONF=$RELEASE_NAME JBR_API_JBR_VERSION=TEST || do_exit $?
[ -f "$JBRSDK_TEST.tar.gz" ] && rm "$JBRSDK_TEST.tar.gz"
COPYFILE_DISABLE=1 tar -pczf "$JBRSDK_TEST".tar.gz -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
fi
do_exit 0

View File

@@ -0,0 +1,63 @@
#!/bin/bash
#immediately exit script with an error if a command fails
set -euo pipefail
[[ "${SCRIPT_VERBOSE:-}" == "1" ]] && set -x
APP_PATH=$1
if [[ -z "$APP_PATH" ]]; then
echo "Usage: $0 AppPath"
exit 1
fi
if [[ ! -f "$APP_PATH" ]]; then
echo "AppName '$APP_PATH' does not exist or not a file"
exit 1
fi
function log() {
echo "$(date '+[%H:%M:%S]') $*"
}
# check required parameters
: "${APPLE_ISSUER_ID}"
: "${APPLE_KEY_ID}"
: "${APPLE_PRIVATE_KEY}"
# shellcheck disable=SC2064
trap "rm -f \"$PWD/tmp_key\"" INT EXIT RETURN
echo -n "${APPLE_PRIVATE_KEY}" > tmp_key
log "Notarizing $APP_PATH..."
xcrun notarytool submit --key tmp_key --key-id "${APPLE_KEY_ID}" --issuer "${APPLE_ISSUER_ID}" "$APP_PATH" 2>&1 --wait| tee "notarytool.submit.out"
REQUEST_ID="$(grep -e " id: " "notarytool.submit.out" | grep -oE '([0-9a-f-]{36})'| head -n1)"
waitOutput=$(xcrun notarytool wait "$REQUEST_ID" --key tmp_key --key-id "${APPLE_KEY_ID}" --issuer "${APPLE_ISSUER_ID}" --timeout 6h)
if [ $? -ne 0 ]; then
log "Notarizing failed (wait command)"
echo "$waitOutput"
exit 1
else
echo "$waitOutput"
fi
logOutout=$(xcrun notarytool log "$REQUEST_ID" --key tmp_key --key-id "${APPLE_KEY_ID}" --issuer "${APPLE_ISSUER_ID}" developer_log.json)
if [ $? -ne 0 ]; then
log "Notarizing failed (log command)"
echo "$logOutout"
exit 1
else
echo "$logOutout"
fi
infoOUtput=$(xcrun notarytool info "$REQUEST_ID" --key tmp_key --key-id "${APPLE_KEY_ID}" --issuer "${APPLE_ISSUER_ID}")
if [ $? -ne 0 ]; then
log "Notarizing failed (info command)"
echo "$infoOUtput"
exit 1
else
echo "$infoOUtput"
fi
log "Notarizing finished"

View File

@@ -0,0 +1,41 @@
#!/bin/bash
SCRIPT_DIR="$(cd "$(dirname "$0")" >/dev/null && pwd)"
source "$SCRIPT_DIR/jetsign-common.sh" || exit 1
function isSigned() {
pkgutil --check-signature "$1" >/dev/null 2>&1 && grep -q "signed by a developer certificate" < <(pkgutil --check-signature "$1" 2>&1)
}
# second last argument is a path to be signed
pathToBeSigned="$(pwd)/${*:(-2):1}"
# last argument is a path to signed file
pathOut="$(pwd)/${*:(-1)}"
jetSignArgs=("${@:1:$#-2}")
if [[ ! -f "$pathToBeSigned" ]]; then
echo "$pathToBeSigned is missing or not a file"
exit 1
elif isSigned "$pathToBeSigned" && ! isForced "${jetSignArgs[@]}" ; then
echo "Already signed: $pathToBeSigned"
elif [[ "$JETSIGN_CLIENT" == "null" ]]; then
echo "JetSign client is missing, cannot proceed with signing"
exit 1
elif [[ "$pathToBeSigned" != *.pkg ]]; then
echo "$pathToBeSigned won't be signed, assumed not to be a macOS package"
else
if ! isSigned "$pathToBeSigned" ; then
echo "Unsigned macOS package: $pathToBeSigned"
fi
workDir=$(dirname "$pathToBeSigned")
pathSigned="$workDir/signed/${pathToBeSigned##*/}"
jetSignExtensions=$(jetSignExtensions "${jetSignArgs[@]}")
contentType=$(jetSignContentType "$pathToBeSigned")
(
cd "$workDir" || exit 1
"$JETSIGN_CLIENT" -log-format text -denoted-content-type "$contentType" -extensions "$jetSignExtensions" "$pathToBeSigned"
isSigned "$pathSigned"
rm -f "$pathOut"
mv "$pathSigned" "$pathOut"
rm -rf "$workDir/signed"
)
fi

View File

@@ -0,0 +1,241 @@
#!/bin/bash
#immediately exit script with an error if a command fails
set -euo pipefail
[[ "${SCRIPT_VERBOSE:-}" == "1" ]] && set -x
if [[ $# -lt 5 ]]; then
echo "Usage: $0 AppDirectory AppName BundleId CertificateID InstallerCertificateID"
exit 1
fi
APPLICATION_PATH=$1
PKG_NAME=$2
BUNDLE_ID=$3
JB_DEVELOPER_CERT=$4
JB_INSTALLER_CERT=$5
SCRIPT_DIR="$(cd "$(dirname "$0")" >/dev/null && pwd)"
# Use JetBrains sign utility if it's available
if [[ "${JETSIGN_CLIENT:=}" == "null" ]] || [[ "$JETSIGN_CLIENT" == "" ]]; then
JB_SIGN=false
SIGN_UTILITY="codesign"
PRODUCTSIGN_UTILITY="productsign"
else
JB_SIGN=true
SIGN_UTILITY="$SCRIPT_DIR/codesign.sh"
PRODUCTSIGN_UTILITY="$SCRIPT_DIR/productsign.sh"
fi
if [[ ! -d "$APPLICATION_PATH" ]]; then
echo "AppDirectory '$APPLICATION_PATH' does not exist or not a directory"
exit 1
fi
function log() {
echo "$(date '+[%H:%M:%S]') $*"
}
# Cleanup files left from previous sign attempt (if any)
find "$APPLICATION_PATH" -name '*.cstemp' -exec rm '{}' \;
log "Signing libraries and executables..."
# -perm +111 searches for executables
for f in \
"Contents/Home/lib" "Contents/MacOS"; do
if [ -d "$APPLICATION_PATH/$f" ]; then
find "$APPLICATION_PATH/$f" \
-type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -name "*.tbd" -o -name "*.node" -o -perm +111 \) \
-exec sh -c '"$1" --timestamp -v -s "$2" --options=runtime --force --entitlements "$3" "$4" || exit 1' sh "$SIGN_UTILITY" "$JB_DEVELOPER_CERT" "$SCRIPT_DIR/entitlements.xml" {} \;
fi
done
log "Signing JCEF libraries and executables..."
if [ -d "$APPLICATION_PATH/Contents/Frameworks" ]; then
find "$APPLICATION_PATH/Contents/Frameworks" \
-type f \( -name "*.dylib" -o -perm +111 \) \
-exec sh -c '"$1" --timestamp -v -s "$2" --options=runtime --force --entitlements "$3" "$4" || exit 1' sh "$SIGN_UTILITY" "$JB_DEVELOPER_CERT" "$SCRIPT_DIR/entitlements_jcef.xml" {} \;
fi
log "Signing jmod files"
JMODS_DIR="$APPLICATION_PATH/Contents/Home/jmods"
JMOD_EXE="$APPLICATION_PATH/Contents/Home/bin/jmod"
if [ -d "$JMODS_DIR" ]; then
log "processing jmods"
for jmod_file in "$JMODS_DIR"/*.jmod; do
log "Processing $jmod_file"
TMP_DIR="$JMODS_DIR/tmp"
rm -rf "$TMP_DIR"
mkdir "$TMP_DIR"
log "Unzipping $jmod_file"
$JMOD_EXE extract --dir "$TMP_DIR" "$jmod_file" >/dev/null
log "Signing dylibs in $TMP_DIR"
find "$TMP_DIR" \
-type f \( -name "*.dylib" -o -name "*.so"-o -perm +111 -o -name jarsigner -o -name jnativescan -o -name jdeps -o -name jpackageapplauncher -o -name jspawnhelper -o -name jar -o -name javap -o -name jdeprscan -o -name jfr -o -name rmiregistry -o -name java -o -name jhsdb -o -name jstatd -o -name jstatd -o -name jpackage -o -name keytool -o -name jmod -o -name jlink -o -name jimage -o -name jstack -o -name jcmd -o -name jps -o -name jmap -o -name jstat -o -name jinfo -o -name jshell -o -name jwebserver -o -name javac -o -name serialver -o -name jrunscript -o -name jdb -o -name jconsole -o -name javadoc \) \
-exec sh -c '"$1" --timestamp -v -s "$2" --options=runtime --force --entitlements "$3" "$4" || exit 1' sh "$SIGN_UTILITY" "$JB_DEVELOPER_CERT" "$SCRIPT_DIR/entitlements.xml" {} \;
log "Removing $jmod_file"
rm -f "$jmod_file"
cmd="$JMOD_EXE create --class-path $TMP_DIR/classes"
# Check each directory and add to the command if it exists
[ -d "$TMP_DIR/bin" ] && cmd="$cmd --cmds $TMP_DIR/bin"
[ -d "$TMP_DIR/conf" ] && cmd="$cmd --config $TMP_DIR/conf"
[ -d "$TMP_DIR/lib" ] && cmd="$cmd --libs $TMP_DIR/lib"
[ -d "$TMP_DIR/include" ] && cmd="$cmd --header-files $TMP_DIR/include"
[ -d "$TMP_DIR/legal" ] && cmd="$cmd --legal-notices $TMP_DIR/legal"
[ -d "$TMP_DIR/man" ] && cmd="$cmd --man-pages $TMP_DIR/man"
log "Creating jmod file"
log "$cmd"
# Add the output file
cmd="$cmd $jmod_file"
# Execute the command
eval $cmd
log "Removing $TMP_DIR"
rm -rf "$TMP_DIR"
done
log "Repack java.base.jmod with new hashes of modules"
hash_modules=$($JMOD_EXE describe $JMODS_DIR/java.base.jmod | grep hashes | awk '{print $2}' | tr '\n' '|' | sed s/\|$//) || exit $?
TMP_DIR="$JMODS_DIR/tmp"
rm -rf "$TMP_DIR"
mkdir "$TMP_DIR"
jmod_file="$JMODS_DIR/java.base.jmod"
log "Unzipping $jmod_file"
$JMOD_EXE extract --dir "$TMP_DIR" "$jmod_file" >/dev/null
log "Removing java.base.jmod"
rm -f "$jmod_file"
cmd="$JMOD_EXE create --class-path $TMP_DIR/classes --hash-modules \"$hash_modules\" --module-path $JMODS_DIR"
# Check each directory and add to the command if it exists
[ -d "$TMP_DIR/bin" ] && cmd="$cmd --cmds $TMP_DIR/bin"
[ -d "$TMP_DIR/conf" ] && cmd="$cmd --config $TMP_DIR/conf"
[ -d "$TMP_DIR/lib" ] && cmd="$cmd --libs $TMP_DIR/lib"
[ -d "$TMP_DIR/include" ] && cmd="$cmd --header-files $TMP_DIR/include"
[ -d "$TMP_DIR/legal" ] && cmd="$cmd --legal-notices $TMP_DIR/legal"
[ -d "$TMP_DIR/man" ] && cmd="$cmd --man-pages $TMP_DIR/man"
log "Creating jmod file"
log "$cmd"
# Add the output file
cmd="$cmd $jmod_file"
# Execute the command
eval $cmd
log "Removing $TMP_DIR"
rm -rf "$TMP_DIR"
else
echo "Directory '$JMODS_DIR' does not exist. Skipping signing of jmod files."
fi
log "Signing libraries in jars in $APPLICATION_PATH"
# todo: add set -euo pipefail; into the inner sh -c
# `-e` prevents `grep -q && printf` loginc
# with `-o pipefail` there's no input for 'while' loop
find "$APPLICATION_PATH" -name '*.jar' \
-exec sh -c "set -u; unzip -l \"\$0\" | grep -q -e '\.dylib\$' -e '\.jnilib\$' -e '\.so\$' -e '\.tbd\$' -e '^jattach\$' && printf \"\$0\0\" " {} \; |
while IFS= read -r -d $'\0' file; do
log "Processing libraries in $file"
rm -rf jarfolder jar.jar
mkdir jarfolder
filename="${file##*/}"
log "Filename: $filename"
cp "$file" jarfolder && (cd jarfolder && jar xf "$filename" && rm "$filename")
find jarfolder \
-type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -name "*.tbd" -o -name "jattach" \) \
-exec sh -c '"$1" --timestamp --force -v -s "$2" --options=runtime --entitlements "$3" "$4" || exit 1' sh "$SIGN_UTILITY" "$JB_DEVELOPER_CERT" "$SCRIPT_DIR/entitlements.xml" {} \;
(cd jarfolder; zip -q -r -o -0 ../jar.jar .)
mv jar.jar "$file"
done
rm -rf jarfolder jar.jar
log "Signing other files..."
# shellcheck disable=SC2043
for f in \
"Contents/Home/bin"; do
if [ -d "$APPLICATION_PATH/$f" ]; then
find "$APPLICATION_PATH/$f" \
-type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -name "*.tbd" -o -perm +111 \) \
-exec sh -c '"$1" --timestamp -v -s "$2" --options=runtime --force --entitlements "$3" "$4" || exit 1' sh "$SIGN_UTILITY" "$JB_DEVELOPER_CERT" "$SCRIPT_DIR/entitlements.xml" {} \;
fi
done
log "Signing whole frameworks..."
# shellcheck disable=SC2043
if [ "$JB_SIGN" = true ]; then for f in \
"Contents/Frameworks/cef_server.app/Contents/Frameworks" "Contents/Frameworks"; do
if [ -d "$APPLICATION_PATH/$f" ]; then
find "$APPLICATION_PATH/$f" \( -name '*.framework' -o -name '*.app' \) -maxdepth 1 | while read -r line
do
log "Signing '$line':"
tar -pczf tmp-to-sign.tar.gz -C "$(dirname "$line")" "$(basename "$line")"
"$SIGN_UTILITY" --timestamp \
-v -s "$JB_DEVELOPER_CERT" --options=runtime \
--force \
--entitlements "$SCRIPT_DIR/entitlements_jcef.xml" tmp-to-sign.tar.gz || exit 1
rm -rf "$line"
tar -xzf tmp-to-sign.tar.gz --directory "$(dirname "$line")"
rm -f tmp-to-sign.tar.gz
done
fi
done; fi
log "Checking framework signatures..."
if [ -d "$APPLICATION_PATH/Contents/Frameworks" ]; then
find "$APPLICATION_PATH/Contents/Frameworks" -name '*.framework' -maxdepth 1 | while read -r line
do
log "Checking '$line':"
codesign --verify --deep --strict --verbose=4 "$line"
done
fi
log "Signing whole app..."
if [ "$JB_SIGN" = true ]; then
tar -pczf tmp-to-sign.tar.gz --exclude='man' -C "$(dirname "$APPLICATION_PATH")" "$(basename "$APPLICATION_PATH")"
"$SIGN_UTILITY" --timestamp \
-v -s "$JB_DEVELOPER_CERT" --options=runtime \
--force \
--entitlements "$SCRIPT_DIR/entitlements.xml" tmp-to-sign.tar.gz || exit 1
rm -rf "$APPLICATION_PATH"
tar -xzf tmp-to-sign.tar.gz --directory "$(dirname "$APPLICATION_PATH")"
rm -f tmp-to-sign.tar.gz
else
"$SIGN_UTILITY" --timestamp \
-v -s "$JB_DEVELOPER_CERT" --options=runtime \
--force \
--entitlements "$SCRIPT_DIR/entitlements.xml" "$APPLICATION_PATH" || exit 1
fi
BUILD_NAME="$(basename "$APPLICATION_PATH")"
log "Creating $PKG_NAME..."
rm -rf "$PKG_NAME"
mkdir -p unsigned
pkgbuild --identifier $BUNDLE_ID --root $APPLICATION_PATH \
--install-location /Library/Java/JavaVirtualMachines/${BUILD_NAME} unsigned/${PKG_NAME}
log "Signing $PKG_NAME..."
"$PRODUCTSIGN_UTILITY" --timestamp --sign "$JB_INSTALLER_CERT" unsigned/${PKG_NAME} ${PKG_NAME}
log "Verifying java is not broken"
find "$APPLICATION_PATH" \
-type f -name 'java' -perm +111 -exec {} -version \;

View File

@@ -0,0 +1,155 @@
#!/bin/bash
#immediately exit script with an error if a command fails
set -euo pipefail
[[ "${SCRIPT_VERBOSE:-}" == "1" ]] && set -x
export COPY_EXTENDED_ATTRIBUTES_DISABLE=true
export COPYFILE_DISABLE=true
INPUT_FILE=$1
EXPLODED=$2.exploded
USERNAME=$3
PASSWORD=$4
CODESIGN_STRING=$5
JB_INSTALLER_CERT=$6
NOTARIZE=$7
BUNDLE_ID=$8
SCRIPT_DIR="$(cd "$(dirname "$0")" >/dev/null && pwd)"
function log() {
echo "$(date '+[%H:%M:%S]') $*"
}
log "Deleting $EXPLODED ..."
if test -d "$EXPLODED"; then
find "$EXPLODED" -mindepth 1 -maxdepth 1 -exec chmod -R u+wx '{}' \;
fi
rm -rf "$EXPLODED"
mkdir "$EXPLODED"
log "Unzipping $INPUT_FILE to $EXPLODED ..."
tar -xzvf "$INPUT_FILE" --directory $EXPLODED
BUILD_NAME="$(ls "$EXPLODED")"
#sed -i '' s/BNDL/APPL/ $EXPLODED/$BUILD_NAME/Contents/Info.plist
rm -f $EXPLODED/$BUILD_NAME/Contents/CodeResources
mv "$INPUT_FILE" "$INPUT_FILE".origin
log "$INPUT_FILE extracted and removed"
APP_NAME=$(basename "$INPUT_FILE" | awk -F".tar" '{ print $1 }')
PKG_NAME="$APP_NAME.pkg"
APPLICATION_PATH=$EXPLODED/$(ls $EXPLODED)
find "$APPLICATION_PATH/Contents/Home/bin" \
-maxdepth 1 -type f -name '*.jnilib' -print0 |
while IFS= read -r -d $'\0' file; do
if [ -f "$file" ]; then
log "Linking $file"
b="$(basename "$file" .jnilib)"
ln -sf "$b.jnilib" "$(dirname "$file")/$b.dylib"
fi
done
find "$APPLICATION_PATH/Contents/" \
-maxdepth 1 -type f -name '*.txt' -print0 |
while IFS= read -r -d $'\0' file; do
if [ -f "$file" ]; then
log "Moving $file"
mv "$file" "$APPLICATION_PATH/Contents/Resources"
fi
done
non_plist=$(find "$APPLICATION_PATH/Contents/" -maxdepth 1 -type f -and -not -name 'Info.plist' | wc -l)
if [[ $non_plist -gt 0 ]]; then
log "Only Info.plist file is allowed in Contents directory but found $non_plist file(s):"
log "$(find "$APPLICATION_PATH/Contents/" -maxdepth 1 -type f -and -not -name 'Info.plist')"
exit 1
fi
if [[ "${JETSIGN_CLIENT:=}" == "null" ]] || [[ "$JETSIGN_CLIENT" == "" ]]; then
log "Unlocking keychain..."
# Make sure *.p12 is imported into local KeyChain
security unlock-keychain -p "$PASSWORD" "/Users/$USERNAME/Library/Keychains/login.keychain"
fi
attempt=1
limit=1
ec=0
set +e
while [[ $attempt -le $limit ]]; do
log "Signing (attempt $attempt) $APPLICATION_PATH ..."
"$SCRIPT_DIR/sign.sh" "$APPLICATION_PATH" "$PKG_NAME" "$BUNDLE_ID" "$CODESIGN_STRING" "$JB_INSTALLER_CERT"
ec=$?
((attempt += 1))
if [[ $ec -ne 0 ]]; then
log "Signing failed, wait for 30 sec and try to sign again"
sleep 30
else
log "Signing done"
codesign -v "$APPLICATION_PATH" -vvvvv
log "Check sign done"
spctl -a -v $APPLICATION_PATH
fi
done
set -e
if [[ $ec -ne 0 ]]; then
log "Signing failed, restore original input file"
mv "$INPUT_FILE".origin "$INPUT_FILE"
fi
if [ "$NOTARIZE" = "yes" ]; then
log "Notarizing..."
"$SCRIPT_DIR/notarize.sh" "$PKG_NAME"
log "Stapling..."
appStaplerOutput=$(xcrun stapler staple "$APPLICATION_PATH")
if [ $? -ne 0 ]; then
log "Stapling application failed"
echo "$appStaplerOutput"
exit 1
else
echo "$appStaplerOutput"
fi
log "Stapling package..."
pkgStaplerOutput=$(xcrun stapler staple "$PKG_NAME")
if [ $? -ne 0 ]; then
log "Stapling package failed"
echo "$pkgStaplerOutput"
exit 1
else
echo "$pkgStaplerOutput"
fi
# Verify stapling
log "Verifying stapling..."
if ! stapler validate "$APPLICATION_PATH"; then
log "Stapling verification failed for application"
exit 1
fi
if ! stapler validate "$PKG_NAME"; then
log "Stapling verification failed for package"
exit 1
fi
else
log "Notarization disabled"
log "Stapling disabled"
fi
log "Zipping $BUILD_NAME to $INPUT_FILE ..."
(
if [[ "$APPLICATION_PATH" != "$EXPLODED/$BUILD_NAME" ]]; then
mv $APPLICATION_PATH $EXPLODED/$BUILD_NAME
else
echo "No move, source == destination: $APPLICATION_PATH"
fi
tar -pczvf $INPUT_FILE --exclude='man' -C $EXPLODED $BUILD_NAME
log "Finished zipping"
)
rm -rf "$EXPLODED"
log "Done"

View File

@@ -0,0 +1,30 @@
diff --git jb/project/tools/common/modules.list jb/project/tools/common/modules.list
index 522acb7cb43..c40e689d5de 100644
--- jb/project/tools/common/modules.list
+++ jb/project/tools/common/modules.list
@@ -51,4 +51,7 @@ jdk.unsupported.desktop,
jdk.xml.dom,
jdk.zipfs,
jdk.hotspot.agent,
-jdk.jcmd
+jdk.jcmd,
+jcef,
+gluegen.rt,
+jogl.all
diff --git src/java.desktop/share/classes/module-info.java src/java.desktop/share/classes/module-info.java
index 897647ee368..781d1809493 100644
--- src/java.desktop/share/classes/module-info.java
+++ src/java.desktop/share/classes/module-info.java
@@ -116,7 +116,11 @@ module java.desktop {
// see make/GensrcModuleInfo.gmk
exports sun.awt to
jdk.accessibility,
- jdk.unsupported.desktop;
+ jdk.unsupported.desktop,
+ jcef,
+ jogl.all;
+
+ exports java.awt.peer to jcef;
exports java.awt.dnd.peer to jdk.unsupported.desktop;
exports sun.awt.dnd to jdk.unsupported.desktop;

View File

@@ -0,0 +1,30 @@
diff --git jb/project/tools/common/modules.list jb/project/tools/common/modules.list
index 522acb7..c40e689 100644
--- jb/project/tools/common/modules.list
+++ jb/project/tools/common/modules.list
@@ -51,4 +51,7 @@ jdk.unsupported.desktop,
jdk.xml.dom,
jdk.zipfs,
jdk.hotspot.agent,
-jdk.jcmd
+jdk.jcmd,
+jcef,
+gluegen.rt,
+jogl.all
diff --git src/java.desktop/share/classes/module-info.java src/java.desktop/share/classes/module-info.java
index 897647e..781d180 100644
--- src/java.desktop/share/classes/module-info.java
+++ src/java.desktop/share/classes/module-info.java
@@ -116,7 +116,11 @@ module java.desktop {
// see make/GensrcModuleInfo.gmk
exports sun.awt to
jdk.accessibility,
- jdk.unsupported.desktop;
+ jdk.unsupported.desktop,
+ jcef,
+ jogl.all;
+
+ exports java.awt.peer to jcef;
exports java.awt.dnd.peer to jdk.unsupported.desktop;
exports sun.awt.dnd to jdk.unsupported.desktop;

View File

@@ -0,0 +1,267 @@
prog.verbose=disabled
prog.printresults=enabled
global.env.outputwidth=640
global.env.outputheight=480
global.env.runcount=5
global.env.repcount=0
global.env.testtime=2500
global.results.workunits=units
global.results.timeunits=sec
global.results.ratio=unitspersec
global.dest.offscreen=disabled
global.dest.frame.defaultframe=enabled
global.dest.frame.transframe=disabled
global.dest.frame.shapedframe=disabled
global.dest.frame.shapedtransframe=disabled
global.dest.compatimg.compatimg=disabled
global.dest.compatimg.opqcompatimg=disabled
global.dest.compatimg.bmcompatimg=disabled
global.dest.compatimg.transcompatimg=disabled
global.dest.volimg.volimg=disabled
global.dest.volimg.opqvolimg=disabled
global.dest.volimg.bmvolimg=disabled
global.dest.volimg.transvolimg=disabled
global.dest.bufimg.IntXrgb=disabled
global.dest.bufimg.IntArgb=disabled
global.dest.bufimg.IntArgbPre=disabled
global.dest.bufimg.3ByteBgr=disabled
global.dest.bufimg.ByteIndexed=disabled
global.dest.bufimg.ByteGray=disabled
global.dest.bufimg.4ByteAbgr=disabled
global.dest.bufimg.4ByteAbgrPre=disabled
global.dest.bufimg.custom=disabled
graphics.opts.anim=2
graphics.opts.sizes=250
graphics.opts.alpharule=SrcOver
graphics.opts.transform=ident
graphics.opts.extraalpha=Off
graphics.opts.xormode=Off
graphics.opts.clip=Off
graphics.opts.renderhint=Default
graphics.render.opts.paint=random
graphics.render.opts.alphacolor=Off
graphics.render.opts.antialias=On
graphics.render.opts.stroke=width1
graphics.render.tests.drawLine=disabled
graphics.render.tests.drawLineHoriz=disabled
graphics.render.tests.drawLineVert=disabled
graphics.render.tests.fillRect=disabled
graphics.render.tests.drawRect=disabled
graphics.render.tests.fillOval=disabled
graphics.render.tests.drawOval=disabled
graphics.render.tests.fillPoly=disabled
graphics.render.tests.drawPoly=enabled
graphics.render.tests.shape.fillCubic=disabled
graphics.render.tests.shape.drawCubic=disabled
graphics.render.tests.shape.fillEllipse2D=disabled
graphics.render.tests.shape.drawEllipse2D=disabled
graphics.imaging.src.offscr.opaque=disabled
graphics.imaging.src.offscr.bitmask=disabled
graphics.imaging.src.offscr.translucent=disabled
graphics.imaging.src.opqcompatimg.opaque=disabled
graphics.imaging.src.opqcompatimg.bitmask=disabled
graphics.imaging.src.opqcompatimg.translucent=disabled
graphics.imaging.src.bmcompatimg.opaque=disabled
graphics.imaging.src.bmcompatimg.bitmask=disabled
graphics.imaging.src.bmcompatimg.translucent=disabled
graphics.imaging.src.transcompatimg.opaque=disabled
graphics.imaging.src.transcompatimg.bitmask=disabled
graphics.imaging.src.transcompatimg.translucent=disabled
graphics.imaging.src.opqvolimg.opaque=disabled
graphics.imaging.src.opqvolimg.bitmask=disabled
graphics.imaging.src.opqvolimg.translucent=disabled
graphics.imaging.src.bmvolimg.opaque=disabled
graphics.imaging.src.bmvolimg.bitmask=disabled
graphics.imaging.src.bmvolimg.translucent=disabled
graphics.imaging.src.transvolimg.opaque=disabled
graphics.imaging.src.transvolimg.bitmask=disabled
graphics.imaging.src.transvolimg.translucent=disabled
graphics.imaging.src.bufimg.IntXrgb.opaque=disabled
graphics.imaging.src.bufimg.IntXrgb.bitmask=disabled
graphics.imaging.src.bufimg.IntXrgb.translucent=disabled
graphics.imaging.src.bufimg.IntArgb.opaque=disabled
graphics.imaging.src.bufimg.IntArgb.bitmask=disabled
graphics.imaging.src.bufimg.IntArgb.translucent=disabled
graphics.imaging.src.bufimg.IntArgbPre.opaque=disabled
graphics.imaging.src.bufimg.IntArgbPre.bitmask=disabled
graphics.imaging.src.bufimg.IntArgbPre.translucent=disabled
graphics.imaging.src.bufimg.ByteGray.opaque=disabled
graphics.imaging.src.bufimg.ByteGray.bitmask=disabled
graphics.imaging.src.bufimg.ByteGray.translucent=disabled
graphics.imaging.src.bufimg.3ByteBgr.opaque=disabled
graphics.imaging.src.bufimg.3ByteBgr.bitmask=disabled
graphics.imaging.src.bufimg.3ByteBgr.translucent=disabled
graphics.imaging.src.bufimg.4ByteAbgr.opaque=disabled
graphics.imaging.src.bufimg.4ByteAbgr.bitmask=disabled
graphics.imaging.src.bufimg.4ByteAbgr.translucent=disabled
graphics.imaging.src.bufimg.4ByteAbgrPre.opaque=disabled
graphics.imaging.src.bufimg.4ByteAbgrPre.bitmask=disabled
graphics.imaging.src.bufimg.4ByteAbgrPre.translucent=disabled
graphics.imaging.src.bufimg.ByteIndexedBm.opaque=disabled
graphics.imaging.src.bufimg.ByteIndexedBm.bitmask=disabled
graphics.imaging.src.bufimg.ByteIndexedBm.translucent=disabled
graphics.imaging.src.bufimg.unmanagedIntXrgb.opaque=disabled
graphics.imaging.src.bufimg.unmanagedIntXrgb.bitmask=disabled
graphics.imaging.src.bufimg.unmanagedIntXrgb.translucent=disabled
graphics.imaging.src.bufimg.unmanagedIntArgb.opaque=disabled
graphics.imaging.src.bufimg.unmanagedIntArgb.bitmask=disabled
graphics.imaging.src.bufimg.unmanagedIntArgb.translucent=disabled
graphics.imaging.src.bufimg.unmanagedIntArgbPre.opaque=disabled
graphics.imaging.src.bufimg.unmanagedIntArgbPre.bitmask=disabled
graphics.imaging.src.bufimg.unmanagedIntArgbPre.translucent=disabled
graphics.imaging.src.bufimg.unmanaged3ByteBgr.opaque=disabled
graphics.imaging.src.bufimg.unmanaged3ByteBgr.bitmask=disabled
graphics.imaging.src.bufimg.unmanaged3ByteBgr.translucent=disabled
graphics.imaging.benchmarks.opts.interpolation=Nearest neighbor
graphics.imaging.benchmarks.opts.touchsrc=Off
graphics.imaging.benchmarks.tests.drawimage=disabled
graphics.imaging.benchmarks.tests.drawimagebg=disabled
graphics.imaging.benchmarks.tests.drawimagescaleup=disabled
graphics.imaging.benchmarks.tests.drawimagescaledown=disabled
graphics.imaging.benchmarks.tests.drawimagescalesplit=disabled
graphics.imaging.benchmarks.tests.drawimagetxform=disabled
graphics.imaging.imageops.opts.op=convolve3x3zero
graphics.imaging.imageops.tests.graphics2d.drawimageop=disabled
graphics.imaging.imageops.tests.bufimgop.filternull=disabled
graphics.imaging.imageops.tests.bufimgop.filtercached=disabled
graphics.imaging.imageops.tests.rasterop.filternull=disabled
graphics.imaging.imageops.tests.rasterop.filtercached=disabled
graphics.misc.copytests.copyAreaVert=disabled
graphics.misc.copytests.copyAreaHoriz=disabled
graphics.misc.copytests.copyAreaDiag=disabled
pixel.opts.renderto=Off
pixel.opts.renderfrom=Off
pixel.src.1BitBinary=disabled
pixel.src.2BitBinary=disabled
pixel.src.4BitBinary=disabled
pixel.src.ByteIndexed=disabled
pixel.src.ByteGray=disabled
pixel.src.Short555=disabled
pixel.src.Short565=disabled
pixel.src.ShortGray=disabled
pixel.src.3ByteBgr=disabled
pixel.src.4ByteAbgr=disabled
pixel.src.IntXrgb=disabled
pixel.src.IntXbgr=disabled
pixel.src.IntArgb=disabled
pixel.bimgtests.getrgb=disabled
pixel.bimgtests.setrgb=disabled
pixel.rastests.getdataelem=disabled
pixel.rastests.setdataelem=disabled
pixel.rastests.getpixel=disabled
pixel.rastests.setpixel=disabled
pixel.dbtests.getelem=disabled
pixel.dbtests.setelem=disabled
text.opts.data.tlength=16
text.opts.data.tscript=english
text.opts.font.fname=serif,physical
text.opts.font.fstyle=0
text.opts.font.fsize=13.0
text.opts.font.ftx=Identity
text.opts.graphics.textaa=Off
text.opts.graphics.tfm=Off
text.opts.graphics.gaa=Off
text.opts.graphics.gtx=Identity
text.opts.advopts.gvstyle=0
text.opts.advopts.tlruns=1
text.opts.advopts.maptype=FONT
text.Rendering.tests.drawString=disabled
text.Rendering.tests.drawChars=disabled
text.Rendering.tests.drawBytes=disabled
text.Rendering.tests.drawGlyphVectors=disabled
text.Rendering.tests.drawTextLayout=disabled
text.Measuring.tests.stringWidth=disabled
text.Measuring.tests.stringBounds=disabled
text.Measuring.tests.charsWidth=disabled
text.Measuring.tests.charsBounds=disabled
text.Measuring.tests.fontcandisplay=disabled
text.Measuring.tests.gvWidth=disabled
text.Measuring.tests.gvLogicalBounds=disabled
text.Measuring.tests.gvVisualBounds=disabled
text.Measuring.tests.gvPixelBounds=disabled
text.Measuring.tests.gvOutline=disabled
text.Measuring.tests.gvGlyphLogicalBounds=disabled
text.Measuring.tests.gvGlyphVisualBounds=disabled
text.Measuring.tests.gvGlyphPixelBounds=disabled
text.Measuring.tests.gvGlyphOutline=disabled
text.Measuring.tests.gvGlyphTransform=disabled
text.Measuring.tests.gvGlyphMetrics=disabled
text.Measuring.tests.tlAdvance=disabled
text.Measuring.tests.tlAscent=disabled
text.Measuring.tests.tlBounds=disabled
text.Measuring.tests.tlGetCaretInfo=disabled
text.Measuring.tests.tlGetNextHit=disabled
text.Measuring.tests.tlGetCaretShape=disabled
text.Measuring.tests.tlGetLogicalHighlightShape=disabled
text.Measuring.tests.tlHitTest=disabled
text.Measuring.tests.tlOutline=disabled
text.construction.tests.gvfromfontstring=disabled
text.construction.tests.gvfromfontchars=disabled
text.construction.tests.gvfromfontci=disabled
text.construction.tests.gvfromfontglyphs=disabled
text.construction.tests.gvfromfontlayout=disabled
text.construction.tests.tlfromfont=disabled
text.construction.tests.tlfrommap=disabled
imageio.opts.size=250
imageio.opts.content=photo
imageio.input.opts.general.source.file=disabled
imageio.input.opts.general.source.url=disabled
imageio.input.opts.general.source.byteArray=disabled
imageio.input.opts.imageio.useCache=Off
imageio.input.image.toolkit.opts.format=
imageio.input.image.toolkit.tests.createImage=disabled
imageio.input.image.imageio.opts.format=
imageio.input.image.imageio.tests.imageioRead=disabled
imageio.input.image.imageio.reader.opts.seekForwardOnly=On
imageio.input.image.imageio.reader.opts.ignoreMetadata=On
imageio.input.image.imageio.reader.opts.installListener=Off
imageio.input.image.imageio.reader.tests.read=disabled
imageio.input.image.imageio.reader.tests.getImageMetadata=disabled
imageio.input.stream.tests.construct=disabled
imageio.input.stream.tests.read=disabled
imageio.input.stream.tests.readByteArray=disabled
imageio.input.stream.tests.readFullyByteArray=disabled
imageio.input.stream.tests.readBit=disabled
imageio.input.stream.tests.readByte=disabled
imageio.input.stream.tests.readUnsignedByte=disabled
imageio.input.stream.tests.readShort=disabled
imageio.input.stream.tests.readUnsignedShort=disabled
imageio.input.stream.tests.readInt=disabled
imageio.input.stream.tests.readUnsignedInt=disabled
imageio.input.stream.tests.readFloat=disabled
imageio.input.stream.tests.readLong=disabled
imageio.input.stream.tests.readDouble=disabled
imageio.input.stream.tests.skipBytes=disabled
imageio.output.opts.general.dest.file=disabled
imageio.output.opts.general.dest.byteArray=disabled
imageio.output.opts.imageio.useCache=Off
imageio.output.image.imageio.opts.format=
imageio.output.image.imageio.tests.imageioWrite=disabled
imageio.output.image.imageio.writer.opts.installListener=Off
imageio.output.image.imageio.writer.tests.write=disabled
imageio.output.stream.tests.construct=disabled
imageio.output.stream.tests.write=disabled
imageio.output.stream.tests.writeByteArray=disabled
imageio.output.stream.tests.writeBit=disabled
imageio.output.stream.tests.writeByte=disabled
imageio.output.stream.tests.writeShort=disabled
imageio.output.stream.tests.writeInt=disabled
imageio.output.stream.tests.writeFloat=disabled
imageio.output.stream.tests.writeLong=disabled
imageio.output.stream.tests.writeDouble=disabled
cmm.opts.profiles=1001
cmm.colorconv.data.fromRGB=disabled
cmm.colorconv.data.toRGB=disabled
cmm.colorconv.data.fromCIEXYZ=disabled
cmm.colorconv.data.toCIEXYZ=disabled
cmm.colorconv.ccop.ccopOptions.size=250
cmm.colorconv.ccop.ccopOptions.content=photo
cmm.colorconv.ccop.ccopOptions.srcType=INT_RGB
cmm.colorconv.ccop.ccopOptions.dstType=INT_RGB
cmm.colorconv.ccop.op_img=disabled
cmm.colorconv.ccop.op_rst=disabled
cmm.colorconv.ccop.op_draw=disabled
cmm.colorconv.embed.embedOptions.Images=512x512
cmm.colorconv.embed.embd_img_read=disabled
cmm.profiles.getHeader=disabled
cmm.profiles.getNumComponents=disabled

View File

@@ -0,0 +1,267 @@
prog.verbose=disabled
prog.printresults=enabled
global.env.outputwidth=640
global.env.outputheight=480
global.env.runcount=5
global.env.repcount=0
global.env.testtime=2500
global.results.workunits=units
global.results.timeunits=sec
global.results.ratio=unitspersec
global.dest.offscreen=disabled
global.dest.frame.defaultframe=enabled
global.dest.frame.transframe=disabled
global.dest.frame.shapedframe=disabled
global.dest.frame.shapedtransframe=disabled
global.dest.compatimg.compatimg=disabled
global.dest.compatimg.opqcompatimg=disabled
global.dest.compatimg.bmcompatimg=disabled
global.dest.compatimg.transcompatimg=disabled
global.dest.volimg.volimg=disabled
global.dest.volimg.opqvolimg=disabled
global.dest.volimg.bmvolimg=disabled
global.dest.volimg.transvolimg=disabled
global.dest.bufimg.IntXrgb=disabled
global.dest.bufimg.IntArgb=disabled
global.dest.bufimg.IntArgbPre=disabled
global.dest.bufimg.3ByteBgr=disabled
global.dest.bufimg.ByteIndexed=disabled
global.dest.bufimg.ByteGray=disabled
global.dest.bufimg.4ByteAbgr=disabled
global.dest.bufimg.4ByteAbgrPre=disabled
global.dest.bufimg.custom=disabled
graphics.opts.anim=2
graphics.opts.sizes=250
graphics.opts.alpharule=SrcOver
graphics.opts.transform=ident
graphics.opts.extraalpha=Off
graphics.opts.xormode=Off
graphics.opts.clip=Off
graphics.opts.renderhint=Default
graphics.render.opts.paint=random
graphics.render.opts.alphacolor=Off
graphics.render.opts.antialias=Off
graphics.render.opts.stroke=width1
graphics.render.tests.drawLine=disabled
graphics.render.tests.drawLineHoriz=disabled
graphics.render.tests.drawLineVert=disabled
graphics.render.tests.fillRect=disabled
graphics.render.tests.drawRect=disabled
graphics.render.tests.fillOval=disabled
graphics.render.tests.drawOval=disabled
graphics.render.tests.fillPoly=disabled
graphics.render.tests.drawPoly=enabled
graphics.render.tests.shape.fillCubic=disabled
graphics.render.tests.shape.drawCubic=disabled
graphics.render.tests.shape.fillEllipse2D=disabled
graphics.render.tests.shape.drawEllipse2D=disabled
graphics.imaging.src.offscr.opaque=disabled
graphics.imaging.src.offscr.bitmask=disabled
graphics.imaging.src.offscr.translucent=disabled
graphics.imaging.src.opqcompatimg.opaque=disabled
graphics.imaging.src.opqcompatimg.bitmask=disabled
graphics.imaging.src.opqcompatimg.translucent=disabled
graphics.imaging.src.bmcompatimg.opaque=disabled
graphics.imaging.src.bmcompatimg.bitmask=disabled
graphics.imaging.src.bmcompatimg.translucent=disabled
graphics.imaging.src.transcompatimg.opaque=disabled
graphics.imaging.src.transcompatimg.bitmask=disabled
graphics.imaging.src.transcompatimg.translucent=disabled
graphics.imaging.src.opqvolimg.opaque=disabled
graphics.imaging.src.opqvolimg.bitmask=disabled
graphics.imaging.src.opqvolimg.translucent=disabled
graphics.imaging.src.bmvolimg.opaque=disabled
graphics.imaging.src.bmvolimg.bitmask=disabled
graphics.imaging.src.bmvolimg.translucent=disabled
graphics.imaging.src.transvolimg.opaque=disabled
graphics.imaging.src.transvolimg.bitmask=disabled
graphics.imaging.src.transvolimg.translucent=disabled
graphics.imaging.src.bufimg.IntXrgb.opaque=disabled
graphics.imaging.src.bufimg.IntXrgb.bitmask=disabled
graphics.imaging.src.bufimg.IntXrgb.translucent=disabled
graphics.imaging.src.bufimg.IntArgb.opaque=disabled
graphics.imaging.src.bufimg.IntArgb.bitmask=disabled
graphics.imaging.src.bufimg.IntArgb.translucent=disabled
graphics.imaging.src.bufimg.IntArgbPre.opaque=disabled
graphics.imaging.src.bufimg.IntArgbPre.bitmask=disabled
graphics.imaging.src.bufimg.IntArgbPre.translucent=disabled
graphics.imaging.src.bufimg.ByteGray.opaque=disabled
graphics.imaging.src.bufimg.ByteGray.bitmask=disabled
graphics.imaging.src.bufimg.ByteGray.translucent=disabled
graphics.imaging.src.bufimg.3ByteBgr.opaque=disabled
graphics.imaging.src.bufimg.3ByteBgr.bitmask=disabled
graphics.imaging.src.bufimg.3ByteBgr.translucent=disabled
graphics.imaging.src.bufimg.4ByteAbgr.opaque=disabled
graphics.imaging.src.bufimg.4ByteAbgr.bitmask=disabled
graphics.imaging.src.bufimg.4ByteAbgr.translucent=disabled
graphics.imaging.src.bufimg.4ByteAbgrPre.opaque=disabled
graphics.imaging.src.bufimg.4ByteAbgrPre.bitmask=disabled
graphics.imaging.src.bufimg.4ByteAbgrPre.translucent=disabled
graphics.imaging.src.bufimg.ByteIndexedBm.opaque=disabled
graphics.imaging.src.bufimg.ByteIndexedBm.bitmask=disabled
graphics.imaging.src.bufimg.ByteIndexedBm.translucent=disabled
graphics.imaging.src.bufimg.unmanagedIntXrgb.opaque=disabled
graphics.imaging.src.bufimg.unmanagedIntXrgb.bitmask=disabled
graphics.imaging.src.bufimg.unmanagedIntXrgb.translucent=disabled
graphics.imaging.src.bufimg.unmanagedIntArgb.opaque=disabled
graphics.imaging.src.bufimg.unmanagedIntArgb.bitmask=disabled
graphics.imaging.src.bufimg.unmanagedIntArgb.translucent=disabled
graphics.imaging.src.bufimg.unmanagedIntArgbPre.opaque=disabled
graphics.imaging.src.bufimg.unmanagedIntArgbPre.bitmask=disabled
graphics.imaging.src.bufimg.unmanagedIntArgbPre.translucent=disabled
graphics.imaging.src.bufimg.unmanaged3ByteBgr.opaque=disabled
graphics.imaging.src.bufimg.unmanaged3ByteBgr.bitmask=disabled
graphics.imaging.src.bufimg.unmanaged3ByteBgr.translucent=disabled
graphics.imaging.benchmarks.opts.interpolation=Nearest neighbor
graphics.imaging.benchmarks.opts.touchsrc=Off
graphics.imaging.benchmarks.tests.drawimage=disabled
graphics.imaging.benchmarks.tests.drawimagebg=disabled
graphics.imaging.benchmarks.tests.drawimagescaleup=disabled
graphics.imaging.benchmarks.tests.drawimagescaledown=disabled
graphics.imaging.benchmarks.tests.drawimagescalesplit=disabled
graphics.imaging.benchmarks.tests.drawimagetxform=disabled
graphics.imaging.imageops.opts.op=convolve3x3zero
graphics.imaging.imageops.tests.graphics2d.drawimageop=disabled
graphics.imaging.imageops.tests.bufimgop.filternull=disabled
graphics.imaging.imageops.tests.bufimgop.filtercached=disabled
graphics.imaging.imageops.tests.rasterop.filternull=disabled
graphics.imaging.imageops.tests.rasterop.filtercached=disabled
graphics.misc.copytests.copyAreaVert=disabled
graphics.misc.copytests.copyAreaHoriz=disabled
graphics.misc.copytests.copyAreaDiag=disabled
pixel.opts.renderto=Off
pixel.opts.renderfrom=Off
pixel.src.1BitBinary=disabled
pixel.src.2BitBinary=disabled
pixel.src.4BitBinary=disabled
pixel.src.ByteIndexed=disabled
pixel.src.ByteGray=disabled
pixel.src.Short555=disabled
pixel.src.Short565=disabled
pixel.src.ShortGray=disabled
pixel.src.3ByteBgr=disabled
pixel.src.4ByteAbgr=disabled
pixel.src.IntXrgb=disabled
pixel.src.IntXbgr=disabled
pixel.src.IntArgb=disabled
pixel.bimgtests.getrgb=disabled
pixel.bimgtests.setrgb=disabled
pixel.rastests.getdataelem=disabled
pixel.rastests.setdataelem=disabled
pixel.rastests.getpixel=disabled
pixel.rastests.setpixel=disabled
pixel.dbtests.getelem=disabled
pixel.dbtests.setelem=disabled
text.opts.data.tlength=16
text.opts.data.tscript=english
text.opts.font.fname=serif,physical
text.opts.font.fstyle=0
text.opts.font.fsize=13.0
text.opts.font.ftx=Identity
text.opts.graphics.textaa=Off
text.opts.graphics.tfm=Off
text.opts.graphics.gaa=Off
text.opts.graphics.gtx=Identity
text.opts.advopts.gvstyle=0
text.opts.advopts.tlruns=1
text.opts.advopts.maptype=FONT
text.Rendering.tests.drawString=disabled
text.Rendering.tests.drawChars=disabled
text.Rendering.tests.drawBytes=disabled
text.Rendering.tests.drawGlyphVectors=disabled
text.Rendering.tests.drawTextLayout=disabled
text.Measuring.tests.stringWidth=disabled
text.Measuring.tests.stringBounds=disabled
text.Measuring.tests.charsWidth=disabled
text.Measuring.tests.charsBounds=disabled
text.Measuring.tests.fontcandisplay=disabled
text.Measuring.tests.gvWidth=disabled
text.Measuring.tests.gvLogicalBounds=disabled
text.Measuring.tests.gvVisualBounds=disabled
text.Measuring.tests.gvPixelBounds=disabled
text.Measuring.tests.gvOutline=disabled
text.Measuring.tests.gvGlyphLogicalBounds=disabled
text.Measuring.tests.gvGlyphVisualBounds=disabled
text.Measuring.tests.gvGlyphPixelBounds=disabled
text.Measuring.tests.gvGlyphOutline=disabled
text.Measuring.tests.gvGlyphTransform=disabled
text.Measuring.tests.gvGlyphMetrics=disabled
text.Measuring.tests.tlAdvance=disabled
text.Measuring.tests.tlAscent=disabled
text.Measuring.tests.tlBounds=disabled
text.Measuring.tests.tlGetCaretInfo=disabled
text.Measuring.tests.tlGetNextHit=disabled
text.Measuring.tests.tlGetCaretShape=disabled
text.Measuring.tests.tlGetLogicalHighlightShape=disabled
text.Measuring.tests.tlHitTest=disabled
text.Measuring.tests.tlOutline=disabled
text.construction.tests.gvfromfontstring=disabled
text.construction.tests.gvfromfontchars=disabled
text.construction.tests.gvfromfontci=disabled
text.construction.tests.gvfromfontglyphs=disabled
text.construction.tests.gvfromfontlayout=disabled
text.construction.tests.tlfromfont=disabled
text.construction.tests.tlfrommap=disabled
imageio.opts.size=250
imageio.opts.content=photo
imageio.input.opts.general.source.file=disabled
imageio.input.opts.general.source.url=disabled
imageio.input.opts.general.source.byteArray=disabled
imageio.input.opts.imageio.useCache=Off
imageio.input.image.toolkit.opts.format=
imageio.input.image.toolkit.tests.createImage=disabled
imageio.input.image.imageio.opts.format=
imageio.input.image.imageio.tests.imageioRead=disabled
imageio.input.image.imageio.reader.opts.seekForwardOnly=On
imageio.input.image.imageio.reader.opts.ignoreMetadata=On
imageio.input.image.imageio.reader.opts.installListener=Off
imageio.input.image.imageio.reader.tests.read=disabled
imageio.input.image.imageio.reader.tests.getImageMetadata=disabled
imageio.input.stream.tests.construct=disabled
imageio.input.stream.tests.read=disabled
imageio.input.stream.tests.readByteArray=disabled
imageio.input.stream.tests.readFullyByteArray=disabled
imageio.input.stream.tests.readBit=disabled
imageio.input.stream.tests.readByte=disabled
imageio.input.stream.tests.readUnsignedByte=disabled
imageio.input.stream.tests.readShort=disabled
imageio.input.stream.tests.readUnsignedShort=disabled
imageio.input.stream.tests.readInt=disabled
imageio.input.stream.tests.readUnsignedInt=disabled
imageio.input.stream.tests.readFloat=disabled
imageio.input.stream.tests.readLong=disabled
imageio.input.stream.tests.readDouble=disabled
imageio.input.stream.tests.skipBytes=disabled
imageio.output.opts.general.dest.file=disabled
imageio.output.opts.general.dest.byteArray=disabled
imageio.output.opts.imageio.useCache=Off
imageio.output.image.imageio.opts.format=
imageio.output.image.imageio.tests.imageioWrite=disabled
imageio.output.image.imageio.writer.opts.installListener=Off
imageio.output.image.imageio.writer.tests.write=disabled
imageio.output.stream.tests.construct=disabled
imageio.output.stream.tests.write=disabled
imageio.output.stream.tests.writeByteArray=disabled
imageio.output.stream.tests.writeBit=disabled
imageio.output.stream.tests.writeByte=disabled
imageio.output.stream.tests.writeShort=disabled
imageio.output.stream.tests.writeInt=disabled
imageio.output.stream.tests.writeFloat=disabled
imageio.output.stream.tests.writeLong=disabled
imageio.output.stream.tests.writeDouble=disabled
cmm.opts.profiles=1001
cmm.colorconv.data.fromRGB=disabled
cmm.colorconv.data.toRGB=disabled
cmm.colorconv.data.fromCIEXYZ=disabled
cmm.colorconv.data.toCIEXYZ=disabled
cmm.colorconv.ccop.ccopOptions.size=250
cmm.colorconv.ccop.ccopOptions.content=photo
cmm.colorconv.ccop.ccopOptions.srcType=INT_RGB
cmm.colorconv.ccop.ccopOptions.dstType=INT_RGB
cmm.colorconv.ccop.op_img=disabled
cmm.colorconv.ccop.op_rst=disabled
cmm.colorconv.ccop.op_draw=disabled
cmm.colorconv.embed.embedOptions.Images=512x512
cmm.colorconv.embed.embd_img_read=disabled
cmm.profiles.getHeader=disabled
cmm.profiles.getNumComponents=disabled

View File

@@ -0,0 +1,267 @@
prog.verbose=disabled
prog.printresults=enabled
global.env.outputwidth=640
global.env.outputheight=480
global.env.runcount=5
global.env.repcount=0
global.env.testtime=2500
global.results.workunits=units
global.results.timeunits=sec
global.results.ratio=unitspersec
global.dest.offscreen=disabled
global.dest.frame.defaultframe=enabled
global.dest.frame.transframe=disabled
global.dest.frame.shapedframe=disabled
global.dest.frame.shapedtransframe=disabled
global.dest.compatimg.compatimg=disabled
global.dest.compatimg.opqcompatimg=disabled
global.dest.compatimg.bmcompatimg=disabled
global.dest.compatimg.transcompatimg=disabled
global.dest.volimg.volimg=disabled
global.dest.volimg.opqvolimg=disabled
global.dest.volimg.bmvolimg=disabled
global.dest.volimg.transvolimg=disabled
global.dest.bufimg.IntXrgb=disabled
global.dest.bufimg.IntArgb=disabled
global.dest.bufimg.IntArgbPre=disabled
global.dest.bufimg.3ByteBgr=disabled
global.dest.bufimg.ByteIndexed=disabled
global.dest.bufimg.ByteGray=disabled
global.dest.bufimg.4ByteAbgr=disabled
global.dest.bufimg.4ByteAbgrPre=disabled
global.dest.bufimg.custom=disabled
graphics.opts.anim=2
graphics.opts.sizes=250
graphics.opts.alpharule=SrcOver
graphics.opts.transform=ident
graphics.opts.extraalpha=Off
graphics.opts.xormode=Off
graphics.opts.clip=Off
graphics.opts.renderhint=Default
graphics.render.opts.paint=single
graphics.render.opts.alphacolor=Off
graphics.render.opts.antialias=Off
graphics.render.opts.stroke=width1
graphics.render.tests.drawLine=disabled
graphics.render.tests.drawLineHoriz=disabled
graphics.render.tests.drawLineVert=disabled
graphics.render.tests.fillRect=disabled
graphics.render.tests.drawRect=disabled
graphics.render.tests.fillOval=disabled
graphics.render.tests.drawOval=disabled
graphics.render.tests.fillPoly=disabled
graphics.render.tests.drawPoly=enabled
graphics.render.tests.shape.fillCubic=disabled
graphics.render.tests.shape.drawCubic=disabled
graphics.render.tests.shape.fillEllipse2D=disabled
graphics.render.tests.shape.drawEllipse2D=disabled
graphics.imaging.src.offscr.opaque=disabled
graphics.imaging.src.offscr.bitmask=disabled
graphics.imaging.src.offscr.translucent=disabled
graphics.imaging.src.opqcompatimg.opaque=disabled
graphics.imaging.src.opqcompatimg.bitmask=disabled
graphics.imaging.src.opqcompatimg.translucent=disabled
graphics.imaging.src.bmcompatimg.opaque=disabled
graphics.imaging.src.bmcompatimg.bitmask=disabled
graphics.imaging.src.bmcompatimg.translucent=disabled
graphics.imaging.src.transcompatimg.opaque=disabled
graphics.imaging.src.transcompatimg.bitmask=disabled
graphics.imaging.src.transcompatimg.translucent=disabled
graphics.imaging.src.opqvolimg.opaque=disabled
graphics.imaging.src.opqvolimg.bitmask=disabled
graphics.imaging.src.opqvolimg.translucent=disabled
graphics.imaging.src.bmvolimg.opaque=disabled
graphics.imaging.src.bmvolimg.bitmask=disabled
graphics.imaging.src.bmvolimg.translucent=disabled
graphics.imaging.src.transvolimg.opaque=disabled
graphics.imaging.src.transvolimg.bitmask=disabled
graphics.imaging.src.transvolimg.translucent=disabled
graphics.imaging.src.bufimg.IntXrgb.opaque=disabled
graphics.imaging.src.bufimg.IntXrgb.bitmask=disabled
graphics.imaging.src.bufimg.IntXrgb.translucent=disabled
graphics.imaging.src.bufimg.IntArgb.opaque=disabled
graphics.imaging.src.bufimg.IntArgb.bitmask=disabled
graphics.imaging.src.bufimg.IntArgb.translucent=disabled
graphics.imaging.src.bufimg.IntArgbPre.opaque=disabled
graphics.imaging.src.bufimg.IntArgbPre.bitmask=disabled
graphics.imaging.src.bufimg.IntArgbPre.translucent=disabled
graphics.imaging.src.bufimg.ByteGray.opaque=disabled
graphics.imaging.src.bufimg.ByteGray.bitmask=disabled
graphics.imaging.src.bufimg.ByteGray.translucent=disabled
graphics.imaging.src.bufimg.3ByteBgr.opaque=disabled
graphics.imaging.src.bufimg.3ByteBgr.bitmask=disabled
graphics.imaging.src.bufimg.3ByteBgr.translucent=disabled
graphics.imaging.src.bufimg.4ByteAbgr.opaque=disabled
graphics.imaging.src.bufimg.4ByteAbgr.bitmask=disabled
graphics.imaging.src.bufimg.4ByteAbgr.translucent=disabled
graphics.imaging.src.bufimg.4ByteAbgrPre.opaque=disabled
graphics.imaging.src.bufimg.4ByteAbgrPre.bitmask=disabled
graphics.imaging.src.bufimg.4ByteAbgrPre.translucent=disabled
graphics.imaging.src.bufimg.ByteIndexedBm.opaque=disabled
graphics.imaging.src.bufimg.ByteIndexedBm.bitmask=disabled
graphics.imaging.src.bufimg.ByteIndexedBm.translucent=disabled
graphics.imaging.src.bufimg.unmanagedIntXrgb.opaque=disabled
graphics.imaging.src.bufimg.unmanagedIntXrgb.bitmask=disabled
graphics.imaging.src.bufimg.unmanagedIntXrgb.translucent=disabled
graphics.imaging.src.bufimg.unmanagedIntArgb.opaque=disabled
graphics.imaging.src.bufimg.unmanagedIntArgb.bitmask=disabled
graphics.imaging.src.bufimg.unmanagedIntArgb.translucent=disabled
graphics.imaging.src.bufimg.unmanagedIntArgbPre.opaque=disabled
graphics.imaging.src.bufimg.unmanagedIntArgbPre.bitmask=disabled
graphics.imaging.src.bufimg.unmanagedIntArgbPre.translucent=disabled
graphics.imaging.src.bufimg.unmanaged3ByteBgr.opaque=disabled
graphics.imaging.src.bufimg.unmanaged3ByteBgr.bitmask=disabled
graphics.imaging.src.bufimg.unmanaged3ByteBgr.translucent=disabled
graphics.imaging.benchmarks.opts.interpolation=Nearest neighbor
graphics.imaging.benchmarks.opts.touchsrc=Off
graphics.imaging.benchmarks.tests.drawimage=disabled
graphics.imaging.benchmarks.tests.drawimagebg=disabled
graphics.imaging.benchmarks.tests.drawimagescaleup=disabled
graphics.imaging.benchmarks.tests.drawimagescaledown=disabled
graphics.imaging.benchmarks.tests.drawimagescalesplit=disabled
graphics.imaging.benchmarks.tests.drawimagetxform=disabled
graphics.imaging.imageops.opts.op=convolve3x3zero
graphics.imaging.imageops.tests.graphics2d.drawimageop=disabled
graphics.imaging.imageops.tests.bufimgop.filternull=disabled
graphics.imaging.imageops.tests.bufimgop.filtercached=disabled
graphics.imaging.imageops.tests.rasterop.filternull=disabled
graphics.imaging.imageops.tests.rasterop.filtercached=disabled
graphics.misc.copytests.copyAreaVert=disabled
graphics.misc.copytests.copyAreaHoriz=disabled
graphics.misc.copytests.copyAreaDiag=disabled
pixel.opts.renderto=Off
pixel.opts.renderfrom=Off
pixel.src.1BitBinary=disabled
pixel.src.2BitBinary=disabled
pixel.src.4BitBinary=disabled
pixel.src.ByteIndexed=disabled
pixel.src.ByteGray=disabled
pixel.src.Short555=disabled
pixel.src.Short565=disabled
pixel.src.ShortGray=disabled
pixel.src.3ByteBgr=disabled
pixel.src.4ByteAbgr=disabled
pixel.src.IntXrgb=disabled
pixel.src.IntXbgr=disabled
pixel.src.IntArgb=disabled
pixel.bimgtests.getrgb=disabled
pixel.bimgtests.setrgb=disabled
pixel.rastests.getdataelem=disabled
pixel.rastests.setdataelem=disabled
pixel.rastests.getpixel=disabled
pixel.rastests.setpixel=disabled
pixel.dbtests.getelem=disabled
pixel.dbtests.setelem=disabled
text.opts.data.tlength=16
text.opts.data.tscript=english
text.opts.font.fname=serif,physical
text.opts.font.fstyle=0
text.opts.font.fsize=13.0
text.opts.font.ftx=Identity
text.opts.graphics.textaa=Off
text.opts.graphics.tfm=Off
text.opts.graphics.gaa=Off
text.opts.graphics.gtx=Identity
text.opts.advopts.gvstyle=0
text.opts.advopts.tlruns=1
text.opts.advopts.maptype=FONT
text.Rendering.tests.drawString=disabled
text.Rendering.tests.drawChars=disabled
text.Rendering.tests.drawBytes=disabled
text.Rendering.tests.drawGlyphVectors=disabled
text.Rendering.tests.drawTextLayout=disabled
text.Measuring.tests.stringWidth=disabled
text.Measuring.tests.stringBounds=disabled
text.Measuring.tests.charsWidth=disabled
text.Measuring.tests.charsBounds=disabled
text.Measuring.tests.fontcandisplay=disabled
text.Measuring.tests.gvWidth=disabled
text.Measuring.tests.gvLogicalBounds=disabled
text.Measuring.tests.gvVisualBounds=disabled
text.Measuring.tests.gvPixelBounds=disabled
text.Measuring.tests.gvOutline=disabled
text.Measuring.tests.gvGlyphLogicalBounds=disabled
text.Measuring.tests.gvGlyphVisualBounds=disabled
text.Measuring.tests.gvGlyphPixelBounds=disabled
text.Measuring.tests.gvGlyphOutline=disabled
text.Measuring.tests.gvGlyphTransform=disabled
text.Measuring.tests.gvGlyphMetrics=disabled
text.Measuring.tests.tlAdvance=disabled
text.Measuring.tests.tlAscent=disabled
text.Measuring.tests.tlBounds=disabled
text.Measuring.tests.tlGetCaretInfo=disabled
text.Measuring.tests.tlGetNextHit=disabled
text.Measuring.tests.tlGetCaretShape=disabled
text.Measuring.tests.tlGetLogicalHighlightShape=disabled
text.Measuring.tests.tlHitTest=disabled
text.Measuring.tests.tlOutline=disabled
text.construction.tests.gvfromfontstring=disabled
text.construction.tests.gvfromfontchars=disabled
text.construction.tests.gvfromfontci=disabled
text.construction.tests.gvfromfontglyphs=disabled
text.construction.tests.gvfromfontlayout=disabled
text.construction.tests.tlfromfont=disabled
text.construction.tests.tlfrommap=disabled
imageio.opts.size=250
imageio.opts.content=photo
imageio.input.opts.general.source.file=disabled
imageio.input.opts.general.source.url=disabled
imageio.input.opts.general.source.byteArray=disabled
imageio.input.opts.imageio.useCache=Off
imageio.input.image.toolkit.opts.format=
imageio.input.image.toolkit.tests.createImage=disabled
imageio.input.image.imageio.opts.format=
imageio.input.image.imageio.tests.imageioRead=disabled
imageio.input.image.imageio.reader.opts.seekForwardOnly=On
imageio.input.image.imageio.reader.opts.ignoreMetadata=On
imageio.input.image.imageio.reader.opts.installListener=Off
imageio.input.image.imageio.reader.tests.read=disabled
imageio.input.image.imageio.reader.tests.getImageMetadata=disabled
imageio.input.stream.tests.construct=disabled
imageio.input.stream.tests.read=disabled
imageio.input.stream.tests.readByteArray=disabled
imageio.input.stream.tests.readFullyByteArray=disabled
imageio.input.stream.tests.readBit=disabled
imageio.input.stream.tests.readByte=disabled
imageio.input.stream.tests.readUnsignedByte=disabled
imageio.input.stream.tests.readShort=disabled
imageio.input.stream.tests.readUnsignedShort=disabled
imageio.input.stream.tests.readInt=disabled
imageio.input.stream.tests.readUnsignedInt=disabled
imageio.input.stream.tests.readFloat=disabled
imageio.input.stream.tests.readLong=disabled
imageio.input.stream.tests.readDouble=disabled
imageio.input.stream.tests.skipBytes=disabled
imageio.output.opts.general.dest.file=disabled
imageio.output.opts.general.dest.byteArray=disabled
imageio.output.opts.imageio.useCache=Off
imageio.output.image.imageio.opts.format=
imageio.output.image.imageio.tests.imageioWrite=disabled
imageio.output.image.imageio.writer.opts.installListener=Off
imageio.output.image.imageio.writer.tests.write=disabled
imageio.output.stream.tests.construct=disabled
imageio.output.stream.tests.write=disabled
imageio.output.stream.tests.writeByteArray=disabled
imageio.output.stream.tests.writeBit=disabled
imageio.output.stream.tests.writeByte=disabled
imageio.output.stream.tests.writeShort=disabled
imageio.output.stream.tests.writeInt=disabled
imageio.output.stream.tests.writeFloat=disabled
imageio.output.stream.tests.writeLong=disabled
imageio.output.stream.tests.writeDouble=disabled
cmm.opts.profiles=1001
cmm.colorconv.data.fromRGB=disabled
cmm.colorconv.data.toRGB=disabled
cmm.colorconv.data.fromCIEXYZ=disabled
cmm.colorconv.data.toCIEXYZ=disabled
cmm.colorconv.ccop.ccopOptions.size=250
cmm.colorconv.ccop.ccopOptions.content=photo
cmm.colorconv.ccop.ccopOptions.srcType=INT_RGB
cmm.colorconv.ccop.ccopOptions.dstType=INT_RGB
cmm.colorconv.ccop.op_img=disabled
cmm.colorconv.ccop.op_rst=disabled
cmm.colorconv.ccop.op_draw=disabled
cmm.colorconv.embed.embedOptions.Images=512x512
cmm.colorconv.embed.embd_img_read=disabled
cmm.profiles.getHeader=disabled
cmm.profiles.getNumComponents=disabled

49
jb/project/tools/perf/run_dc.sh Executable file
View File

@@ -0,0 +1,49 @@
#!/bin/bash
#set -euo pipefail
set -x
BASE_DIR=$(dirname "$0")
source $BASE_DIR/run_inc.sh
if [ -z "$DACAPOTEST_DIR" ]; then
DACAPOTEST_DIR="./"
fi
DACAPOTEST=${DACAPOTEST:='dacapo-9.12-bach.jar'}
if [ -z "$DACAPOTEST" ]; then
if [ ! -f "$DACAPOTEST_DIR/$DACAPOTEST" ]; then
echo "ERR### cannot find $DACAPOTEST_DIR/$DACAPOTEST"
exit 2
fi
fi
TRACE=false
if [[ ($# -eq 1 && "$1" == "-help") ]] ; then
echo "Usage: run_dc.sh [rendering_options]"
echo "$RENDER_OPS_DOC"
exit 3
fi
OPTS=""
# use time + repeat
OPTS="$OPTS -no-validation $1"
echo "OPTS: $OPTS"
echo "Unit: Milliseconds (not FPS), lower is better"
for i in `seq $N` ; do
if [ $i -eq 1 ]; then
echo x
fi
$JAVA \
-jar $DACAPOTEST $OPTS 2>&1 | tee dacapo_$1$MODE_$i.log | grep "PASSED" | awk '{print $7 }'
if [ $i -ne $N ]; then
sleep $ST
fi
done | $DATAMASH_CMD | expand -t12 > dacapo_$1.log

View File

@@ -0,0 +1,127 @@
export LC_ALL=C
ST=1 # sleep between iterations
# number of iterations (jvm spawned)
N=5
# number of repeats (within jvm)
R=3
type datamash 2>&1 > /dev/null ; ec=$?
if [ $ec -ne 0 ] ; then
echo "Missing datamash utility"
exit 1
fi
DATAMASH_CMD="datamash --format=%.2f -H count x min x q1 x median x q3 x max x mad x"
J2D_OPTS=""
OS=""
case "$OSTYPE" in
linux*) echo "Linux"
;;
darwin*) echo "OSX"
;;
*) echo "unknown: $OSTYPE"
exit 1
;;
esac
read -r -d '' RENDER_OPS_DOC << EOM
rendering_options:
-opengl # OpenGL pipeline (windows, linux, macOS)
-metal # Metal pipeline (macOS)
-vulkan # Vulkan pipeline (WLToolkit)
-accelsd # Vulkan full acceleration (WLToolkit, Vulkan)
-tk tk_name # AWT toolkit (linux: WLToolkit|XToolkit)
-scale # UI scale
-N num # Number of iterations (JVM runs)
-R num # Number of repeats in the test
EOM
while [ $# -ge 1 ] ; do
case "$1" in
-opengl) J2D_OPTS=$J2D_OPTS" -Dsun.java2d.opengl=true"
shift
;;
-metal) J2D_OPTS=$J2D_OPTS" -Dsun.java2d.metal=true"
shift
;;
-vulkan) J2D_OPTS=$J2D_OPTS" -Dsun.java2d.vulkan=true"
shift
;;
-accelsd) J2D_OPTS=$J2D_OPTS" -Dsun.java2d.vulkan.accelsd=true"
shift
;;
-tk) shift
if [ $# -ge 1 ] ; then
J2D_OPTS=$J2D_OPTS" -Dawt.toolkit.name="$1
shift
else
echo "Invalid parameters for -tk option. Use: -tk tkname"
exit 1
fi
;;
-N) shift
if [ $# -ge 1 ] ; then
N=$1
shift
else
echo "Invalid parameters for -N option. Use: -N <number>"
exit 1
fi
;;
-R) shift
if [ $# -ge 1 ] ; then
R=$1
shift
else
echo "Invalid parameters for -R option. Use: -R <number>"
exit 1
fi
;;
-scale) shift
if [ $# -ge 1 ] ; then
J2D_OPTS=$J2D_OPTS" -Dsun.java2d.uiScale="$1
shift
else
echo "Invalid parameters for -scale option. Use: -scale scale"
exit 1
fi
;;
-dSync) shift
if [ $# -ge 1 ] ; then
J2D_OPTS=$J2D_OPTS" -Dsun.java2d.metal.displaySync="$1
shift
else
echo "Invalid parameters for -dSync option. Use: -dSync [true|false]"
exit 1
fi
;;
-jdk) shift
if [ $# -ge 1 ] ; then
JAVA=$1/bin/java
shift
else
echo "Invalid parameters for -jdk option"
exit 1
fi
;;
*) break
;;
esac
done
if [ -z "$JAVA" ] ; then
BUILD_DIR=`find $BASE_DIR/../../../../build -name '*-release' -type d | head -n 1`
JAVA=`find $BUILD_DIR/images/jdk -name java -type f | head -n 1`
fi
JAVA_HOME=`dirname $JAVA`/../
"$JAVA" -version
LANG=C
WS_ROOT=$BASE_DIR/../../../..
echo "N: $N"
echo "R: $R"
echo "J2D_OPTS: $J2D_OPTS"

View File

@@ -0,0 +1,53 @@
#!/bin/bash
BASE_DIR=$(dirname "$0")
source $BASE_DIR/run_inc.sh
J2DBENCH_DIR=$WS_ROOT/src/demo/share/java2d/J2DBench
if [ -z "$J2DBENCH" ]; then
if [ ! -f "$J2DBENCH_DIR/dist/J2DBench.jar" ]; then
PATH=$JAVA_HOME/bin:$PATH make -C $J2DBENCH_DIR
fi
if [ ! -f "$J2DBENCH_DIR/dist/J2DBench.jar" ]; then
echo "Cannot build J2DBench. You may use J2DBench env variable instead pointing to the J2DBench.jar."
exit 1
fi
J2DBENCH=$J2DBENCH_DIR/dist/J2DBench.jar
fi
if [ $# -ne 1 ] ; then
echo "Usage: run_j2b.sh [rendering_options] bench_name"
echo
echo "bench_name: poly250 poly250-rand_col poly250-AA-rand_col"
echo ""
echo "$RENDER_OPS_DOC"
exit 2
fi
if [ ! -f "$BASE_DIR/j2dbopts_$1.txt" ]; then
echo "Unknown test: $1"
exit 1
fi
OPTS="j2dbopts_$1.txt"
#OPTS=j2dbopts_poly250.txt
#OPTS=j2dbopts_poly250-rand_col.txt
#OPTS=j2dbopts_poly250-AA-rand_col.txt
echo "OPTS: $OPTS"
for i in `seq $N`; do
if [ $i -eq 1 ]; then
echo x
fi
echo `$JAVA $J2D_OPTS -jar $J2DBENCH \
-batch -loadopts $BASE_DIR/$OPTS -saveres pl.res \
-title pl -desc pl | awk '/averaged/{print $3}' | head -n1`
if [ $i -ne $N ]; then
sleep $ST
fi
done | $DATAMASH_CMD | expand -t12

88
jb/project/tools/perf/run_rp.sh Executable file
View File

@@ -0,0 +1,88 @@
#!/bin/bash
#set -euo pipefail
#set -x
BASE_DIR=$(dirname "$0")
source $BASE_DIR/run_inc.sh
RENDERPERFTEST_DIR=$WS_ROOT/test/jdk/performance/client/RenderPerfTest
RENDERPERFTEST=""
if [ -z "$RENDERPERFTEST" ]; then
if [ ! -f "$RENDERPERFTEST_DIR/dist/RenderPerfTest.jar" ]; then
PATH=$JAVA_HOME/bin:$PATH make -C $RENDERPERFTEST_DIR
fi
if [ ! -f "$RENDERPERFTEST_DIR/dist/RenderPerfTest.jar" ]; then
echo "Cannot build RenderPerfTest. You may use RENDERPERFTEST env variable instead pointing to the RenderPerfTest.jar."
exit 1
fi
RENDERPERFTEST=$RENDERPERFTEST_DIR/dist/RenderPerfTest.jar
fi
TRACE=false
# removes leading hyphen
mode_param="${1/-}"
MODE="Robot"
while [ $# -ge 1 ] ; do
case "$1" in
-onscreen) MODE="Robot"
shift
;;
-volatile) MODE="Volatile"
shift
;;
-buffer) MODE="Buffer"
shift
;;
*) break
;;
esac
done
if [[ ($# -eq 1 && "$1" == "-help") || ($# -eq 0) ]] ; then
echo "Usage: run_rp.sh [rp_rendering_mode] [rendering_options] bench_name"
echo
echo "bench_name: ArgbSurfaceBlitImage ArgbSwBlitImage BgrSurfaceBlitImage BgrSwBlitImage"
echo " Image ImageAA Image_XOR VolImage VolImageAA"
echo " ClipFlatBox ClipFlatBoxAA ClipFlatOval ClipFlatOvalAA"
echo " FlatBox FlatBoxAA FlatOval FlatOvalAA FlatOval_XOR FlatQuad FlatQuadAA"
echo " RotatedBox RotatedBoxAA RotatedBox_XOR RotatedOval RotatedOvalAA"
echo " WiredBox WiredBoxAA WiredBubbles WiredBubblesAA WiredQuad WiredQuadAA"
echo " Lines LinesAA Lines_XOR"
echo " TextGray TextLCD TextLCD_XOR TextNoAA TextNoAA_XOR"
echo " LargeTextGray LargeTextLCD LargeTextNoAA WhiteTextGray WhiteTextLCD WhiteTextNoAA"
echo " LinGrad3RotatedOval LinGrad3RotatedOvalAA LinGradRotatedOval LinGradRotatedOvalAA"
echo " RadGrad3RotatedOval RadGrad3RotatedOvalAA"
echo ""
echo "rp_rendering_mode: "
echo " -onscreen : rendering to the window and check it using Robot"
echo " -volatile : rendering to volatile image (default)"
echo " -buffer : rendering to buffered image"
echo "$RENDER_OPS_DOC"
exit 2
fi
OPTS=""
# use time + repeat
OPTS="$OPTS -t -n=$N -e$MODE $1"
echo "OPTS: $OPTS"
echo "Unit: Milliseconds (not FPS), lower is better"
for i in `seq $R` ; do
if [ $i -eq 1 ]; then
echo x
fi
# echo "[debug] " + "test run"
# $JAVA $J2D_OPTS -DTRACE=$TRACE \
# -jar $RENDERPERFTEST $OPTS 2>&1 | awk '/'$1'/{print $3 }' | tee test_run.log
$JAVA $J2D_OPTS -DTRACE=$TRACE \
-jar $RENDERPERFTEST $OPTS -v 2>&1 | tee render_$1_${mode_param}_$i.log | grep -v "^#" | tail -n 1 | \
awk '{print $3 }'
if [ $i -ne $N ]; then
sleep $ST
fi
done | $DATAMASH_CMD | expand -t12 | tee render_$1_${mode_param}.log

39
jb/project/tools/perf/run_sm.sh Executable file
View File

@@ -0,0 +1,39 @@
#!/bin/bash
BASE_DIR=$(dirname "$0")
source $BASE_DIR/run_inc.sh
SWINGMARK_DIR=$WS_ROOT/test/jdk/performance/client/SwingMark
if [ -z "$SWINGMARK" ]; then
if [ ! -f "$SWINGMARK_DIR/dist/SwingMark.jar" ]; then
PATH=$JAVA_HOME/bin:$PATH make -C $SWINGMARK_DIR
fi
if [ ! -f "$SWINGMARK_DIR/dist/SwingMark.jar" ]; then
echo "Cannot build SwingMark. You may use SWINGMARK env variable instead pointing to the SwingMark.jar."
exit 1
fi
SWINGMARK=$SWINGMARK_DIR/dist/SwingMark.jar
fi
if [ $# -eq 1 -a "$1" == "--help" ] ; then
shift
echo "Usage: run_sm [rendering_options]"
echo ""
echo "$RENDER_OPS_DOC"
exit 0
fi
for i in `seq $N` ; do
if [ $i -eq 1 ]; then
echo x
fi
# SwingMark gives 1 global 'Score: <value>'
echo `$JAVA $J2D_OPTS -jar $BASE_DIR/../../../../test/jdk/performance/client/SwingMark/dist/SwingMark.jar \
-r $R -q -lf javax.swing.plaf.metal.MetalLookAndFeel | awk '/Score/{print $2}'`
if [ $i -ne $N ]; then
sleep $ST
fi
done | $DATAMASH_CMD | expand -t12

View File

@@ -0,0 +1,162 @@
#!/bin/bash
set -euo pipefail
TC_PRINT=0
# Always print TeamCity service messages if running under TeamCity
[[ -n "${TEAMCITY_VERSION:-}" ]] && TC_PRINT=1
while getopts ":t" o; do
case "${o}" in
t) TC_PRINT=1 ;;
*);;
esac
done
shift $((OPTIND-1))
NEWFILEPATH="$1"
CONFIGID="$2"
BUILDID="$3"
TOKEN="$4"
if [ ! -f "$NEWFILEPATH" ]; then
echo "File not found: $NEWFILEPATH"
exit 1
fi
#
# Get the size of new artifact
#
unameOut="$(uname -s)"
case "${unameOut}" in
Linux*)
NEWFILESIZE=$(stat -c%s "$NEWFILEPATH")
;;
Darwin*)
NEWFILESIZE=$(stat -f%z "$NEWFILEPATH")
;;
CYGWIN*)
NEWFILESIZE=$(stat -c%s "$NEWFILEPATH")
;;
MINGW*)
NEWFILESIZE=$(stat -c%s "$NEWFILEPATH")
;;
*)
echo "Unknown machine: ${unameOut}"
exit 1
esac
FILENAME=$(basename "${NEWFILEPATH}")
#
# Get pattern of artifact name
# Base filename pattern: <BUNDLE_TYPE>-<JDK_VERSION>-<OS>-<ARCH>-b<BUILD>.tar.gz: jbr_dcevm-17.0.2-osx-x64-b1234.tar.gz
# BUNDLE_TYPE: jbr, jbrsdk, jbr_dcevm, jbrsdk_jcef etc.
# OS_ARCH_PATTERN - <os_architecture>: osx-x64, linux-aarch64, linux-musl-x64, windows-x64 etc.
BUNDLE_TYPE=jbrsdk
OS_ARCH_PATTERN=""
FILE_EXTENSION=tar.gz
re='(jbr[a-z_]*).*-[0-9_\.]+-(.+)-b[0-9]+(.+)'
if [[ $FILENAME =~ $re ]]; then
BUNDLE_TYPE=${BASH_REMATCH[1]}
OS_ARCH_PATTERN=${BASH_REMATCH[2]}
FILE_EXTENSION=${BASH_REMATCH[3]}
else
echo "File name $FILENAME does not match regex $re"
exit 1
fi
function test_started_msg() {
if [ $TC_PRINT -eq 1 ]; then
echo "##teamcity[testStarted name='$1']"
fi
}
function test_failed_msg() {
if [ $TC_PRINT -eq 1 ]; then
echo "##teamcity[testFailed name='$1' message='$2']"
fi
}
function test_finished_msg() {
if [ $TC_PRINT -eq 1 ]; then
echo "##teamcity[testFinished name='$1']"
fi
}
test_name="${BUNDLE_TYPE}_${OS_ARCH_PATTERN//\-/_}${FILE_EXTENSION//\./_}"
test_started_msg "$test_name"
echo "BUNDLE_TYPE: $BUNDLE_TYPE"
echo "OS_ARCH_PATTERN: $OS_ARCH_PATTERN"
echo "FILE_EXTENSION: $FILE_EXTENSION"
echo "Size of $FILENAME is $NEWFILESIZE bytes"
#
# Get previous successful build ID
# Example:
# CONFIGID=IntellijCustomJdk_Jdk17_Master_LinuxX64jcef
# BUILDID=12345678
#
# expected return value
# id="123".number="567"
#
CURL_RESPONSE=$(curl -sSL --header "Authorization: Bearer $TOKEN" "https://buildserver.labs.intellij.net/app/rest/builds/?locator=buildType:(id:$CONFIGID),status:success,count:1,finishDate:(build:$BUILDID,condition:before)")
re='id=\"([0-9]+)\".+number=\"([0-9\.]+)\"'
# ID: Previous successful build id
ID=0
if [[ $CURL_RESPONSE =~ $re ]]; then
ID=${BASH_REMATCH[1]}
echo "Previous build ID: $ID"
echo "Previous build number: ${BASH_REMATCH[2]}"
else
msg="ERROR: cannot find previous build"
echo "$msg"
echo "$CURL_RESPONSE"
test_failed_msg "$test_name" "$msg"
test_finished_msg "$test_name"
exit 1
fi
#
# Get artifacts from previous successful build
#
# expected return value
# name="jbrsdk_jcef*.tar.gz size="123'
#
CURL_RESPONSE=$(curl -sSL --header "Authorization: Bearer $TOKEN" "https://buildserver.labs.intellij.net/app/rest/builds/$ID?fields=id,number,artifacts(file(name,size))")
echo "Artifacts of the previous build:"
echo "$CURL_RESPONSE"
# Find binary size (in response) with reg exp
re="name=\"(${BUNDLE_TYPE}[^\"]+${OS_ARCH_PATTERN}[^\"]+${FILE_EXTENSION})\" size=\"([0-9]+)\""
if [[ $CURL_RESPONSE =~ $re ]]; then
prevFileName=${BASH_REMATCH[1]}
echo "Previous artifact name: $prevFileName"
prevFileSize=${BASH_REMATCH[2]}
echo "Previous artifact size: $prevFileSize"
((allowedSize=prevFileSize+prevFileSize/20)) # use 5% threshold
echo "Allowed size: $allowedSize"
if [[ "$NEWFILESIZE" -gt "$allowedSize" ]]; then
msg="ERROR: new size is significantly greater than previous size (need to investigate)"
echo "$msg"
test_failed_msg "$test_name" "$msg"
test_finished_msg "$test_name"
exit 1
else
echo "PASSED"
test_finished_msg "$test_name"
fi
else
msg="ERROR: cannot find string with size in xml response:"
echo "Regex: $re"
echo "$msg"
echo "$CURL_RESPONSE"
test_failed_msg "$test_name" "$msg"
test_finished_msg "$test_name"
exit 1
fi

View File

@@ -0,0 +1,93 @@
#!/bin/bash
set -euo pipefail
set -x
usage ()
{
echo "Usage: perfcmp.sh [options] <test_results_cur> <test_results_ref> <results> <test_prefix> <noHeaders>"
echo "Options:"
echo -e " -h, --help\tdisplay this help"
echo -e " -tc\tprint teacmity statistic"
echo -e "test_results_cur - the file with metrics values for the current measuring"
echo -e "test_results_ref - the file with metrics values for the reference measuring"
echo -e "results - results of comaprison"
echo -e "test_prefix - specifys measuring type, makes sense for enabled -tc, by default no prefixes"
echo -e "noHeaders - by default 1-st line contains headers"
echo -e ""
echo -e "test_results_* files content should be in csv format with header and tab separator:"
echo -e "The 1-st column is the test name"
echo -e "The 2-st column is the test value"
echo -e ""
echo -e "Example:"
echo -e "Test Value"
echo -e "Testname 51.54"
}
while [ -n "$1" ]
do
case "$1" in
-h | --help) usage
exit 1 ;;
-tc) tc=1
shift
break ;;
*) break;;
esac
done
if [[ "$#" < "3" ]]; then
echo "Error: Invalid arguments"
usage
exit 1
fi
curFile=$1
refFile=$2
resFile=$3
testNamePrefix=$4
noHeaders=$5
echo $curFile
echo $refFile
echo $resFile
curValues=`cat "$curFile" | cut -f 2 | tr -d '\t'`
if [ -z $noHeaders ]; then
curValuesHeader=`echo "$curValues" | head -n +1`_cur
header=`cat "$refFile" | head -n +1 | awk -F'\t' -v x=$curValuesHeader '{print " "$1"\t"$2"_ref\t"x"\tratio"}'`
testContent=`paste -d '\t' $refFile <(echo "$curValues") | tail -n +2`
else
testContent=`paste -d '\t' $refFile <(echo "$curValues") | tail -n +1`
fi
testContent=`echo "$testContent" | tr "," "." | awk -F'\t' '{
if ($3>$2+$2*0.1) {
print "* "$1"\t"$2"\t"$3"\t"(($2>0)?$3/$2:"-")
} else {
print " "$1"\t"$2"\t"$3"\t"(($2>0)?$3/$2:"-")
}
}'`
if [ -z $noHeaders ]; then
echo "$header" > $resFile
fi
echo "$testContent" >> $resFile
cat "$resFile" | tr '\t' ';' | column -t -s ';' | tee $resFile
if [ -z $tc ]; then
exit 0
fi
failed=0
echo "$testContent" 2>&1 | (
while read -r s; do
testname=`echo "$s" | cut -f 1 | tr -d "[:space:]" | tr -d "*"`
duration=`echo "$s" | cut -f 3`
echo "$s" | cut -c1 | grep -c "*" && failed=1
echo \#\#teamcity[testStarted name=\'$testNamePrefix$testname\']
echo "===>$s"
echo \#\#teamcity[buildStatisticValue key=\'$testNamePrefix$testname\' value=\'$duration\']
[ $failed -eq 1 ] && echo \#\#teamcity[testFailed name=\'$testNamePrefix$testname\' message=\'$s\']
echo \#\#teamcity[testFinished name=\'$testNamePrefix$testname\' duration=\'$duration\']
failed=0
done
)

View File

@@ -0,0 +1,155 @@
#!/bin/bash
set -euo pipefail
set -x
# The following parameters must be specified:
# build_number - specifies the number of JetBrainsRuntime build
# bundle_type - specifies bundle to be built;possible values:
# <empty> or nomod - the release bundles without any additional modules (jcef)
# jcef - the release bundles with jcef
# fd - the fastdebug bundles which also include the jcef module
#
# This script makes test-image along with JDK images when bundle_type is set to "jcef".
# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
#
# Environment variables:
# JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument
# to configure
# By default JDK_BUILD_NUMBER is set zero
# JCEF_PATH - specifies the path to the directory with JCEF binaries.
# By default JCEF binaries should be located in ./jcef_win_aarch64
if [ -z "$BUILD_JDK" ]; then
echo "BUILD_JDK environment variable must be specified and point to a JDK built from the current sources" \
" and is able to run on the build system. See OpenJDK documentation for --with-build-jdk for more info."
exit 1
fi
source jb/project/tools/common/scripts/common.sh
WORK_DIR=$(pwd)
JCEF_PATH=${JCEF_PATH:=$WORK_DIR/jcef_win_aarch64}
NVDA_PATH=${NVDA_PATH:=$WORK_DIR/nvda_controllerClient}
function do_configure {
sh ./configure \
--enable-option-checking=fatal \
--openjdk-target=aarch64-unknown-cygwin \
$WITH_DEBUG_LEVEL \
--with-vendor-name="$VENDOR_NAME" \
--with-vendor-version-string="$VENDOR_VERSION_STRING" \
--with-jvm-features=shenandoahgc \
--with-version-pre= \
--with-version-build=$JDK_BUILD_NUMBER \
--with-version-opt=b${build_number} \
--with-toolchain-version=$TOOLCHAIN_VERSION \
--with-boot-jdk=$BOOT_JDK \
--with-build-jdk=$BUILD_JDK \
--with-nvdacontrollerclient=$NVDA_PATH \
--disable-ccache \
--enable-cds=yes \
$DISABLE_WARNINGS_AS_ERRORS \
$STATIC_CONF_ARGS \
$REPRODUCIBLE_BUILD_OPTS \
|| do_exit $?
}
function create_image_bundle {
__bundle_name=$1
__arch_name=$2
__modules_path=$3
__modules=$4
fastdebug_infix=''
[ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
__root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-aarch64-${fastdebug_infix}b${build_number}
echo Running jlink ...
${BUILD_JDK}/bin/jlink \
--module-path $__modules_path --no-man-pages --compress=2 \
--add-modules $__modules --output $__root_dir || do_exit $?
grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> $__root_dir/release
if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
sed 's/JBR/JBRSDK/g' $__root_dir/release > release
mv release $__root_dir/release
cp $IMAGES_DIR/jdk/lib/src.zip $__root_dir/lib
for dir in $(ls -d $IMAGES_DIR/jdk/*); do
rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
done
copy_jmods "$__modules" "$__modules_path" "$__root_dir"/jmods
fi
}
WITH_DEBUG_LEVEL="--with-debug-level=release"
RELEASE_NAME=windows-aarch64-server-release
case "$bundle_type" in
"jcef")
do_reset_changes=0
do_maketest=1
;;
"nomod" | "")
bundle_type=""
;;
"fd")
do_reset_changes=0
WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
RELEASE_NAME=windows-aarch64-server-fastdebug
;;
esac
if [ -z "${INC_BUILD:-}" ]; then
do_configure || do_exit $?
if [ $do_maketest -eq 1 ]; then
make LOG=info CONF=$RELEASE_NAME clean || do_exit $?
make LOG=info CONF=$RELEASE_NAME images test-image JBR_API_JBR_VERSION=TEST || do_exit $?
else
make LOG=info CONF=$RELEASE_NAME clean || do_exit $?
make LOG=info CONF=$RELEASE_NAME images || do_exit $?
fi
else
if [ $do_maketest -eq 1 ]; then
make LOG=info CONF=$RELEASE_NAME images test-image JBR_API_JBR_VERSION=TEST || do_exit $?
else
make LOG=info CONF=$RELEASE_NAME images || do_exit $?
fi
fi
IMAGES_DIR=build/$RELEASE_NAME/images
JSDK=$IMAGES_DIR/jdk
JSDK_MODS_DIR=$IMAGES_DIR/jmods
JBRSDK_BUNDLE=jbrsdk
where cygpath
if [ $? -eq 0 ]; then
JCEF_PATH="$(cygpath -w $JCEF_PATH | sed 's/\\/\//g')"
fi
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
if [ "$bundle_type" == "jcef" ]; then
git apply -p0 < jb/project/tools/patches/add_jcef_module_aarch64.patch || do_exit $?
update_jsdk_mods "$BUILD_JDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not unchanged
cat $JCEF_PATH/jcef.version >> $JSDK/release
fi
jbr_name_postfix="_${bundle_type}"
else
jbr_name_postfix=""
fi
# create runtime image bundle
modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
modules+=",jdk.crypto.mscapi"
create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
# create sdk image bundle
modules=$(cat ${JSDK}/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\r//g | sed s/\\n//g) || do_exit $?
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
fi
create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?
do_exit 0

View File

@@ -0,0 +1,148 @@
#!/bin/bash
set -euo pipefail
set -x
# The following parameters must be specified:
# build_number - specifies the number of JetBrainsRuntime build
# bundle_type - specifies bundle to be built;possible values:
# <empty> or nomod - the release bundles without any additional modules (jcef)
# jcef - the release bundles with jcef
# fd - the fastdebug bundles which also include the jcef module
#
# This script makes test-image along with JDK images when bundle_type is set to "jcef".
# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
#
# Environment variables:
# JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument
# to configure
# By default JDK_BUILD_NUMBER is set zero
# JCEF_PATH - specifies the path to the directory with JCEF binaries.
# By default JCEF binaries should be located in ./jcef_win_x64
source jb/project/tools/common/scripts/common.sh
WORK_DIR=$(pwd)
JCEF_PATH=${JCEF_PATH:=$WORK_DIR/jcef_win_x64}
NVDA_PATH=${NVDA_PATH:=$WORK_DIR/nvda_controllerClient}
function do_configure {
sh ./configure \
$WITH_DEBUG_LEVEL \
--with-vendor-name="$VENDOR_NAME" \
--with-vendor-version-string="$VENDOR_VERSION_STRING" \
--with-jvm-features=shenandoahgc \
--with-version-pre= \
--with-version-build=$JDK_BUILD_NUMBER \
--with-version-opt=b${build_number} \
--with-toolchain-version=$TOOLCHAIN_VERSION \
--with-boot-jdk=$BOOT_JDK \
--with-nvdacontrollerclient=$NVDA_PATH \
--disable-ccache \
--enable-cds=yes \
$DISABLE_WARNINGS_AS_ERRORS \
$STATIC_CONF_ARGS \
$REPRODUCIBLE_BUILD_OPTS \
|| do_exit $?
}
function create_image_bundle {
__bundle_name=$1
__arch_name=$2
__modules_path=$3
__modules=$4
fastdebug_infix=''
__cds_opt=''
__cds_opt="--generate-cds-archive"
[ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
__root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x64-${fastdebug_infix}b${build_number}
echo Running jlink ...
${JSDK}/bin/jlink \
--module-path $__modules_path --no-man-pages --compress=2 \
$__cds_opt --add-modules $__modules --output $__root_dir || do_exit $?
grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> $__root_dir/release
if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
sed 's/JBR/JBRSDK/g' $__root_dir/release > release
mv release $__root_dir/release
cp $IMAGES_DIR/jdk/lib/src.zip $__root_dir/lib
for dir in $(ls -d $IMAGES_DIR/jdk/*); do
rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
done
copy_jmods "$__modules" "$__modules_path" "$__root_dir"/jmods
fi
}
WITH_DEBUG_LEVEL="--with-debug-level=release"
RELEASE_NAME=windows-x86_64-server-release
case "$bundle_type" in
"jcef")
do_reset_changes=0
do_maketest=1
;;
"nomod" | "")
bundle_type=""
;;
"fd")
do_reset_changes=0
WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
RELEASE_NAME=windows-x86_64-server-fastdebug
;;
esac
if [ -z "${INC_BUILD:-}" ]; then
do_configure || do_exit $?
if [ $do_maketest -eq 1 ]; then
make LOG=info CONF=$RELEASE_NAME clean || do_exit $?
make LOG=info CONF=$RELEASE_NAME images test-image JBR_API_JBR_VERSION=TEST || do_exit $?
else
make LOG=info CONF=$RELEASE_NAME clean || do_exit $?
make LOG=info CONF=$RELEASE_NAME images || do_exit $?
fi
else
if [ $do_maketest -eq 1 ]; then
make LOG=info CONF=$RELEASE_NAME images test-image JBR_API_JBR_VERSION=TEST || do_exit $?
else
make LOG=info CONF=$RELEASE_NAME images || do_exit $?
fi
fi
IMAGES_DIR=build/$RELEASE_NAME/images
JSDK=$IMAGES_DIR/jdk
JSDK_MODS_DIR=$IMAGES_DIR/jmods
JBRSDK_BUNDLE=jbrsdk
where cygpath
if [ $? -eq 0 ]; then
JCEF_PATH="$(cygpath -w $JCEF_PATH | sed 's/\\/\//g')"
fi
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
if [ "$bundle_type" == "jcef" ]; then
git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
update_jsdk_mods "$JSDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
cp $JCEF_PATH/jmods/* ${JSDK_MODS_DIR} # $JSDK/jmods is not unchanged
cat $JCEF_PATH/jcef.version >> $JSDK/release
fi
jbr_name_postfix="_${bundle_type}"
else
jbr_name_postfix=""
fi
# create runtime image bundle
modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
modules+=",jdk.crypto.mscapi"
create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
# create sdk image bundle
modules=$(cat ${JSDK}/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\r//g | sed s/\\n//g)
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
fi
create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?
do_exit 0

View File

@@ -0,0 +1,138 @@
#!/bin/bash
set -euo pipefail
set -x
# The following parameters must be specified:
# build_number - specifies the number of JetBrainsRuntime build
# bundle_type - specifies bundle to be built;possible values:
# <empty> or nomod - the release bundles without any additional modules (jcef)
# jcef - the release bundles with jcef
# fd - the fastdebug bundles which also include the jcef module
#
# $ ./java --version
# openjdk 11.0.6 2020-01-14
# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
#
source jb/project/tools/common/scripts/common.sh
WORK_DIR=$(pwd)
NVDA_PATH=${NVDA_PATH:=$WORK_DIR/nvda_controllerClient}
function do_configure {
sh ./configure \
$WITH_DEBUG_LEVEL \
--with-vendor-name="$VENDOR_NAME" \
--with-vendor-version-string="$VENDOR_VERSION_STRING" \
--with-jvm-features=shenandoahgc \
--with-version-pre= \
--with-version-build=$JDK_BUILD_NUMBER \
--with-version-opt=b${build_number} \
--with-toolchain-version=$TOOLCHAIN_VERSION \
--with-boot-jdk=$BOOT_JDK \
--with-nvdacontrollerclient=$NVDA_PATH \
--disable-ccache \
--enable-cds=yes \
$DISABLE_WARNINGS_AS_ERRORS \
$STATIC_CONF_ARGS \
$REPRODUCIBLE_BUILD_OPTS \
|| do_exit $?
}
function create_image_bundle {
__bundle_name=$1
__arch_name=$2
__modules_path=$3
__modules=$4
fastdebug_infix=''
__cds_opt=''
__cds_opt="--generate-cds-archive"
[ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
__root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x86-${fastdebug_infix}b${build_number}
echo Running jlink ...
${JSDK}/bin/jlink \
--module-path $__modules_path --no-man-pages --compress=2 \
$__cds_opt --add-modules $__modules --output $__root_dir || do_exit $?
grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> $__root_dir/release
if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
sed 's/JBR/JBRSDK/g' $__root_dir/release > release
mv release $__root_dir/release
cp $IMAGES_DIR/jdk/lib/src.zip $__root_dir/lib
for dir in $(ls -d $IMAGES_DIR/jdk/*); do
rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
done
copy_jmods "$__modules" "$__modules_path" "$__root_dir"/jmods
fi
}
WITH_DEBUG_LEVEL="--with-debug-level=release"
RELEASE_NAME=windows-x86_64-server-release
case "$bundle_type" in
"jcef")
echo "not implemented" && do_exit 1
;;
"nomod" | "")
bundle_type=""
;;
"fd")
do_reset_changes=0
WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
RELEASE_NAME=windows-x86_64-server-fastdebug
;;
esac
if [ -z "${INC_BUILD:-}" ]; then
do_configure || do_exit $?
if [ $do_maketest -eq 1 ]; then
make LOG=info CONF=$RELEASE_NAME clean || do_exit $?
make LOG=info CONF=$RELEASE_NAME images test-image JBR_API_JBR_VERSION=TEST || do_exit $?
else
make LOG=info CONF=$RELEASE_NAME clean || do_exit $?
make LOG=info CONF=$RELEASE_NAME clean images || do_exit $?
fi
else
if [ $do_maketest -eq 1 ]; then
make LOG=info CONF=$RELEASE_NAME images test-image JBR_API_JBR_VERSION=TEST || do_exit $?
else
make LOG=info CONF=$RELEASE_NAME images || do_exit $?
fi
fi
IMAGES_DIR=build/$RELEASE_NAME/images
JSDK=$IMAGES_DIR/jdk
JSDK_MODS_DIR=$IMAGES_DIR/jmods
JBRSDK_BUNDLE=jbrsdk
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
if [ "$bundle_type" == "jcef" ]; then
git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
update_jsdk_mods "$JSDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
cp $JCEF_PATH/jmods/* ${JSDK_MODS_DIR} # $JSDK/jmods is not unchanged
fi
jbr_name_postfix="_${bundle_type}"
else
jbr_name_postfix=""
fi
# create runtime image bundle
modules=$(grep -v "jdk.internal.vm" jb/project/tools/common/modules.list | xargs | sed s/" "//g) || do_exit $?
modules+=",jdk.crypto.mscapi"
create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
# create sdk image bundle
modules=$(cat ${JSDK}/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\r//g | sed s/\\n//g)
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
fi
create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?
do_exit 0

View File

@@ -0,0 +1,59 @@
#!/bin/bash
set -euo pipefail
set -x
# The following parameters must be specified:
# build_number - specifies the number of JetBrainsRuntime build
# bundle_type - specifies bundle to be built;possible values:
# <empty> or nomod - the release bundles without any additional modules (jcef)
# jcef - the release bundles with jcef
# fd - the fastdebug bundles which also include the jcef module
#
# This script packs test-image along with JDK images when bundle_type is set to "jcef".
# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
#
source jb/project/tools/common/scripts/common.sh
[ "$bundle_type" == "jcef" ] && do_maketest=1
function pack_jbr {
__bundle_name=$1
__arch_name=$2
fastdebug_infix=''
[ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
JBR=${__bundle_name}-${JBSDK_VERSION}-windows-aarch64-${fastdebug_infix}b${build_number}
__root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-aarch64-${fastdebug_infix}b${build_number}
echo Creating $JBR.tar.gz ...
chmod -R ug+rwx,o+rx ${BASE_DIR}/$__root_dir
/usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR $__root_dir || do_exit $?
echo Creating $JBR.zip ...
/usr/bin/zip -r $JBR.zip $__root_dir || do_exit $?
}
[ "$bundle_type" == "nomod" ] && bundle_type=""
JBRSDK_BUNDLE=jbrsdk
RELEASE_NAME=windows-aarch64-server-release
IMAGES_DIR=build/$RELEASE_NAME/images
BASE_DIR=.
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "dcevm" ] || [ "$bundle_type" == "fd" ]; then
jbr_name_postfix="_${bundle_type}"
else
jbr_name_postfix=""
fi
pack_jbr jbr${jbr_name_postfix} jbr
pack_jbr jbrsdk${jbr_name_postfix} jbrsdk
if [ $do_maketest -eq 1 ]; then
JBRSDK_TEST=$JBRSDK_BUNDLE-$JBSDK_VERSION-windows-test-aarch64-b$build_number
echo Creating $JBRSDK_TEST.tar.gz ...
/usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
fi

View File

@@ -0,0 +1,59 @@
#!/bin/bash
set -euo pipefail
set -x
# The following parameters must be specified:
# build_number - specifies the number of JetBrainsRuntime build
# bundle_type - specifies bundle to be built;possible values:
# <empty> or nomod - the release bundles without any additional modules (jcef)
# jcef - the release bundles with jcef
# fd - the fastdebug bundles which also include the jcef module
#
# This script packs test-image along with JDK images when bundle_type is set to "jcef".
# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
#
source jb/project/tools/common/scripts/common.sh
[ "$bundle_type" == "jcef" ] && do_maketest=1
function pack_jbr {
__bundle_name=$1
__arch_name=$2
fastdebug_infix=''
[ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
JBR=${__bundle_name}-${JBSDK_VERSION}-windows-x64-${fastdebug_infix}b${build_number}
__root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x64-${fastdebug_infix}b${build_number}
echo Creating $JBR.tar.gz ...
chmod -R ug+rwx,o+rx ${BASE_DIR}/$__root_dir
/usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR $__root_dir || do_exit $?
echo Creating $JBR.zip ...
/usr/bin/zip -r $JBR.zip $__root_dir || do_exit $?
}
[ "$bundle_type" == "nomod" ] && bundle_type=""
JBRSDK_BUNDLE=jbrsdk
RELEASE_NAME=windows-x86_64-server-release
IMAGES_DIR=build/$RELEASE_NAME/images
BASE_DIR=.
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "dcevm" ] || [ "$bundle_type" == "fd" ]; then
jbr_name_postfix="_${bundle_type}"
else
jbr_name_postfix=""
fi
pack_jbr jbr${jbr_name_postfix} jbr
pack_jbr jbrsdk${jbr_name_postfix} jbrsdk
if [ $do_maketest -eq 1 ]; then
JBRSDK_TEST=$JBRSDK_BUNDLE-$JBSDK_VERSION-windows-test-x64-b$build_number
echo Creating $JBRSDK_TEST.tar.gz ...
/usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
fi

View File

@@ -0,0 +1,55 @@
#!/bin/bash
set -euo pipefail
set -x
# The following parameters must be specified:
# build_number - specifies the number of JetBrainsRuntime build
# bundle_type - specifies bundle to be built;possible values:
# <empty> or nomod - the release bundles without any additional modules (jcef)
# fd - the fastdebug bundles which also include the jcef module
#
source jb/project/tools/common/scripts/common.sh
[ "$bundle_type" == "jcef" ] && echo "not implemented" && do_exit 1
function pack_jbr {
__bundle_name=$1
__arch_name=$2
fastdebug_infix=''
[ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
JBR=${__bundle_name}-${JBSDK_VERSION}-windows-x86-${fastdebug_infix}b${build_number}
__root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x86-${fastdebug_infix}b${build_number}
echo Creating $JBR.tar.gz ...
chmod -R ug+rwx,o+rx ${BASE_DIR}/$__root_dir
/usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR $__root_dir || do_exit $?
echo Creating $JBR.zip ...
/usr/bin/zip -r $JBR.zip $__root_dir || do_exit $?
}
[ "$bundle_type" == "nomod" ] && bundle_type=""
JBRSDK_BUNDLE=jbrsdk
RELEASE_NAME=windows-x86_64-server-release
IMAGES_DIR=build/$RELEASE_NAME/images
BASE_DIR=.
if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "dcevm" ] || [ "$bundle_type" == "fd" ]; then
jbr_name_postfix="_${bundle_type}"
else
jbr_name_postfix=""
fi
pack_jbr jbr${jbr_name_postfix} jbr
pack_jbr jbrsdk${jbr_name_postfix} jbrsdk
if [ $do_maketest -eq 1 ]; then
JBRSDK_TEST=$JBRSDK_BUNDLE-$JBSDK_VERSION-windows-test-x86-b$build_number
echo Creating $JBRSDK_TEST.tar.gz ...
/usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $BASE_DIR --exclude='test/jdk/demos' test || do_exit $?
fi

View File

@@ -107,6 +107,7 @@ $(eval $(call SetupJavaCompilation, $(MODULE), \
BIN := $(if $($(MODULE)_BIN), $($(MODULE)_BIN), $(JDK_OUTPUTDIR)/modules), \
HEADERS := $(SUPPORT_OUTPUTDIR)/headers, \
CREATE_API_DIGEST := true, \
PROCESS_JBR_API := true, \
CLEAN := $(CLEAN), \
CLEAN_FILES := $(CLEAN_FILES), \
COPY := $(COPY), \

View File

@@ -80,7 +80,7 @@ $(eval $(call SetupJavaCompilation, COMPILE_DEPEND, \
TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
SRC := $(TOPDIR)/make/jdk/src/classes, \
INCLUDES := build/tools/depend, \
BIN := $(BUILDTOOLS_OUTPUTDIR)/depend, \
BIN := $(BUILDTOOLS_OUTPUTDIR)/plugins, \
DISABLED_WARNINGS := options, \
JAVAC_FLAGS := \
--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
@@ -93,13 +93,21 @@ $(eval $(call SetupJavaCompilation, COMPILE_DEPEND, \
--add-exports jdk.internal.opt/jdk.internal.opt=jdk.javadoc.interim, \
))
DEPEND_SERVICE_PROVIDER := $(BUILDTOOLS_OUTPUTDIR)/depend/META-INF/services/com.sun.source.util.Plugin
$(eval $(call SetupJavaCompilation, COMPILE_JBR_API_PLUGIN, \
TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
SRC := $(TOPDIR)/make/jdk/src/classes, \
INCLUDES := build/tools/jbrapi, \
BIN := $(BUILDTOOLS_OUTPUTDIR)/plugins, \
))
$(DEPEND_SERVICE_PROVIDER):
$(call MakeDir, $(BUILDTOOLS_OUTPUTDIR)/depend/META-INF/services)
PLUGINS_SERVICE_PROVIDER := $(BUILDTOOLS_OUTPUTDIR)/plugins/META-INF/services/com.sun.source.util.Plugin
$(PLUGINS_SERVICE_PROVIDER):
$(call MakeDir, $(BUILDTOOLS_OUTPUTDIR)/plugins/META-INF/services)
$(ECHO) build.tools.depend.Depend > $@
$(ECHO) build.tools.jbrapi.JBRApiPlugin >> $@
TARGETS += $(COMPILE_DEPEND) $(DEPEND_SERVICE_PROVIDER)
TARGETS += $(COMPILE_DEPEND) $(COMPILE_JBR_API_PLUGIN) $(PLUGINS_SERVICE_PROVIDER)
################################################################################

73
make/JBRApi.gmk Normal file
View File

@@ -0,0 +1,73 @@
#
# Copyright 2000-2023 JetBrains s.r.o.
# 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. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# 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.
#
include $(SPEC)
include MakeBase.gmk
include Utils.gmk
JBR_API_ORIGIN := https://github.com/JetBrains/JetBrainsRuntimeApi.git
JBR_API_DIR := $(TOPDIR)/jbr-api
ARTIFACT_NAME := jbr-api-SNAPSHOT
ifeq ($(call isBuildOsEnv, windows.cygwin windows.msys2), true)
HOME := $$USERPROFILE
M2_REPO := $(shell $(PATHTOOL) $(HOME))/.m2/repository
else ifeq ($(call isBuildOsEnv, windows.wsl1 windows.wsl2), true)
HOME := `cmd.exe /C "echo %USERPROFILE%" 2> /dev/null`
M2_REPO := $(shell $(PATHTOOL) $(HOME))/.m2/repository
else
M2_REPO := $(HOME)/.m2/repository
endif
M2_ARTIFACT := $(M2_REPO)/com/jetbrains/jbr-api/SNAPSHOT
M2_POM_CONTENT := \
<?xml version="1.0" encoding="UTF-8"?> \
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" \
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> \
<modelVersion>4.0.0</modelVersion> \
<groupId>com.jetbrains</groupId> \
<artifactId>jbr-api</artifactId> \
<version>SNAPSHOT</version> \
</project> \
jbr-api:
if [ -d "$(JBR_API_DIR)" ]; then \
$(GIT) -C "$(JBR_API_DIR)" fetch; \
$(GIT) -C "$(JBR_API_DIR)" merge-base --is-ancestor origin/main HEAD || \
$(ECHO) "!!! Current JBR API revision is outdated, update the branch in $(JBR_API_DIR) !!!"; \
else \
$(ECHO) "JBR API directory does not exist. Initializing..."; \
$(GIT) clone "$(JBR_API_ORIGIN)" "$(JBR_API_DIR)" --config core.autocrlf=false; \
fi
$(BASH) "$(JBR_API_DIR)/tools/build.sh" dev "$(BOOT_JDK)"
if [ -d "$(M2_REPO)" ]; then \
$(MKDIR) -p $(M2_ARTIFACT); \
$(ECHO) "$(M2_POM_CONTENT)" > $(M2_ARTIFACT)/$(ARTIFACT_NAME).pom; \
$(CP) "$(JBR_API_DIR)/out/$(ARTIFACT_NAME).jar" "$(M2_ARTIFACT)"; \
$(ECHO) "Installed into local Maven repository as com.jetbrains:jbr-api:SNAPSHOT"; \
else \
$(ECHO) "No Maven repository found at $(M2_REPO) - skipping local installation"; \
fi
.PHONY: jbr-api

View File

@@ -358,7 +358,7 @@ $(eval $(call SetupTarget, vscode-project-ccls, \
$(eval $(call SetupTarget, idea-gen-config, \
MAKEFILE := ide/idea/jdk/IdeaGenConfig, \
ARGS := IDEA_OUTPUT="$(IDEA_OUTPUT)" MODULES="$(MODULES)", \
ARGS := IDEA_OUTPUT="$(IDEA_OUTPUT)" MODULES="$(MODULES)" TOPLEVEL_DIR="$(TOPLEVEL_DIR)" IDEA_OUTPUT_PARENT="$(IDEA_OUTPUT_PARENT)", \
))
################################################################################
@@ -1500,6 +1500,14 @@ create-main-targets-include:
@$(ECHO) ALL_MAIN_TARGETS := $(sort $(ALL_TARGETS)) > \
$(MAKESUPPORT_OUTPUTDIR)/main-targets.gmk
################################################################################
# JBR API
$(eval $(call SetupTarget, jbr-api, \
MAKEFILE := JBRApi, \
TARGET := jbr-api \
))
.PHONY: $(ALL_TARGETS)
FRC: # Force target

View File

@@ -89,8 +89,8 @@ AC_DEFUN([BASIC_SETUP_PATHS_WINDOWS],
WINENV_TEMP_DIR=$($PATHTOOL -u $($CMD /q /c echo %TEMP% 2> /dev/null) | $TR -d '\r\n')
AC_MSG_RESULT([$WINENV_TEMP_DIR])
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl2"; then
# Don't trust the current directory for WSL2, but change to an OK temp dir
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl1" || test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl2"; then
# Don't trust the current directory for WSL, but change to an OK temp dir
cd "$WINENV_TEMP_DIR"
# Bring along confdefs.h or autoconf gets all confused
cp "$CONFIGURE_START_DIR/confdefs.h" "$WINENV_TEMP_DIR"
@@ -228,7 +228,7 @@ AC_DEFUN([BASIC_WINDOWS_FINALIZE_FIXPATH],
# Platform-specific finalization
AC_DEFUN([BASIC_WINDOWS_FINALIZE],
[
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl2"; then
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl1" || test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl2"; then
# Change back from temp dir
cd $CONFIGURE_START_DIR
fi

View File

@@ -244,6 +244,31 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
fi
AC_SUBST(HOTSPOT_OVERRIDE_LIBPATH)
# Should we build the client for the JAWS screen reader?
if test "x$OPENJDK_TARGET_OS" = xwindows; then
AC_MSG_CHECKING([if JAWS client support is enabled])
A11Y_JAWS_ANNOUNCING_ENABLED=true
AC_ARG_ENABLE(
[jaws-client],
[AS_HELP_STRING([--disable-jaws-client], [Set to disable to exclude the client for the JAWS screen reader from the build])],
[
if test "x$ENABLE_HEADLESS_ONLY" = xtrue; then
AC_MSG_WARN([--[enable|disable]-jaws-client[=*] flags are ignored for headless builds])
elif test "x$enableval" != xyes; then
A11Y_JAWS_ANNOUNCING_ENABLED=false
fi
]
)
if test "x$ENABLE_HEADLESS_ONLY" = xtrue; then
A11Y_JAWS_ANNOUNCING_ENABLED=false
fi
AC_MSG_RESULT([$A11Y_JAWS_ANNOUNCING_ENABLED])
else
A11Y_JAWS_ANNOUNCING_ENABLED=false
fi
AC_SUBST(A11Y_JAWS_ANNOUNCING_ENABLED)
])
################################################################################

55
make/autoconf/lib-dbus.m4 Normal file
View File

@@ -0,0 +1,55 @@
#
# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2024, JetBrains s.r.o.. 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. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# 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.
#
################################################################################
# Check if a potential dbus library match is correct and usable
################################################################################
AC_DEFUN_ONCE([LIB_SETUP_DBUS],
[
AC_ARG_WITH(dbus-includes, [AS_HELP_STRING([--with-dbus-includes],
[specify include directories for the dbus files as list separated by space])])
if test "x$NEEDS_LIB_DBUS" = xfalse; then
DBUS_CFLAGS=
DBUS_FOUND=false
else
if test "x${with_dbus_includes}" != x; then
DBUS_FOUND=true
DBUS_CFLAGS=""
for include in $with_dbus_includes; do
DBUS_CFLAGS="${DBUS_CFLAGS}-I${include} "
done
else
PKG_CHECK_MODULES(DBUS, dbus-1, [DBUS_FOUND=true], [
DBUS_FOUND=false
AC_MSG_NOTICE([Can't find dbus-1 library. This library is needed to use some features. You can install dbus-1 library or specify include directories manually by giving --with-dbus-includes option.])
])
fi
fi
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_FOUND)
])

View File

@@ -0,0 +1,121 @@
#
# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2022, JetBrains s.r.o.. 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. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# 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.
#
################################################################################
# Setup nvdacontrollerclient (The library for communication with
# NVDA - a screen reader for Microsoft Windows)
################################################################################
AC_DEFUN_ONCE([LIB_SETUP_NVDACONTROLLERCLIENT], [
# To enable NVDA, user specifies neither --with-nvdacontrollerclient or
# a pair (--with-nvdacontrollerclient-include, --with-nvdacontrollerclient-lib)
AC_ARG_WITH(nvdacontrollerclient, [AS_HELP_STRING([--with-nvdacontrollerclient],
[specify prefix directory for the NVDA Controller Client library package
(expecting headers and libs under PATH/<target-arch>/)])])
AC_ARG_WITH(nvdacontrollerclient-include, [AS_HELP_STRING([--with-nvdacontrollerclient-include],
[specify directory for the NVDA Controller Client include files])])
AC_ARG_WITH(nvdacontrollerclient-lib, [AS_HELP_STRING([--with-nvdacontrollerclient-lib],
[specify directory for the NVDA Controller Client library])])
NVDACONTROLLERCLIENT_FOUND=no
NVDACONTROLLERCLIENT_LIB=
NVDACONTROLLERCLIENT_DLL=
NVDACONTROLLERCLIENT_CFLAGS=
if test "x${NEEDS_LIB_NVDACONTROLLERCLIENT}" = "xtrue" ; then
if (test "x${with_nvdacontrollerclient_include}" = "x" && test "x${with_nvdacontrollerclient_lib}" != "x") || \
(test "x${with_nvdacontrollerclient_include}" != "x" && test "x${with_nvdacontrollerclient_lib}" = "x") ; then
AC_MSG_ERROR([Must specify both or neither of --with-nvdacontrollerclient-include and --with-nvdacontrollerclient-lib])
elif (test "x${with_nvdacontrollerclient}" != "x" && test "x${with_nvdacontrollerclient_include}" != "x") ; then
AC_MSG_ERROR([Must specify either --with-nvdacontrollerclient or a pair (--with-nvdacontrollerclient-include, --with-nvdacontrollerclient-lib)])
fi
if (test "x${with_nvdacontrollerclient}" != "x") || \
(test "x${with_nvdacontrollerclient_include}" != "x" && test "x${with_nvdacontrollerclient_lib}" != "x") ; then
AC_MSG_CHECKING([for nvdacontrollerclient])
if test "x${OPENJDK_TARGET_OS}" != "xwindows" ; then
AC_MSG_ERROR([--with-nvdacontrollerclient[-*] flags are applicable only to Windows builds])
fi
if test "x${OPENJDK_TARGET_CPU_ARCH}" = "xaarch64" ; then
NVDACONTROLLERCLIENT_BIN_BASENAME="nvdaControllerClient32"
NVDACONTROLLERCLIENT_ARCHDIR="arm64"
elif test "x${OPENJDK_TARGET_CPU_ARCH}" = "xx86" && test "x${OPENJDK_TARGET_CPU_BITS}" = "x64" ; then
NVDACONTROLLERCLIENT_BIN_BASENAME="nvdaControllerClient64"
NVDACONTROLLERCLIENT_ARCHDIR="x64"
elif test "x${OPENJDK_TARGET_CPU_ARCH}" = "xx86" && test "x${OPENJDK_TARGET_CPU_BITS}" = "x32" ; then
NVDACONTROLLERCLIENT_BIN_BASENAME="nvdaControllerClient32"
NVDACONTROLLERCLIENT_ARCHDIR="x86"
else
AC_MSG_ERROR([The nvdacontrollerclient library exists only for x86_32, x86_64, AArch64 architectures])
fi
if test "x${with_nvdacontrollerclient}" != "x" ; then
# NVDACONTROLLERCLIENT_ARCHDIR is used only here
NVDACONTROLLERCLIENT_INC_PATH="${with_nvdacontrollerclient}/${NVDACONTROLLERCLIENT_ARCHDIR}"
NVDACONTROLLERCLIENT_BIN_PATH="${with_nvdacontrollerclient}/${NVDACONTROLLERCLIENT_ARCHDIR}"
else
NVDACONTROLLERCLIENT_INC_PATH="${with_nvdacontrollerclient_include}"
NVDACONTROLLERCLIENT_BIN_PATH="${with_nvdacontrollerclient_lib}"
fi
POTENTIAL_NVDACONTROLLERCLIENT_DLL="${NVDACONTROLLERCLIENT_BIN_PATH}/${NVDACONTROLLERCLIENT_BIN_BASENAME}.dll"
POTENTIAL_NVDACONTROLLERCLIENT_LIB="${NVDACONTROLLERCLIENT_BIN_PATH}/${NVDACONTROLLERCLIENT_BIN_BASENAME}.lib"
POTENTIAL_NVDACONTROLLERCLIENT_EXP="${NVDACONTROLLERCLIENT_BIN_PATH}/${NVDACONTROLLERCLIENT_BIN_BASENAME}.exp"
if ! test -s "${POTENTIAL_NVDACONTROLLERCLIENT_DLL}" || \
! test -s "${POTENTIAL_NVDACONTROLLERCLIENT_LIB}" || \
! test -s "${POTENTIAL_NVDACONTROLLERCLIENT_EXP}" ; then
AC_MSG_ERROR([Could not find ${NVDACONTROLLERCLIENT_BIN_BASENAME}.dll and/or ${NVDACONTROLLERCLIENT_BIN_BASENAME}.lib and/or ${NVDACONTROLLERCLIENT_BIN_BASENAME}.exp inside ${NVDACONTROLLERCLIENT_BIN_PATH}])
fi
if ! test -s "${NVDACONTROLLERCLIENT_INC_PATH}/nvdaController.h" ; then
AC_MSG_ERROR([Could not find the header file nvdaController.h inside ${NVDACONTROLLERCLIENT_INC_PATH}])
fi
NVDACONTROLLERCLIENT_CFLAGS="-I${NVDACONTROLLERCLIENT_INC_PATH}"
NVDACONTROLLERCLIENT_DLL="${POTENTIAL_NVDACONTROLLERCLIENT_DLL}"
NVDACONTROLLERCLIENT_LIB="${POTENTIAL_NVDACONTROLLERCLIENT_LIB}"
NVDACONTROLLERCLIENT_FOUND=yes
AC_MSG_RESULT([includes at ${NVDACONTROLLERCLIENT_INC_PATH} ; binaries at ${NVDACONTROLLERCLIENT_BIN_PATH}])
fi
elif test "x${with_nvdacontrollerclient}" != "x" || \
test "x${with_nvdacontrollerclient_include}" != "x" || test "x${with_nvdacontrollerclient_lib}" != "x" ; then
AC_MSG_WARN([[nvdacontrollerclient is not used, so --with-nvdacontrollerclient[-*] is ignored]])
fi
if test "x${NVDACONTROLLERCLIENT_FOUND}" = "xyes" ; then
A11Y_NVDA_ANNOUNCING_ENABLED=true
else
A11Y_NVDA_ANNOUNCING_ENABLED=false
fi
AC_SUBST(A11Y_NVDA_ANNOUNCING_ENABLED)
AC_SUBST(NVDACONTROLLERCLIENT_CFLAGS)
AC_SUBST(NVDACONTROLLERCLIENT_DLL)
AC_SUBST(NVDACONTROLLERCLIENT_LIB)
])

View File

@@ -0,0 +1,92 @@
#
# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2022, JetBrains s.r.o.. 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. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# 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.
#
################################################################################
# Setup speechd
################################################################################
AC_DEFUN_ONCE([LIB_SETUP_SPEECHD],
[
AC_ARG_WITH(speechd, [AS_HELP_STRING([--with-speechd],
[specify prefix directory for the libspeechd package
(expecting the headers under PATH/include); required for AccessibleAnnouncer to work])])
AC_ARG_WITH(speechd-include, [AS_HELP_STRING([--with-speechd-include],
[specify directory for the speechd include files])])
if test "x$NEEDS_LIB_SPEECHD" = xfalse || test "x${with_speechd}" = xno || \
test "x${with_speechd_include}" = xno; then
if (test "x${with_speechd}" != x && test "x${with_speechd}" != xno) || \
(test "x${with_speechd_include}" != x && test "x${with_speechd_include}" != xno); then
AC_MSG_WARN([[speechd not used, so --with-speechd[-*] is ignored]])
fi
A11Y_SPEECHD_ANNOUNCING_ENABLED=false
SPEECHD_CFLAGS=
SPEECHD_LIBS=
else
SPEECHD_FOUND=no
if test "x${with_speechd}" != x && test "x${with_speechd}" != xyes; then
AC_MSG_CHECKING([for speechd header and library])
if test -s "${with_speechd}/include/libspeechd.h"; then
SPEECHD_CFLAGS="-I${with_speechd}/include"
SPEECHD_LIBS="-L${with_speechd}/lib -lspeechd"
SPEECHD_FOUND=yes
AC_MSG_RESULT([$SPEECHD_FOUND])
else
AC_MSG_ERROR([Can't find 'include/libspeechd.h' under ${with_speechd} given with the --with-speechd option.])
fi
fi
if test "x${with_speechd_include}" != x; then
AC_MSG_CHECKING([for speechd headers])
if test -s "${with_speechd_include}/libspeechd.h"; then
SPEECHD_CFLAGS="-I${with_speechd_include}"
SPEECHD_FOUND=yes
AC_MSG_RESULT([$SPEECHD_FOUND])
else
AC_MSG_ERROR([Can't find 'include/libspeechd.h' under ${with_speechd} given with the --with-speechd-include option.])
fi
fi
if test "x$SPEECHD_FOUND" = xno; then
# Are the libspeechd headers installed in the default /usr/include location?
AC_CHECK_HEADERS([libspeechd.h],
[ SPEECHD_FOUND=yes ],
[ SPEECHD_FOUND=no; break ]
)
if test "x$SPEECHD_FOUND" = xyes; then
SPEECHD_CFLAGS=
SPEECHD_LIBS="-lspeechd"
fi
fi
if test "x$SPEECHD_FOUND" = xno; then
A11Y_SPEECHD_ANNOUNCING_ENABLED=false
else
A11Y_SPEECHD_ANNOUNCING_ENABLED=true
fi
fi
AC_SUBST(A11Y_SPEECHD_ANNOUNCING_ENABLED)
AC_SUBST(SPEECHD_CFLAGS)
AC_SUBST(SPEECHD_LIBS)
])

114
make/autoconf/lib-vulkan.m4 Normal file
View File

@@ -0,0 +1,114 @@
#
# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2025, JetBrains s.r.o.. 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. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# 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.
#
################################################################################
# Setup vulkan
################################################################################
AC_DEFUN_ONCE([LIB_SETUP_VULKAN],
[
AC_ARG_WITH(vulkan, [AS_HELP_STRING([--with-vulkan],
[specify whether we use vulkan])])
AC_ARG_WITH(vulkan-include, [AS_HELP_STRING([--with-vulkan-include],
[specify directory for the vulkan include files ({with-vulkan-include}/vulkan/vulkan.h)])])
AC_ARG_WITH(vulkan-shader-compiler, [AS_HELP_STRING([--with-vulkan-shader-compiler],
[specify which shader compiler to use: glslc/glslangValidator])])
VULKAN_ENABLED=false
VULKAN_FLAGS=
# Find Vulkan SDK
if test "x$NEEDS_LIB_VULKAN" = xtrue || test "x${with_vulkan}" = xyes || test "x${with_vulkan_include}" != x ; then
# Check custom directory
if test "x${with_vulkan_include}" != x; then
AC_MSG_CHECKING([for ${with_vulkan_include}/vulkan/vulkan.h])
if test -s "${with_vulkan_include}/vulkan/vulkan.h"; then
VULKAN_ENABLED=true
VULKAN_FLAGS="-I${with_vulkan_include}"
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
AC_MSG_ERROR([Can't find 'vulkan/vulkan.h' under '${with_vulkan_include}'])
fi
fi
# Check $VULKAN_SDK
if test "x$VULKAN_ENABLED" = xfalse && test "x${VULKAN_SDK}" != x; then
AC_MSG_CHECKING([for ${VULKAN_SDK}/include/vulkan/vulkan.h])
if test -s "${VULKAN_SDK}/include/vulkan/vulkan.h"; then
VULKAN_ENABLED=true
VULKAN_FLAGS="-I${VULKAN_SDK}/include"
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi
fi
# Check default /usr/include location
if test "x$VULKAN_ENABLED" = xfalse; then
AC_CHECK_HEADERS([vulkan/vulkan.h],
[ VULKAN_ENABLED=true ], [ break ]
)
fi
if test "x$VULKAN_ENABLED" = xfalse; then
# Vulkan SDK not found
HELP_MSG_MISSING_DEPENDENCY([vulkan])
AC_MSG_ERROR([Could not find vulkan! $HELP_MSG ])
fi
fi
# Find shader compiler - glslc or glslangValidator
if test "x$VULKAN_ENABLED" = xtrue; then
SHADER_COMPILER=
# Check glslc
if (test "x${with_vulkan_shader_compiler}" = x || test "x${with_vulkan_shader_compiler}" = xglslc); then
UTIL_LOOKUP_PROGS(GLSLC, glslc)
SHADER_COMPILER="$GLSLC"
VULKAN_SHADER_COMPILER="glslc --target-env=vulkan1.2 -mfmt=num -o"
fi
# Check glslangValidator
if (test "x${with_vulkan_shader_compiler}" = x || test "x${with_vulkan_shader_compiler}" = xglslangValidator) && \
test "x$SHADER_COMPILER" = x; then
UTIL_LOOKUP_PROGS(GLSLANG, glslangValidator)
SHADER_COMPILER="$GLSLANG"
VULKAN_SHADER_COMPILER="glslangValidator --target-env vulkan1.2 -x -o"
fi
if test "x$SHADER_COMPILER" = x; then
# Compiler not found
VULKAN_ENABLED=false
VULKAN_FLAGS=
AC_MSG_ERROR([Can't find vulkan shader compiler])
fi
fi
AC_SUBST(VULKAN_ENABLED)
AC_SUBST(VULKAN_FLAGS)
AC_SUBST(VULKAN_SHADER_COMPILER)
])

View File

@@ -0,0 +1,130 @@
#
# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2023, JetBrains s.r.o.. 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. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# 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.
#
################################################################################
# Setup wayland
################################################################################
AC_DEFUN_ONCE([LIB_SETUP_WAYLAND],
[
AC_ARG_WITH(wayland, [AS_HELP_STRING([--with-wayland],
[specify prefix directory for the wayland package
(expecting the headers under PATH/include)])])
AC_ARG_WITH(wayland-include, [AS_HELP_STRING([--with-wayland-include],
[specify directory for the wayland include files])])
AC_ARG_WITH(wayland-lib, [AS_HELP_STRING([--with-wayland-lib],
[specify directory for the wayland library files])])
AC_ARG_WITH(wayland-protocols, [AS_HELP_STRING([--with-wayland-protocols],
[specify the root directory for the wayland protocols xml files])])
AC_ARG_WITH(gtk-shell1-protocol, [AS_HELP_STRING([--with-gtk-shell1-protocol],
[specify the path to the gtk-shell1 Wayland protocol xml file])])
if test "x$NEEDS_LIB_WAYLAND" = xfalse; then
if (test "x${with_wayland}" != x && test "x${with_wayland}" != xno) || \
(test "x${with_wayland_include}" != x && test "x${with_wayland_include}" != xno); then
AC_MSG_WARN([[wayland not used, so --with-wayland[-*] is ignored]])
fi
WAYLAND_CFLAGS=
WAYLAND_LIBS=
else
WAYLAND_FOUND=no
WAYLAND_INCLUDES=
WAYLAND_DEFINES=
if test "x${with_wayland}" = xno || test "x${with_wayland_include}" = xno; then
AC_MSG_ERROR([It is not possible to disable the use of wayland. Remove the --without-wayland option.])
fi
if test "x${with_wayland}" != x; then
AC_MSG_CHECKING([for wayland headers])
if test -s "${with_wayland}/include/wayland-client.h" && test -s "${with_wayland}/include/wayland-cursor.h"; then
WAYLAND_INCLUDES="-I${with_wayland}/include"
WAYLAND_LIBS="-L${with_wayland}/lib -lwayland-client -lwayland-cursor"
WAYLAND_FOUND=yes
AC_MSG_RESULT([$WAYLAND_FOUND])
else
AC_MSG_ERROR([Can't find 'include/wayland-client.h' and 'include/wayland-cursor.h' under ${with_wayland} given with the --with-wayland option.])
fi
fi
if test "x${with_wayland_include}" != x; then
AC_MSG_CHECKING([for wayland headers])
if test -s "${with_wayland_include}/wayland-client.h" && test -s "${with_wayland_include}/wayland-cursor.h"; then
WAYLAND_INCLUDES="-I${with_wayland_include}"
WAYLAND_FOUND=yes
AC_MSG_RESULT([$WAYLAND_FOUND])
else
AC_MSG_ERROR([Can't find 'wayland-client.h' and 'wayland-cursor.h' under ${with_wayland_include} given with the --with-wayland-include option.])
fi
fi
UTIL_REQUIRE_PROGS(WAYLAND_SCANNER, wayland-scanner)
if test "x${with_wayland_protocols}" != x; then
WAYLAND_PROTOCOLS_ROOT=${with_wayland_protocols}
else
WAYLAND_PROTOCOLS_ROOT=/usr/share/wayland-protocols/
fi
AC_MSG_CHECKING([for wayland-protocols])
if test -d "$WAYLAND_PROTOCOLS_ROOT"; then
AC_MSG_RESULT([yes])
else
AC_MSG_ERROR([Can't find 'wayland-protocols' under $WAYLAND_PROTOCOLS_ROOT.])
fi
GTK_SHELL1_PROTOCOL_PATH=
if test "x${with_gtk_shell1_protocol}" != x && test "x${with_gtk_shell1_protocol}" != xno; then
AC_MSG_CHECKING([for the gtk-shell1 Wayland protocol])
if test -s "${with_gtk_shell1_protocol}"; then
WAYLAND_DEFINES="${WAYLAND_DEFINES} -DHAVE_GTK_SHELL1"
GTK_SHELL1_PROTOCOL_PATH="${with_gtk_shell1_protocol}"
AC_MSG_RESULT([yes])
else
AC_MSG_ERROR([Can't find gtk-shell1 protocol in ${with_gtk_shell1_protocol} given with the --with-gtk-shell1-protocol option.])
fi
fi
if test "x${with_wayland_lib}" != x; then
WAYLAND_LIBS="-L${with_wayland_lib} -lwayland-client -lwayland-cursor"
fi
if test "x$WAYLAND_FOUND" = xno; then
# Are the wayland headers installed in the default /usr/include location?
AC_CHECK_HEADERS([wayland-client.h wayland-cursor.h],
[ WAYLAND_FOUND=yes ],
[ WAYLAND_FOUND=no; break ]
)
if test "x$WAYLAND_FOUND" = xyes; then
WAYLAND_INCLUDES=
WAYLAND_LIBS="-lwayland-client -lwayland-cursor"
DEFAULT_WAYLAND=yes
fi
fi
if test "x$WAYLAND_FOUND" = xno; then
HELP_MSG_MISSING_DEPENDENCY([wayland])
AC_MSG_ERROR([Could not find wayland! $HELP_MSG ])
fi
WAYLAND_CFLAGS="${WAYLAND_INCLUDES} ${WAYLAND_DEFINES}"
fi
AC_SUBST(WAYLAND_CFLAGS)
AC_SUBST(WAYLAND_LIBS)
AC_SUBST(WAYLAND_PROTOCOLS_ROOT)
AC_SUBST(GTK_SHELL1_PROTOCOL_PATH)
])

View File

@@ -33,7 +33,11 @@ m4_include([lib-freetype.m4])
m4_include([lib-hsdis.m4])
m4_include([lib-std.m4])
m4_include([lib-x11.m4])
m4_include([lib-speechd.m4])
m4_include([lib-nvdacontrollerclient.m4])
m4_include([lib-dbus.m4])
m4_include([lib-vulkan.m4])
m4_include([lib-wayland.m4])
m4_include([lib-tests.m4])
################################################################################
@@ -41,16 +45,29 @@ m4_include([lib-tests.m4])
################################################################################
AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES],
[
# Check if X11 is needed
# Check if X11, wayland and vulkan is needed
if test "x$OPENJDK_TARGET_OS" = xwindows || test "x$OPENJDK_TARGET_OS" = xmacosx; then
# No X11 support on windows or macosx
# No X11 and wayland support on windows or macosx
NEEDS_LIB_X11=false
NEEDS_LIB_SPEECHD=false
NEEDS_LIB_WAYLAND=false
else
# All other instances need X11, even if building headless only, libawt still
# needs X11 headers.
NEEDS_LIB_X11=true
if test "x$ENABLE_HEADLESS_ONLY" = xtrue; then
NEEDS_LIB_SPEECHD=false
NEEDS_LIB_WAYLAND=false
else
NEEDS_LIB_SPEECHD=true
NEEDS_LIB_WAYLAND=true
fi
fi
# Vulkan is not built by default
NEEDS_LIB_VULKAN=false
# Check if fontconfig is needed
if test "x$OPENJDK_TARGET_OS" = xwindows || test "x$OPENJDK_TARGET_OS" = xmacosx; then
# No fontconfig support on windows or macosx
@@ -74,11 +91,13 @@ AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES],
NEEDS_LIB_FREETYPE=true
fi
# Check if alsa is needed
# Check if alsa and dbus is needed
if test "x$OPENJDK_TARGET_OS" = xlinux; then
NEEDS_LIB_ALSA=true
NEEDS_LIB_DBUS=true
else
NEEDS_LIB_ALSA=false
NEEDS_LIB_DBUS=false
fi
# Check if ffi is needed
@@ -87,6 +106,13 @@ AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES],
else
NEEDS_LIB_FFI=false
fi
# Check if nvdacontrollerclient is needed
if test "x$OPENJDK_TARGET_OS" = xwindows && test "x$ENABLE_HEADLESS_ONLY" != xtrue; then
NEEDS_LIB_NVDACONTROLLERCLIENT=true
else
NEEDS_LIB_NVDACONTROLLERCLIENT=false
fi
])
################################################################################
@@ -120,7 +146,11 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
LIB_SETUP_LIBFFI
LIB_SETUP_MISC_LIBS
LIB_SETUP_X11
LIB_SETUP_SPEECHD
LIB_SETUP_NVDACONTROLLERCLIENT
LIB_SETUP_DBUS
LIB_SETUP_VULKAN
LIB_SETUP_WAYLAND
LIB_TESTS_SETUP_GTEST
# Math library
@@ -153,7 +183,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
if test "x$OPENJDK_TARGET_OS" = xwindows; then
BASIC_JVM_LIBS="$BASIC_JVM_LIBS kernel32.lib user32.lib gdi32.lib winspool.lib \
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib powrprof.lib uuid.lib \
ws2_32.lib winmm.lib version.lib psapi.lib"
ws2_32.lib winmm.lib version.lib psapi.lib Synchronization.lib"
fi
LIB_SETUP_JVM_LIBS(BUILD)
LIB_SETUP_JVM_LIBS(TARGET)

View File

@@ -471,6 +471,33 @@ UBSAN_LDFLAGS := @UBSAN_LDFLAGS@
X_CFLAGS := @X_CFLAGS@
X_LIBS := @X_LIBS@
# Necessary additional compiler flags to compile dbus
DBUS_CFLAGS := @DBUS_CFLAGS@
DBUS_FOUND := @DBUS_FOUND@
# Linux speechd a11y announcer
A11Y_SPEECHD_ANNOUNCING_ENABLED:=@A11Y_SPEECHD_ANNOUNCING_ENABLED@
SPEECHD_CFLAGS:=@SPEECHD_CFLAGS@
SPEECHD_LIBS:=@SPEECHD_LIBS@
# Windows NVDA a11y announcer
A11Y_NVDA_ANNOUNCING_ENABLED:=@A11Y_NVDA_ANNOUNCING_ENABLED@
NVDACONTROLLERCLIENT_CFLAGS:=@NVDACONTROLLERCLIENT_CFLAGS@
NVDACONTROLLERCLIENT_DLL:=@NVDACONTROLLERCLIENT_DLL@
NVDACONTROLLERCLIENT_LIB:=@NVDACONTROLLERCLIENT_LIB@
# Windows the client for the JAWS screen reader
A11Y_JAWS_ANNOUNCING_ENABLED:=@A11Y_JAWS_ANNOUNCING_ENABLED@
WAYLAND_CFLAGS:=@WAYLAND_CFLAGS@
WAYLAND_LIBS:=@WAYLAND_LIBS@
WAYLAND_PROTOCOLS_ROOT:=@WAYLAND_PROTOCOLS_ROOT@
WAYLAND_SCANNER:=@WAYLAND_SCANNER@
GTK_SHELL1_PROTOCOL_PATH:=@GTK_SHELL1_PROTOCOL_PATH@
VULKAN_ENABLED:=@VULKAN_ENABLED@
VULKAN_FLAGS:=@VULKAN_FLAGS@
VULKAN_SHADER_COMPILER:=@VULKAN_SHADER_COMPILER@
# The lowest required version of macosx
MACOSX_VERSION_MIN := @MACOSX_VERSION_MIN@
# The highest allowed version of macosx

View File

@@ -163,6 +163,7 @@ endef
# CREATE_API_DIGEST Set to true to use a javac plugin to generate a public API
# hash which can be used for down stream dependencies to only rebuild
# when the API changes.
# PROCESS_JBR_API Set to true to use an annotation processor to generate JBR API bindings.
# KEEP_ALL_TRANSLATIONS Set to true to skip translation filtering
SetupJavaCompilation = $(NamedParamsMacroTemplate)
define SetupJavaCompilationBody
@@ -289,11 +290,20 @@ define SetupJavaCompilationBody
"-XDLOG_LEVEL=$(LOG_LEVEL)" \
#
$1_EXTRA_DEPS := $$(BUILDTOOLS_OUTPUTDIR)/depend/_the.COMPILE_DEPEND_batch
$1_EXTRA_DEPS := $$(BUILDTOOLS_OUTPUTDIR)/plugins/_the.COMPILE_DEPEND_batch
endif
ifeq ($$($1_PROCESS_JBR_API), true)
# Automatic path conversion doesn't work for two arguments, so call fixpath manually
$1_JBR_API_FLAGS := -Xplugin:"jbr-api $$(call FixPath, $$($1_BIN)/java.base/META-INF/jbrapi.registry) $$(call FixPath, $(TOPDIR)/jb/jbr-api.version)"
$1_EXTRA_DEPS := $$($1_EXTRA_DEPS) $$(BUILDTOOLS_OUTPUTDIR)/plugins/_the.COMPILE_JBR_API_PLUGIN_batch
endif
ifeq ($$(call Or, $$($1_CREATE_API_DIGEST) $$($1_PROCESS_JBR_API)), true)
# including the compilation output on the classpath, so that incremental
# compilations in unnamed module can refer to other classes from the same
# source root, which are not being recompiled in this compilation:
$1_AUGMENTED_CLASSPATH += $$(BUILDTOOLS_OUTPUTDIR)/depend $$($1_BIN)
$1_AUGMENTED_CLASSPATH += $$(BUILDTOOLS_OUTPUTDIR)/plugins $$($1_BIN)
endif
ifneq ($$($1_AUGMENTED_CLASSPATH), )
@@ -503,7 +513,7 @@ define SetupJavaCompilationBody
$$(call MakeDir, $$(@D))
$$(call ExecuteWithLog, $$($1_BIN)$$($1_MODULE_SUBDIR)/_the.$$($1_SAFE_NAME)_batch, \
$$($1_JAVAC_CMD) $$($1_FLAGS) \
$$($1_API_DIGEST_FLAGS) \
$$($1_API_DIGEST_FLAGS) $$($1_JBR_API_FLAGS) \
-XDmodifiedInputs=$$($1_MODFILELIST_FIXED) \
-d $$($1_BIN) $$($1_HEADERS_ARG) @$$($1_FILELIST)) && \
$(TOUCH) $$@

View File

@@ -41,15 +41,22 @@ endif
OUT := $(IDEA_OUTPUT)/env.cfg
idea:
$(RM) $(OUT)
$(ECHO) "MODULES=\"$(foreach mod, $(MODULES), \
module='$(mod)' \
moduleSrcDirs='$(foreach m,$(call FindModuleSrcDirs,$(mod)),$(call RelativePath,$m,$(TOPDIR)))' \
moduleDependencies='$(call FindTransitiveDepsForModule,$(mod))' \
#)\"" > $(OUT)
$(ECHO) "SUPPORT=$(SUPPORT_OUTPUTDIR)" >> $(OUT)
$(ECHO) "MODULE_ROOTS=\"$(foreach mod, $(MODULES), $(call FindModuleSrcDirs, $(mod)))\"" >> $(OUT)
$(ECHO) "MODULE_NAMES=\"$(strip $(foreach mod, $(MODULES), $(mod)))\"" >> $(OUT)
$(ECHO) "SEL_MODULES=\"$(MODULES)\"" >> $(OUT)
$(ECHO) "BOOT_JDK=\"$(BOOT_JDK)\"" >> $(OUT)
$(ECHO) "CYGPATH=\"$(PATHTOOL)\"" >> $(OUT)
$(ECHO) "SPEC=\"$(SPEC)\"" >> $(OUT)
$(ECHO) "RELATIVE_TOPLEVEL_PROJECT_DIR=\"$(call RelativePath,$(TOPLEVEL_DIR),$(IDEA_OUTPUT_PARENT))\"" >> $(OUT)
$(ECHO) "RELATIVE_PROJECT_DIR=\"$(call RelativePath,$(TOPLEVEL_DIR),$(IDEA_OUTPUT_PARENT))\"" >> $(OUT)
# $(ECHO) "RELATIVE_PROJECT_DIR=\"$(call RelativePath,$(TOPDIR),$(IDEA_OUTPUT_PARENT))\"" >> $(OUT)
$(ECHO) "RELATIVE_BUILD_DIR=\"$(call RelativePath,$(OUTPUTDIR),$(IDEA_OUTPUT_PARENT))\"" >> $(OUT)
$(ECHO) "CLION_RELATIVE_PROJECT_DIR=\"$(call RelativePath,$(TOPDIR),$(IDEA_OUTPUT_PARENT)/.idea/jdk-clion)\"" >> $(OUT)
$(ECHO) "PATHTOOL=\"$(PATHTOOL)\"" >> $(OUT)
$(ECHO) "JT_HOME=\"$(JT_HOME)\"" >> $(OUT)
$(ECHO) "WINENV_ROOT=\"$(WINENV_ROOT)\"" >> $(OUT)
all: idea

View File

@@ -1,42 +0,0 @@
<!-- importing.xml -->
<project name="jdk">
<taskdef name="wrapLogger" classname="idea.IdeaLoggerWrapper" classpath="${idea.dir}/classes"/>
<wrapLogger/>
<macrodef name="call-make">
<attribute name="dir"/>
<attribute name="args"/>
<sequential>
<exec executable="make" dir="@{dir}" failonerror="true">
<arg line="@{args}"/>
<env key="CLASSPATH" value = ""/>
</exec>
</sequential>
</macrodef>
<target name="cond-clean" unless="${intellij.ismake}">
<antcall target="clean"/>
</target>
<target name="post-make" depends="cond-clean, build-module"/>
<!--
**** Global JDK Build Targets
-->
<target name="clean">
<echo message="base = ${basedir}"/>
<call-make dir = "${build.target.dir}" args = "reconfigure"/>
<call-make dir = "${build.target.dir}" args = "clean"/>
</target>
<target name="images">
<call-make dir = "${build.target.dir}" args = "images"/>
</target>
<target name="build-module">
<call-make dir = "${build.target.dir}" args = "${module.name}"/>
</target>
</project>

View File

@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AntConfiguration">
<buildFile url="file://###ROOT_DIR###/make/ide/idea/jdk/build.xml">
<properties>
<property name="intellij.ismake" value="$IsMake$" />
<property name="build.target.dir" value="###BUILD_DIR###" />
<property name="module.name" value="###MODULE_NAMES###" />
<property name="idea.dir" value="###IDEA_DIR###" />
</properties>
<executeOn event="afterCompilation" target="post-make" />
</buildFile>
</component>
</project>

View File

@@ -3,10 +3,10 @@
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
<excludeFromCompile>
<directory url="file://###ROOT_DIR###/src" includeSubdirectories="true" />
<directory url="file://###ROOT_DIR###/build" includeSubdirectories="true" />
<directory url="file://###ROOT_DIR###/make" includeSubdirectories="true" />
<directory url="file://###ROOT_DIR###/test" includeSubdirectories="true" />
<directory url="file://###PROJECT_DIR###/src" includeSubdirectories="true" />
<directory url="file://###PROJECT_DIR###/build" includeSubdirectories="true" />
<directory url="file://###PROJECT_DIR###/make" includeSubdirectories="true" />
<directory url="file://###PROJECT_DIR###/test" includeSubdirectories="false" />
</excludeFromCompile>
<resourceExtensions />
<wildcardResourcePatterns>

View File

@@ -0,0 +1,9 @@
<component name="CopyrightManager">
<copyright>
<option name="notice" value="Copyright &amp;#36;originalComment.match(&quot;Copyright (\d+)&quot;, 1, &quot;-&quot;)&amp;#36;today.year JetBrains s.r.o.&#10;DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.&#10;&#10;This code is free software; you can redistribute it and/or modify it&#10;under the terms of the GNU General Public License version 2 only, as&#10;published by the Free Software Foundation.&#10;&#10;This code is distributed in the hope that it will be useful, but WITHOUT&#10;ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or&#10;FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License&#10;version 2 for more details (a copy is included in the LICENSE file that&#10;accompanied this code).&#10;&#10;You should have received a copy of the GNU General Public License version&#10;2 along with this work; if not, write to the Free Software Foundation,&#10;Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.&#10;&#10;Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA&#10;or visit www.oracle.com if you need additional information or have any&#10;questions." />
<option name="keyword" value="Copyright" />
<option name="allowReplaceKeyword" value="JetBrains" />
<option name="myName" value="JetBrains" />
<option name="myLocal" value="true" />
</copyright>
</component>

View File

@@ -0,0 +1,7 @@
<component name="CopyrightManager">
<copyright>
<option name="allowReplaceRegexp" value="JetBrains" />
<option name="notice" value="Copyright &amp;#36;originalComment.match(&quot;Copyright (\d+)&quot;, 1, &quot;-&quot;)&amp;#36;today.year JetBrains s.r.o.&#10;DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.&#10;&#10;This code is free software; you can redistribute it and/or modify it&#10;under the terms of the GNU General Public License version 2 only, as&#10;published by the Free Software Foundation. Oracle designates this&#10;particular file as subject to the &quot;Classpath&quot; exception as provided&#10;by Oracle in the LICENSE file that accompanied this code.&#10;&#10;This code is distributed in the hope that it will be useful, but WITHOUT&#10;ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or&#10;FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License&#10;version 2 for more details (a copy is included in the LICENSE file that&#10;accompanied this code).&#10;&#10;You should have received a copy of the GNU General Public License version&#10;2 along with this work; if not, write to the Free Software Foundation,&#10;Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.&#10;&#10;Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA&#10;or visit www.oracle.com if you need additional information or have any&#10;questions." />
<option name="myName" value="JetBrainsCE" />
</copyright>
</component>

View File

@@ -1,3 +1,7 @@
<component name="CopyrightManager">
<settings default="" />
</component>
<settings default="JetBrainsCE">
<module2copyright>
<element module="TestFiles" copyright="JetBrains" />
</module2copyright>
</settings>
</component>

View File

@@ -0,0 +1,9 @@
<component name="CopyrightManager">
<copyright>
<option name="notice" value="Copyright &amp;#36;originalComment.match(&quot;Copyright (\d+)&quot;, 1, &quot;-&quot;)&amp;#36;today.year JetBrains s.r.o.&#10;DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.&#10;&#10;This code is free software; you can redistribute it and/or modify it&#10;under the terms of the GNU General Public License version 2 only, as&#10;published by the Free Software Foundation.&#10;&#10;This code is distributed in the hope that it will be useful, but WITHOUT&#10;ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or&#10;FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License&#10;version 2 for more details (a copy is included in the LICENSE file that&#10;accompanied this code).&#10;&#10;You should have received a copy of the GNU General Public License version&#10;2 along with this work; if not, write to the Free Software Foundation,&#10;Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.&#10;&#10;Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA&#10;or visit www.oracle.com if you need additional information or have any&#10;questions." />
<option name="keyword" value="Copyright" />
<option name="allowReplaceKeyword" value="JetBrains" />
<option name="myName" value="JetBrains" />
<option name="myLocal" value="true" />
</copyright>
</component>

View File

@@ -0,0 +1,7 @@
<component name="CopyrightManager">
<copyright>
<option name="allowReplaceRegexp" value="JetBrains" />
<option name="notice" value="Copyright &amp;#36;originalComment.match(&quot;Copyright (\d+)&quot;, 1, &quot;-&quot;)&amp;#36;today.year JetBrains s.r.o.&#10;DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.&#10;&#10;This code is free software; you can redistribute it and/or modify it&#10;under the terms of the GNU General Public License version 2 only, as&#10;published by the Free Software Foundation. Oracle designates this&#10;particular file as subject to the &quot;Classpath&quot; exception as provided&#10;by Oracle in the LICENSE file that accompanied this code.&#10;&#10;This code is distributed in the hope that it will be useful, but WITHOUT&#10;ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or&#10;FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License&#10;version 2 for more details (a copy is included in the LICENSE file that&#10;accompanied this code).&#10;&#10;You should have received a copy of the GNU General Public License version&#10;2 along with this work; if not, write to the Free Software Foundation,&#10;Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.&#10;&#10;Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA&#10;or visit www.oracle.com if you need additional information or have any&#10;questions." />
<option name="myName" value="JetBrainsCE" />
</copyright>
</component>

View File

@@ -0,0 +1,7 @@
<component name="CopyrightManager">
<settings default="JetBrainsCE">
<module2copyright>
<element module="TestFiles" copyright="JetBrains" />
</module2copyright>
</settings>
</component>

View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CidrRootsConfiguration">
<excludeRoots>
<file path="###CLION_PROJECT_DIR###/build" />
<file path="###CLION_PROJECT_DIR###/make" />
</excludeRoots>
</component>
<component name="CompDBSettings">
<option name="linkedExternalProjectsSettings">
<CompDBProjectSettings>
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
</set>
</option>
</CompDBProjectSettings>
</option>
</component>
<component name="CompDBWorkspace" PROJECT_DIR="$PROJECT_DIR$">
<contentRoot DIR="###CLION_PROJECT_DIR###" />
</component>
<component name="ExternalStorageConfigurationManager" enabled="true" />
</project>

View File

@@ -0,0 +1,3 @@
<component name="DependencyValidationManager">
<scope name="TestFiles" pattern="file[test]:*/" />
</component>

View File

@@ -0,0 +1,5 @@
<component name="DependencyValidationManager">
<state>
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
</state>
</component>

View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="IssueNavigationConfiguration">
<option name="links">
<list>
<IssueNavigationLink>
<option name="issueRegexp" value="(?:^|\s|\p{Punct})(?:JDK-)?(\d{7})(?=$|\s|\p{Punct})" />
<option name="linkRegexp" value="https://bugs.openjdk.java.net/browse/JDK-$1" />
</IssueNavigationLink>
</list>
</option>
</component>
<component name="VcsDirectoryMappings">
<mapping directory="###CLION_PROJECT_DIR###" vcs="###VCS_TYPE###" />
</component>
</project>

View File

@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ClangdSettings">
<option name="formatViaClangd" value="false" />
</component>
<component name="CompDBLocalSettings">
<option name="availableProjects">
<map>
<entry>
<key>
<ExternalProjectPojo>
<option name="name" value="jdk-clion" />
<option name="path" value="$PROJECT_DIR$" />
</ExternalProjectPojo>
</key>
<value>
<list>
<ExternalProjectPojo>
<option name="name" value="jdk-clion" />
<option name="path" value="$PROJECT_DIR$" />
</ExternalProjectPojo>
</list>
</value>
</entry>
</map>
</option>
<option name="projectSyncType">
<map>
<entry key="$PROJECT_DIR$" value="RE_IMPORT" />
</map>
</option>
</component>
<component name="ExternalProjectsData">
<projectState path="$PROJECT_DIR$">
<ProjectState />
</projectState>
</component>
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="RunOnceActivity.cidr.known.project.marker" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="cf.first.check.clang-format" value="false" />
<property name="cidr.known.project.marker" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="settings.editor.selected.configurable" value="CPPToolchains" />
</component>
</project>

View File

@@ -0,0 +1,29 @@
#!/bin/bash
TOPDIR="###CLION_SCRIPT_TOPDIR###"
BUILD_DIR="###RELATIVE_BUILD_DIR###"
PATHTOOL="###PATHTOOL###"
cd "`dirname $0`"
SCRIPT_DIR="`pwd`"
cd "$TOPDIR"
echo "Updating Clion project files in \"$SCRIPT_DIR\" for project \"`pwd`\""
set -o pipefail
make compile-commands SPEC="$BUILD_DIR/spec.gmk" | sed 's/^/ /' || exit 1
if [ "x$PATHTOOL" != "x" ]; then
CLION_PROJECT_DIR="`$PATHTOOL -am $SCRIPT_DIR`"
sed "s/\\\\\\\\\\\\\\\\/\\\\\\\\/g" "$BUILD_DIR/compile_commands.json" > "$SCRIPT_DIR/compile_commands.json"
else
CLION_PROJECT_DIR="$SCRIPT_DIR"
cp "$BUILD_DIR/compile_commands.json" "$SCRIPT_DIR"
fi
echo "
Now you can open \"$CLION_PROJECT_DIR\" as Clion project
If Clion complains about missing files when loading a project, building it may help:
cd \"`pwd`\" && make SPEC=\"$BUILD_DIR/spec.gmk\""

View File

@@ -2,10 +2,9 @@
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://###ROOT_DIR###">
###SOURCE_ROOTS###
<excludeFolder url="file://###ROOT_DIR###/build" />
<excludeFolder url="file://###ROOT_DIR###/make" />
<content url="file://###TOPLEVEL_MODULE_DIR###">
<excludeFolder url="file://###MODULE_DIR###/build" />
<excludeFolder url="file://###MODULE_DIR###/make" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="inheritedJdk" />

View File

@@ -6,11 +6,8 @@
<component name="JTRegService">
<path>###JTREG_HOME###</path>
<workDir>###BUILD_DIR###</workDir>
<jre alt="true" value="###IMAGES_DIR###" />
<jre alt="true" value="###BUILD_DIR###/images/jdk" />
<options></options>
<ant>
<target file="file://###ROOT_DIR###/make/ide/idea/jdk/build.xml" name="images" />
</ant>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_X" assert-keyword="true" project-jdk-type="JavaSDK">
<output url="file://###BUILD_DIR###/idea" />

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
###MODULE_CONTENT_ROOTS###
<orderEntry type="sourceFolder" forTests="false" />
###DEPENDENCIES###
<orderEntry type="inheritedJdk" />
</component>
</module>

View File

@@ -3,6 +3,8 @@
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/jdk.iml" filepath="$PROJECT_DIR$/.idea/jdk.iml" />
###MODULE_IMLS###
<module fileurl="file://$PROJECT_DIR$/.idea/test.iml" filepath="$PROJECT_DIR$/.idea/test.iml" />
</modules>
</component>
</project>

View File

@@ -0,0 +1,3 @@
<component name="DependencyValidationManager">
<scope name="TestFiles" pattern="file[test]:*/" />
</component>

View File

@@ -1,13 +0,0 @@
package idea;
import org.apache.tools.ant.Task;
/**
* This class implements a custom Ant task which replaces the standard Intellij IDEA Ant logger
* with a custom one which generates tighter output.
*/
public class IdeaLoggerWrapper extends Task {
public void execute() {
new JdkIdeaAntLogger(getProject());
}
}

View File

@@ -1,375 +0,0 @@
/*
* Copyright (c) 2014, 2023, 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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.
*/
package idea;
import org.apache.tools.ant.BuildEvent;
import org.apache.tools.ant.BuildListener;
import org.apache.tools.ant.DefaultLogger;
import org.apache.tools.ant.Project;
import java.util.EnumSet;
import java.util.Stack;
import static org.apache.tools.ant.Project.*;
/**
* This class is used to wrap the IntelliJ ant logger in order to provide more meaningful
* output when building langtools. The basic ant output in IntelliJ can be quite cumbersome to
* work with, as it provides two separate views: (i) a tree view, which is good to display build task
* in a hierarchical fashion as they are processed; and a (ii) plain text view, which gives you
* the full ant output. The main problem is that javac-related messages are buried into the
* ant output (which is made very verbose by IntelliJ in order to support the tree view). It is
* not easy to figure out which node to expand in order to see the error message; switching
* to plain text doesn't help either, as now the output is totally flat.
*
* This logger class removes a lot of verbosity from the IntelliJ ant logger by not propagating
* all the events to the IntelliJ's logger. In addition, certain events are handled in a custom
* fashion, to generate better output during the build.
*/
public final class JdkIdeaAntLogger extends DefaultLogger {
/**
* This is just a way to pass in customized binary string predicates;
*
* TODO: replace with {@code BiPredicate<String, String>} and method reference when moving to 8
*/
enum StringBinaryPredicate {
CONTAINS() {
@Override
boolean apply(String s1, String s2) {
return s1.contains(s2);
}
},
STARTS_WITH {
@Override
boolean apply(String s1, String s2) {
return s1.startsWith(s2);
}
},
MATCHES {
@Override
boolean apply(String s1, String s2) {
return s1.matches(s2);
}
};
abstract boolean apply(String s1, String s2);
}
/**
* Various kinds of ant messages that we shall intercept
*/
enum MessageKind {
/** a make error */
MAKE_ERROR(StringBinaryPredicate.CONTAINS, MSG_ERR, "error:", "compiler.err"),
/** a make warning */
MAKE_WARNING(StringBinaryPredicate.CONTAINS, MSG_WARN, "warning:", "compiler.warn"),
/** a make note */
MAKE_NOTE(StringBinaryPredicate.CONTAINS, MSG_INFO, "note:", "compiler.note"),
/** std make output */
MAKE_OTHER(StringBinaryPredicate.MATCHES, MSG_INFO, ".*"),
/** a javac crash */
JAVAC_CRASH(StringBinaryPredicate.STARTS_WITH, MSG_ERR, "An exception has occurred in the compiler"),
/** jtreg test success */
JTREG_TEST_PASSED(StringBinaryPredicate.STARTS_WITH, MSG_INFO, "Passed: "),
/** jtreg test failure */
JTREG_TEST_FAILED(StringBinaryPredicate.STARTS_WITH, MSG_ERR, "FAILED: "),
/** jtreg test error */
JTREG_TEST_ERROR(StringBinaryPredicate.STARTS_WITH, MSG_ERR, "Error: "),
/** jtreg report */
JTREG_TEST_REPORT(StringBinaryPredicate.STARTS_WITH, MSG_INFO, "Report written");
StringBinaryPredicate sbp;
int priority;
String[] keys;
MessageKind(StringBinaryPredicate sbp, int priority, String... keys) {
this.sbp = sbp;
this.priority = priority;
this.keys = keys;
}
/**
* Does a given message string matches this kind?
*/
boolean matches(String s) {
for (String key : keys) {
if (sbp.apply(s, key)) {
return true;
}
}
return false;
}
}
/**
* This enum is used to represent the list of tasks we need to keep track of during logging.
*/
enum Task {
/** javac task - invoked during compilation */
MAKE("exec", MessageKind.MAKE_ERROR, MessageKind.MAKE_WARNING, MessageKind.MAKE_NOTE,
MessageKind.MAKE_OTHER, MessageKind.JAVAC_CRASH),
/** jtreg task - invoked during test execution */
JTREG("jtreg", MessageKind.JTREG_TEST_PASSED, MessageKind.JTREG_TEST_FAILED, MessageKind.JTREG_TEST_ERROR, MessageKind.JTREG_TEST_REPORT),
/** initial synthetic task when the logger is created */
ROOT("") {
@Override
boolean matches(String s) {
return false;
}
},
/** synthetic task catching any other tasks not in this list */
ANY("") {
@Override
boolean matches(String s) {
return true;
}
};
String taskName;
MessageKind[] msgs;
Task(String taskName, MessageKind... msgs) {
this.taskName = taskName;
this.msgs = msgs;
}
boolean matches(String s) {
return s.equals(taskName);
}
}
/**
* This enum is used to represent the list of targets we need to keep track of during logging.
* A regular expression is used to match a given target name.
*/
enum Target {
/** jtreg target - executed when launching tests */
JTREG("jtreg") {
@Override
String getDisplayMessage(BuildEvent e) {
return "Running jtreg tests: " + e.getProject().getProperty("jtreg.tests");
}
},
/** build selected modules */
BUILD_MODULE("build-module") {
@Override
String getDisplayMessage(BuildEvent e) {
return "Building modules: " + e.getProject().getProperty("module.name") + "...";
}
},
/** build images */
BUILD_IMAGES("images") {
@Override
String getDisplayMessage(BuildEvent e) {
return "Building images...";
}
},
/** build images */
CONFIGURE("-do-configure") {
@Override
String getDisplayMessage(BuildEvent e) {
return "Configuring build...";
}
},
/** synthetic target catching any other target not in this list */
ANY("") {
@Override
String getDisplayMessage(BuildEvent e) {
return "Executing Ant target(s): " + e.getProject().getProperty("ant.project.invoked-targets");
}
@Override
boolean matches(String msg) {
return true;
}
};
String targetRegex;
Target(String targetRegex) {
this.targetRegex = targetRegex;
}
boolean matches(String msg) {
return msg.matches(targetRegex);
}
abstract String getDisplayMessage(BuildEvent e);
}
/**
* A custom build event used to represent status changes which should be notified inside
* Intellij
*/
static class StatusEvent extends BuildEvent {
/** the target to which the status update refers */
Target target;
StatusEvent(BuildEvent e, Target target) {
super(new StatusTask(e, target.getDisplayMessage(e)));
this.target = target;
setMessage(getTask().getTaskName(), 2);
}
/**
* A custom task used to channel info regarding a status change
*/
static class StatusTask extends org.apache.tools.ant.Task {
StatusTask(BuildEvent event, String msg) {
setProject(event.getProject());
setOwningTarget(event.getTarget());
setTaskName(msg);
}
}
}
/** wrapped ant logger (IntelliJ's own logger) */
DefaultLogger logger;
/** flag - is this the first target we encounter? */
boolean firstTarget = true;
/** flag - should subsequent failures be suppressed ? */
boolean suppressTaskFailures = false;
/** flag - have we ran into a javac crash ? */
boolean crashFound = false;
/** stack of status changes associated with pending targets */
Stack<StatusEvent> statusEvents = new Stack<>();
/** stack of pending tasks */
Stack<Task> tasks = new Stack<>();
public JdkIdeaAntLogger(Project project) {
for (Object o : project.getBuildListeners()) {
if (o instanceof DefaultLogger) {
this.logger = (DefaultLogger)o;
project.removeBuildListener((BuildListener)o);
project.addBuildListener(this);
}
}
tasks.push(Task.ROOT);
}
@Override
public void buildStarted(BuildEvent event) {
//do nothing
}
@Override
public void buildFinished(BuildEvent event) {
//do nothing
}
@Override
public void targetStarted(BuildEvent event) {
EnumSet<Target> statusKinds = firstTarget ?
EnumSet.allOf(Target.class) :
EnumSet.complementOf(EnumSet.of(Target.ANY));
String targetName = event.getTarget().getName();
for (Target statusKind : statusKinds) {
if (statusKind.matches(targetName)) {
StatusEvent statusEvent = new StatusEvent(event, statusKind);
statusEvents.push(statusEvent);
logger.taskStarted(statusEvent);
firstTarget = false;
return;
}
}
}
@Override
public void targetFinished(BuildEvent event) {
if (!statusEvents.isEmpty()) {
StatusEvent lastEvent = statusEvents.pop();
if (lastEvent.target.matches(event.getTarget().getName())) {
logger.taskFinished(lastEvent);
}
}
}
@Override
public void taskStarted(BuildEvent event) {
String taskName = event.getTask().getTaskName();
System.err.println("task started " + taskName);
for (Task task : Task.values()) {
if (task.matches(taskName)) {
tasks.push(task);
return;
}
}
}
@Override
public void taskFinished(BuildEvent event) {
if (tasks.peek() == Task.ROOT) {
//we need to 'close' the root task to get nicer output
logger.taskFinished(event);
} else if (!suppressTaskFailures && event.getException() != null) {
//the first (innermost) task failure should always be logged
event.setMessage(event.getException().toString(), 0);
event.setException(null);
//note: we turn this into a plain message to avoid stack trace being logged by Idea
logger.messageLogged(event);
suppressTaskFailures = true;
}
tasks.pop();
}
@Override
public void messageLogged(BuildEvent event) {
String msg = event.getMessage();
boolean processed = false;
if (!tasks.isEmpty()) {
Task task = tasks.peek();
for (MessageKind messageKind : task.msgs) {
if (messageKind.matches(msg)) {
event.setMessage(msg, messageKind.priority);
processed = true;
if (messageKind == MessageKind.JAVAC_CRASH) {
crashFound = true;
}
break;
}
}
}
if (event.getPriority() == MSG_ERR || crashFound) {
//we log errors regardless of owning task
logger.messageLogged(event);
suppressTaskFailures = true;
} else if (processed) {
logger.messageLogged(event);
}
}
}

View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://###MODULE_DIR###/test/jdk"></content>
<orderEntry type="sourceFolder" forTests="true" />
###TEST_MODULE_DEPENDENCIES###
<orderEntry type="inheritedJdk" />
</component>
</module>

View File

@@ -4,13 +4,13 @@
<option name="links">
<list>
<IssueNavigationLink>
<option name="issueRegexp" value="\d{7}" />
<option name="linkRegexp" value="https://bugs.openjdk.org/browse/JDK-$0" />
<option name="issueRegexp" value="(?:^|\s|\p{Punct})(?:JDK-)?(\d{7})(?=$|\s|\p{Punct})" />
<option name="linkRegexp" value="https://bugs.openjdk.java.net/browse/JDK-$1" />
</IssueNavigationLink>
</list>
</option>
</component>
<component name="VcsDirectoryMappings">
<mapping directory="###ROOT_DIR###" vcs="###VCS_TYPE###" />
<mapping directory="###TOPLEVEL_PROJECT_DIR###" vcs="###VCS_TYPE###" />
</component>
</project>

View File

@@ -2,63 +2,62 @@
<project version="4">
<component name="ChangeListManager">
<ignored path="jdk.iws" />
<ignored path="###ROOT_DIR###/build/idea/out/" />
<ignored path="###PROJECT_DIR###/build/idea/out/" />
<ignored path=".idea/" />
</component>
<component name="StructureViewFactory">
<option name="ACTIVE_ACTIONS" value=",ALPHA_COMPARATOR" />
</component>
<component name="antWorkspaceConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
<option name="FILTER_TARGETS" value="false" />
<buildFile url="file://###ROOT_DIR###/make/ide/idea/jdk/build.xml">
<runInBackground value="false" />
<targetFilters>
<filter targetName="clean" isVisible="true" />
<filter targetName="images" isVisible="true" />
</targetFilters>
<treeView value="false" />
<expanded value="true" />
</buildFile>
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
<flattenPackages />
<showMembers />
<showModules />
<showLibraryContents />
<hideEmptyPackages />
<abbreviatePackageNames />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
</navigator>
<panes>
<pane id="ProjectPane">
<subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="jdk" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="PackagesPane">
<subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="jdk" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="jdk" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scope" />
</panes>
<component name="RunManager" selected="Shell Script.images">
<configuration name="clean" type="ShConfigurationType" folderName="make">
<option name="SCRIPT_TEXT" value="###BASH_RUNNER_PREFIX### make clean" />
<option name="INDEPENDENT_SCRIPT_PATH" value="true" />
<option name="SCRIPT_PATH" value="" />
<option name="SCRIPT_OPTIONS" value="" />
<option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
<option name="SCRIPT_WORKING_DIRECTORY" value="###PROJECT_DIR###" />
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
<option name="INTERPRETER_PATH" value="" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="EXECUTE_IN_TERMINAL" value="true" />
<option name="EXECUTE_SCRIPT_FILE" value="false" />
<envs />
<method v="2" />
</configuration>
<configuration name="images" type="ShConfigurationType" folderName="make">
<option name="SCRIPT_TEXT" value="###BASH_RUNNER_PREFIX### make images" />
<option name="INDEPENDENT_SCRIPT_PATH" value="true" />
<option name="SCRIPT_PATH" value="" />
<option name="SCRIPT_OPTIONS" value="" />
<option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
<option name="SCRIPT_WORKING_DIRECTORY" value="###PROJECT_DIR###" />
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
<option name="INTERPRETER_PATH" value="" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="EXECUTE_IN_TERMINAL" value="true" />
<option name="EXECUTE_SCRIPT_FILE" value="false" />
<envs />
<method v="2" />
</configuration>
<configuration name="reconfigure" type="ShConfigurationType" folderName="make">
<option name="SCRIPT_TEXT" value="###BASH_RUNNER_PREFIX### make reconfigure" />
<option name="INDEPENDENT_SCRIPT_PATH" value="true" />
<option name="SCRIPT_PATH" value="" />
<option name="SCRIPT_OPTIONS" value="" />
<option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
<option name="SCRIPT_WORKING_DIRECTORY" value="###PROJECT_DIR###" />
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
<option name="INTERPRETER_PATH" value="" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="EXECUTE_IN_TERMINAL" value="true" />
<option name="EXECUTE_SCRIPT_FILE" value="false" />
<envs />
<method v="2" />
</configuration>
<list>
<item itemvalue="Shell Script.images" />
<item itemvalue="Shell Script.clean" />
<item itemvalue="Shell Script.reconfigure" />
</list>
</component>
</project>

View File

@@ -0,0 +1,451 @@
package build.tools.jbrapi;
import com.sun.source.tree.CompilationUnitTree;
import com.sun.source.tree.Tree;
import com.sun.source.util.*;
import javax.lang.model.element.*;
import javax.lang.model.type.ArrayType;
import javax.lang.model.type.DeclaredType;
import javax.lang.model.type.ExecutableType;
import javax.lang.model.type.TypeMirror;
import javax.lang.model.util.ElementScanner14;
import javax.lang.model.util.Elements;
import javax.lang.model.util.Types;
import javax.tools.Diagnostic;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.channels.FileChannel;
import java.nio.channels.OverlappingFileLockException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.*;
import java.util.concurrent.locks.LockSupport;
import java.util.stream.Collectors;
public class JBRApiPlugin implements Plugin {
enum Binding {
SERVICE,
PROVIDES,
PROVIDED,
TWO_WAY
}
record DiagnosticTree(CompilationUnitTree root, Tree tree) {}
record TypeBinding(DiagnosticTree diagnostic, TypeElement element, String currentType, String bindType, Binding binding) {}
record MethodBinding(DiagnosticTree diagnostic, ExecutableElement element, Registry.StaticDescriptor currentMethod, Registry.StaticMethod bindMethod) {}
final Map<String, TypeBinding> typeBindings = new HashMap<>();
final List<MethodBinding> methodBindings = new ArrayList<>();
Elements elements;
Trees trees;
Types types;
class Registry {
record Type(String type, Binding binding) {}
record StaticMethod(String type, String name) {}
record StaticDescriptor(StaticMethod method, String descriptor) {}
final Map<String, Type> types = new HashMap<>();
final Map<StaticDescriptor, StaticMethod> methods = new HashMap<>();
final Set<Object> internal = new HashSet<>();
void validateInternal(DiagnosticTree diagnostic, String currentType, Binding binding, TypeElement bindType) {
if (bindType.getKind() != ElementKind.CLASS && bindType.getKind() != ElementKind.INTERFACE) {
trees.printMessage(Diagnostic.Kind.ERROR, "Invalid JBR API binding:" + currentType + " -> " +
bindType.getQualifiedName().toString() + " (not a class or interface)",
diagnostic.tree, diagnostic.root);
} else if (bindType.getModifiers().contains(Modifier.FINAL) || bindType.getModifiers().contains(Modifier.SEALED)) {
trees.printMessage(Diagnostic.Kind.ERROR, "Invalid JBR API binding:" + currentType + " -> " +
bindType.getQualifiedName().toString() + " (not inheritable)",
diagnostic.tree, diagnostic.root);
}
if (binding != Binding.SERVICE) {
trees.printMessage(Diagnostic.Kind.ERROR, "Invalid JBR API binding:" + currentType + " -> " +
bindType.getQualifiedName().toString() + " (internal, non-service)",
diagnostic.tree, diagnostic.root);
}
}
void validateInternalMethod(DiagnosticTree diagnostic, StaticDescriptor currentMethod, TypeElement bindType, String bindMethod) {
boolean methodFound = false;
for (Element m : bindType.getEnclosedElements()) {
if (m.getKind() == ElementKind.METHOD &&
!m.getModifiers().contains(Modifier.STATIC) &&
!m.getModifiers().contains(Modifier.FINAL) &&
m.getSimpleName().contentEquals(bindMethod) &&
descriptor(m.asType()).equals(currentMethod.descriptor)) {
methodFound = true;
}
}
if (!methodFound) {
trees.printMessage(Diagnostic.Kind.ERROR, "Invalid static binding: " +
currentMethod.method.type + "#" + currentMethod.method.name + " -> " +
bindType.getQualifiedName().toString() + "#" + bindMethod +
" (no matching method found, type conversions are not allowed for internal bindings)",
diagnostic.tree, diagnostic.root);
}
}
List<String> addBindings() {
List<String> unresolvedErrors = new ArrayList<>();
List<TypeBinding> addedTypes = new ArrayList<>();
List<MethodBinding> addedMethods = new ArrayList<>();
Set<Object> validated = new HashSet<>();
// Remove changed bindings.
for (TypeBinding type : typeBindings.values()) {
if (type.bindType != null) addedTypes.add(type);
types.remove(type.currentType);
}
for (MethodBinding method : methodBindings) {
if (method.bindMethod != null) addedMethods.add(method);
methods.remove(method.currentMethod);
}
methods.entrySet().removeIf(m -> typeBindings.containsKey(m.getKey().method.type));
// Build inverse binding map.
Map<String, String> inverseTypes = types.entrySet().stream().collect(Collectors.toMap(
e -> e.getValue().type, Map.Entry::getKey, (a, b) -> {
unresolvedErrors.add("Conflicting JBR API binding: " + a + " and "+ b + " binds to the same type");
return a + "," + b;
}));
Map<StaticDescriptor, StaticMethod> inverseMethods = methods.entrySet().stream().collect(Collectors.toMap(
e -> new StaticDescriptor(e.getValue(), e.getKey().descriptor), e -> e.getKey().method, (a, b) -> {
unresolvedErrors.add("Conflicting JBR API binding: " +
a.type + "#" + a.name + " and "+ b.type + "#" + b.name + " binds to the same method");
return new StaticMethod(a.type + "," + b.type, a.name + "," + b.name);
}));
// Add new bindings.
for (TypeBinding type : addedTypes) types.put(type.currentType, new Type(type.bindType, type.binding));
for (MethodBinding method : addedMethods) methods.put(method.currentMethod, method.bindMethod);
// Validate type bindings.
for (TypeBinding type : addedTypes) {
String inv = inverseTypes.get(type.bindType);
if (inv != null) {
trees.printMessage(Diagnostic.Kind.ERROR,
"Conflicting JBR API binding: " + type.currentType + " -> " + type.bindType + " <- " + inv,
type.diagnostic.tree, type.diagnostic.root);
inverseTypes.put(type.bindType, inv + "," + type.currentType);
} else inverseTypes.put(type.bindType, type.currentType);
Type next = types.get(type.bindType);
if (next != null) {
trees.printMessage(Diagnostic.Kind.ERROR,
"Conflicting JBR API binding: " + type.currentType + " -> " + type.bindType + " -> " + next,
type.diagnostic.tree, type.diagnostic.root);
}
String prev = inverseTypes.get(type.currentType);
if (prev != null) {
trees.printMessage(Diagnostic.Kind.ERROR,
"Conflicting JBR API binding: " + prev + " -> " + type.currentType + " -> " + type.bindType,
type.diagnostic.tree, type.diagnostic.root);
}
if (validated.add(type.currentType)) {
TypeElement bindElement = elements.getTypeElement(type.bindType);
if (bindElement != null) {
internal.add(type.currentType);
validateInternal(type.diagnostic, type.currentType, type.binding, bindElement);
}
}
}
// Validate method bindings.
for (MethodBinding method : addedMethods) {
StaticDescriptor invDescriptor = new StaticDescriptor(method.bindMethod, method.currentMethod.descriptor);
StaticMethod inv = inverseMethods.get(invDescriptor);
if (inv != null) {
trees.printMessage(Diagnostic.Kind.ERROR, "Conflicting JBR API binding: " +
method.currentMethod.method.type + "#" + method.currentMethod.method.name + " -> " +
method.bindMethod.type + "#" + method.bindMethod.name + " <- " +
inv.type + "#" + inv.name,
method.diagnostic.tree, method.diagnostic.root);
inverseMethods.put(invDescriptor, new StaticMethod(
inv.type + "," + method.currentMethod.method.type, inv.name + "," + method.currentMethod.method.name));
} else inverseMethods.put(invDescriptor, method.currentMethod.method);
if (validated.add(method.currentMethod)) {
TypeElement bindElement = elements.getTypeElement(method.bindMethod.type);
if (bindElement != null) {
internal.add(method.currentMethod);
validateInternalMethod(method.diagnostic, method.currentMethod, bindElement, method.bindMethod.name);
}
}
}
// [Re]validate remaining.
types.forEach((k, v) -> {
if (validated.add(k)) {
TypeBinding type = typeBindings.get(v.type);
if (type != null) {
internal.add(k);
validateInternal(type.diagnostic, k, v.binding, type.element);
} else if (elements.getTypeElement(v.type) != null) {
internal.add(k); // Couldn't validate, but at least found the type.
if (v.binding != Binding.SERVICE) {
unresolvedErrors.add("Invalid JBR API binding:" + k + " -> " + v.type + " (internal, non-service)");
}
}
}
});
methods.forEach((k, v) -> {
if (validated.add(k)) {
TypeBinding type = typeBindings.get(v.type);
if (type != null) {
internal.add(k);
validateInternalMethod(type.diagnostic, k, type.element, v.name);
} else if (elements.getTypeElement(v.type) != null) {
internal.add(k); // Couldn't validate, but at least found the type.
}
}
});
return unresolvedErrors;
}
void read(RandomAccessFile file) throws IOException {
String s;
while ((s = file.readLine()) != null) {
String[] tokens = s.split(" ");
switch (tokens[0]) {
case "TYPE" -> {
types.put(tokens[1], new Type(tokens[2], Binding.valueOf(tokens[3])));
if (tokens.length > 4 && tokens[4].equals("INTERNAL")) internal.add(tokens[1]);
}
case "STATIC" -> {
StaticDescriptor descriptor = new StaticDescriptor(new StaticMethod(
tokens[1], tokens[2]), tokens[3]);
methods.put(descriptor, new StaticMethod(tokens[4], tokens[5]));
if (tokens.length > 6 && tokens[6].equals("INTERNAL")) internal.add(descriptor);
}
}
}
}
void write(RandomAccessFile file) throws IOException {
for (var t : types.entrySet()) {
file.writeBytes("TYPE " + t.getKey() + " " + t.getValue().type + " " + t.getValue().binding +
(internal.contains(t.getKey()) ? " INTERNAL\n" : "\n"));
}
for (var t : methods.entrySet()) {
file.writeBytes("STATIC " + t.getKey().method.type + " " + t.getKey().method.name + " " +
t.getKey().descriptor + " " + t.getValue().type + " " + t.getValue().name +
(internal.contains(t.getKey()) ? " INTERNAL\n" : "\n"));
}
}
}
String descriptor(TypeMirror t) {
return switch (t.getKind()) {
case VOID -> "V";
case BOOLEAN -> "Z";
case BYTE -> "B";
case CHAR -> "C";
case SHORT -> "S";
case INT -> "I";
case LONG -> "J";
case FLOAT -> "F";
case DOUBLE -> "D";
case ARRAY -> "[" + descriptor(((ArrayType) t).getComponentType());
case DECLARED -> "L" + elements.getBinaryName((TypeElement) ((DeclaredType) t).asElement())
.toString().replace('.', '/') + ";";
case EXECUTABLE -> "(" + ((ExecutableType) t).getParameterTypes().stream().map(this::descriptor)
.collect(Collectors.joining()) + ")" + descriptor(((ExecutableType) t).getReturnType());
case TYPEVAR, WILDCARD, UNION, INTERSECTION -> descriptor(types.erasure(t));
default -> throw new RuntimeException("Cannot generate descriptor for type: " + t);
};
}
Registry.StaticDescriptor staticDescriptor(String type, ExecutableElement e) {
return new Registry.StaticDescriptor(new Registry.StaticMethod(type, e.getSimpleName().toString()), descriptor(e.asType()));
}
AnnotationValue annotationValue(AnnotationMirror m) {
if (m == null) return null;
return m.getElementValues().entrySet().stream()
.filter(t -> t.getKey().getSimpleName().contentEquals("value"))
.map(Map.Entry::getValue).findFirst().orElseThrow();
}
static boolean isJavaIdentifier(String name, int from, int to) {
if (!Character.isJavaIdentifierStart(name.charAt(from))) return false;
for (int i = from + 1; i < to; i++) {
if (!Character.isJavaIdentifierPart(name.charAt(i))) return false;
}
return true;
}
static boolean isJavaIdentifier(String name) {
if (name == null || name.isEmpty()) return false;
return isJavaIdentifier(name, 0, name.length());
}
static boolean isJavaTypeIdentifier(String name) {
if (name == null || name.isEmpty()) return false;
for (int i = 0; i < name.length();) {
int next = name.indexOf('.', i);
if (next == -1) next = name.length();
if (!isJavaIdentifier(name, i, next)) return false;
i = next + 1;
}
return true;
}
void scan(CompilationUnitTree root, Element e) {
// Get current type name.
String currentType;
if (e.getKind() == ElementKind.CLASS || e.getKind() == ElementKind.INTERFACE) {
currentType = ((TypeElement) e).getQualifiedName().toString();
} else if (e.getKind() == ElementKind.METHOD && e.getModifiers().contains(Modifier.STATIC)) {
currentType = ((QualifiedNameable) e.getEnclosingElement()).getQualifiedName().toString();
} else currentType = null;
// Find the annotation.
AnnotationMirror providedMirror = null, providesMirror = null, serviceMirror = null;
for (AnnotationMirror m : elements.getAllAnnotationMirrors(e)) {
switch (m.getAnnotationType().toString()) {
case "com.jetbrains.exported.JBRApi.Provided" -> providedMirror = m;
case "com.jetbrains.exported.JBRApi.Provides" -> providesMirror = m;
case "com.jetbrains.exported.JBRApi.Service" -> serviceMirror = m;
}
}
AnnotationMirror mirror = null;
AnnotationValue value = null;
Binding binding = null;
if (serviceMirror != null) {
if (providesMirror == null) {
trees.printMessage(Diagnostic.Kind.ERROR,
"@Service also requires @Provides", trees.getTree(e, serviceMirror), root);
return;
}
if (providedMirror != null) {
trees.printMessage(Diagnostic.Kind.ERROR,
"@Service cannot be used with @Provided", trees.getTree(e, serviceMirror), root);
return;
}
value = annotationValue(mirror = providesMirror);
binding = Binding.SERVICE;
} else if (providesMirror != null) {
value = annotationValue(mirror = providesMirror);
if (providedMirror != null) {
AnnotationValue v = annotationValue(providedMirror);
if (!value.getValue().toString().equals(v.getValue().toString())) {
trees.printMessage(Diagnostic.Kind.ERROR,
"@Provided and @Provides doesn't match", trees.getTree(e, mirror, value), root);
return;
}
binding = Binding.TWO_WAY;
} else binding = Binding.PROVIDES;
} else if (providedMirror != null) {
value = annotationValue(mirror = providedMirror);
binding = Binding.PROVIDED;
}
if (value != null && value.getValue().toString().isEmpty()) {
trees.printMessage(Diagnostic.Kind.ERROR,
"Empty JBR API binding",
trees.getTree(e, mirror, value), root);
return;
}
if (currentType == null) {
if (value != null) {
trees.printMessage(Diagnostic.Kind.ERROR,
"JBR API annotations are only allowed on classes, interfaces and static methods",
trees.getTree(e, mirror), root);
}
return;
}
if (value != null && e.getKind() == ElementKind.METHOD && binding != Binding.PROVIDES) {
trees.printMessage(Diagnostic.Kind.ERROR,
"Only @Provides is allowed for static methods",
trees.getTree(e, mirror), root);
return;
}
// Determine class/method names.
String bindType = null, bindMethod = null;
if (value != null) {
bindType = value.getValue().toString();
if (e.getKind() == ElementKind.METHOD) {
int splitIndex = bindType.indexOf('#');
if (splitIndex != -1) {
bindMethod = bindType.substring(splitIndex + 1);
bindType = bindType.substring(0, splitIndex);
if (!isJavaIdentifier(bindMethod)) {
trees.printMessage(Diagnostic.Kind.ERROR, "Invalid method identifier: " + bindMethod,
trees.getTree(e, mirror, value), root);
return;
}
} else bindMethod = e.getSimpleName().toString();
}
if (!isJavaTypeIdentifier(bindType)) {
trees.printMessage(Diagnostic.Kind.ERROR, "Invalid type identifier: " + bindType,
trees.getTree(e, mirror, value), root);
return;
}
if (Character.isUpperCase(bindType.charAt(0))) bindType = "com.jetbrains." + bindType; // Short form
}
// Add entry.
DiagnosticTree diagnostic = new DiagnosticTree(root, trees.getTree(e, mirror, value));
if (e.getKind() == ElementKind.METHOD) {
ExecutableElement m = (ExecutableElement) e;
methodBindings.add(new MethodBinding(diagnostic, m, staticDescriptor(currentType, m),
bindType == null ? null : new Registry.StaticMethod(bindType, bindMethod)));
} else {
typeBindings.put(currentType, new TypeBinding(diagnostic, (TypeElement) e, currentType, bindType, binding));
}
}
@Override
public String getName() {
return "jbr-api";
}
@Override
public void init(JavacTask jt, String... args) {
Path output = Path.of(args[0]);
String implVersion;
try {
implVersion = Files.readString(Path.of(args[1])).strip();
} catch (IOException e) {
throw new RuntimeException(e);
}
elements = jt.getElements();
trees = Trees.instance(jt);
types = jt.getTypes();
jt.addTaskListener(new TaskListener() {
@Override
public void finished(TaskEvent te) {
if (te.getKind() == TaskEvent.Kind.ANALYZE && te.getTypeElement() != null) {
new ElementScanner14<Void, CompilationUnitTree>() {
@Override
public Void visitModule(ModuleElement e, CompilationUnitTree unused) { return null; }
@Override
public Void visitPackage(PackageElement e, CompilationUnitTree unused) { return null; }
@Override
public Void scan(Element e, CompilationUnitTree root) {
JBRApiPlugin.this.scan(root, e);
e.accept(this, root);
return null;
}
}.scan(te.getTypeElement(), te.getCompilationUnit());
} else if (te.getKind() == TaskEvent.Kind.COMPILATION) {
try (RandomAccessFile file = new RandomAccessFile(output.toFile(), "rw");
FileChannel channel = file.getChannel()) {
for (;;) {
try { if (channel.lock() != null) break; } catch (OverlappingFileLockException ignore) {}
LockSupport.parkNanos(10_000000);
}
Registry r = new Registry();
r.read(file);
var unresolvedErrors = r.addBindings();
file.setLength(0);
file.writeBytes("VERSION " + implVersion + "\n");
r.write(file);
if (!unresolvedErrors.isEmpty()) {
throw new RuntimeException(String.join("\n", unresolvedErrors));
}
} catch (IOException e) {
throw new RuntimeException(e);
}
}
}
});
}
}

View File

@@ -1142,6 +1142,8 @@ public class WrapperGenerator {
pw.println("/* This file is an automatically generated file, please do not edit this file, modify the XlibParser.java file instead !*/\n" );
pw.println("#include <X11/Xlib.h>\n#include <X11/Xutil.h>\n#include <X11/Xos.h>\n#include <X11/Xatom.h>\n#include <stdio.h>\n");
pw.println("#include <X11/extensions/Xdbe.h>");
pw.println("#include <X11/extensions/XI2.h>");
pw.println("#include <X11/extensions/XInput2.h>");
pw.println("#include <X11/XKBlib.h>");
pw.println("#include \"awt_p.h\"");
pw.println("#include \"color.h\"");

View File

@@ -61,6 +61,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJAVA, \
-DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"', \
DISABLED_WARNINGS_gcc_ProcessImpl_md.c := unused-result, \
DISABLED_WARNINGS_clang_TimeZone_md.c := unused-variable, \
DISABLED_WARNINGS_clang_jni_util.c := format-nonliteral, \
JDK_LIBS := libjvm, \
LIBS_linux := $(LIBDL), \
LIBS_aix := $(LIBDL) $(LIBM), \

View File

@@ -82,3 +82,13 @@ $(eval $(call SetupCopyLegalFiles, COPY_LEGAL, \
TARGETS += $(COPY_LEGAL)
################################################################################
FONTFILE_SRC_DIR := $(TOPDIR)/src/java.desktop/share
FONTFILE_SRCS := $(wildcard $(FONTFILE_SRC_DIR)/fonts/*.ttf) $(wildcard $(FONTFILE_SRC_DIR)/fonts/*.otf) $(FONTFILE_SRC_DIR)/fonts/fonts.dir $(FONTFILE_SRC_DIR)/fonts/font.conf
FONTFILE_TARGET_FILES := $(subst $(FONTFILE_SRC_DIR),$(LIB_DST_DIR),$(FONTFILE_SRCS))
$(LIB_DST_DIR)/fonts/%: $(FONTFILE_SRC_DIR)/fonts/%
$(call install-file)
TARGETS += $(FONTFILE_TARGET_FILES)

View File

@@ -37,6 +37,10 @@ endif
include gensrc/GensrcSwing.gmk
ifeq ($(call isTargetOs, windows macosx), false)
include gensrc/GensrcWayland.gmk
endif
################################################################################
include GensrcProperties.gmk

View File

@@ -51,6 +51,8 @@ ifeq ($(call isTargetOs, macosx), true)
EXCLUDES += \
sun/awt/screencast \
sun/awt/X11 \
sun/awt/wl \
sun/java2d/wl \
sun/java2d/x11 \
sun/java2d/jules \
sun/java2d/xr \
@@ -117,6 +119,10 @@ ifeq ($(call isTargetOs, windows macosx), false)
EXCLUDE_FILES += sun/awt/AWTCharset.java
endif
ifneq ($(VULKAN_ENABLED), true)
EXCLUDES += sun/java2d/vulkan
endif
# These files do not appear in the build result of the old build. This
# is because they are generated sources, but the AUTO_JAVA_FILES won't
# pick them up since they aren't generated when the source dirs are

View File

@@ -94,6 +94,7 @@ ifeq ($(call isTargetOs, macosx), true)
format-nonliteral, \
DISABLED_WARNINGS_clang_QueuingApplicationDelegate.m := \
objc-method-access, \
DISABLED_WARNINGS_clang_ThreadUtilities.m := format-nonliteral, \
JDK_LIBS := java.base:libjava, \
LIBS_macosx := \
-framework Accelerate \

View File

@@ -0,0 +1,62 @@
#
# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2024, JetBrains s.r.o.. 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. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# 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.
#
#
# Generate C header and source files for Wayland protocols
#
WAYLAND_GENSRC_DIR = $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/wayland
WAYLAND_BASIC_PROTOCOL_FILES := \
$(WAYLAND_PROTOCOLS_ROOT)/stable/viewporter/viewporter.xml \
$(WAYLAND_PROTOCOLS_ROOT)/stable/xdg-shell/xdg-shell.xml \
$(WAYLAND_PROTOCOLS_ROOT)/staging/xdg-activation/xdg-activation-v1.xml \
$(WAYLAND_PROTOCOLS_ROOT)/unstable/primary-selection/primary-selection-unstable-v1.xml \
$(WAYLAND_PROTOCOLS_ROOT)/unstable/xdg-output/xdg-output-unstable-v1.xml \
$(GTK_SHELL1_PROTOCOL_PATH) \
#
WAYLAND_PROTOCOL_FILES := \
$(WAYLAND_BASIC_PROTOCOL_FILES) \
$(MODULE_SRC)/share/native/libwakefield/protocol/wakefield.xml \
#
$(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/_the.generated_wayland_protocols: $(WAYLAND_PROTOCOL_FILES)
$(call LogInfo, Generating Wayland protocol source and header files)
$(call MakeTargetDir)
$(call MakeDir, $(WAYLAND_GENSRC_DIR))
@for p in $^; do \
HEADER=$$(basename "$$p" | $(SED) 's/\.[^.]*$$//').h; \
$(WAYLAND_SCANNER) client-header $$p $(WAYLAND_GENSRC_DIR)/$$HEADER; \
done
@for p in $^; do \
CODE=$$(basename "$$p" | $(SED) 's/\.[^.]*$$//').c; \
$(WAYLAND_SCANNER) private-code $$p $(WAYLAND_GENSRC_DIR)/$$CODE; \
done
$(TOUCH) $@
GENSRC_WAYLAND := $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/_the.generated_wayland_protocols
TARGETS += $(GENSRC_WAYLAND)

View File

@@ -58,9 +58,14 @@ ifeq ($(call isTargetOs, windows), true)
$(TOPDIR)/src/$(MODULE)/share/native/common/font \
$(TOPDIR)/src/$(MODULE)/share/native/common/java2d/opengl \
$(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt/systemscale \
$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/launcher \
#
endif
ifeq ($(DBUS_FOUND), false)
LIBAWT_EXCLUDE_FILES += dbus_interface.c dbus_interface.h
endif
ifeq ($(call isTargetOs, linux macosx aix), true)
LIBAWT_EXCLUDE_FILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c
endif
@@ -88,6 +93,10 @@ LIBAWT_EXTRA_HEADER_DIRS := \
LIBAWT_CFLAGS := -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES -DMLIB_NO_LIBSUNMATH
ifeq ($(DBUS_FOUND), true)
LIBAWT_CFLAGS += -DDBUS_FOUND
endif
ifeq ($(call isTargetOs, windows), true)
LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE -DMLIB_OS64BIT
LIBAWT_RCFLAGS ?= -I$(TOPDIR)/src/java.base/windows/native/launcher/icons
@@ -105,14 +114,56 @@ ifeq ($(call isTargetOs, aix), true)
LIBAWT_STATIC_EXCLUDE_OBJS := porting_aix.o
endif
# Setup NVDA a11y announcer
ifeq ($(call isTargetOs, windows), true)
A11Y_NVDA_ANNOUNCING_CFLAGS := -DNO_A11Y_NVDA_ANNOUNCING
A11Y_NVDA_ANNOUNCING_LIBS :=
A11Y_NVDA_ANNOUNCING_DEPENDENCIES :=
ifeq ($(ENABLE_HEADLESS_ONLY), false)
ifeq ($(A11Y_NVDA_ANNOUNCING_ENABLED), true)
A11Y_NVDA_ANNOUNCING_CFLAGS := $(NVDACONTROLLERCLIENT_CFLAGS)
A11Y_NVDA_ANNOUNCING_LIBS := $(NVDACONTROLLERCLIENT_LIB)
A11Y_NVDA_ANNOUNCING_DEPENDENCIES := $(NVDACONTROLLERCLIENT_DLL)
endif
endif
LIBAWT_CFLAGS += $(A11Y_NVDA_ANNOUNCING_CFLAGS)
endif
# Setup the client for the JAWS screen reader
ifeq ($(call isTargetOs, windows), true)
A11Y_JAWS_ANNOUNCING_CFLAGS := -DNO_A11Y_JAWS_ANNOUNCING
ifeq ($(ENABLE_HEADLESS_ONLY), false)
ifeq ($(A11Y_JAWS_ANNOUNCING_ENABLED), true)
A11Y_JAWS_ANNOUNCING_CFLAGS :=
endif
endif
LIBAWT_CFLAGS += $(A11Y_JAWS_ANNOUNCING_CFLAGS)
endif
# Setup Vulkan
ifeq ($(VULKAN_ENABLED), true)
LIBAWT_EXTRA_SRC += common/font common/java2d/vulkan
LIBAWT_EXTRA_HEADER_DIRS += common/font common/java2d/vulkan common/java2d
LIBAWT_CFLAGS += $(VULKAN_FLAGS)
LIBAWT_EXTRA_FILES += $(TOPDIR)/src/$(MODULE)/share/native/common/java2d/AccelTexturePool.c
VULKAN_EXCLUDES := vulkan
else
VULKAN_EXCLUDES := vulkan java2d/vulkan
endif
# -fgcse-after-reload improves performance of MaskFill in Java2D by 20% for
# some gcc
$(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
NAME := awt, \
EXTRA_SRC := $(LIBAWT_EXTRA_SRC), \
EXTRA_FILES := $(LIBAWT_EXTRA_FILES), \
EXCLUDE_FILES := $(LIBAWT_EXCLUDE_FILES), \
OPTIMIZATION := HIGHEST, \
CFLAGS := $(LIBAWT_CFLAGS) $(X_CFLAGS), \
CFLAGS := $(LIBAWT_CFLAGS) $(X_CFLAGS) $(DBUS_CFLAGS), \
CXXFLAGS := $(LIBAWT_CFLAGS) $(X_CFLAGS), \
CFLAGS_gcc := -fgcse-after-reload, \
EXTRA_HEADER_DIRS := $(LIBAWT_EXTRA_HEADER_DIRS), \
@@ -128,10 +179,11 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
DISABLED_WARNINGS_clang_debug_trace.c := format-nonliteral, \
DISABLED_WARNINGS_clang_Trace.c := format-nonliteral, \
DISABLED_WARNINGS_clang_TransformHelper.c := sign-compare, \
DISABLED_WARNINGS_clang_system_properties.c := format-nonliteral, \
DISABLED_WARNINGS_microsoft := 4244 4996, \
DISABLED_WARNINGS_microsoft_awt_Toolkit.cpp := 4267, \
LDFLAGS_windows := -delayload:comctl32.dll -delayload:comdlg32.dll \
-delayload:gdi32.dll -delayload:imm32.dll -delayload:ole32.dll \
-delayload:gdi32.dll -delayload:gdiplus.dll -delayload:imm32.dll -delayload:ole32.dll \
-delayload:shell32.dll -delayload:shlwapi.dll -delayload:user32.dll \
-delayload:winmm.dll -delayload:winspool.drv, \
JDK_LIBS := java.base:libjava java.base:libjvm, \
@@ -146,13 +198,53 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
-framework Metal \
-framework OpenGL, \
LIBS_windows := advapi32.lib comctl32.lib comdlg32.lib delayimp.lib \
gdi32.lib imm32.lib kernel32.lib ole32.lib shell32.lib shlwapi.lib \
user32.lib uuid.lib winmm.lib winspool.lib, \
gdi32.lib gdiplus.lib imm32.lib kernel32.lib ole32.lib shell32.lib shlwapi.lib \
user32.lib uuid.lib winmm.lib winspool.lib dwmapi.lib $(A11Y_NVDA_ANNOUNCING_LIBS), \
VERSIONINFO_RESOURCE := $(LIBAWT_VERSIONINFO_RESOURCE), \
EXTRA_RCFLAGS := $(LIBAWT_RCFLAGS), \
STATIC_LIB_EXCLUDE_OBJS := $(LIBAWT_STATIC_EXCLUDE_OBJS), \
))
ifeq ($(call isTargetOs, windows)+$(ENABLE_HEADLESS_ONLY)+$(A11Y_NVDA_ANNOUNCING_ENABLED), true+false+true)
$(eval $(call SetupCopyFiles, COPY_NVDA_DEPENDENCIES, \
FILES := $(A11Y_NVDA_ANNOUNCING_DEPENDENCIES), \
DEST := $(BUILD_LIBAWT_OUTPUT_DIR), \
))
$(COPY_NVDA_DEPENDENCIES): $(A11Y_NVDA_ANNOUNCING_DEPENDENCIES)
$(BUILD_LIBAWT): $(COPY_NVDA_DEPENDENCIES)
TARGETS += $(COPY_NVDA_DEPENDENCIES)
endif
# Compile Vulkan shaders
define compile-spirv
$(call MakeTargetDir)
$(VULKAN_SHADER_COMPILER) '$(call FixPath, $(call DecodeSpace, $@))' '$(call FixPath, $(call DecodeSpace, $<))'
endef
spirv-name = $(strip $1).h
ifeq ($(VULKAN_ENABLED), true)
$(eval $(call SetupCopyFiles, COMPILE_VULKAN_SHADERS, \
SRC := $(TOPDIR)/src/$(MODULE)/share/glsl/vulkan, \
FILES := $(filter-out %.glsl, $(call FindFiles, $(TOPDIR)/src/$(MODULE)/share/glsl/vulkan)), \
DEST := $(SUPPORT_OUTPUTDIR)/headers/java.desktop/vulkan/spirv, \
MACRO := compile-spirv, \
NAME_MACRO := spirv-name, \
))
VULKAN_SHADER_LIST = $(SUPPORT_OUTPUTDIR)/headers/java.desktop/vulkan/shader_list.h
$(VULKAN_SHADER_LIST): $(COMPILE_VULKAN_SHADERS)
> $(VULKAN_SHADER_LIST) $(NEWLINE) \
$(foreach f, $(patsubst $(TOPDIR)/src/$(MODULE)/share/glsl/vulkan/%,%,$(filter-out %.glsl, $(call FindFiles, $(TOPDIR)/src/$(MODULE)/share/glsl/vulkan))), \
$(ECHO) SHADER_ENTRY\($(subst .,$(COMMA),$(subst /,_,$f))\) >> $(VULKAN_SHADER_LIST) $(NEWLINE) \
$(ECHO) '#ifdef INCLUDE_BYTECODE' >> $(VULKAN_SHADER_LIST) $(NEWLINE) \
$(ECHO) '#include "spirv/$f.h"' >> $(VULKAN_SHADER_LIST) $(NEWLINE) \
$(ECHO) BYTECODE_END >> $(VULKAN_SHADER_LIST) $(NEWLINE) \
$(ECHO) '#endif' >> $(VULKAN_SHADER_LIST) $(NEWLINE) \
)
$(BUILD_LIBAWT_TARGET_DEPS): $(VULKAN_SHADER_LIST)
endif
TARGETS += $(BUILD_LIBAWT)
# Mac and Windows only use the native AWT lib, do not build libawt_headless
@@ -191,11 +283,12 @@ ifeq ($(call isTargetOs, windows macosx), false)
$(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \
NAME := awt_headless, \
EXTRA_SRC := $(LIBAWT_HEADLESS_EXTRA_SRC), \
EXCLUDES := medialib, \
EXCLUDES := medialib wl $(VULKAN_EXCLUDES), \
ONLY_EXPORTED := $(LIBAWT_HEADLESS_ONLY_EXPORTED), \
OPTIMIZATION := LOW, \
CFLAGS := -DHEADLESS=true $(CUPS_CFLAGS) $(FONTCONFIG_CFLAGS) \
$(X_CFLAGS), \
$(X_CFLAGS) $(DBUS_CFLAGS), \
CXXFLAGS := $(CXXFLAGS_JDKLIB), \
EXTRA_HEADER_DIRS := $(LIBAWT_HEADLESS_EXTRA_HEADER_DIRS), \
DISABLED_WARNINGS_gcc := unused-variable, \
DISABLED_WARNINGS_clang := unused-variable, \
@@ -222,6 +315,20 @@ ifeq ($(call isTargetOs, windows macosx)+$(ENABLE_HEADLESS_ONLY), false+false)
common/font \
#
ifeq ($(A11Y_SPEECHD_ANNOUNCING_ENABLED), true)
A11Y_SPEECHD_ANNOUNCING_CFLAGS :=
else
A11Y_SPEECHD_ANNOUNCING_CFLAGS := -DNO_A11Y_SPEECHD_ANNOUNCING
endif
ifeq ($(call isTargetOs, linux), true)
LIBAWT_XAWT_EXTRA_SRC += \
$(TOPDIR)/src/$(MODULE)/linux/native/libawt_xawt \
#
endif
LIBAWT_XAWT_CFLAGS += $(SPEECHD_CFLAGS) $(A11Y_SPEECHD_ANNOUNCING_CFLAGS)
LIBAWT_XAWT_EXTRA_HEADER_DIRS := \
$(LIBAWT_DEFAULT_HEADER_DIRS) \
libawt_xawt/awt \
@@ -257,9 +364,9 @@ ifeq ($(call isTargetOs, windows macosx)+$(ENABLE_HEADLESS_ONLY), false+false)
NAME := awt_xawt, \
EXTRA_SRC := $(LIBAWT_XAWT_EXTRA_SRC), \
EXTRA_HEADER_DIRS := $(LIBAWT_XAWT_EXTRA_HEADER_DIRS), \
EXCLUDES := medialib debug, \
EXCLUDES := medialib debug wl $(VULKAN_EXCLUDES), \
OPTIMIZATION := LOW, \
CFLAGS := -DXAWT -DXAWT_HACK $(LIBAWT_XAWT_CFLAGS) \
CFLAGS := -DXAWT -DXAWT_HACK $(LIBAWT_XAWT_CFLAGS) $(DBUS_CFLAGS) \
$(FONTCONFIG_CFLAGS) $(CUPS_CFLAGS) $(X_CFLAGS), \
DISABLED_WARNINGS_gcc := int-to-pointer-cast unused-variable, \
DISABLED_WARNINGS_clang := unused-variable, \
@@ -267,6 +374,7 @@ ifeq ($(call isTargetOs, windows macosx)+$(ENABLE_HEADLESS_ONLY), false+false)
DISABLED_WARNINGS_gcc_GLXSurfaceData.c := unused-function, \
DISABLED_WARNINGS_gcc_gtk3_interface.c := parentheses type-limits \
unused-function, \
DISABLED_WARNINGS_gcc_keycode_cache.c := unused-function, \
DISABLED_WARNINGS_gcc_OGLBufImgOps.c := format-nonliteral, \
DISABLED_WARNINGS_gcc_OGLPaints.c := format-nonliteral, \
DISABLED_WARNINGS_gcc_screencast_pipewire.c := undef, \
@@ -279,6 +387,7 @@ ifeq ($(call isTargetOs, windows macosx)+$(ENABLE_HEADLESS_ONLY), false+false)
DISABLED_WARNINGS_gcc_XlibWrapper.c := type-limits pointer-to-int-cast, \
DISABLED_WARNINGS_gcc_XRBackendNative.c := maybe-uninitialized, \
DISABLED_WARNINGS_gcc_XWindow.c := unused-function, \
DISABLED_WARNINGS_gcc_awt_InputMethod.c := unused-label, \
DISABLED_WARNINGS_clang_awt_Taskbar.c := parentheses, \
DISABLED_WARNINGS_clang_gtk3_interface.c := unused-function parentheses, \
DISABLED_WARNINGS_clang_GLXSurfaceData.c := unused-function, \
@@ -286,6 +395,7 @@ ifeq ($(call isTargetOs, windows macosx)+$(ENABLE_HEADLESS_ONLY), false+false)
DISABLED_WARNINGS_clang_OGLPaints.c := format-nonliteral, \
DISABLED_WARNINGS_clang_screencast_pipewire.c := format-nonliteral, \
DISABLED_WARNINGS_clang_sun_awt_X11_GtkFileDialogPeer.c := parentheses, \
DISABLED_WARNINGS_clang_awt_InputMethod.c := unused-label, \
DISABLED_WARNINGS_clang_XWindow.c := unused-function, \
DISABLED_WARNINGS_clang_aix := deprecated-non-prototype, \
DISABLED_WARNINGS_clang_aix_awt_Taskbar.c := parentheses, \
@@ -297,7 +407,7 @@ ifeq ($(call isTargetOs, windows macosx)+$(ENABLE_HEADLESS_ONLY), false+false)
parentheses, \
DISABLED_WARNINGS_clang_aix_awt_InputMethod.c := unused-function sign-compare, \
JDK_LIBS := libawt java.base:libjava, \
LIBS_unix := $(LIBDL) $(LIBM) $(X_LIBS) -lX11 -lXext -lXi -lXrender \
LIBS_unix := $(LIBDL) $(LIBM) $(SPEECHD_LIBS) $(X_LIBS) -lX11 -lXext -lXi -lXrender \
-lXtst, \
LIBS_linux := $(LIBPTHREAD), \
STATIC_LIB_EXCLUDE_OBJS := $(LIBAWT_XAWT_STATIC_EXCLUDE_OBJS), \
@@ -306,6 +416,95 @@ ifeq ($(call isTargetOs, windows macosx)+$(ENABLE_HEADLESS_ONLY), false+false)
TARGETS += $(BUILD_LIBAWT_XAWT)
endif
ifeq ($(call isTargetOs, windows macosx), false)
ifeq ($(ENABLE_HEADLESS_ONLY), false)
LIBAWT_WLAWT_EXTRA_SRC := \
common/awt \
common/java2d \
common/font \
common/wayland \
$(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/wayland \
#
LIBAWT_WLAWT_EXCLUDES := medialib debug opengl x11 $(VULKAN_EXCLUDES)
LIBAWT_WLAWT_EXCLUDE_FILES := common/awt/X11Color.c common/awt/awt_Font.c
LIBAWT_WLAWT_EXTRA_HEADER_DIRS := \
$(LIBAWT_DEFAULT_HEADER_DIRS) \
libawt_wlawt/awt \
$(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/wayland \
include \
common/awt/debug \
common/awt/systemscale \
common/font \
common/java2d \
common/java2d/wl \
common/java2d/vulkan \
common/wayland \
java.base:libjvm \
java.base:libjava \
libvmahpp \
#
# Enable 'wakefield' extension for java.awt.Robot support
WAKEFIELD_ROBOT_CFLAGS=-DWAKEFIELD_ROBOT
LIBAWT_WLAWT_CFLAGS += -DWLAWT \
$(WAKEFIELD_ROBOT_CFLAGS) \
$(FONTCONFIG_CFLAGS) \
$(VULKAN_FLAGS) \
$(WAYLAND_CFLAGS) \
$(CUPS_CFLAGS)
ifeq ($(TOOLCHAIN_TYPE), gcc)
# Turn off all warnings for the following files since they contain warnings
# that cannot be turned of individually.
# redefining a macro
BUILD_LIBAWT_WLAWT_awt_Font.c_CFLAGS := -w
# initializing a declared 'extern'
BUILD_LIBAWT_WLAWT_debug_mem.c_CFLAGS := -w
endif
$(eval $(call SetupJdkLibrary, BUILD_LIBAWT_WLAWT, \
NAME := awt_wlawt, \
EXCLUDE_FILES := $(LIBAWT_WLAWT_EXCLUDE_FILES), \
EXTRA_FILES := $(LIBAWT_WLAWT_EXTRA_FILES), \
EXTRA_SRC := $(LIBAWT_WLAWT_EXTRA_SRC), \
EXTRA_HEADER_DIRS := $(LIBAWT_WLAWT_EXTRA_HEADER_DIRS), \
EXCLUDES := $(LIBAWT_WLAWT_EXCLUDES), \
OPTIMIZATION := LOW, \
LINK_TYPE := C++, \
CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_WLAWT_CFLAGS), \
CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBAWT_WLAWT_CXXFLAGS), \
WARNINGS_AS_ERRORS_xlc := false, \
DISABLED_WARNINGS_C_gcc := type-limits pointer-to-int-cast \
unused-result maybe-uninitialized format unused-variable \
format-security int-to-pointer-cast parentheses \
implicit-fallthrough undef unused-function, \
DISABLED_WARNINGS_CXX_gcc := undef, \
DISABLED_WARNINGS_clang := parentheses format undef \
logical-op-parentheses format-nonliteral int-conversion, \
DISABLED_WARNINGS_gcc_awt_InputMethod.c := unused-label, \
DISABLED_WARNINGS_gcc_CUPSfuncs.c := unused-variable, \
DISABLED_WARNINGS_gcc_VKRenderQueue.c := unused-variable unused-but-set-variable, \
DISABLED_WARNINGS_clang_awt_InputMethod.c := unused-label, \
DISABLED_WARNINGS_clang_CUPSfuncs.c := unused-variable, \
DISABLED_WARNINGS_clang_VKRenderQueue.c := unused-variable unused-but-set-variable, \
JDK_LIBS := libawt java.base:libjava java.base:libjvm, \
LIBS := $(WAYLAND_LIBS), \
LIBS_unix := $(LIBDL) $(LIBM), \
LIBS_linux := -lpthread -lrt, \
))
$(BUILD_LIBAWT_WLAWT): $(call FindLib, java.base, java)
$(BUILD_LIBAWT_WLAWT): $(BUILD_LIBAWT)
TARGETS += $(BUILD_LIBAWT_WLAWT)
endif
endif
ifeq ($(call isTargetOs, macosx), true)
##############################################################################
## Build libawt_lwawt
@@ -321,16 +520,20 @@ ifeq ($(call isTargetOs, macosx), true)
$(LIBAWT_DEFAULT_HEADER_DIRS) \
libawt_lwawt/awt \
libawt_lwawt/font \
libawt_lwawt/java2d \
libawt_lwawt/java2d/opengl \
libawt_lwawt/java2d/metal \
include \
common/awt/debug \
common/java2d \
common/java2d/opengl \
java.base:libjvm \
#
LIBAWT_LWAWT_EXCLUDE_FILES := fontpath.c awt_Font.c X11Color.c
LIBAWT_LWAWT_EXCLUDES := $(TOPDIR)/src/$(MODULE)/unix/native/common/awt/medialib
LIBAWT_LWAWT_EXCLUDES := $(VULKAN_EXCLUDES) \
$(TOPDIR)/src/$(MODULE)/unix/native/common/awt/medialib \
#
LIBAWT_LWAWT_STATIC_EXCLUDE_OBJS := systemScale.o
@@ -359,6 +562,8 @@ ifeq ($(call isTargetOs, macosx), true)
DISABLED_WARNINGS_clang_OGLBufImgOps.c := format-nonliteral, \
DISABLED_WARNINGS_clang_OGLPaints.c := format-nonliteral, \
DISABLED_WARNINGS_clang_PrinterView.m := enum-conversion, \
DISABLED_WARNINGS_clang_SystemHotkey.m := format-nonliteral, \
DISABLED_WARNINGS_clang_system_properties.c := format-nonliteral, \
JDK_LIBS := libawt java.base:libjava libosxapp, \
LIBS_macosx := $(LIBM) \
-framework Accelerate \
@@ -366,11 +571,13 @@ ifeq ($(call isTargetOs, macosx), true)
-framework AudioToolbox \
-framework Carbon \
-framework Cocoa \
-framework IOKit \
-framework ExceptionHandling \
-framework JavaRuntimeSupport \
-framework Metal \
-framework OpenGL \
-framework QuartzCore \
-framework UniformTypeIdentifiers \
-framework Security, \
STATIC_LIB_EXCLUDE_OBJS := $(LIBAWT_LWAWT_STATIC_EXCLUDE_OBJS), \
))

View File

@@ -143,7 +143,9 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
#
LIBSPLASHSCREEN_HEADER_DIRS := \
libsplashscreen \
common/awt/utility \
common/awt/systemscale \
libosxapp \
java.base:libjava \
java.base:libjvm \
@@ -213,14 +215,21 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
else ifeq ($(call isTargetOs, windows), true)
LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
else
LIBWLSPLASHSCREEN_CFLAGS := -DWITH_WL $(LIBSPLASHSCREEN_CFLAGS) $(X_CFLAGS) $(WAYLAND_CFLAGS)
LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
endif
LIBSPLASHSCREEN_STATIC_LIB_EXCLUDE_OBJS += systemScale.o
LIBSPLASHSCREEN_EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c
LIBSPLASHSCREEN_LIBS := $(GIFLIB_LIBS) $(LIBJPEG_LIBS) $(LIBZ_LIBS) $(PNG_LIBS)
LIBSPLASHSCREEN_DISABLED_WARNINGS_gcc := sign-compare implicit-fallthrough shift-negative-value maybe-uninitialized unused-function type-limits unused-result unused-but-set-variable
LIBSPLASHSCREEN_DISABLED_WARNINGS_clang := deprecated-non-prototype format-nonliteral sign-compare incompatible-pointer-types deprecated-declarations
LIBWLSPLASHSCREEN_HEADER_DIRS := common/wayland $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/wayland
LIBWLSPLASHSCREEN_EXTRA_SRC := common/wayland
$(eval $(call SetupJdkLibrary, BUILD_LIBSPLASHSCREEN, \
NAME := splashscreen, \
EXTRA_SRC := $(LIBSPLASHSCREEN_EXTRA_SRC), \
EXTRA_SRC := $(LIBSPLASHSCREEN_EXTRA_SRC) libxsplashscreen libsplashscreen, \
EXCLUDE_SRC_PATTERNS := $(LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS), \
EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
EXCLUDES := $(LIBSPLASHSCREEN_EXCLUDES), \
@@ -231,7 +240,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
CXXFLAGS := $(LIBSPLASHSCREEN_CFLAGS) \
$(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS) \
$(ICONV_CFLAGS), \
EXTRA_HEADER_DIRS := $(LIBSPLASHSCREEN_HEADER_DIRS), \
EXTRA_HEADER_DIRS := libxsplashscreen $(LIBSPLASHSCREEN_HEADER_DIRS), \
DISABLED_WARNINGS_gcc_dgif_lib.c := sign-compare, \
DISABLED_WARNINGS_gcc_jcmaster.c := implicit-fallthrough, \
DISABLED_WARNINGS_gcc_jdphuff.c := shift-negative-value, \
@@ -241,8 +250,9 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
maybe-uninitialized, \
DISABLED_WARNINGS_gcc_splashscreen_impl.c := implicit-fallthrough \
sign-compare unused-function, \
DISABLED_WARNINGS_gcc_splashscreen_sys.c := type-limits \
DISABLED_WARNINGS_gcc_splashscreen_sys_common.c := type-limits \
unused-but-set-variable unused-result unused-variable, \
DISABLED_WARNINGS_gcc_splashscreen_sys.c := unused-variable \
DISABLED_WARNINGS_clang := deprecated-non-prototype, \
DISABLED_WARNINGS_clang_dgif_lib.c := sign-compare, \
DISABLED_WARNINGS_clang_gzwrite.c := format-nonliteral, \
@@ -261,7 +271,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
LDFLAGS_windows := -delayload:user32.dll, \
JDK_LIBS_windows := java.base:libjava, \
JDK_LIBS_macosx := libosxapp, \
LIBS := $(GIFLIB_LIBS) $(LIBJPEG_LIBS) $(LIBZ_LIBS) $(PNG_LIBS) $(ICONV_LIBS), \
LIBS := $(LIBSPLASHSCREEN_LIBS) $(ICONV_LIBS), \
LIBS_unix := $(LIBM) $(LIBPTHREAD), \
LIBS_linux := $(LIBDL) $(X_LIBS) -lX11 -lXext, \
LIBS_macosx := \
@@ -275,7 +285,29 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
STATIC_LIB_EXCLUDE_OBJS := $(LIBSPLASHSCREEN_STATIC_LIB_EXCLUDE_OBJS), \
))
$(eval $(call SetupJdkLibrary, BUILD_LIBWLSPLASHSCREEN, \
NAME := wlsplashscreen, \
EXTRA_SRC := $(LIBSPLASHSCREEN_EXTRA_SRC) $(LIBWLSPLASHSCREEN_EXTRA_SRC) libwlsplashscreen libsplashscreen, \
EXTRA_FILES := $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/wayland/xdg-shell.c, \
EXCLUDE_SRC_PATTERNS := $(LIBSPLASHSCREEN_EXCLUDE_SRC_PATTERNS), \
DISABLED_WARNINGS_gcc := $(LIBSPLASHSCREEN_DISABLED_WARNINGS_gcc), \
DISABLED_WARNINGS_clang := $(LIBSPLASHSCREEN_DISABLED_WARNINGS_clang), \
EXCLUDE_FILES := $(LIBSPLASHSCREEN_EXCLUDE_FILES), \
EXCLUDES := $(LIBSPLASHSCREEN_EXCLUDES), \
OPTIMIZATION := LOW, \
CFLAGS := $(LIBWLSPLASHSCREEN_CFLAGS) \
$(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \
EXTRA_HEADER_DIRS := $(LIBSPLASHSCREEN_HEADER_DIRS) $(LIBWLSPLASHSCREEN_HEADER_DIRS) libwlsplashscreen, \
LIBS := -lwayland-client -lwayland-cursor $(LIBSPLASHSCREEN_LIBS) -lrt, \
LIBS_unix := $(LIBDL) $(LIBM) -lpthread, \
LIBS_aix := -liconv, \
))
TARGETS += $(BUILD_LIBSPLASHSCREEN)
ifeq ($(call isTargetOs, linux), true)
TARGETS += $(BUILD_LIBWLSPLASHSCREEN)
endif
endif
################################################################################
@@ -350,6 +382,7 @@ else
endif
LIBFONTMANAGER_EXTRA_HEADER_DIRS := \
java.base:libjvm \
common/awt \
common/awt/utility \
common/font \
@@ -378,9 +411,9 @@ ifeq ($(call isTargetOs, windows), true)
LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c X11TextRenderer.c
else ifeq ($(call isTargetOs, macosx), true)
LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c X11TextRenderer.c \
fontpath.c lcdglyph.c
lcdglyph.c lcdglyphDW.cpp
else
LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c lcdglyph.c
LIBFONTMANAGER_EXCLUDE_FILES += lcdglyph.c lcdglyphDW.cpp
endif
LIBFONTMANAGER_CFLAGS += $(X_CFLAGS) -DLE_STANDALONE -DHEADLESS
@@ -400,7 +433,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
CFLAGS_windows = -DCC_NOEX, \
EXTRA_HEADER_DIRS := $(LIBFONTMANAGER_EXTRA_HEADER_DIRS), \
EXTRA_SRC := $(LIBFONTMANAGER_EXTRA_SRC), \
DISABLED_WARNINGS_gcc := $(HARFBUZZ_DISABLED_WARNINGS_gcc), \
DISABLED_WARNINGS_gcc := $(HARFBUZZ_DISABLED_WARNINGS_gcc) unused-result, \
DISABLED_WARNINGS_CXX_gcc := $(HARFBUZZ_DISABLED_WARNINGS_CXX_gcc), \
DISABLED_WARNINGS_clang := $(HARFBUZZ_DISABLED_WARNINGS_clang), \
DISABLED_WARNINGS_microsoft := $(HARFBUZZ_DISABLED_WARNINGS_microsoft), \
@@ -421,6 +454,48 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
TARGETS += $(BUILD_LIBFONTMANAGER)
ifeq ($(call isTargetOs, windows macosx), false)
ifeq ($(ENABLE_HEADLESS_ONLY), false)
LIBFONTMANAGER_XAWT_EXCLUDE_FILES := $(LIBFONTMANAGER_EXCLUDE_FILES)
LIBFONTMANAGER_XAWT_CFLAGS := $(LIBFONTMANAGER_CFLAGS)
LIBFONTMANAGER_XAWT_OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION)
LIBFONTMANAGER_XAWT_EXTRA_HEADER_DIRS := $(LIBFONTMANAGER_EXTRA_HEADER_DIRS) \
libfontmanager java.base:libjava
LIBFONTMANAGER_XAWT_EXTRA_SRC :=
$(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER_XAWT, \
NAME := fontmanager_xawt, \
EXCLUDE_FILES := $(LIBFONTMANAGER_XAWT_EXCLUDE_FILES) \
AccelGlyphCache.c, \
LINK_TYPE := C++, \
CFLAGS := $(CFLAGS_JDKLIB) $(LIBFONTMANAGER_XAWT_CFLAGS), \
CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBFONTMANAGER_XAWT_CFLAGS), \
OPTIMIZATION := $(LIBFONTMANAGER_XAWT_OPTIMIZATION), \
CFLAGS_windows = -DCC_NOEX, \
EXTRA_HEADER_DIRS := $(LIBFONTMANAGER_XAWT_EXTRA_HEADER_DIRS), \
EXTRA_SRC := $(LIBFONTMANAGER_XAWT_EXTRA_SRC), \
WARNINGS_AS_ERRORS_xlc := false, \
DISABLED_WARNINGS_gcc := $(HARFBUZZ_DISABLED_WARNINGS_gcc), \
DISABLED_WARNINGS_CXX_gcc := $(HARFBUZZ_DISABLED_WARNINGS_CXX_gcc), \
DISABLED_WARNINGS_clang := $(HARFBUZZ_DISABLED_WARNINGS_clang), \
DISABLED_WARNINGS_microsoft := $(HARFBUZZ_DISABLED_WARNINGS_microsoft), \
LDFLAGS := $(LDFLAGS_CXX_JDK), \
LDFLAGS_FILTER_OUT :=-Wl$(COMMA)-z$(COMMA)defs, \
LDFLAGS_aix := -Wl$(COMMA)-berok, \
JDK_LIBS := libfontmanager libawt java.base:libjava $(LIBFONTMANAGER_JDK_LIBS), \
LIBS := $(LIBFONTMANAGER_LIBS), \
LIBS_unix := $(LIBM), \
))
$(BUILD_LIBFONTMANAGER_XAWT): $(BUILD_LIBFONTMANAGER)
$(BUILD_LIBFONTMANAGER_XAWT): $(BUILD_LIBAWT_XAWT)
TARGETS += $(BUILD_LIBFONTMANAGER_XAWT)
endif
endif
ifeq ($(call isTargetOs, macosx), true)
##############################################################################
## Build libosxui

Some files were not shown because too many files have changed in this diff Show More