On Fri, 1 Jul 2022 18:47:57 GMT, Nir Lisker <nlis...@openjdk.org> wrote:
>> Andy Goryachev has updated the pull request with a new target base due to a >> merge or a rebase. The incremental webrev excludes the unrelated changes >> brought in by the merge/rebase. The pull request contains seven additional >> commits since the last revision: >> >> - Merge remote-tracking branch 'origin/master' into JDK-8289255 >> - Revert "8279297: removed unused Shape.setMode method" >> >> This reverts commit 6b3b7e51f168a02f68c3bc0324528164680cb6c9. >> - 8279297: removed unused Shape.setMode method >> - 8289255: reverted gradlew >> - 8289255: reverted gradlew >> - 8289255: remove executable flag >> - 8289255: updated eclipse .classpath and other configuration files > > modules/javafx.graphics/.classpath line 5: > >> 3: <classpathentry kind="src" path="src/main/java"/> >> 4: <classpathentry kind="src" path="build/gensrc/jsl-prism"/> >> 5: <classpathentry kind="src" path="build/gensrc/jsl-decora"/> > > I think that you can remove these source folders too. > > Did you get errors with `build/hlsl/Decora` and `build/hlsl/Prism`? These are > generated for Windows, so possibly on Linux/Mac you would get errors, but > marking them with "ignore_optional_problems" should resolve these. > > In general, we should be able to remove OS-specific folders. 1. I will try to incorporate your changes, especially in apps/. My initial goal was to fix the build of everything except apps/ 2. I do get some warnings, they will be addressed by other fixes under JDK-8289379. But others (ex: MacPasteboardShim) I do not see, as those have been fixed. Could you please make sure you have no modified files and do a refresh? 3. Could you clarify your point about build/hlsl/Decora and build/hlsl/Prism please? I noticed there is nothing there, and nothing seem to be put there. Also, there are build/gensrc/jsl-prism and build/gensrc/jsl-decora directories being created, so I felt we can remove these entries from .classpath. I do build on Mac though. > modules/javafx.swing/.classpath line 9: > >> 7: </attributes> >> 8: </classpathentry> >> 9: <classpathentry kind="src" output="testbin" path="src/test/java"> > > This folder doesn't exist, it should be giving you an error, does it not? line 4 is <classpathentry kind="src" output="testbin" path="src/shims/java"> shims seem to be required, notice you get a bunch of shim-related warnings above. ------------- PR: https://git.openjdk.org/jfx/pull/804
