make/common/JavaCompilation.gmk

*** 1,7 ****
  #
! # Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 263,273 ****
      $1_JAR_CREATE_OPTIONS := cfm
      $1_JAR_UPDATE_OPTIONS := uf
    endif
  
    # Include all variables of significance in the vardeps file
!   $1_VARDEPS := $(JAR) $$($1_JAR_CREATE_OPTIONS) $$($1_MANIFEST) $(RELEASE) $(COMPANY_NAME) \
        $$($1_JARMAIN) $$($1_EXTRA_MANIFEST_ATTR)
    $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, $$(dir $$($1_JAR))_the.$$($1_JARNAME).vardeps)
  
    # Here is the rule that creates/updates the jar file.
    $$($1_JAR) : $$($1_DEPENDENCIES) $$($1_MANIFEST) $$($1_VARDEPS_FILE)
--- 263,273 ----
      $1_JAR_CREATE_OPTIONS := cfm
      $1_JAR_UPDATE_OPTIONS := uf
    endif
  
    # Include all variables of significance in the vardeps file
!   $1_VARDEPS := $(JAR) $$($1_JAR_CREATE_OPTIONS) $$($1_MANIFEST) \
        $$($1_JARMAIN) $$($1_EXTRA_MANIFEST_ATTR)
    $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, $$(dir $$($1_JAR))_the.$$($1_JARNAME).vardeps)
  
    # Here is the rule that creates/updates the jar file.
    $$($1_JAR) : $$($1_DEPENDENCIES) $$($1_MANIFEST) $$($1_VARDEPS_FILE)
*** 278,289 ****
          # either the jar file does not exist, or we need to recreate it from
          # from scratch anyway since a simple update will not catch all the
          # potential changes.
          $$(if $$(filter $$($1_VARDEPS_FILE) $$($1_MANIFEST), $$?), \
            $$(if $$($1_MANIFEST), \
!             $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
!                 -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) $$(NEWLINE) \
            , \
              $(RM) $$($1_MANIFEST_FILE) && $(TOUCH) $$($1_MANIFEST_FILE) $$(NEWLINE)) \
            $$(if $$($1_JARMAIN), \
              $(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE) $$(NEWLINE)) \
            $$(if $$($1_EXTRA_MANIFEST_ATTR), \
--- 278,288 ----
          # either the jar file does not exist, or we need to recreate it from
          # from scratch anyway since a simple update will not catch all the
          # potential changes.
          $$(if $$(filter $$($1_VARDEPS_FILE) $$($1_MANIFEST), $$?), \
            $$(if $$($1_MANIFEST), \
!             $(CP) $$($1_MANIFEST) $$($1_MANIFEST_FILE) $$(NEWLINE) \
            , \
              $(RM) $$($1_MANIFEST_FILE) && $(TOUCH) $$($1_MANIFEST_FILE) $$(NEWLINE)) \
            $$(if $$($1_JARMAIN), \
              $(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE) $$(NEWLINE)) \
            $$(if $$($1_EXTRA_MANIFEST_ATTR), \