j2sdk sparcv9 image has flattened out demo tree, all .so's put in one dir

The built solaris-sparcv9 directory has the following sparcv9 directories
in bin and demo:

./bin/sparcv9
./demo/jvmti/versionCheck/lib/sparcv9
./demo/jvmti/gctest/lib/sparcv9
./demo/jvmti/heapViewer/lib/sparcv9
./demo/jvmti/heapTracker/lib/sparcv9
./demo/jvmti/mtrace/lib/sparcv9
./demo/jvmti/waiters/lib/sparcv9
./demo/jni/Poller/sparcv9

The file make/common/Release.gmk (around line 623) contains these lines:

        @# vvvvvvvvvvvvvvvvv 64-bit images only vvvvvvvvvvvvvvvvvvvvv
        @#
        @# 64-bit solaris JDK image contains only the 64-bit add-on files.
        @#
ifdef SOLARIS64
        for dir in bin demo ; do $(MKDIR) $(JDK_IMAGE_DIR)/$$dir ; $(CD) $(ABS_OUTPUTDIR); $(FIND) $$dir -name '$(LIBARCH)' -exec $(CP) -r {} $(JDK_IMAGE_DIR)/$$dir \; ; done ;
This effectively completely flattens out the bin and sparcv9 directories to this
in the image directory:

./j2sdk-image/bin/sparcv9
./j2sdk-image/demo/sparcv9

That might be ok for 'bin' (by accident?) but is not acceptable for the
jvmti demo tests.

I've lost all the directory structure of the demo directory.
All the sparcv9 .so libraries are being placed in a single directory
at demo/sparcv9. This can cause tests to fail.

As verification I looked at the sparcv9 pkgmap file:

cruella<86> pwd
/net/koori.sfbay/p/jdk10/jdk/1.5.0/beta2/b51/bundles/solaris-sparcv9/pkgarchive/SUNWj5dmx
cruella<87> fgrep demo pkgmap
1 d none jdk/jdk1.5.0/demo 0755 root bin
1 d none jdk/jdk1.5.0/demo/sparcv9 0755 root bin
1 f none jdk/jdk1.5.0/demo/sparcv9/libgctest.so 0755 root bin 6616 44443 1084450122
1 f none jdk/jdk1.5.0/demo/sparcv9/libgctest_g.so 0755 root bin 12056 58889 1084450122
1 f none jdk/jdk1.5.0/demo/sparcv9/libheapViewer.so 0755 root bin 8424 34757 1084450122
1 f none jdk/jdk1.5.0/demo/sparcv9/libheapViewer_g.so 0755 root bin 14448 59795 1084450122
1 f none jdk/jdk1.5.0/demo/sparcv9/libmtrace.so 0755 root bin 16808 32784 1084450122
1 f none jdk/jdk1.5.0/demo/sparcv9/libmtrace_g.so 0755 root bin 30120 25828 1084450122
1 f none jdk/jdk1.5.0/demo/sparcv9/libpoller.so 0755 root bin 15152 39926 1084450123
1 f none jdk/jdk1.5.0/demo/sparcv9/libversionCheck.so 0755 root bin 4856 13248 1084450122
1 f none jdk/jdk1.5.0/demo/sparcv9/libversionCheck_g.so 0755 root bin 8784 32028 1084450122
1 f none jdk/jdk1.5.0/demo/sparcv9/libwaiters.so 0755 root bin 10104 28439 1084450123
1 f none jdk/jdk1.5.0/demo/sparcv9/libwaiters_g.so 0755 root bin 33968 62860 1084450123


-kto

###@###.### 2004-05-21
###@###.### 2004-05-21