make/BuildNashorn.gmk

rev 742 : 8033951: nasgen needs the newly build nasgen and nashorn classes in the bootclasspath

*** 75,85 ****
          $(ECHO) Running nasgen
          $(MKDIR) -p $(@D)
          $(RM) -rf $(@D)/jdk $(@D)/netscape
          $(CP) -R -p $(NASHORN_OUTPUTDIR)/nashorn_classes/* $(@D)/
          $(FIXPATH) $(JAVA) \
!             -cp "$(NASHORN_OUTPUTDIR)/nasgen_classes$(PATH_SEP)$(NASHORN_OUTPUTDIR)/nashorn_classes" \
              jdk.nashorn.internal.tools.nasgen.Main $(@D) jdk.nashorn.internal.objects $(@D)
          $(TOUCH) $@
  
  # Version file needs to be processed with version numbers
  VERSION_FILE := $(NASHORN_OUTPUTDIR)/classes/jdk/nashorn/internal/runtime/resources/version.properties
--- 75,85 ----
          $(ECHO) Running nasgen
          $(MKDIR) -p $(@D)
          $(RM) -rf $(@D)/jdk $(@D)/netscape
          $(CP) -R -p $(NASHORN_OUTPUTDIR)/nashorn_classes/* $(@D)/
          $(FIXPATH) $(JAVA) \
!             -Xbootclasspath/p:"$(NASHORN_OUTPUTDIR)/nasgen_classes$(PATH_SEP)$(NASHORN_OUTPUTDIR)/nashorn_classes" \
              jdk.nashorn.internal.tools.nasgen.Main $(@D) jdk.nashorn.internal.objects $(@D)
          $(TOUCH) $@
  
  # Version file needs to be processed with version numbers
  VERSION_FILE := $(NASHORN_OUTPUTDIR)/classes/jdk/nashorn/internal/runtime/resources/version.properties