1.1 --- a/makefiles/Makefile Fri Jun 01 14:12:06 2012 -0700
1.2 +++ b/makefiles/Makefile Thu Jun 07 20:30:30 2012 -0700
1.3 @@ -27,13 +27,14 @@
1.4 # Makefile for building the corba workspace.
1.5 #
1.6
1.7 +# This must be the first rule
1.8 +default: all
1.9 +
1.10 include $(SPEC)
1.11 include MakeBase.gmk
1.12 include JavaCompilation.gmk
1.13 include IdlCompilation.gmk
1.14
1.15 -default: all
1.16 -
1.17 JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
1.18 -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
1.19 # The Corba sources are old and generates a LOT of warnings.
1.20 @@ -105,9 +106,9 @@
1.21 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/%SystemException.java : \
1.22 $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
1.23 $(CORBA_OUTPUTDIR)/btjars/logutil.jar
1.24 - mkdir -p $(@D)
1.25 - rm -f $(@D)/_the_wrappers.d
1.26 - echo Generating class file from $*.mc
1.27 + $(MKDIR) -p $(@D)
1.28 + $(RM) -f $(@D)/_the_wrappers.d
1.29 + $(ECHO) Generating class file from $*.mc
1.30 $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-class $< $(@D)
1.31
1.32 # Generate LogWrapper properties file by concatening resource files
1.33 @@ -120,15 +121,15 @@
1.34 $(CORBA_OUTPUTDIR)/logwrappers/ORBUtilSystemException.resource \
1.35 $(CORBA_OUTPUTDIR)/logwrappers/POASystemException.resource \
1.36 $(CORBA_OUTPUTDIR)/logwrappers/UtilSystemException.resource
1.37 - mkdir -p $(@D)
1.38 - echo Concatenating 8 resource files into $(@F)
1.39 + $(MKDIR) -p $(@D)
1.40 + $(ECHO) Concatenating 8 resource files into $(@F)
1.41 $(CAT) $^ > $@
1.42
1.43 # The resources files are generated from lisp-like .mc files.
1.44 $(CORBA_OUTPUTDIR)/logwrappers/%SystemException.resource : $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc $(CORBA_OUTPUTDIR)/btjars/logutil.jar
1.45 - mkdir -p $(@D)
1.46 - rm -f $(@D)/_the_wrappers.d
1.47 - echo Generating resource file from $*.mc
1.48 + $(MKDIR) -p $(@D)
1.49 + $(RM) -f $(@D)/_the_wrappers.d
1.50 + $(ECHO) Generating resource file from $*.mc
1.51 $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-resource $< $(@D)
1.52
1.53
1.54 @@ -142,8 +143,8 @@
1.55 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/POASystemException.java \
1.56 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/UtilSystemException.java \
1.57 $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties
1.58 - mkdir -p $(@D)
1.59 - echo LOGWRAPPERS_ARE_CREATED=yes > $@
1.60 + $(MKDIR) -p $(@D)
1.61 + $(ECHO) LOGWRAPPERS_ARE_CREATED=yes > $@
1.62
1.63 # Trigger the generation of the logwrappers. After the logwrapper classes and
1.64 # resources have been created, then the makefile will restart and the newly
1.65 @@ -167,8 +168,8 @@
1.66 $(BUILD_IDLS) : $(CORBA_OUTPUTDIR)/btjars/idlj.jar
1.67
1.68 $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d : $(BUILD_IDLS) $(CORBA_OUTPUTDIR)/btjars/idlj.jar
1.69 - mkdir -p $(@D)
1.70 - echo IDLS_ARE_CREATED=yes > $@
1.71 + $(MKDIR) -p $(@D)
1.72 + $(ECHO) IDLS_ARE_CREATED=yes > $@
1.73
1.74 -include $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d
1.75
1.76 @@ -229,15 +230,16 @@
1.77 # The created src.zip now contains .java and .properties files used to create the classes in classes.jar
1.78 # and is ready for inclusion into the jdk src.zip
1.79
1.80 - BIN_FILES:=$(CORBA_TOPDIR)/src/share/classes/org/omg/CORBA/orb.idl $(CORBA_TOPDIR)/src/share/classes/org/omg/CORBA/ir.idl
1.81 + BIN_FILES:=$(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/orb.idl \
1.82 + $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/ir.idl
1.83
1.84 $(CORBA_OUTPUTDIR)/dist/lib/bin.zip : $(BIN_FILES) $(CORBA_OUTPUTDIR)/dist/lib/classes.jar
1.85 - mkdir -p $(CORBA_OUTPUTDIR)/dist/lib
1.86 - mkdir -p $(CORBA_OUTPUTDIR)/lib
1.87 - rm -f $@
1.88 - echo Creating `basename $@`
1.89 - cp $(CORBA_TOPDIR)/src/share/classes/org/omg/CORBA/*.idl $(CORBA_OUTPUTDIR)/lib
1.90 - chmod ug+w $(CORBA_OUTPUTDIR)/lib/*
1.91 + $(MKDIR) -p $(CORBA_OUTPUTDIR)/dist/lib
1.92 + $(MKDIR) -p $(CORBA_OUTPUTDIR)/lib
1.93 + $(RM) -f $@
1.94 + $(ECHO) Creating `basename $@`
1.95 + $(CP) $(BIN_FILES) $(CORBA_OUTPUTDIR)/lib
1.96 + $(CHMOD) ug+w $(CORBA_OUTPUTDIR)/lib/*
1.97 (cd $(CORBA_OUTPUTDIR); $(ZIP) -q $@ lib/orb.idl lib/ir.idl)
1.98
1.99 # The created bin.zip now contains the corba specific binaries: orb.idl, ir.idl
1.100 @@ -252,6 +254,6 @@
1.101 endif
1.102
1.103 clean:
1.104 - rm -rf $(CORBA_OUTPUTDIR)
1.105 + $(RM) -rf $(CORBA_OUTPUTDIR)
1.106
1.107 .PHONY: default all clean clobber
