Uploaded image for project: 'JDK'
  1. JDK
  2. JDK-8003593

build-infra: Paths to optional platform-specific files should not be hardwired to src/closed

    XMLWordPrintable

    Details

    • Type: Bug
    • Status: Resolved
    • Priority: P3
    • Resolution: Fixed
    • Affects Version/s: 8
    • Fix Version/s: 9
    • Component/s: infrastructure
    • Labels:
    • Subcomponent:
    • Introduced In Version:
      8
    • Resolved In Build:
      b127

      Description

      In the old build we have the following logic to deal with some of the platform specific files being located in a source repository instead of being generated at build time (this is for cross-compilation):

      ./java/nio/Makefile

      ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
      $(SCH_GEN)/SocketOptionRegistry.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/ch/SocketOptionRegistry-$(PLATFORM)-$(ARCH).j
      ava
              $(prep-target)
              $(CP) $< $@
      else
      $(SCH_GEN)/SocketOptionRegistry.java: $(GENSOR_EXE)
              $(prep-target)
              NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@
              $(GENSOR_EXE) >> $@
      endif


      In build-infra the NIO_PLATFORM_CLASSES_ROOT_DIR path variable wasn't used and instead we have hardwired a path to src/closed

      ifneq ($(wildcard $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/ch/SocketOptionRegistry-$(OPENJDK_TARGET_OS)-$(OPENJDK_TA
      RGET_CPU_ARCH).java),)
        HAS_SOCKET_OPTION_REGISTRY:=true
      endif

      ifneq ($(HAS_SOCKET_OPTION_REGISTRY),true)
      ...
      else
      ...
      endif


      This affects both the SocketOptionRegistry and UnixConstants

        Attachments

          Issue Links

            Activity

              People

              Assignee:
              erikj Erik Joelsson
              Reporter:
              dholmes David Holmes
              Votes:
              0 Vote for this issue
              Watchers:
              4 Start watching this issue

                Dates

                Created:
                Updated:
                Resolved: