4719 Common patchset for jdk1.7 support preparation

          --- old/usr/src/cmd/dtrace/test/tst/common/java_api/Makefile
          +++ new/usr/src/cmd/dtrace/test/tst/common/java_api/Makefile

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each
  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  
  22   22  #
  23   23  # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  24   24  # Use is subject to license terms.
  25   25  #
  26   26  #ident  "%Z%%M% %I%     %E% SMI"
  27   27  
  28   28  include $(SRC)/Makefile.master
  29   29  
  30   30  ROOTOPTPKG = $(ROOT)/opt/SUNWdtrt
  31   31  JAR_DSTDIR = $(ROOTOPTPKG)/tst/common/java_api
  32   32  JAR_SRCDIR = $(SRC)/cmd/dtrace/test/tst/common/java_api
  33   33  
  34   34  # Use the proto dtrace.jar if it exists, otherwise use whatever is
  35   35  # installed on the system. It should be possible to build
  36   36  # usr/src/cmd/dtrace/test independently, even if only on systems that
  37   37  # have a compatible dtrace.jar installed.
  38   38  DTRACE_JAR=usr/share/lib/java/dtrace.jar
  39   39  PROTO_DTRACE_JAR=$(ROOT)/$(DTRACE_JAR)
  40   40  INSTALLED_DTRACE_JAR=/$(DTRACE_JAR)
  41   41  CLASSPATH=$(PROTO_DTRACE_JAR):$(INSTALLED_DTRACE_JAR)
  42   42  SRCDIR=src
  43   43  CLASSDIR=classes
  44   44  MANIFESTDIR=manifest
  45   45  MANIFEST=$(MANIFESTDIR)/test.jar-manifest
  46   46  TEST_JAR=$(JAR_SRCDIR)/test.jar
  47   47  PROTO_TEST_JAR=$(JAR_DSTDIR)/test.jar
  48   48  
  49   49  default: $(TEST_JAR)
  50   50  
  51   51  clean:
  52   52          $(RM) $(CLASSDIR)/*.class

  53   53  
  54   54  clobber: clean
  55   55          $(RM) $(TEST_JAR)
  56   56  
  57   57  all: default
  58   58  
  59   59  lint:
  60   60  
  61   61  install: all $(PROTO_TEST_JAR)
  62   62  
  63      -JFLAGS= -g -cp $(CLASSPATH) -d $(CLASSDIR) -deprecation
  64      -JFLAGS += -target 1.5
  65      -JFLAGS += -Xlint
       63 +JFLAGS= -g -cp $(CLASSPATH) -d $(CLASSDIR)
       64 +JFLAGS += -source 1.5 -target 1.6 -Xlint:all,-options,-rawtypes
  66   65  COMPILE.java=$(JAVAC) $(JFLAGS)
  67   66  
  68   67  $(TEST_JAR): $(SRCDIR)/*.java
  69   68          @mkdir -p $(CLASSDIR)
  70   69          $(COMPILE.java) $(SRCDIR)/*.java
  71   70          $(JAR) -cmf $(MANIFEST) $(TEST_JAR) -C $(CLASSDIR) .
  72   71  
  73   72  $(PROTO_TEST_JAR): $(JAR_DSTDIR)
  74   73  
  75   74  $(JAR_DSTDIR):
  76   75          $(INS.dir)
  77   76  
  78   77  $(JAR_DSTDIR)/%: $(JAR_SRCDIR)/%
  79   78          $(INS.file)
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX