Mercurial > jdk8-mips64-public > corba / changeset

     1.1 --- a/make/common/shared/Platform.gmk	Thu Jun 07 12:10:14 2012 -0700
     1.2 +++ b/make/common/shared/Platform.gmk	Wed Jun 13 16:53:07 2012 -0700
     1.3 @@ -143,7 +143,7 @@
     1.4      REQUIRED_FREE_SPACE=1040000
     1.5    endif
     1.6    # How much RAM does this machine have:
     1.7 -  MB_OF_MEMORY=$(shell /etc/prtconf | fgrep 'Memory size:' | expand | cut -d' ' -f3)
     1.8 +  MB_OF_MEMORY:=$(shell /usr/sbin/prtconf 2>/dev/null | fgrep 'Memory size:' | expand | cut -d' ' -f3)
     1.9  endif
    1.10  
    1.11  # Platform settings specific to Linux

     2.1 --- a/makefiles/Makefile	Thu Jun 07 12:10:14 2012 -0700
     2.2 +++ b/makefiles/Makefile	Wed Jun 13 16:53:07 2012 -0700
     2.3 @@ -27,13 +27,14 @@
     2.4  # Makefile for building the corba workspace.
     2.5  #
     2.6  
     2.7 +# This must be the first rule
     2.8 +default: all
     2.9 +
    2.10  include $(SPEC)
    2.11  include MakeBase.gmk
    2.12  include JavaCompilation.gmk
    2.13  include IdlCompilation.gmk
    2.14  
    2.15 -default: all
    2.16 -
    2.17  JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
    2.18  		-jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
    2.19  # The Corba sources are old and generates a LOT of warnings.
    2.20 @@ -105,9 +106,9 @@
    2.21  $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/%SystemException.java : \
    2.22  			$(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
    2.23  			$(CORBA_OUTPUTDIR)/btjars/logutil.jar
    2.24 -	mkdir -p $(@D)
    2.25 -	rm -f $(@D)/_the_wrappers.d
    2.26 -	echo Generating class file from $*.mc
    2.27 +	$(MKDIR) -p $(@D)
    2.28 +	$(RM) -f $(@D)/_the_wrappers.d
    2.29 +	$(ECHO) Generating class file from $*.mc
    2.30  	$(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-class $< $(@D)
    2.31  
    2.32  # Generate LogWrapper properties file by concatening resource files 
    2.33 @@ -120,15 +121,15 @@
    2.34  		$(CORBA_OUTPUTDIR)/logwrappers/ORBUtilSystemException.resource \
    2.35  		$(CORBA_OUTPUTDIR)/logwrappers/POASystemException.resource \
    2.36  		$(CORBA_OUTPUTDIR)/logwrappers/UtilSystemException.resource
    2.37 -	mkdir -p $(@D)
    2.38 -	echo Concatenating 8 resource files into $(@F)
    2.39 +	$(MKDIR) -p $(@D)
    2.40 +	$(ECHO) Concatenating 8 resource files into $(@F)
    2.41  	$(CAT) $^ > $@
    2.42  
    2.43  # The resources files are generated from lisp-like .mc files.
    2.44  $(CORBA_OUTPUTDIR)/logwrappers/%SystemException.resource : $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc $(CORBA_OUTPUTDIR)/btjars/logutil.jar
    2.45 -	mkdir -p $(@D)
    2.46 -	rm -f $(@D)/_the_wrappers.d
    2.47 -	echo Generating resource file from $*.mc
    2.48 +	$(MKDIR) -p $(@D)
    2.49 +	$(RM) -f $(@D)/_the_wrappers.d
    2.50 +	$(ECHO) Generating resource file from $*.mc
    2.51  	$(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-resource $< $(@D)
    2.52  
    2.53  
    2.54 @@ -142,8 +143,8 @@
    2.55  	$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/POASystemException.java \
    2.56  	$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/UtilSystemException.java \
    2.57  	$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties
    2.58 -	mkdir -p $(@D) 
    2.59 -	echo LOGWRAPPERS_ARE_CREATED=yes > $@
    2.60 +	$(MKDIR) -p $(@D) 
    2.61 +	$(ECHO) LOGWRAPPERS_ARE_CREATED=yes > $@
    2.62  
    2.63  # Trigger the generation of the logwrappers. After the logwrapper classes and
    2.64  # resources have been created, then the makefile will restart and the newly
    2.65 @@ -167,8 +168,8 @@
    2.66          $(BUILD_IDLS) : $(CORBA_OUTPUTDIR)/btjars/idlj.jar
    2.67  
    2.68          $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d : $(BUILD_IDLS) $(CORBA_OUTPUTDIR)/btjars/idlj.jar
    2.69 -		mkdir -p $(@D)
    2.70 -		echo IDLS_ARE_CREATED=yes > $@
    2.71 +		$(MKDIR) -p $(@D)
    2.72 +		$(ECHO) IDLS_ARE_CREATED=yes > $@
    2.73  
    2.74          -include $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d
    2.75  
    2.76 @@ -229,15 +230,16 @@
    2.77                  # The created src.zip now contains .java and .properties files used to create the classes in classes.jar
    2.78                  # and is ready for inclusion into the jdk src.zip
    2.79  
    2.80 -                BIN_FILES:=$(CORBA_TOPDIR)/src/share/classes/org/omg/CORBA/orb.idl $(CORBA_TOPDIR)/src/share/classes/org/omg/CORBA/ir.idl
    2.81 +                BIN_FILES:=$(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/orb.idl \
    2.82 +			   $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/ir.idl
    2.83  
    2.84                  $(CORBA_OUTPUTDIR)/dist/lib/bin.zip : $(BIN_FILES) $(CORBA_OUTPUTDIR)/dist/lib/classes.jar
    2.85 -			mkdir -p $(CORBA_OUTPUTDIR)/dist/lib
    2.86 -			mkdir -p $(CORBA_OUTPUTDIR)/lib
    2.87 -			rm -f $@
    2.88 -			echo Creating `basename $@`
    2.89 -			cp $(CORBA_TOPDIR)/src/share/classes/org/omg/CORBA/*.idl $(CORBA_OUTPUTDIR)/lib
    2.90 -			chmod ug+w $(CORBA_OUTPUTDIR)/lib/*
    2.91 +			$(MKDIR) -p $(CORBA_OUTPUTDIR)/dist/lib
    2.92 +			$(MKDIR) -p $(CORBA_OUTPUTDIR)/lib
    2.93 +			$(RM) -f $@
    2.94 +			$(ECHO) Creating `basename $@`
    2.95 +			$(CP) $(BIN_FILES) $(CORBA_OUTPUTDIR)/lib
    2.96 +			$(CHMOD) ug+w $(CORBA_OUTPUTDIR)/lib/*
    2.97  			(cd $(CORBA_OUTPUTDIR); $(ZIP) -q $@ lib/orb.idl lib/ir.idl)
    2.98  
    2.99                  # The created bin.zip now contains the corba specific binaries: orb.idl, ir.idl
   2.100 @@ -252,6 +254,6 @@
   2.101  endif
   2.102  
   2.103  clean:
   2.104 -	rm -rf $(CORBA_OUTPUTDIR)
   2.105 +	$(RM) -rf $(CORBA_OUTPUTDIR)
   2.106  
   2.107  .PHONY: default all clean clobber