RFR: 8056216 : Remove "sun" directory layer from libawt and common

[Phil Race]

https://bugs.openjdk.java.net/browse/JDK-8056216
http://cr.openjdk.java.net/~prr/8056216/

This is all just removing the sequence "sun/" from various pathnames.

Aside from the make file changes there are over 600 file moves which I
don't think
its worth including in the webrev but they are the result of the
following 'hg mv' commands

hg mv src/java.desktop/windows/native/libawt/sun/*
src/java.desktop/windows/native/libawt/
hg mv src/java.desktop/windows/native/common/sun/awt
src/java.desktop/windows/native/common
hg mv src/java.desktop/share/native/libawt/sun/*
src/java.desktop/share/native/libawt
hg mv src/java.desktop/share/native/common/sun/*
src/java.desktop/share/native/common
hg mv src/java.desktop/macosx/native/libawt_lwawt/sun/*
src/java.desktop/macosx/native/libawt_lwawt
hg mv src/java.desktop/unix/native/libawt/sun/*
src/java.desktop/unix/native/libawt
hg mv src/java.desktop/unix/native/common/sun/*
src/java.desktop/unix/native/common
hg mv src/java.desktop/unix/native/libawt_headless/sun/awt
src/java.desktop/unix/native/libawt_headless
hg mv src/java.desktop/unix/native/libawt_xawt/sun/*
src/java.desktop/unix/native/libawt_xawt/

I have done full open+closed builds via JPRT on all platforms ...

-phil.

[Erik Joelsson]

Looks good to me. Thanks for fixing this!

/Erik

Post by Phil Race
https://bugs.openjdk.java.net/browse/JDK-8056216
http://cr.openjdk.java.net/~prr/8056216/
This is all just removing the sequence "sun/" from various pathnames.
Aside from the make file changes there are over 600 file moves which I
don't think
its worth including in the webrev but they are the result of the
following 'hg mv' commands
hg mv src/java.desktop/windows/native/libawt/sun/*
src/java.desktop/windows/native/libawt/
hg mv src/java.desktop/windows/native/common/sun/awt
src/java.desktop/windows/native/common
hg mv src/java.desktop/share/native/libawt/sun/*
src/java.desktop/share/native/libawt
hg mv src/java.desktop/share/native/common/sun/*
src/java.desktop/share/native/common
hg mv src/java.desktop/macosx/native/libawt_lwawt/sun/*
src/java.desktop/macosx/native/libawt_lwawt
hg mv src/java.desktop/unix/native/libawt/sun/*
src/java.desktop/unix/native/libawt
hg mv src/java.desktop/unix/native/common/sun/*
src/java.desktop/unix/native/common
hg mv src/java.desktop/unix/native/libawt_headless/sun/awt
src/java.desktop/unix/native/libawt_headless
hg mv src/java.desktop/unix/native/libawt_xawt/sun/*
src/java.desktop/unix/native/libawt_xawt/
I have done full open+closed builds via JPRT on all platforms ...
-phil.

[Magnus Ihse Bursie]

Post by Phil Race
https://bugs.openjdk.java.net/browse/JDK-8056216
http://cr.openjdk.java.net/~prr/8056216/

Looks good to me. Thanks!

/Magnus

Post by Phil Race
This is all just removing the sequence "sun/" from various pathnames.
Aside from the make file changes there are over 600 file moves which I
don't think
its worth including in the webrev but they are the result of the
following 'hg mv' commands
hg mv src/java.desktop/windows/native/libawt/sun/*
src/java.desktop/windows/native/libawt/
hg mv src/java.desktop/windows/native/common/sun/awt
src/java.desktop/windows/native/common
hg mv src/java.desktop/share/native/libawt/sun/*
src/java.desktop/share/native/libawt
hg mv src/java.desktop/share/native/common/sun/*
src/java.desktop/share/native/common
hg mv src/java.desktop/macosx/native/libawt_lwawt/sun/*
src/java.desktop/macosx/native/libawt_lwawt
hg mv src/java.desktop/unix/native/libawt/sun/*
src/java.desktop/unix/native/libawt
hg mv src/java.desktop/unix/native/common/sun/*
src/java.desktop/unix/native/common
hg mv src/java.desktop/unix/native/libawt_headless/sun/awt
src/java.desktop/unix/native/libawt_headless
hg mv src/java.desktop/unix/native/libawt_xawt/sun/*
src/java.desktop/unix/native/libawt_xawt/
I have done full open+closed builds via JPRT on all platforms ...
-phil.

[Seán Coffey]

Hi Phil,

you'll need to update the unshuffle script[1] also given your path
changes. A find/replace operation should work. It probably makes sense
to push all changes together.

Regards,
Sean.

[1] http://cr.openjdk.java.net/~chegar/docs/portingScript.html

Post by Magnus Ihse Bursie

Post by Phil Race
https://bugs.openjdk.java.net/browse/JDK-8056216
http://cr.openjdk.java.net/~prr/8056216/

Looks good to me. Thanks!
/Magnus

Post by Phil Race
This is all just removing the sequence "sun/" from various pathnames.
Aside from the make file changes there are over 600 file moves which
I don't think
its worth including in the webrev but they are the result of the
following 'hg mv' commands
hg mv src/java.desktop/windows/native/libawt/sun/*
src/java.desktop/windows/native/libawt/
hg mv src/java.desktop/windows/native/common/sun/awt
src/java.desktop/windows/native/common
hg mv src/java.desktop/share/native/libawt/sun/*
src/java.desktop/share/native/libawt
hg mv src/java.desktop/share/native/common/sun/*
src/java.desktop/share/native/common
hg mv src/java.desktop/macosx/native/libawt_lwawt/sun/*
src/java.desktop/macosx/native/libawt_lwawt
hg mv src/java.desktop/unix/native/libawt/sun/*
src/java.desktop/unix/native/libawt
hg mv src/java.desktop/unix/native/common/sun/*
src/java.desktop/unix/native/common
hg mv src/java.desktop/unix/native/libawt_headless/sun/awt
src/java.desktop/unix/native/libawt_headless
hg mv src/java.desktop/unix/native/libawt_xawt/sun/*
src/java.desktop/unix/native/libawt_xawt/
I have done full open+closed builds via JPRT on all platforms ...
-phil.

[Phil Race]

Gosh that's going to be a pain to maintain .. here's an update to the
334 affected lines in that file ! Look ok ?
http://cr.openjdk.java.net/~prr/8056216.1

-phil

Post by Seán Coffey
Hi Phil,
you'll need to update the unshuffle script[1] also given your path
changes. A find/replace operation should work. It probably makes sense
to push all changes together.
Regards,
Sean.
[1] http://cr.openjdk.java.net/~chegar/docs/portingScript.html

Post by Magnus Ihse Bursie

Post by Phil Race
https://bugs.openjdk.java.net/browse/JDK-8056216
http://cr.openjdk.java.net/~prr/8056216/

Looks good to me. Thanks!
/Magnus

Post by Phil Race
This is all just removing the sequence "sun/" from various pathnames.
Aside from the make file changes there are over 600 file moves which
I don't think
its worth including in the webrev but they are the result of the
following 'hg mv' commands
hg mv src/java.desktop/windows/native/libawt/sun/*
src/java.desktop/windows/native/libawt/
hg mv src/java.desktop/windows/native/common/sun/awt
src/java.desktop/windows/native/common
hg mv src/java.desktop/share/native/libawt/sun/*
src/java.desktop/share/native/libawt
hg mv src/java.desktop/share/native/common/sun/*
src/java.desktop/share/native/common
hg mv src/java.desktop/macosx/native/libawt_lwawt/sun/*
src/java.desktop/macosx/native/libawt_lwawt
hg mv src/java.desktop/unix/native/libawt/sun/*
src/java.desktop/unix/native/libawt
hg mv src/java.desktop/unix/native/common/sun/*
src/java.desktop/unix/native/common
hg mv src/java.desktop/unix/native/libawt_headless/sun/awt
src/java.desktop/unix/native/libawt_headless
hg mv src/java.desktop/unix/native/libawt_xawt/sun/*
src/java.desktop/unix/native/libawt_xawt/
I have done full open+closed builds via JPRT on all platforms ...
-phil.

[Alan Bateman]

Post by Phil Race
Gosh that's going to be a pain to maintain .. here's an update to the
334 affected lines in that file ! Look ok ?
http://cr.openjdk.java.net/~prr/8056216.1
-phil

Ideally there should be just one line per directory, it should only list
individual files for cases the files aren't all in the same directory in
jdk8u-dev. It's hard to see from the webrev to know why there are
individual source files listed. It would be great to collapse this down
to 1 line if possible.

-Alan

[Seán Coffey]

Post by Alan Bateman

Post by Phil Race
Gosh that's going to be a pain to maintain .. here's an update to the
334 affected lines in that file ! Look ok ?
http://cr.openjdk.java.net/~prr/8056216.1
-phil

Ideally there should be just one line per directory, it should only
list individual files for cases the files aren't all in the same
directory in jdk8u-dev. It's hard to see from the webrev to know why
there are individual source files listed. It would be great to
collapse this down to 1 line if possible.

For the simpler packages, this was possible :
e.g. nashorn/src/jdk.scripting.nashorn/share/classes : nashorn/src

for the more complex packages where java src, native src and config
files got split up and where backwards (9 -> 8) and forwards (8 -> 9)
shuffling remained functional - then the picture is not as clear.

Thanks for the update Phil. Looks ok to me.

regards,
Sean.

Post by Alan Bateman
-Alan