4719 Common patchset for jdk1.7 support preparation

          --- old/usr/src/cmd/dtrace/test/cmd/jdtrace/Makefile
          +++ new/usr/src/cmd/dtrace/test/cmd/jdtrace/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  PROG = jdtrace
  29   29  SRCS = jdtrace.c
  30   30  
  31   31  include $(SRC)/cmd/Makefile.cmd
  32   32  
  33   33  ROOTOPTPKG = $(ROOT)/opt/SUNWdtrt
  34   34  ROOTBIN = $(ROOTOPTPKG)/bin
  35   35  ROOTLIB = $(ROOTOPTPKG)/lib
  36   36  ROOTLIBJAVA = $(ROOTLIB)/java
  37   37  
  38   38  # Use the proto dtrace.jar if it exists, otherwise use whatever is
  39   39  # installed on the system. It should be possible to build
  40   40  # usr/src/cmd/dtrace/test independently, even if only on systems that
  41   41  # have a compatible dtrace.jar installed.
  42   42  DTRACE_JAR=usr/share/lib/java/dtrace.jar
  43   43  PROTO_DTRACE_JAR=$(ROOT)/$(DTRACE_JAR)
  44   44  INSTALLED_DTRACE_JAR=/$(DTRACE_JAR)
  45   45  CLASSPATH=$(PROTO_DTRACE_JAR):$(INSTALLED_DTRACE_JAR)
  46   46  DTEST_DIR=$(SRC)/cmd/dtrace/test
  47   47  CLASSDIR=classes
  48   48  LIBDIR=lib
  49   49  MANIFESTDIR=manifest
  50   50  MANIFEST=$(MANIFESTDIR)/jdtrace.jar-manifest
  51   51  JDTRACE_JAR=$(LIBDIR)/jdtrace.jar
  52   52  
  53   53  PROTO_JDTRACE_JAR=$(ROOTLIBJAVA)/jdtrace.jar
  54   54  CMD = $(ROOTBIN)/jdtrace
  55   55  XLIST = $(ROOTBIN)/exception.lst
  56   56  
  57   57  $(PROTO_JDTRACE_JAR) := FILEMODE = 0644
  58   58  $(CMD) := FILEMODE = 0555
  59   59  $(XLIST) := FILEMODE = 0444
  60   60  
  61   61  all: $(JDTRACE_JAR) $(PROG)
  62   62  
  63   63  clean:
  64   64          -$(RM) $(CLASSDIR)/*.class
  65   65  
  66   66  clobber: clean
  67   67          -$(RM) $(JDTRACE_JAR)

  68   68          -$(RM) $(PROG)
  69   69  
  70   70  lint:
  71   71  
  72   72  install: all $(PROTO_JDTRACE_JAR) $(CMD) $(XLIST)
  73   73  
  74   74  $(PROG): $(SRCS)
  75   75          $(LINK.c) -o $@ $(SRCS) $(LDLIBS)
  76   76          $(POST_PROCESS) ; $(STRIP_STABS)
  77   77  
  78      -JFLAGS= -g -cp $(CLASSPATH) -d $(CLASSDIR) -deprecation
  79      -JFLAGS += -target 1.5
  80      -JFLAGS += -Xlint
       78 +JFLAGS= -g -cp $(CLASSPATH) -d $(CLASSDIR)
       79 +JFLAGS += -source 1.5 -target 1.6 -Xlint:all,-options
  81   80  COMPILE.java=$(JAVAC) $(JFLAGS)
  82   81  JAVASRC= JDTrace.java Getopt.java
  83   82  
  84   83  $(JDTRACE_JAR): $(JAVASRC)
  85   84          @mkdir -p $(CLASSDIR)
  86   85          @mkdir -p $(LIBDIR)
  87   86          $(COMPILE.java) $(JAVASRC)
  88   87          $(JAR) -cmf $(MANIFEST) $(JDTRACE_JAR) -C $(CLASSDIR) .
  89   88  
  90   89  $(PROTO_JDTRACE_JAR): $(ROOTLIBJAVA)

  91   90  
  92   91  $(CMD): $(ROOTBIN)
  93   92  
  94   93  $(XLIST): $(ROOTBIN)
  95   94  
  96   95  $(ROOTBIN):
  97   96          $(INS.dir)
  98   97  
  99   98  $(ROOTLIB):
 100   99          $(INS.dir)
 101  100  
 102  101  $(ROOTLIBJAVA): $(ROOTLIB)
 103  102          $(INS.dir)
 104  103  
 105  104  $(ROOTLIBJAVA)/%.jar: $(LIBDIR)/%.jar
 106  105          $(INS.file)
 107  106  
 108  107  $(ROOTBIN)/%: %
 109  108          $(INS.file)

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX