make/CompileJavaModules.gmk

*** 233,242 ****
--- 233,247 ----
        #
  endif
  
  ################################################################################
  
+ java.scripting_COPY := .js
+ java.scripting_CLEAN := .properties
+ 
+ ################################################################################
+ 
  java.sql_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
  
  ################################################################################
  
  java.sql.rowset_CLEAN_FILES := $(wildcard \
*** 316,325 ****
--- 321,333 ----
  jdk.charsets_COPY := .dat
  
  ################################################################################
  
  jdk.compiler_COPY := javax.tools.JavaCompilerTool
+ jdk.compiler_CLEAN_FILES := $(wildcard \
+     $(patsubst %, $(JDK_TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
+         sun/tools/serialver/resources))
  
  ################################################################################
  
  jdk.jcmd_COPY := _options 
  
*** 364,379 ****
  jdk.jconsole_CLEAN_FILES := $(wildcard \
      $(JDK_TOPDIR)/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/*.properties)
  
  ################################################################################
  
- jdk.compiler_CLEAN_FILES := $(wildcard \
-     $(patsubst %, $(JDK_TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
-         sun/tools/serialver/resources))
- 
- ################################################################################
- 
  jdk.jdi_EXCLUDES += \
      com/sun/tools/example/debug/bdi \
      com/sun/tools/example/debug/event \
      com/sun/tools/example/debug/gui \
      com/sun/jdi/doc-files \
--- 372,381 ----
*** 424,437 ****
  # Order src dirs in order of override with the most important first. Generated
  # source before static source and platform specific source before shared.
  #
  # To use this variable, use $(call ALL_SRC_DIRS,module) with no space.
  GENERATED_SRC_DIRS += \
!     $(JDK_OUTPUTDIR)/gensrc/$1 \
!     $(LANGTOOLS_OUTPUTDIR)/gensrc/$1 \
!     $(CORBA_OUTPUTDIR)/gensrc/$1 \
!     $(JDK_OUTPUTDIR)/gensrc_no_srczip/$1 \
      #
  
  OS_SRC_DIRS += $(JDK_TOPDIR)/src/$1/$(OPENJDK_TARGET_OS)/classes
  ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_API_DIR))
  OS_API_SRC_DIRS += $(JDK_TOPDIR)/src/$1/$(OPENJDK_TARGET_OS_API_DIR)/classes
--- 426,437 ----
  # Order src dirs in order of override with the most important first. Generated
  # source before static source and platform specific source before shared.
  #
  # To use this variable, use $(call ALL_SRC_DIRS,module) with no space.
  GENERATED_SRC_DIRS += \
!     $(SUPPORT_OUTPUTDIR)/gensrc/$1 \
!     $(SUPPORT_OUTPUTDIR)/gensrc_no_docs/$1 \
      #
  
  OS_SRC_DIRS += $(JDK_TOPDIR)/src/$1/$(OPENJDK_TARGET_OS)/classes
  ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_API_DIR))
  OS_API_SRC_DIRS += $(JDK_TOPDIR)/src/$1/$(OPENJDK_TARGET_OS_API_DIR)/classes
*** 486,496 ****
    $$(eval $$(call SetupJavaCompilation,$1, \
        SETUP := $$(if $$($1_SETUP), $$($1_SETUP), GENERATE_JDKBYTECODE), \
        SRC := $$(wildcard $$(call ALL_SRC_DIRS,$1)), \
        INCLUDES:=$(JDK_USER_DEFINED_FILTER),\
        BIN := $(JDK_OUTPUTDIR)/modules/$1, \
!       HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers/$1, \
        ADD_JAVAC_FLAGS := $$($1_JAVAC_FLAGS)))
  
    $1: $$($1) $$($1_COPY_EXTRA)
  
    # Declare dependencies between java compilation of different modules.
--- 486,496 ----
    $$(eval $$(call SetupJavaCompilation,$1, \
        SETUP := $$(if $$($1_SETUP), $$($1_SETUP), GENERATE_JDKBYTECODE), \
        SRC := $$(wildcard $$(call ALL_SRC_DIRS,$1)), \
        INCLUDES:=$(JDK_USER_DEFINED_FILTER),\
        BIN := $(JDK_OUTPUTDIR)/modules/$1, \
!       HEADERS := $(SUPPORT_OUTPUTDIR)/headers/$1, \
        ADD_JAVAC_FLAGS := $$($1_JAVAC_FLAGS)))
  
    $1: $$($1) $$($1_COPY_EXTRA)
  
    # Declare dependencies between java compilation of different modules.