RFR: 8251886: Unable to use --disable-zip-debug-info on JDK8 Windows

[Andrew Hughes]

On 20:02 Mon 17 Aug     , Andrew Leonard wrote:
> Hi Andrew,
> I hadn't seen that bug, I'm looking through the changesets for it:
> https://hg.openjdk.java.net/jdk/jdk/rev/5193a7e23f14
> https://hg.openjdk.java.net/jdk/jdk/rev/4cbb04a368cb

It took me a while to find it through tracing back through the history
of the file. If a new patch is against a stable release, I try and
check if/how it is solved in later releases to see if there is a
possibility something could be backported instead.

> And must say seems quite a bit more complex, there's some tidying up in 
> those, but not sure I understand the actual change although GNU make is 
> hard to follow sometimes, i'll have a compare of it tomorrow.

It looks more complicated than it is, because a block is being moved,
but the contents are largely the same.

The main change is the dependency for creating the zip:

ifeq ($(OPENJDK_TARGET_OS), windows)
  $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET)
    $(CD) $$($1_OBJECT_DIR) \
     && $(ZIP) -q $$@ $$($1_LIBRARY).map $$($1_LIBRARY).pdb

becomes

# The dependency on TARGET is needed on windows for debuginfo files
# to be rebuilt properly.

$$($1_DEBUGINFO_ZIP): $$($1_DEBUGINFO_FILES) $$($1_TARGET)
   $(CD) $$($1_OBJECT_DIR) \
    && $(ZIP) -q $$@ $$($1_DEBUGINFO_FILES)

($1_DEBUGINFO_FILES is defined as the map and pdb file)

Thanks,
-- 
Andrew :)

Senior Free Java Software Engineer
OpenJDK Package Owner
Red Hat, Inc. (http://www.redhat.com)

PGP Key: ed25519/0xCFDA0F9B35964222 (hkp://keys.gnupg.net)
Fingerprint = 5132 579D D154 0ED2 3E04  C5A0 CFDA 0F9B 3596 4222