make/GensrcCorba.gmk

*** 32,49 ****
  
  include CommonCorba.gmk
  
  ################################################################################
  
! $(eval $(call SetupJavaCompilation,BUILD_STRIPPROP, \
      SETUP := GENERATE_OLDBYTECODE, \
      SRC := $(CORBA_TOPDIR)/make/tools/src, \
!     BIN := $(CORBA_OUTPUTDIR)/stripprop_classes))
  
! TOOL_STRIPPROP_CMD := $(JAVA) -cp $(CORBA_OUTPUTDIR)/stripprop_classes \
      build.tools.stripproperties.StripPropertiesCorba
  
  $(eval $(call SetupJavaCompilation,BUILD_IDLJ, \
      SETUP := GENERATE_OLDBYTECODE, \
      SRC := $(CORBA_TOPDIR)/src/share/classes, \
      BIN := $(CORBA_OUTPUTDIR)/idlj_classes, \
      COPY := .prp, \
--- 32,52 ----
  
  include CommonCorba.gmk
  
  ################################################################################
  
! $(eval $(call SetupJavaCompilation,BUILD_TOOLS, \
      SETUP := GENERATE_OLDBYTECODE, \
      SRC := $(CORBA_TOPDIR)/make/tools/src, \
!     BIN := $(CORBA_OUTPUTDIR)/tools_classes))
  
! TOOL_STRIPPROP_CMD := $(JAVA) -cp $(CORBA_OUTPUTDIR)/tools_classes \
      build.tools.stripproperties.StripPropertiesCorba
  
+ TOOL_LOGUTIL_CMD := $(JAVA) -cp $(CORBA_OUTPUTDIR)/tools_classes \
+     com.sun.tools.corba.se.logutil.MC
+ 
  $(eval $(call SetupJavaCompilation,BUILD_IDLJ, \
      SETUP := GENERATE_OLDBYTECODE, \
      SRC := $(CORBA_TOPDIR)/src/share/classes, \
      BIN := $(CORBA_OUTPUTDIR)/idlj_classes, \
      COPY := .prp, \
*** 51,75 ****
      EXCLUDE_FILES := ResourceBundleUtil.java))
  
  TOOL_IDLJ_CMD := $(JAVA) -cp $(CORBA_OUTPUTDIR)/idlj_classes \
      com.sun.tools.corba.se.idl.toJavaPortable.Compile
  
- $(eval $(call SetupJavaCompilation,BUILD_LOGUTIL, \
-     SETUP := GENERATE_OLDBYTECODE, \
-     SRC := $(CORBA_TOPDIR)/src/share/classes, \
-     BIN := $(CORBA_OUTPUTDIR)/logutil_classes, \
-     INCLUDES := com/sun/tools/corba/se/logutil))
- 
- TOOL_LOGUTIL_CMD := $(JAVA) -cp $(CORBA_OUTPUTDIR)/logutil_classes \
-     com.sun.tools.corba.se.logutil.MC
- 
  ################################################################################
  
  # Generate LogWrapper classes
  $(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/%SystemException.java: \
      $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
!     $(BUILD_LOGUTIL)
          $(MKDIR) -p $(@D)
          $(RM) -f $(@D)/_the_wrappers.d
          $(ECHO) $(LOG_INFO) Generating class file from $*.mc
          $(TOOL_LOGUTIL_CMD) make-class $< $(@D)
  
--- 54,69 ----
      EXCLUDE_FILES := ResourceBundleUtil.java))
  
  TOOL_IDLJ_CMD := $(JAVA) -cp $(CORBA_OUTPUTDIR)/idlj_classes \
      com.sun.tools.corba.se.idl.toJavaPortable.Compile
  
  ################################################################################
  
  # Generate LogWrapper classes
  $(CORBA_OUTPUTDIR)/gensrc/com/sun/corba/se/impl/logging/%SystemException.java: \
      $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
!     $(BUILD_TOOLS)
          $(MKDIR) -p $(@D)
          $(RM) -f $(@D)/_the_wrappers.d
          $(ECHO) $(LOG_INFO) Generating class file from $*.mc
          $(TOOL_LOGUTIL_CMD) make-class $< $(@D)
  
*** 88,98 ****
          $(CAT) $^ > $@
  
  # The resources files are generated from lisp-like .mc files.
  $(CORBA_OUTPUTDIR)/logwrappers/%SystemException.resource: \
      $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
!     $(BUILD_LOGUTIL)
          $(MKDIR) -p $(@D)
          $(RM) -f $(@D)/_the_wrappers.d
          $(ECHO) $(LOG_INFO) Generating resource file from $*.mc
          $(TOOL_LOGUTIL_CMD) make-resource $< $(@D)
  
--- 82,92 ----
          $(CAT) $^ > $@
  
  # The resources files are generated from lisp-like .mc files.
  $(CORBA_OUTPUTDIR)/logwrappers/%SystemException.resource: \
      $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
!     $(BUILD_TOOLS)
          $(MKDIR) -p $(@D)
          $(RM) -f $(@D)/_the_wrappers.d
          $(ECHO) $(LOG_INFO) Generating resource file from $*.mc
          $(TOOL_LOGUTIL_CMD) make-resource $< $(@D)
  
*** 140,150 ****
  STRIP_PROP_CMDLINE := $(subst _SPACE_, $(SPACE), \
      $(join $(addprefix -clean_SPACE_, $(STRIP_PROP_SRC_FILES)), \
      $(addprefix _SPACE_, $(STRIP_PROP_FILES))))
  
  $(CORBA_OUTPUTDIR)/_the.stripped_properties: $(STRIP_PROP_SRC_FILES) \
!     $(BUILD_STRIPPROP)
          $(MKDIR) -p $(sort $(dir $(STRIP_PROP_FILES)))
          $(call ListPathsSafely,STRIP_PROP_CMDLINE,\n, >> $(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline)
          $(TOOL_STRIPPROP_CMD) @$(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline
          $(TOUCH) $@
  
--- 134,144 ----
  STRIP_PROP_CMDLINE := $(subst _SPACE_, $(SPACE), \
      $(join $(addprefix -clean_SPACE_, $(STRIP_PROP_SRC_FILES)), \
      $(addprefix _SPACE_, $(STRIP_PROP_FILES))))
  
  $(CORBA_OUTPUTDIR)/_the.stripped_properties: $(STRIP_PROP_SRC_FILES) \
!     $(BUILD_TOOLS)
          $(MKDIR) -p $(sort $(dir $(STRIP_PROP_FILES)))
          $(call ListPathsSafely,STRIP_PROP_CMDLINE,\n, >> $(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline)
          $(TOOL_STRIPPROP_CMD) @$(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline
          $(TOUCH) $@